Last commit before release

b41235c5 · nicolocarpignoli · 3e584f59 · b41235c5 · b41235c5 · b41235c5
12 changed file
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# 1.7.1
+
+- added possibility to change border marker color in marker generator
+
 # 1.7.0

 - optionally manage smooth parameter (for video entity glitches and similar problems)

--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ More details about markers:
 <!doctype HTML>
 <html>
 <script src="https://aframe.io/releases/0.9.1/aframe.min.js"></script>
-<script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.0/aframe/build/aframe-ar.js"></script>
+<script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.1/aframe/build/aframe-ar.js"></script>
  <body style='margin : 0px; overflow: hidden;'>
    <a-scene embedded arjs>
      <a-marker preset="hiro">

--- a/aframe/build/aframe-ar.js
+++ b/aframe/build/aframe-ar.js
@@ -5308,9 +5308,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '1.6.2'
-
-
+ARjs.Context.REVISION = '1.7.1';

 /**
 * Create a default camera for this trackingBackend
@@ -8472,14 +8470,14 @@ AFRAME.registerPrimitive('a-anchor', AFRAME.utils.extendDeep({}, AFRAME.primitiv
 		'url': 'arjs-anchor.patternUrl',
 		'value': 'arjs-anchor.barcodeValue',
 		'preset': 'arjs-anchor.preset',
-		'minConfidence': 'arjs-anchor.minConfidence',
-		'markerhelpers': 'arjs-anchor.markerhelpers',
+		'min-confidence': 'arjs-anchor.minConfidence',
+		'marker-helpers': 'arjs-anchor.markerhelpers',
 		'smooth': 'arjs-anchor.smooth',
-		'smoothCount': 'arjs-anchor.smoothCount',
-		'smoothTolerance': 'arjs-anchor.smoothTolerance',
-		'smoothThreshold': 'arjs-anchor.smoothThreshold',
+		'smooth-count': 'arjs-anchor.smoothCount',
+		'smooth-tolerance': 'arjs-anchor.smoothTolerance',
+		'smooth-threshold': 'arjs-anchor.smoothThreshold',

-		'hit-testing-renderDebug': 'arjs-hit-testing.renderDebug',
+		'hit-testing-render-debug': 'arjs-hit-testing.renderDebug',
 		'hit-testing-enabled': 'arjs-hit-testing.enabled',
 	}
 }))
@@ -8509,14 +8507,14 @@ AFRAME.registerPrimitive('a-marker', AFRAME.utils.extendDeep({}, AFRAME.primitiv
 		'url': 'arjs-anchor.patternUrl',
 		'value': 'arjs-anchor.barcodeValue',
 		'preset': 'arjs-anchor.preset',
-		'minConfidence': 'arjs-anchor.minConfidence',
-		'markerhelpers': 'arjs-anchor.markerhelpers',
+		'min-confidence': 'arjs-anchor.minConfidence',
+		'marker-helpers': 'arjs-anchor.markerhelpers',
 		'smooth': 'arjs-anchor.smooth',
-		'smoothCount': 'arjs-anchor.smoothCount',
-		'smoothTolerance': 'arjs-anchor.smoothTolerance',
-		'smoothThreshold': 'arjs-anchor.smoothThreshold',
+		'smooth-count': 'arjs-anchor.smoothCount',
+		'smooth-tolerance': 'arjs-anchor.smoothTolerance',
+		'smooth-threshold': 'arjs-anchor.smoothThreshold',

-		'hit-testing-renderDebug': 'arjs-hit-testing.renderDebug',
+		'hit-testing-render-debug': 'arjs-hit-testing.renderDebug',
 		'hit-testing-enabled': 'arjs-hit-testing.enabled',
 	}
 }))
@@ -8534,8 +8532,8 @@ AFRAME.registerPrimitive('a-marker-camera', AFRAME.utils.extendDeep({}, AFRAME.p
 		'url': 'arjs-anchor.patternUrl',
 		'value': 'arjs-anchor.barcodeValue',
 		'preset': 'arjs-anchor.preset',
-		'minConfidence': 'arjs-anchor.minConfidence',
-		'markerhelpers': 'arjs-anchor.markerhelpers',
+		'min-confidence': 'arjs-anchor.minConfidence',
+		'marker-helpers': 'arjs-anchor.markerhelpers',
 	}
 }))
 //////////////////////////////////////////////////////////////////////////////
--- a/aframe/build/aframe-ar.min.js
+++ b/aframe/build/aframe-ar.min.js
--- a/prova.html
+++ b/prova.html
+<!doctype HTML>
+<html>
+    <head>
+        <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+    </head>
+    <script src="https://aframe.io/releases/0.9.1/aframe.min.js"></script>
+    <script src="./aframe/build/aframe-ar.min.js"></script>
+    <script src="https://rawgit.com/donmccurdy/aframe-extras/master/dist/aframe-extras.loaders.min.js"></script>
+    
+    
+    <body style='margin : 0px; overflow: hidden;'>
+        <a-scene embedded arjs='sourceType: webcam; debugUIEnabled: false; detectionMode: mono_and_matrix; matrixCodeType: 3x3;'>
+        <a-assets>
+            <a-asset-item id="animated-asset" src="https://raw.githubusercontent.com/nicolocarpignoli/nicolocarpignoli.github.io/master/ar-experimental/models/butterf.glb"></a-asset-item>
+        </a-assets>
+
+
+        <a-marker type='barcode' value='7'>
+            <a-entity
+                scale="0.5 0.5 0.5" 
+                animation-mixer="loop: repeat"
+                gltf-model='#animated-asset'
+                rotation="-90 0 0">
+            </a-entity>
+        </a-marker>
+
+        <a-marker id="animated-marker" type='barcode' value='6'>
+            <a-entity
+                smooth="true" 
+                smoothCount="10" 
+                smoothTolerance="0.01" 
+                smoothThreshold="5"
+                scale="0.5 0.5 0.5" 
+                animation-mixer="loop: repeat"
+                gltf-model='#animated-asset'
+                rotation="-90 0 0">
+            </a-entity>
+        </a-marker>
+
+        <!-- use this <a-entity camera> to support multiple-markers, otherwise use <a-marker-camera> instead of </a-marker> -->
+        <a-entity camera></a-entity>
+        </a-scene>
+    </body>
+</html>
\ No newline at end of file
--- a/three.js/build/ar.js
+++ b/three.js/build/ar.js
@@ -5308,9 +5308,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '1.6.2'
-
-
+ARjs.Context.REVISION = '1.7.1';

 /**
 * Create a default camera for this trackingBackend
--- a/three.js/build/ar.lean.js
+++ b/three.js/build/ar.lean.js
@@ -2574,9 +2574,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '1.6.2'
-
-
+ARjs.Context.REVISION = '1.7.1';

 /**
 * Create a default camera for this trackingBackend

--- a/three.js/build/ar.lean.min.js
+++ b/three.js/build/ar.lean.min.js
--- a/three.js/build/ar.min.js
+++ b/three.js/build/ar.min.js
--- a/three.js/contribs/portableAR.js/build/portable-ar.js
+++ b/three.js/contribs/portableAR.js/build/portable-ar.js
@@ -49418,9 +49418,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '1.6.2'
-
-
+ARjs.Context.REVISION = '1.7.1';

 /**
 * Create a default camera for this trackingBackend
--- a/three.js/contribs/portableAR.js/build/portable-ar.min.js
+++ b/three.js/contribs/portableAR.js/build/portable-ar.min.js
--- a/three.js/src/threex/threex-artoolkitcontext.js
+++ b/three.js/src/threex/threex-artoolkitcontext.js
-import *  as PACKAGE from '../../../package.json';
-
 var ARjs = ARjs || {}
 var THREEx = THREEx || {}

@@ -78,7 +76,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = PACKAGE.version;
+ARjs.Context.REVISION = '1.7.1';

 /**
 * Create a default camera for this trackingBackend