Explorar o código

Fixed JSONLoader example material palette and some more examples cleanup.

alteredq %!s(int64=12) %!d(string=hai) anos
pai
achega
ec9f99712e

+ 5 - 5
examples/webgl_loader_ctm_materials.html

@@ -183,9 +183,9 @@
 				loader = new THREE.BinaryLoader( true );
 				document.body.appendChild( loader.statusDomElement );
 
-				var callbackScene   = function( geometry ) {
+				var callbackScene   = function( geometry, materials ) {
 
-					createScene( geometry,  0, 0, 0, 30 );
+					createScene( geometry, materials, 0, 0, 0, 30 );
 
 					var end = Date.now();
 
@@ -287,14 +287,14 @@
 
 			//
 
-			function createScene( geometry, x, y, z, s ) {
+			function createScene( geometry, materials, x, y, z, s ) {
 
 				loader.statusDomElement.style.display = "none";
 
 				THREE.GeometryUtils.center( geometry );
-				hackMaterials( geometry.materials );
+				hackMaterials( materials );
 
-				var material = new THREE.MeshFaceMaterial();
+				var material = new THREE.MeshFaceMaterial( materials );
 
 				mesh = new THREE.Mesh( geometry, material );
 				mesh.position.set( x, y, z );

+ 1 - 1
examples/webgl_loader_json_objconverter.html

@@ -218,7 +218,7 @@
 				zmesh.scale.set( 3, 3, 3 );
 				scene.add( zmesh );
 
-				createMaterialsPalette( geometry.materials, 100, b );
+				createMaterialsPalette( materials, 100, b );
 
 			}
 

+ 0 - 2
examples/webgl_shadowmap.html

@@ -274,8 +274,6 @@
 
 					var material = new THREE.MeshLambertMaterial( { color: 0xffaa55, morphTargets: true, vertexColors: THREE.FaceColors } );
 
-					//geometry.materials[ 0 ] = material;
-
 					if ( fudgeColor ) {
 
 						THREE.ColorUtils.adjustHSV( material.color, 0, 0.5 - Math.random(), 0.5 - Math.random() );

+ 0 - 2
examples/webgl_shadowmap_performance.html

@@ -274,8 +274,6 @@
 
 					var material = new THREE.MeshLambertMaterial( { color: 0xffaa55, morphTargets: true, vertexColors: THREE.FaceColors } );
 
-					//geometry.materials[ 0 ] = material;
-
 					if ( fudgeColor ) {
 
 						THREE.ColorUtils.adjustHSV( material.color, 0, 0.5 - Math.random(), 0.5 - Math.random() );