Skip to content

Commit 0f5725b

Browse files
nicolocarpignolinicolocarpignoli
authored
Merge pull request #725 from umutto/border-labeling-mode
artoolkit border labeling mode implementation
2 parents 32532d7 + 82f5733 commit 0f5725b

File tree

12 files changed

+103
-3
lines changed

12 files changed

+103
-3
lines changed

‎aframe/build/aframe-ar.js

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aframe/build/aframe-ar.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aframe/examples/assets/white_000.png

735 Bytes
Loading

‎aframe/examples/white-region-marker.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<script
2+
src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
3+
<script src="../build/aframe-ar.js"></script>
4+
5+
<body style='margin : 0px; overflow: hidden;'>
6+
<div style='position: fixed; top: 10px; text-align: center; z-index: 1; width: 100%; background: gray;'>
7+
White region marker (markers with white borders) example, use <a href="assets/white_000.png">this inverted marker.</a>
8+
</div>
9+
<a-scene embedded
10+
arjs='sourceType: webcam; detectionMode: mono_and_matrix; matrixCodeType: 3x3; labelingMode: white_region;' renderer='precision: mediump;'>
11+
12+
<a-marker type='barcode' value='0'>
13+
<a-sphere position="0 0.5 0" radius="1" color="red" />
14+
</a-marker>
15+
16+
<a-entity camera></a-entity>
17+
18+
</a-scene>
19+
</body>

‎aframe/src/system-arjs.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ AFRAME.registerSystem('arjs', {
3333
type: 'number',
3434
default: -1,
3535
},
36+
labelingMode: {
37+
type: 'string',
38+
default: '',
39+
},
3640
cameraParametersUrl: {
3741
type: 'string',
3842
default: '',
@@ -108,6 +112,7 @@ AFRAME.registerSystem('arjs', {
108112
if (this.data.detectionMode !== '') arProfile.contextParameters.detectionMode = this.data.detectionMode
109113
if (this.data.matrixCodeType !== '') arProfile.contextParameters.matrixCodeType = this.data.matrixCodeType
110114
if (this.data.patternRatio !== -1) arProfile.contextParameters.patternRatio = this.data.patternRatio
115+
if (this.data.labelingMode !== '') arProfile.contextParameters.labelingMode = this.data.labelingMode
111116
if (this.data.cameraParametersUrl !== '') arProfile.contextParameters.cameraParametersUrl = this.data.cameraParametersUrl
112117
if (this.data.maxDetectionRate !== -1) arProfile.contextParameters.maxDetectionRate = this.data.maxDetectionRate
113118
if (this.data.canvasWidth !== -1) arProfile.contextParameters.canvasWidth = this.data.canvasWidth

‎three.js/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ var parameters = {
5353
matrixCodeType: '3x3',
5454
// Pattern ratio for custom markers
5555
patternRatio: 0.5
56+
// Labeling mode for markers - ['black_region', 'white_region']
57+
// black_region: Black bordered markers on a white background, white_region: White bordered markers on a black background
58+
labelingMode: 'black_region',
5659

5760
// url of the camera parameters
5861
cameraParametersUrl: 'parameters/camera_para.dat',

‎three.js/build/ar.js

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar.lean.js

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar.lean.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)