2
0
Эх сурвалжийг харах

Updated more examples to geometry.materials-less setup.

Mr.doob 12 жил өмнө
parent
commit
708925855a

+ 5 - 5
examples/webgl_loader_json_objconverter.html

@@ -182,9 +182,9 @@
 				bwebgl.addEventListener("click", toggleWebGL, false);
 				bwebgl.addEventListener("click", toggleWebGL, false);
 
 
 				//var loader = new THREE.BinaryLoader(),
 				//var loader = new THREE.BinaryLoader(),
-				var loader = new THREE.JSONLoader(),
-					callbackMale   = function( geometry ) { createScene( geometry,  90, FLOOR, 50, 105 ) },
-					callbackFemale = function( geometry ) { createScene( geometry, -80, FLOOR, 50, 0 ) };
+				var loader = new THREE.JSONLoader();
+				var callbackMale = function ( geometry, materials ) { createScene( geometry, materials, 90, FLOOR, 50, 105 ) };
+				var callbackFemale = function ( geometry, materials ) { createScene( geometry, materials, -80, FLOOR, 50, 0 ) };
 
 
 				loader.load( "obj/male02/Male02_dds.js", callbackMale );
 				loader.load( "obj/male02/Male02_dds.js", callbackMale );
 				loader.load( "obj/female02/Female02_slim.js", callbackFemale );
 				loader.load( "obj/female02/Female02_slim.js", callbackFemale );
@@ -211,9 +211,9 @@
 
 
 			}
 			}
 
 
-			function createScene( geometry, x, y, z, b ) {
+			function createScene( geometry, materials, x, y, z, b ) {
 
 
-				zmesh = new THREE.Mesh( geometry, new THREE.MeshFaceMaterial() );
+				zmesh = new THREE.Mesh( geometry, new THREE.MeshFaceMaterial( materials ) );
 				zmesh.position.set( x, y, z );
 				zmesh.position.set( x, y, z );
 				zmesh.scale.set( 3, 3, 3 );
 				zmesh.scale.set( 3, 3, 3 );
 				scene.add( zmesh );
 				scene.add( zmesh );

+ 1 - 1
examples/webgl_materials_cars.html

@@ -578,7 +578,7 @@
 
 
 				for ( var i in CARS[ car ].mmap ) {
 				for ( var i in CARS[ car ].mmap ) {
 
 
-					geometry.materials[ i ] = CARS[ car ].mmap[ i ];
+					m.materials[ i ] = CARS[ car ].mmap[ i ];
 
 
 				}
 				}
 
 

+ 1 - 1
examples/webgl_materials_cars_anaglyph.html

@@ -572,7 +572,7 @@
 
 
 				for( var i in CARS[ car ].mmap ) {
 				for( var i in CARS[ car ].mmap ) {
 
 
-					geometry.materials[ i ] = CARS[ car ].mmap[ i ];
+					m.materials[ i ] = CARS[ car ].mmap[ i ];
 
 
 				}
 				}
 
 

+ 9 - 9
examples/webgl_materials_cars_camaro.html

@@ -185,15 +185,15 @@
 
 
 				var s = 75, m = new THREE.MeshFaceMaterial();
 				var s = 75, m = new THREE.MeshFaceMaterial();
 
 
-				geometry.materials[ 0 ] = materials.body[ 0 ][ 1 ]; // car body
-				geometry.materials[ 1 ] = materials.chrome; // wheels chrome
-				geometry.materials[ 2 ] = materials.chrome; // grille chrome
-				geometry.materials[ 3 ] = materials.darkchrome; // door lines
-				geometry.materials[ 4 ] = materials.glass; // windshield
-				geometry.materials[ 5 ] = materials.interior; // interior
-				geometry.materials[ 6 ] = materials.tire; // tire
-				geometry.materials[ 7 ] = materials.black; // tireling
-				geometry.materials[ 8 ] = materials.black; // behind grille
+				m.materials[ 0 ] = materials.body[ 0 ][ 1 ]; // car body
+				m.materials[ 1 ] = materials.chrome; // wheels chrome
+				m.materials[ 2 ] = materials.chrome; // grille chrome
+				m.materials[ 3 ] = materials.darkchrome; // door lines
+				m.materials[ 4 ] = materials.glass; // windshield
+				m.materials[ 5 ] = materials.interior; // interior
+				m.materials[ 6 ] = materials.tire; // tire
+				m.materials[ 7 ] = materials.black; // tireling
+				m.materials[ 8 ] = materials.black; // behind grille
 
 
 				var mesh = new THREE.Mesh( geometry, m );
 				var mesh = new THREE.Mesh( geometry, m );
 				mesh.rotation.y = 1;
 				mesh.rotation.y = 1;

+ 9 - 9
examples/webgl_materials_cars_camaro_crosseyed.html

@@ -195,15 +195,15 @@
 
 
 				var s = 75, m = new THREE.MeshFaceMaterial();
 				var s = 75, m = new THREE.MeshFaceMaterial();
 
 
-				geometry.materials[ 0 ] = materials.body[ 0 ][ 1 ]; // car body
-				geometry.materials[ 1 ] = materials.chrome; // wheels chrome
-				geometry.materials[ 2 ] = materials.chrome; // grille chrome
-				geometry.materials[ 3 ] = materials.darkchrome; // door lines
-				geometry.materials[ 4 ] = materials.glass; // windshield
-				geometry.materials[ 5 ] = materials.interior; // interior
-				geometry.materials[ 6 ] = materials.tire; // tire
-				geometry.materials[ 7 ] = materials.black; // tireling
-				geometry.materials[ 8 ] = materials.black; // behind grille
+				m.materials[ 0 ] = materials.body[ 0 ][ 1 ]; // car body
+				m.materials[ 1 ] = materials.chrome; // wheels chrome
+				m.materials[ 2 ] = materials.chrome; // grille chrome
+				m.materials[ 3 ] = materials.darkchrome; // door lines
+				m.materials[ 4 ] = materials.glass; // windshield
+				m.materials[ 5 ] = materials.interior; // interior
+				m.materials[ 6 ] = materials.tire; // tire
+				m.materials[ 7 ] = materials.black; // tireling
+				m.materials[ 8 ] = materials.black; // behind grille
 
 
 				var mesh = new THREE.Mesh( geometry, m );
 				var mesh = new THREE.Mesh( geometry, m );
 				mesh.rotation.y = 1;
 				mesh.rotation.y = 1;

+ 1 - 1
examples/webgl_materials_cars_parallaxbarrier.html

@@ -571,7 +571,7 @@
 
 
 				for( var i in CARS[ car ].mmap ) {
 				for( var i in CARS[ car ].mmap ) {
 
 
-					geometry.materials[ i ] = CARS[ car ].mmap[ i ];
+					m.materials[ i ] = CARS[ car ].mmap[ i ];
 
 
 				}
 				}
 
 

+ 3 - 3
examples/webgl_materials_lightmap.html

@@ -154,7 +154,7 @@
 				// MODEL
 				// MODEL
 
 
 				var loader = new THREE.JSONLoader();
 				var loader = new THREE.JSONLoader();
-				var callback = function( geometry ) { createScene( geometry,  0, 0, 0, 0, 100 ) };
+				var callback = function ( geometry, materials ) { createScene( geometry, materials, 0, 0, 0, 0, 100 ) };
 
 
 				loader.load( "obj/lightmap/lightmap.js", callback );
 				loader.load( "obj/lightmap/lightmap.js", callback );
 
 
@@ -173,9 +173,9 @@
 
 
 			}
 			}
 
 
-			function createScene( geometry, x, y, z, b, s ) {
+			function createScene( geometry, materials, x, y, z, b, s ) {
 
 
-				var mesh = new THREE.Mesh( geometry, new THREE.MeshFaceMaterial() );
+				var mesh = new THREE.Mesh( geometry, new THREE.MeshFaceMaterial( materials ) );
 				mesh.position.set( x, y, z );
 				mesh.position.set( x, y, z );
 				mesh.scale.set( s, s, s );
 				mesh.scale.set( s, s, s );
 				scene.add( mesh );
 				scene.add( mesh );