浏览代码

Material variations examples clean up.

Mr.doob 9 年之前
父节点
当前提交
9f8ddda658

+ 8 - 9
examples/webgl_materials_variations_basic.html

@@ -72,15 +72,14 @@
 
 				var materials = [];
 
-				var path = "textures/cube/SwedishRoyalCastle/";
-				var format = '.jpg';
-				var urls = [
-						path + 'px' + format, path + 'nx' + format,
-						path + 'py' + format, path + 'ny' + format,
-						path + 'pz' + format, path + 'nz' + format
-					];
-
-				var reflectionCube = new THREE.CubeTextureLoader().load( urls );
+				var loader = new THREE.CubeTextureLoader();
+				loader.setPath( 'textures/cube/SwedishRoyalCastle/' );
+
+				var reflectionCube = loader.load( [
+					'px.jpg', 'nx.jpg',
+					'py.jpg', 'ny.jpg',
+					'pz.jpg', 'nz.jpg'
+				] );
 				reflectionCube.format = THREE.RGBFormat;
 
 				var cubeWidth = 400;

+ 8 - 9
examples/webgl_materials_variations_lambert.html

@@ -72,15 +72,14 @@
 
 				var materials = [];
 
-				var path = "textures/cube/SwedishRoyalCastle/";
-				var format = '.jpg';
-				var urls = [
-						path + 'px' + format, path + 'nx' + format,
-						path + 'py' + format, path + 'ny' + format,
-						path + 'pz' + format, path + 'nz' + format
-					];
-
-				var reflectionCube = new THREE.CubeTextureLoader().load( urls );
+				var loader = new THREE.CubeTextureLoader();
+				loader.setPath( 'textures/cube/SwedishRoyalCastle/' );
+
+				var reflectionCube = loader.load( [
+					'px.jpg', 'nx.jpg',
+					'py.jpg', 'ny.jpg',
+					'pz.jpg', 'nz.jpg'
+				] );
 				reflectionCube.format = THREE.RGBFormat;
 
 				var cubeWidth = 400;

+ 18 - 29
examples/webgl_materials_variations_physical.html

@@ -63,24 +63,14 @@
 
 				// Materials
 
-				var imgTexture = new THREE.TextureLoader().load( "textures/planets/moon_1024.jpg" );
-				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
-				imgTexture.anisotropy = 16;
-				imgTexture = null;
-
-				var shininess = 50, specular = 0x333333, bumpScale = 1, shading = THREE.SmoothShading;
-
-				var materials = [];
-
-				var path = "textures/cube/SwedishRoyalCastle/";
-				var format = '.jpg';
-				var urls = [
-						path + 'px' + format, path + 'nx' + format,
-						path + 'py' + format, path + 'ny' + format,
-						path + 'pz' + format, path + 'nz' + format
-					];
-
-				var reflectionCube = new THREE.CubeTextureLoader().load( urls );
+				var loader = new THREE.CubeTextureLoader();
+				loader.setPath( 'textures/cube/SwedishRoyalCastle/' );
+
+				var reflectionCube = loader.load( [
+					'px.jpg', 'nx.jpg',
+					'py.jpg', 'ny.jpg',
+					'pz.jpg', 'nz.jpg'
+				] );
 				reflectionCube.format = THREE.RGBFormat;
 
 				var cubeWidth = 400;
@@ -90,19 +80,10 @@
 
 				var geometry = new THREE.SphereBufferGeometry( sphereRadius, 32, 16 );
 
-				var localReflectionCube;
-
 				for( var alpha = 0, alphaIndex = 0; alpha <= 1.0; alpha += stepSize, alphaIndex ++ ) {
 
 					var clearCoat = 1.0 - alpha;
 
-					//if( alphaIndex % 2 === 0 ) {
-						//localReflectionCube = null;
-					//}
-					//else {
-						localReflectionCube = reflectionCube;
-					//}
-
 					for( var beta = 0; beta <= 1.0; beta += stepSize ) {
 
 						var clearCoatRoughness = 1 - beta;
@@ -111,7 +92,15 @@
 
 							var reflectivity = 1 - gamma;
 
-							var material = new THREE.MeshPhysicalMaterial( { map: imgTexture, bumpMap: imgTexture, bumpScale: bumpScale, color: 0x888888, metalness: 0, roughness: 0.5, clearCoat: clearCoat, clearCoatRoughness: clearCoatRoughness, reflectivity: reflectivity, shading: THREE.SmoothShading, envMap: localReflectionCube } )
+							var material = new THREE.MeshPhysicalMaterial( {
+								color: 0x888822,
+								metalness: 0,
+								roughness: 0.5,
+								clearCoat: clearCoat,
+								clearCoatRoughness: clearCoatRoughness,
+								reflectivity: reflectivity,
+								envMap: reflectionCube
+							} );
 
 							var mesh = new THREE.Mesh( geometry, material );
 
@@ -173,7 +162,7 @@
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				renderer.sortObjects = true;
-			
+
 				container.appendChild( renderer.domElement );
 
 				renderer.gammaInput = true;

+ 8 - 9
examples/webgl_materials_variations_standard.html

@@ -72,15 +72,14 @@
 
 				var materials = [];
 
-				var path = "textures/cube/SwedishRoyalCastle/";
-				var format = '.jpg';
-				var urls = [
-						path + 'px' + format, path + 'nx' + format,
-						path + 'py' + format, path + 'ny' + format,
-						path + 'pz' + format, path + 'nz' + format
-					];
-
-				var reflectionCube = new THREE.CubeTextureLoader().load( urls );
+				var loader = new THREE.CubeTextureLoader();
+				loader.setPath( 'textures/cube/SwedishRoyalCastle/' );
+
+				var reflectionCube = loader.load( [
+					'px.jpg', 'nx.jpg',
+					'py.jpg', 'ny.jpg',
+					'pz.jpg', 'nz.jpg'
+				] );
 				reflectionCube.format = THREE.RGBFormat;
 
 				var cubeWidth = 400;