Last commit before release

Makefile

 build:
-	(cd three.js && make build) && (cd aframe && make build) && (cd webvr-polyfill && make build)
+	cd three.js && make build
+	cd aframe && make build
+	cd babylon.js && make build
+	cd webvr-polyfill && make build
 
 minify:
-	(cd three.js && make minify) && (cd aframe && make minify) && (cd webvr-polyfill && make minify)
+	cd three.js && make minify
+	cd aframe && make minify
+	cd babylon.js && make minify
+	cd webvr-polyfill && make minify
 
 .PHONY: test
 test:

README.md

@@ -232,10 +232,10 @@ This one is mainly for [me](@jerome_etienne) to remember :)
 
 ```bash
 # replace REVISION to the proper version
-atom three.js/src/threex-artoolkitcontext.js package.json
+atom three.js/src/threex/threex-artoolkitcontext.js package.json
 
 # Rebuild a-frame and webvr-polyfill
-make build
+make minify
 
 # Commit everything
 git add . && git commit -a -m 'Last commit before release'

aframe/build/aframe-ar.js

@@ -5205,7 +5205,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.4.10'
+ARjs.Context.REVISION = '1.5.0'
 
 
 
@@ -6903,6 +6903,21 @@ ARjs.HitTesting.Result.prototype.applyPosition = function(object3d){
 	object3d.position.copy(this.position)
 
 	object3d.updateMatrix()
+
+	return this
+}
+
+/**
+ * Apply to a controlled object3d
+ * 
+ * @param {THREE.Object3D} object3d - the result to apply
+ */
+ARjs.HitTesting.Result.prototype.applyQuaternion = function(object3d){
+	object3d.quaternion.copy(this.quaternion)
+
+	object3d.updateMatrix()
+
+	return this
 }
 var ARjs = ARjs || {}
 

babylon.js/build/babylon-ar.js

@@ -49315,7 +49315,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.4.10'
+ARjs.Context.REVISION = '1.5.0'
 
 
 

package.json

 {
   "name": "ar.js",
-  "version": "1.4.10",
+  "version": "1.5.0",
   "description": "Efficient Augmented Reality for the Web",
   "main": "three.js",
   "scripts": {

three.js/build/ar.js

@@ -5205,7 +5205,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.4.10'
+ARjs.Context.REVISION = '1.5.0'
 
 
 

three.js/src/threex/threex-artoolkitcontext.js

@@ -73,7 +73,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.4.10'
+ARjs.Context.REVISION = '1.5.0'
 
 
 

webvr-polyfill/build/artoolkit-webvr-polyfill.js

@@ -5205,7 +5205,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.4.10'
+ARjs.Context.REVISION = '1.5.0'
 
 
 
@@ -6903,6 +6903,21 @@ ARjs.HitTesting.Result.prototype.applyPosition = function(object3d){
 	object3d.position.copy(this.position)
 
 	object3d.updateMatrix()
+
+	return this
+}
+
+/**
+ * Apply to a controlled object3d
+ * 
+ * @param {THREE.Object3D} object3d - the result to apply
+ */
+ARjs.HitTesting.Result.prototype.applyQuaternion = function(object3d){
+	object3d.quaternion.copy(this.quaternion)
+
+	object3d.updateMatrix()
+
+	return this
 }
 var ARjs = ARjs || {}