morework

three.js/Makefile

@@ -4,7 +4,7 @@ watch: build
 .PHONY: build
 build: 
 	cat 	vendor/jsartoolkit5/build/artoolkit.min.js	\
-		vendor/jsartoolkit5/js/artoolkit.api.js	\
+		vendor/jsartoolkit5/js/artoolkit.api.js		\
 		threex-*.js 					\
 		> build/ar.js
 

three.js/examples/multi-markers/examples/learner.html

@@ -90,8 +90,8 @@
 		sourceType : 'webcam',
 		
 		// // to read from an image
-		sourceType : 'image',
-		sourceUrl : '../../../../data/images/multimarker.jpg'		
+		// sourceType : 'image',
+		// sourceUrl : '../../../../data/images/multimarker.jpg'		
 
 		// to read from a video
 		// sourceType : 'video',

three.js/examples/multi-markers/examples/player.html

@@ -86,8 +86,8 @@
 		sourceType : 'webcam',
 		
 		// // to read from an image
-		sourceType : 'image',
-		sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/multimarker.jpg'		
+		// sourceType : 'image',
+		// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/multimarker.jpg'		
 
 		// to read from a video
 		// sourceType : 'video',
@@ -180,14 +180,14 @@
 			type : 'pattern',
 			patternUrl : THREEx.ArToolkitContext.baseURL + '../data/multimarkers/multi-abcdef/patt.b',
 		},
-		// {
-		// 	type : 'pattern',
-		// 	patternUrl : THREEx.ArToolkitContext.baseURL + '../data/multimarkers/multi-abcdef/patt.c',
-		// },
-		// {
-		// 	type : 'pattern',
-		// 	patternUrl : THREEx.ArToolkitContext.baseURL + '../data/multimarkers/multi-abcdef/patt.f',
-		// },
+		{
+			type : 'pattern',
+			patternUrl : THREEx.ArToolkitContext.baseURL + '../data/multimarkers/multi-abcdef/patt.c',
+		},
+		{
+			type : 'pattern',
+			patternUrl : THREEx.ArToolkitContext.baseURL + '../data/multimarkers/multi-abcdef/patt.f',
+		},
 	]
 	
 	//////////////////////////////////////////////////////////////////////////////
@@ -226,7 +226,7 @@
 		// compute the average matrix of this markerFile
 		var averageMatrix = THREEx.ArMultiMarkerControls.computeCenter(multiMarkerFile)
 		averageMatrix.decompose(markerScene.position, markerScene.quaternion, markerScene.scale)
-
+		 markerScene.scale.multiplyScalar(3)
 		//////////////////////////////////////////////////////////////////////////////////
 		//		add an object in the scene
 		//////////////////////////////////////////////////////////////////////////////////