border labeling param changes after dev cleanup

umutto · umutto · commit ca12d5a1ea27 · 2020-02-09T15:40:08.000+09:00
diff --git a/aframe/examples/assets/white_000.png b/aframe/examples/assets/white_000.png
diff --git a/aframe/examples/white-region-marker.html b/aframe/examples/white-region-marker.html
@@ -0,0 +1,19 @@
+<script
+    src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
+<script src="../build/aframe-ar.js"></script>
+
+<body style='margin : 0px; overflow: hidden;'>
+    <div style='position: fixed; top: 10px; text-align: center; z-index: 1; width: 100%; background: gray;'>
+       White region marker (markers with white borders) example, use <a href="assets/white_000.png">this inverted marker.</a>
+    </div>
+    <a-scene embedded
+        arjs='sourceType: webcam; detectionMode: mono_and_matrix; matrixCodeType: 3x3; labelingMode: white_region;'>
+
+        <a-marker type='barcode' value='0'>
+            <a-sphere position="0 0.5 0" radius="1" color="red" />
+        </a-marker>
+
+        <a-entity camera></a-entity>
+
+    </a-scene>
+</body>
diff --git a/aframe/src/system-arjs.js b/aframe/src/system-arjs.js
@@ -33,6 +33,10 @@ AFRAME.registerSystem('arjs', {
             type: 'number',
             default: -1,
         },
+        labelingMode: {
+            type: 'string',
+            default: '',
+        },
         cameraParametersUrl: {
             type: 'string',
             default: '',
@@ -108,6 +112,7 @@ AFRAME.registerSystem('arjs', {
         if (this.data.detectionMode !== '') arProfile.contextParameters.detectionMode = this.data.detectionMode
         if (this.data.matrixCodeType !== '') arProfile.contextParameters.matrixCodeType = this.data.matrixCodeType
         if (this.data.patternRatio !== -1) arProfile.contextParameters.patternRatio = this.data.patternRatio
+        if (this.data.labelingMode !== '') arProfile.contextParameters.labelingMode = this.data.labelingMode
         if (this.data.cameraParametersUrl !== '') arProfile.contextParameters.cameraParametersUrl = this.data.cameraParametersUrl
         if (this.data.maxDetectionRate !== -1) arProfile.contextParameters.maxDetectionRate = this.data.maxDetectionRate
         if (this.data.canvasWidth !== -1) arProfile.contextParameters.canvasWidth = this.data.canvasWidth
diff --git a/three.js/README.md b/three.js/README.md
@@ -53,6 +53,9 @@ var parameters = {
 	matrixCodeType: '3x3',
 	// Pattern ratio for custom markers
 	patternRatio: 0.5
+	// Labeling mode for markers - ['black_region', 'white_region']
+	// black_region: Black bordered markers on a white background, white_region: White bordered markers on a black background
+	labelingMode: 'black_region',
 	
 	// url of the camera parameters
 	cameraParametersUrl: 'parameters/camera_para.dat',
diff --git a/three.js/src/threex/threex-artoolkitcontext.js b/three.js/src/threex/threex-artoolkitcontext.js
@@ -29,13 +29,19 @@ ARjs.Context = THREEx.ArToolkitContext = function (parameters) {
         // the patternRatio inside the artoolkit marker - artoolkit only
         patternRatio: 0.5,
 
+        // Labeling mode for markers - ['black_region', 'white_region']
+        // black_region: Black bordered markers on a white background, white_region: White bordered markers on a black background
+        labelingMode: 'black_region',
+
+
         // enable image smoothing or not for canvas copy - default to true
         // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/imageSmoothingEnabled
         imageSmoothingEnabled: false,
     }
     // parameters sanity check
     console.assert(['artoolkit', 'aruco'].indexOf(this.parameters.trackingBackend) !== -1, 'invalid parameter trackingBackend', this.parameters.trackingBackend)
     console.assert(['color', 'color_and_matrix', 'mono', 'mono_and_matrix'].indexOf(this.parameters.detectionMode) !== -1, 'invalid parameter detectionMode', this.parameters.detectionMode)
+    console.assert(["black_region", "white_region"].indexOf(this.parameters.labelingMode) !== -1, "invalid parameter labelingMode", this.parameters.labelingMode);
 
     this.arController = null;
     this.arucoContext = null;
@@ -234,6 +240,16 @@ ARjs.Context.prototype._initArtoolkit = function (onCompleted) {
         // set the patternRatio for artoolkit
         arController.setPattRatio(_this.parameters.patternRatio);
 
+        // set the labelingMode for artoolkit
+        var labelingModeTypes = {
+            "black_region": artoolkit.AR_LABELING_BLACK_REGION,
+            "white_region": artoolkit.AR_LABELING_WHITE_REGION
+        }
+        var labelingModeType = labelingModeTypes[_this.parameters.labelingMode];
+        console.assert(labelingModeType !== undefined);
+        arController.setLabelingMode(labelingModeType);
+
+
         // set thresholding in artoolkit
         // this seems to be the default
         // arController.setThresholdMode(artoolkit.AR_LABELING_THRESH_MODE_MANUAL)
diff --git a/three.js/src/threex/threex-artoolkitprofile.js b/three.js/src/threex/threex-artoolkitprofile.js
@@ -46,6 +46,7 @@ ARjs.Profile.prototype.reset = function () {
     this.contextParameters = {
         cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
         detectionMode: 'mono',
+        labelingMode: "black_region"
     }
     this.defaultMarkerParameters = {
         type: 'pattern',
@@ -105,10 +106,12 @@ ARjs.Profile.prototype.defaultMarker = function (trackingBackend) {
         this.contextParameters.detectionMode = 'mono'
         this.defaultMarkerParameters.type = 'pattern'
         this.defaultMarkerParameters.patternUrl = THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro'
+        this.contextParameters.labelingMode = "black_region"
     } else if (trackingBackend === 'aruco') {
         this.contextParameters.detectionMode = 'mono'
         this.defaultMarkerParameters.type = 'barcode'
         this.defaultMarkerParameters.barcodeValue = 1001
+        this.contextParameters.labelingMode = "black_region"
     } else console.assert(false)
 
     return this
