revert the old artoolkit.min.js libs for testing

Author: kalwalt

aframe/build/aframe-ar-nft.js

@@ -3,7 +3,7 @@ watch: build
 
 build-main:
 	echo	> build/ar.js
-	cat vendor/jsartoolkit5/build/artoolkit.min.js >> build/ar.js
+	cat vendor/jsartoolkit5/build/artoolkit-nft.min.js >> build/ar.js
 	cat	src/threex/threex-arbasecontrols.js					\
 		src/threex/threex-arclickability.js					\
 		src/threex/threex-armarkercloak.js					\
@@ -20,7 +20,7 @@ build-main:
 
 build-main-nft:
 	echo	> build/ar-nft.js
-	cat vendor/jsartoolkit5/build/artoolkit.min.js	>> build/ar-nft.js
+	cat vendor/jsartoolkit5/build/artoolkit-nft.min.js	>> build/ar-nft.js
 	cat	src/threex/threex-arbasecontrols.js					\
 		src/threex/threex-arclickability.js					\
 		src/threex/threex-armarkercloak.js					\

three.js/Makefile

@@ -5,7 +5,6 @@
 <script src='vendor/three.js/examples/js/libs/stats.min.js'></script>
 <!-- jsartookit -->
 <script src='../vendor/jsartoolkit5/build/artoolkit.min.js'></script>
-<script src='../vendor/jsartoolkit5/js/artoolkit.api.js'></script>
 <!-- include threex.artoolkit -->
 <script src='../src/threex/threex-artoolkitsource.js'></script>
 <script src='../src/threex/threex-artoolkitcontext.js'></script>
@@ -64,11 +63,11 @@
 
 	var arToolkitSource = new THREEx.ArToolkitSource({
 		// to read from the webcam
-		sourceType : 'webcam',
+		//sourceType : 'webcam',
 
 		// // to read from an image
-		// sourceType : 'image',
-		// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
+		 sourceType : 'image',
+		 sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
 		// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/armchair.jpg',
 
 		// to read from a video
@@ -179,14 +178,14 @@
 		side: THREE.DoubleSide
 	})
 	var mesh	= new THREE.Mesh( geometry, material );
-	mesh.position.z	= geometry.parameters.height/2
+	mesh.position.y	= geometry.parameters.height/2
 	// markerRoot.add( mesh );
 	arWorldRoot.add(mesh)
 
 	var geometry	= new THREE.TorusKnotGeometry(0.3,0.1,64,16);
 	var material	= new THREE.MeshNormalMaterial();
 	var mesh	= new THREE.Mesh( geometry, material );
-	mesh.position.z	= 0.5
+	mesh.position.y	= 0.5
 	// markerRoot.add( mesh );
 	arWorldRoot.add( mesh );
 

three.js/build/ar-nft.js

@@ -252,6 +252,7 @@ ARjs.Context.prototype.getProjectionMatrix = function (srcElement) {
     console.assert(this.arController, 'arController MUST be initialized to call this function')
     // get projectionMatrixArr from artoolkit
     var projectionMatrixArr = this.arController.getCameraMatrix();
+    console.log(projectionMatrixArr);
     var projectionMatrix = new THREE.Matrix4().fromArray(projectionMatrixArr)
 
     // apply context._axisTransformMatrix - change artoolkit axis to match usual webgl one