Merge pull request mrdoob#17077 from sciecode/dev-uvgrid

Mugen87 · web-flow · commit feb11a5ce6e6 · 2019-07-23T20:54:36.000+02:00
Examples: Replaces UV Grid Texture
diff --git a/examples/misc_exporter_collada.html b/examples/misc_exporter_collada.html
@@ -85,7 +85,7 @@
 				cameraControls.addEventListener( 'change', render );
 
 				// TEXTURE MAP
-				var textureMap = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
+				var textureMap = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
 				textureMap.wrapS = textureMap.wrapT = THREE.RepeatWrapping;
 				textureMap.anisotropy = 16;
 
diff --git a/examples/misc_exporter_gltf.html b/examples/misc_exporter_gltf.html
@@ -186,7 +186,7 @@
 				// Simple geometry with basic material
 				// ---------------------------------------------------------------------
 				// Icosahedron
-				var mapGrid = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
+				var mapGrid = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
 				mapGrid.wrapS = mapGrid.wrapT = THREE.RepeatWrapping;
 				var material = new THREE.MeshBasicMaterial( {
 					color: 0xffffff,
diff --git a/examples/textures/UV_Grid_Sm.jpg b/examples/textures/UV_Grid_Sm.jpg
diff --git a/examples/textures/UV_Grid_Sm.txt b/examples/textures/UV_Grid_Sm.txt
diff --git a/examples/textures/uv_grid_directx.jpg b/examples/textures/uv_grid_directx.jpg
diff --git a/examples/textures/uv_grid_opengl.jpg b/examples/textures/uv_grid_opengl.jpg
diff --git a/examples/webgl_geometries.html b/examples/webgl_geometries.html
@@ -37,7 +37,7 @@
 				camera.add( pointLight );
 				scene.add( camera );
 
-				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
+				var map = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 
diff --git a/examples/webgl_geometries_parametric.html b/examples/webgl_geometries_parametric.html
@@ -45,7 +45,7 @@
 
 				//
 
-				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
+				var map = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 
diff --git a/examples/webgl_geometry_nurbs.html b/examples/webgl_geometry_nurbs.html
@@ -142,7 +142,7 @@
 				var knots2 = [ 0, 0, 0, 0, 1, 1, 1, 1 ];
 				var nurbsSurface = new NURBSSurface( degree1, degree2, knots1, knots2, nsControlPoints );
 
-				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
+				var map = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 
diff --git a/examples/webgl_geometry_shapes.html b/examples/webgl_geometry_shapes.html
@@ -59,7 +59,7 @@
 				scene.add( group );
 
 				var loader = new THREE.TextureLoader();
-				var texture = loader.load( "textures/UV_Grid_Sm.jpg" );
+				var texture = loader.load( "textures/uv_grid_opengl.jpg" );
 
 				// it's necessary to apply these settings in order to correctly display the texture on a shape geometry
 
diff --git a/examples/webgl_geometry_teapot.html b/examples/webgl_geometry_teapot.html
@@ -79,7 +79,7 @@
 				cameraControls.addEventListener( 'change', render );
 
 				// TEXTURE MAP
-				var textureMap = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
+				var textureMap = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
 				textureMap.wrapS = textureMap.wrapT = THREE.RepeatWrapping;
 				textureMap.anisotropy = 16;
 
diff --git a/examples/webgl_loader_ctm.html b/examples/webgl_loader_ctm.html
@@ -130,7 +130,7 @@
 
 				loader.load( "models/ctm/ben.ctm", function ( geometry ) {
 
-					var material = new THREE.MeshLambertMaterial( { color: 0xffaa00, map: textureLoader.load( "textures/UV_Grid_Sm.jpg" ), envMap: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.3 } );
+					var material = new THREE.MeshLambertMaterial( { color: 0xffaa00, map: textureLoader.load( "textures/uv_grid_opengl.jpg" ), envMap: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.3 } );
 					callbackModel( geometry, 450, material, 0, - 200, 0, 0, 0 );
 					checkTime();
 
diff --git a/examples/webgl_loader_obj.html b/examples/webgl_loader_obj.html
@@ -79,7 +79,7 @@
 
 				var textureLoader = new THREE.TextureLoader( manager );
 
-				var texture = textureLoader.load( 'textures/UV_Grid_Sm.jpg' );
+				var texture = textureLoader.load( 'textures/uv_grid_opengl.jpg' );
 
 				// model
 
diff --git a/examples/webgl_marchingcubes.html b/examples/webgl_marchingcubes.html
@@ -157,7 +157,7 @@
 			var hatchingMaterial = createShaderMaterial( ToonShaderHatching, light, ambientLight );
 			var dottedMaterial = createShaderMaterial( ToonShaderDotted, light, ambientLight );
 
-			var texture = new THREE.TextureLoader().load( "textures/UV_Grid_Sm.jpg" );
+			var texture = new THREE.TextureLoader().load( "textures/uv_grid_opengl.jpg" );
 			texture.wrapS = THREE.RepeatWrapping;
 			texture.wrapT = THREE.RepeatWrapping;
 
diff --git a/examples/webgl_materials_blending.html b/examples/webgl_materials_blending.html
@@ -79,7 +79,7 @@
 					{ name: 'Multiply', constant: THREE.MultiplyBlending }
 				];
 
-				var map0 = textureLoader.load( 'textures/UV_Grid_Sm.jpg' );
+				var map0 = textureLoader.load( 'textures/uv_grid_opengl.jpg' );
 				var map1 = textureLoader.load( 'textures/sprite0.jpg' );
 				var map2 = textureLoader.load( 'textures/sprite0.png' );
 				var map3 = textureLoader.load( 'textures/lensflare/lensflare0.png' );
diff --git a/examples/webgl_materials_texture_rotation.html b/examples/webgl_materials_texture_rotation.html
@@ -56,7 +56,7 @@
 
 				var geometry = new THREE.BoxBufferGeometry( 10, 10, 10 );
 
-				new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg', function ( texture ) {
+				new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg', function ( texture ) {
 
 					texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 					texture.anisotropy = renderer.capabilities.getMaxAnisotropy();
diff --git a/examples/webgl_raycast_texture.html b/examples/webgl_raycast_texture.html
@@ -93,7 +93,7 @@
 
 				}, false );
 				this._background.crossOrigin = '';
-				this._background.src = "textures/UV_Grid_Sm.jpg";
+				this._background.src = "textures/uv_grid_opengl.jpg";
 
 				this._draw();
 
