Removed NinjaLo_bin.

mrdoob · Dec 7, 2016 · f778f6f · f778f6f
1 parent c2be5f5
commit f778f6f
Show file tree

Hide file tree

Showing 10 changed files with 18,345 additions and 83 deletions.
diff --git a/examples/textures/normal/ninja/ao.jpg → examples/models/obj/ninja/ao.jpg b/examples/textures/normal/ninja/ao.jpg → examples/models/obj/ninja/ao.jpg
diff --git a/...es/textures/normal/ninja/displacement.jpg → examples/models/obj/ninja/displacement.jpg b/...es/textures/normal/ninja/displacement.jpg → examples/models/obj/ninja/displacement.jpg
diff --git a/...es/textures/normal/ninja/displacement.txt → examples/models/obj/ninja/displacement.txt b/...es/textures/normal/ninja/displacement.txt → examples/models/obj/ninja/displacement.txt
diff --git a/examples/models/obj/ninja/ninjaHead_Low.obj b/examples/models/obj/ninja/ninjaHead_Low.obj
diff --git a/examples/textures/normal/ninja/normal.jpg → examples/models/obj/ninja/normal.jpg b/examples/textures/normal/ninja/normal.jpg → examples/models/obj/ninja/normal.jpg
diff --git a/examples/obj/ninja/NinjaLo_bin.bin b/examples/obj/ninja/NinjaLo_bin.bin
diff --git a/examples/obj/ninja/NinjaLo_bin.js b/examples/obj/ninja/NinjaLo_bin.js
diff --git a/examples/scenes/test_scene.js b/examples/scenes/test_scene.js
@@ -168,15 +168,6 @@
 					"visible"  : true
 				},
 
-				"ninja" : {
-					"geometry" : "NinjaLo",
-					"material" : "phong_normal",
-					"position" : [ 75, 10, -30 ],
-					"rotation" : [ 0, -0.5, 0 ],
-					"scale"	   : [ 1.25, 1.25, 1.25 ],
-					"visible"  : true
-				},
-
 				"sittingBox" : {
 					"geometry" : "sittingBox",
 					"material" : "phong_morph",
@@ -443,11 +434,6 @@
 			"url" : "obj/walt/WaltHead_bin.js"
 		},
 
-		"NinjaLo": {
-			"type": "binary",
-			"url" : "obj/ninja/NinjaLo_bin.js"
-		},
-
 		"veyron": {
 			"type": "binary",
 			"url" : "obj/veyron/VeyronNoUv_bin.js"
@@ -580,11 +566,6 @@
 			"parameters": { "color": 16733491, "specular": 1118481, "shininess": 30, "wireframe": false }
 		},
 
-		"phong_normal": {
-			"type": "MeshPhongMaterial",
-			"parameters": { "color": 0, "specular": 16777215, "shininess": 25, "envMap": "cube_reflection", "reflectivity": 0.1, "lightMap": "texture_ao", "normalMap": "texture_normal", "normalScale": [ 1, -1 ] }
-		},
-
 		"phong_morph": {
 			"type": "MeshPhongMaterial",
 			"parameters": { "color": 0, "specular": 16777215, "shininess": 50, "envMap": "cube_reflection", "reflectivity": 0.125, "combine": "MixOperation", "shading": "flat", "side": "double", "morphTargets": true }
@@ -749,21 +730,6 @@
 			"anisotropy": 4
 		},
 
-		"texture_normal": {
-			"url": "textures/normal/ninja/normal.jpg",
-			"anisotropy": 4
-		},
-
-		"texture_ao": {
-			"url": "textures/normal/ninja/ao.jpg",
-			"anisotropy": 4
-		},
-
-		"texture_displacement": {
-			"url": "textures/normal/ninja/displacement.jpg",
-			"anisotropy": 4
-		},
-
 		"texture_minecraft": {
 			"url": "textures/minecraft/grass.png",
 			"magFilter": "NearestFilter",

diff --git a/examples/webgl_materials_channels.html b/examples/webgl_materials_channels.html
@@ -43,8 +43,7 @@
 		<script src="../build/three.js"></script>
 		<script src="js/controls/OrbitControls.js"></script>
 
-
-		<script src="js/loaders/BinaryLoader.js"></script>
+		<script src="js/loaders/OBJLoader.js"></script>
 
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
@@ -54,7 +53,7 @@
 
 			if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
-			var stats, loader;
+			var stats;
 
 			var camera, scene, renderer, controls;
 
@@ -145,12 +144,9 @@
 				// textures
 
 				var textureLoader = new THREE.TextureLoader();
-
-				var normalMap = textureLoader.load( "textures/normal/ninja/normal.jpg" );
-
-				var aoMap = textureLoader.load( "textures/normal/ninja/ao.jpg" );
-
-				var displacementMap = textureLoader.load( "textures/normal/ninja/displacement.jpg" );
+				var normalMap = textureLoader.load( "models/obj/ninja/normal.jpg" );
+				var aoMap = textureLoader.load( "models/obj/ninja/ao.jpg" );
+				var displacementMap = textureLoader.load( "models/obj/ninja/displacement.jpg" );
 
 				// material
 
@@ -196,11 +192,12 @@
 
 				//
 
-				loader = new THREE.BinaryLoader();
-
-				loader.load( "obj/ninja/NinjaLo_bin.js", function( geometry ) {
+				var loader = new THREE.OBJLoader();
+				loader.load( "models/obj/ninja/ninjaHead_Low.obj", function ( group ) {
 
-					geometry.faceVertexUvs[ 1 ] = geometry.faceVertexUvs[ 0 ]; // 2nd set of UVs required for aoMap
+					geometry = group.children[ 0 ].geometry;
+					geometry.attributes.uv2 = geometry.attributes.uv;
+					geometry.center();
 
 					mesh = new THREE.Mesh( geometry, materialNormal );
 					mesh.scale.multiplyScalar( 25 );

diff --git a/examples/webgl_materials_displacementmap.html b/examples/webgl_materials_displacementmap.html
@@ -43,8 +43,7 @@
 		<script src="../build/three.js"></script>
 		<script src="js/controls/OrbitControls.js"></script>
 
-
-		<script src="js/loaders/BinaryLoader.js"></script>
+		<script src="js/loaders/OBJLoader.js"></script>
 
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
@@ -54,7 +53,7 @@
 
 			if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
-			var stats, loader;
+			var stats;
 
 			var camera, scene, renderer, controls;
 			var settings = {
@@ -192,12 +191,9 @@
 				// textures
 
 				var textureLoader = new THREE.TextureLoader();
-
-				var normalMap = textureLoader.load( "textures/normal/ninja/normal.jpg" );
-
-				var aoMap = textureLoader.load( "textures/normal/ninja/ao.jpg" );
-
-				var displacementMap = textureLoader.load( "textures/normal/ninja/displacement.jpg" );
+				var normalMap = textureLoader.load( "models/obj/ninja/normal.jpg" );
+				var aoMap = textureLoader.load( "models/obj/ninja/ao.jpg" );
+				var displacementMap = textureLoader.load( "models/obj/ninja/displacement.jpg" );
 
 				// material
 
@@ -226,11 +222,12 @@
 
 				//
 
-				loader = new THREE.BinaryLoader();
-
-				loader.load( "obj/ninja/NinjaLo_bin.js", function( geometry ) {
+				var loader = new THREE.OBJLoader();
+				loader.load( "models/obj/ninja/ninjaHead_Low.obj", function ( group ) {
 
-					geometry.faceVertexUvs[ 1 ] = geometry.faceVertexUvs[ 0 ]; // 2nd set of UVs required for aoMap
+					geometry = group.children[ 0 ].geometry;
+					geometry.attributes.uv2 = geometry.attributes.uv;
+					geometry.center();
 
 					mesh = new THREE.Mesh( geometry, material );
 					mesh.scale.multiplyScalar( 25 );