Bläddra i källkod

removed deprecated THREE.ImageUtils.loadTexture

Mugen87 9 år sedan
förälder
incheckning
6857b6d5d3
76 ändrade filer med 277 tillägg och 209 borttagningar
  1. 2 2
      docs/api/objects/Sprite.html
  2. 2 2
      docs/api/textures/Texture.html
  3. 1 1
      docs/scenes/js/material.js
  4. 11 4
      examples/canvas_materials.html
  5. 4 1
      examples/canvas_materials_reflection.html
  6. 4 1
      examples/canvas_sandbox.html
  7. 4 2
      examples/js/GPUParticleSystem.js
  8. 4 3
      examples/js/MD2Character.js
  9. 3 2
      examples/js/MD2CharacterComplex.js
  10. 20 19
      examples/js/UCSCharacter.js
  11. 2 2
      examples/js/loaders/sea3d/SEA3DLoader.js
  12. 2 1
      examples/misc_animation_authoring.html
  13. 1 1
      examples/misc_controls_deviceorientation.html
  14. 2 2
      examples/misc_controls_transform.html
  15. 1 1
      examples/misc_fps.html
  16. 4 2
      examples/misc_ubiquity_test.html
  17. 5 4
      examples/misc_ubiquity_test2.html
  18. 1 1
      examples/webgl_buffergeometry_custom_attributes_particles.html
  19. 1 1
      examples/webgl_buffergeometry_instancing_billboards.html
  20. 1 1
      examples/webgl_buffergeometry_instancing_dynamic.html
  21. 1 1
      examples/webgl_buffergeometry_instancing_interleaved_dynamic.html
  22. 1 1
      examples/webgl_custom_attributes.html
  23. 1 1
      examples/webgl_custom_attributes_points.html
  24. 1 1
      examples/webgl_custom_attributes_points2.html
  25. 1 1
      examples/webgl_custom_attributes_points3.html
  26. 1 1
      examples/webgl_geometries.html
  27. 1 1
      examples/webgl_geometries2.html
  28. 1 1
      examples/webgl_geometry_convex.html
  29. 1 1
      examples/webgl_geometry_cube.html
  30. 1 1
      examples/webgl_geometry_dynamic.html
  31. 1 1
      examples/webgl_geometry_minecraft.html
  32. 4 4
      examples/webgl_geometry_minecraft_ao.html
  33. 1 1
      examples/webgl_geometry_nurbs.html
  34. 1 1
      examples/webgl_geometry_teapot.html
  35. 1 1
      examples/webgl_hdr.html
  36. 1 1
      examples/webgl_interactive_points.html
  37. 1 1
      examples/webgl_interactive_voxelpainter.html
  38. 4 3
      examples/webgl_lensflares.html
  39. 4 3
      examples/webgl_lights_pointlights2.html
  40. 1 1
      examples/webgl_loader_md2.html
  41. 1 1
      examples/webgl_loader_md2_control.html
  42. 5 3
      examples/webgl_marchingcubes.html
  43. 11 7
      examples/webgl_materials_blending_custom.html
  44. 1 1
      examples/webgl_materials_bumpmap.html
  45. 5 3
      examples/webgl_materials_bumpmap_skin.html
  46. 4 3
      examples/webgl_materials_cubemap_dynamic.html
  47. 8 4
      examples/webgl_materials_cubemap_dynamic2.html
  48. 8 4
      examples/webgl_materials_displacementmap.html
  49. 4 3
      examples/webgl_materials_envmaps.html
  50. 5 3
      examples/webgl_materials_normalmap.html
  51. 5 2
      examples/webgl_materials_parallaxmap.html
  52. 4 2
      examples/webgl_materials_skin.html
  53. 4 2
      examples/webgl_materials_texture_anisotropy.html
  54. 5 4
      examples/webgl_materials_texture_filters.html
  55. 5 5
      examples/webgl_materials_texture_manualmipmap.html
  56. 1 1
      examples/webgl_materials_variations_basic.html
  57. 1 1
      examples/webgl_materials_variations_lambert.html
  58. 1 1
      examples/webgl_materials_variations_phong.html
  59. 1 1
      examples/webgl_materials_variations_standard.html
  60. 1 1
      examples/webgl_materials_variations_standard2.html
  61. 9 7
      examples/webgl_nearestneighbour.html
  62. 18 18
      examples/webgl_objects_update.html
  63. 2 2
      examples/webgl_panorama_equirectangular.html
  64. 11 9
      examples/webgl_particles_general.html
  65. 1 1
      examples/webgl_points_billboards.html
  66. 1 1
      examples/webgl_points_billboards_colors.html
  67. 7 5
      examples/webgl_points_sprites.html
  68. 6 4
      examples/webgl_postprocessing_nodes.html
  69. 3 4
      examples/webgl_sandbox.html
  70. 1 1
      examples/webgl_shader2.html
  71. 4 2
      examples/webgl_shader_lava.html
  72. 2 2
      examples/webgl_shaders_ocean.html
  73. 7 5
      examples/webgl_shaders_tonemapping.html
  74. 4 3
      examples/webgl_shading_physical.html
  75. 7 5
      examples/webgl_sprites.html
  76. 10 8
      examples/webgl_terrain_dynamic.html

+ 2 - 2
docs/api/objects/Sprite.html

@@ -17,7 +17,7 @@
                 <h2>Example</h2>
                 <h2>Example</h2>
 
 
                 <code>
                 <code>
-                var map = THREE.ImageUtils.loadTexture( "sprite.png" );
+                var map = new THREE.TextureLoader().load( "sprite.png" );
                 var material = new THREE.SpriteMaterial( { map: map, color: 0xffffff, fog: true } );
                 var material = new THREE.SpriteMaterial( { map: map, color: 0xffffff, fog: true } );
                 var sprite = new THREE.Sprite( material );
                 var sprite = new THREE.Sprite( material );
                 scene.add( sprite );
                 scene.add( sprite );
@@ -48,7 +48,7 @@
                 <div>
                 <div>
                 This creates a new clone of the sprite.
                 This creates a new clone of the sprite.
                 </div>
                 </div>
-		
+
 		<h3>[method:Object3D clone]([page:Object3D object])</h3>
 		<h3>[method:Object3D clone]([page:Object3D object])</h3>
 		<div>
 		<div>
 		object -- (optional) Object3D which needs to be cloned. If undefined, clone method will create a new cloned Sprite Object.
 		object -- (optional) Object3D which needs to be cloned. If undefined, clone method will create a new cloned Sprite Object.

+ 2 - 2
docs/api/textures/Texture.html

@@ -21,7 +21,7 @@
 
 
 		<code>
 		<code>
 		// load a texture, set wrap mode to repeat
 		// load a texture, set wrap mode to repeat
-		var texture = THREE.ImageUtils.loadTexture( "textures/water.jpg" );
+		var texture = new THREE.TextureLoader().load( "textures/water.jpg" );
 		texture.wrapS = THREE.RepeatWrapping;
 		texture.wrapS = THREE.RepeatWrapping;
 		texture.wrapT = THREE.RepeatWrapping;
 		texture.wrapT = THREE.RepeatWrapping;
 		texture.repeat.set( 4, 4 );
 		texture.repeat.set( 4, 4 );
@@ -53,7 +53,7 @@
 		<div>
 		<div>
 		The default is THREE.ClampToEdgeWrapping, where the edge is clamped to the outer edge texels. The other two choices are THREE.RepeatWrapping and THREE.MirroredRepeatWrapping.
 		The default is THREE.ClampToEdgeWrapping, where the edge is clamped to the outer edge texels. The other two choices are THREE.RepeatWrapping and THREE.MirroredRepeatWrapping.
 		</div>
 		</div>
-		
+
 		<div>
 		<div>
 		NOTE: tiling of images in textures only functions if image dimensions are powers of two (2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, ...) in terms of pixels. Individual dimensions need not be equal, but each must be a power of two. This is a limitation of WebGL, not Three.js.
 		NOTE: tiling of images in textures only functions if image dimensions are powers of two (2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, ...) in terms of pixels. Individual dimensions need not be equal, but each must be a power of two. This is a limitation of WebGL, not Three.js.
 		</div>
 		</div>

+ 1 - 1
docs/scenes/js/material.js

@@ -125,7 +125,7 @@ var textureMaps = (function () {
 
 
 	return {
 	return {
 		none : null,
 		none : null,
-		grass : THREE.ImageUtils.loadTexture( "../../examples/textures/terrain/grasslight-thin.jpg" )
+		grass : new THREE.TextureLoader().load( "../../examples/textures/terrain/grasslight-thin.jpg" )
 	};
 	};
 
 
 })();
 })();

+ 11 - 4
examples/canvas_materials.html

@@ -67,15 +67,22 @@
 
 
 				var geometry = new THREE.SphereGeometry( 100, 14, 7 );
 				var geometry = new THREE.SphereGeometry( 100, 14, 7 );
 
 
+				var textureLoader = new THREE.TextureLoader();
+
+				var earthTexture = textureLoader.load( 'textures/land_ocean_ice_cloud_2048.jpg' );
+
+				var envMap = textureLoader.load( 'textures/envmap.png' );
+				envMap.mapping = THREE.SphericalReflectionMapping;
+
 				var materials = [
 				var materials = [
 
 
 					new THREE.MeshBasicMaterial( { color: 0x00ffff, wireframe: true, side: THREE.DoubleSide } ),
 					new THREE.MeshBasicMaterial( { color: 0x00ffff, wireframe: true, side: THREE.DoubleSide } ),
 					new THREE.MeshBasicMaterial( { color: 0xff0000, blending: THREE.AdditiveBlending } ),
 					new THREE.MeshBasicMaterial( { color: 0xff0000, blending: THREE.AdditiveBlending } ),
-					new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 } ),
-					new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.SmoothShading, overdraw: 0.5 } ),
+					new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } ),
+					new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } ),
 					new THREE.MeshNormalMaterial( { overdraw: 0.5 } ),
 					new THREE.MeshNormalMaterial( { overdraw: 0.5 } ),
-					new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ),
-					new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/envmap.png', THREE.SphericalReflectionMapping ), overdraw: 0.5 } )
+					new THREE.MeshBasicMaterial( { map: earthTexture } ),
+					new THREE.MeshBasicMaterial( { envMap: envMap, overdraw: 0.5 } )
 
 
 				];
 				];
 
 

+ 4 - 1
examples/canvas_materials_reflection.html

@@ -67,7 +67,10 @@
 
 
 					geometry.computeVertexNormals();
 					geometry.computeVertexNormals();
 
 
-					mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/metal.jpg', THREE.SphericalReflectionMapping ), overdraw: 0.5 } ) );
+					var envMap = new THREE.TextureLoader().load( 'textures/metal.jpg' );
+					envMap.mapping = THREE.SphericalReflectionMapping;
+
+					mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { envMap: envMap, overdraw: 0.5 } ) );
 					scene.add( mesh );
 					scene.add( mesh );
 
 
 				} );
 				} );

+ 4 - 1
examples/canvas_sandbox.html

@@ -94,7 +94,10 @@
 
 
 				geometry = new THREE.IcosahedronGeometry( 100, 1 );
 				geometry = new THREE.IcosahedronGeometry( 100, 1 );
 
 
-				material = new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/metal.jpg', THREE.SphericalReflectionMapping ), overdraw: 0.5 } );
+				var envMap = new THREE.TextureLoader().load( 'textures/metal.jpg' );
+				envMap.mapping = THREE.SphericalReflectionMapping;
+
+				material = new THREE.MeshBasicMaterial( { envMap: envMap, overdraw: 0.5 } );
 
 
 				for ( var i = 0; i < 10; i ++ ) {
 				for ( var i = 0; i < 10; i ++ ) {
 
 

+ 4 - 2
examples/js/GPUParticleSystem.js

@@ -198,10 +198,12 @@ THREE.GPUParticleSystem = function(options) {
     return ++i >= self.rand.length ? self.rand[i = 1] : self.rand[i];
     return ++i >= self.rand.length ? self.rand[i = 1] : self.rand[i];
   }
   }
 
 
-  self.particleNoiseTex = THREE.ImageUtils.loadTexture("textures/perlin-512.png");
+  var textureLoader = new THREE.TextureLoader();
+
+  self.particleNoiseTex = textureLoader.load("textures/perlin-512.png");
   self.particleNoiseTex.wrapS = self.particleNoiseTex.wrapT = THREE.RepeatWrapping;
   self.particleNoiseTex.wrapS = self.particleNoiseTex.wrapT = THREE.RepeatWrapping;
 
 
-  self.particleSpriteTex = THREE.ImageUtils.loadTexture("textures/particle2.png");
+  self.particleSpriteTex = textureLoader.load("textures/particle2.png");
   self.particleSpriteTex.wrapS = self.particleSpriteTex.wrapT = THREE.RepeatWrapping;
   self.particleSpriteTex.wrapS = self.particleSpriteTex.wrapT = THREE.RepeatWrapping;
 
 
   self.particleShaderMat = new THREE.ShaderMaterial({
   self.particleShaderMat = new THREE.ShaderMaterial({

+ 4 - 3
examples/js/MD2Character.js

@@ -212,7 +212,7 @@ THREE.MD2Character = function () {
 			}
 			}
 
 
 		}
 		}
-			
+
 	}
 	}
 
 
 	this.update = function ( delta ) {
 	this.update = function ( delta ) {
@@ -228,7 +228,8 @@ THREE.MD2Character = function () {
 
 
 		for ( var i = 0; i < textureUrls.length; i ++ ) {
 		for ( var i = 0; i < textureUrls.length; i ++ ) {
 
 
-			textures[ i ] = THREE.ImageUtils.loadTexture( baseUrl + textureUrls[ i ], mapping, checkLoadingComplete );
+			textures[ i ] = new THREE.TextureLoader().load( baseUrl + textureUrls[ i ], checkLoadingComplete );
+			textures[ i ].mapping = mapping;
 			textures[ i ].name = textureUrls[ i ];
 			textures[ i ].name = textureUrls[ i ];
 
 
 		}
 		}
@@ -254,7 +255,7 @@ THREE.MD2Character = function () {
 
 
 		mesh.materialTexture = materialTexture;
 		mesh.materialTexture = materialTexture;
 		mesh.materialWireframe = materialWireframe;
 		mesh.materialWireframe = materialWireframe;
-	
+
 		return mesh;
 		return mesh;
 
 
 	}
 	}

+ 3 - 2
examples/js/MD2CharacterComplex.js

@@ -510,8 +510,9 @@ THREE.MD2CharacterComplex = function () {
 		var textures = [];
 		var textures = [];
 
 
 		for ( var i = 0; i < textureUrls.length; i ++ ) {
 		for ( var i = 0; i < textureUrls.length; i ++ ) {
-
-			textures[ i ] = THREE.ImageUtils.loadTexture( baseUrl + textureUrls[ i ], mapping, checkLoadingComplete );
+			
+			textures[ i ] = new THREE.TextureLoader().load( baseUrl + textureUrls[ i ], checkLoadingComplete );
+			textures[ i ].mapping = mapping;
 			textures[ i ].name = textureUrls[ i ];
 			textures[ i ].name = textureUrls[ i ];
 
 
 		}
 		}

+ 20 - 19
examples/js/UCSCharacter.js

@@ -1,16 +1,16 @@
 THREE.UCSCharacter = function() {
 THREE.UCSCharacter = function() {
 
 
 	var scope = this;
 	var scope = this;
-	
+
 	var mesh;
 	var mesh;
 
 
 	this.scale = 1;
 	this.scale = 1;
 
 
 	this.root = new THREE.Object3D();
 	this.root = new THREE.Object3D();
-	
+
 	this.numSkins;
 	this.numSkins;
 	this.numMorphs;
 	this.numMorphs;
-	
+
 	this.skins = [];
 	this.skins = [];
 	this.materials = [];
 	this.materials = [];
 	this.morphs = [];
 	this.morphs = [];
@@ -18,24 +18,24 @@ THREE.UCSCharacter = function() {
 	this.mixer = new THREE.AnimationMixer( this.root );
 	this.mixer = new THREE.AnimationMixer( this.root );
 
 
 	this.onLoadComplete = function () {};
 	this.onLoadComplete = function () {};
-	
+
 	this.loadCounter = 0;
 	this.loadCounter = 0;
 
 
 	this.loadParts = function ( config ) {
 	this.loadParts = function ( config ) {
-		
+
 		this.numSkins = config.skins.length;
 		this.numSkins = config.skins.length;
 		this.numMorphs = config.morphs.length;
 		this.numMorphs = config.morphs.length;
-		
+
 		// Character geometry + number of skins
 		// Character geometry + number of skins
 		this.loadCounter = 1 + config.skins.length;
 		this.loadCounter = 1 + config.skins.length;
-		
+
 		// SKINS
 		// SKINS
 		this.skins = loadTextures( config.baseUrl + "skins/", config.skins );
 		this.skins = loadTextures( config.baseUrl + "skins/", config.skins );
 		this.materials = createMaterials( this.skins );
 		this.materials = createMaterials( this.skins );
-		
+
 		// MORPHS
 		// MORPHS
 		this.morphs = config.morphs;
 		this.morphs = config.morphs;
-		
+
 		// CHARACTER
 		// CHARACTER
 		var loader = new THREE.JSONLoader();
 		var loader = new THREE.JSONLoader();
 		console.log( config.baseUrl + config.character );
 		console.log( config.baseUrl + config.character );
@@ -43,11 +43,11 @@ THREE.UCSCharacter = function() {
 
 
 			geometry.computeBoundingBox();
 			geometry.computeBoundingBox();
 			geometry.computeVertexNormals();
 			geometry.computeVertexNormals();
-			
+
 			mesh = new THREE.SkinnedMesh( geometry, new THREE.MeshFaceMaterial() );
 			mesh = new THREE.SkinnedMesh( geometry, new THREE.MeshFaceMaterial() );
 			mesh.name = config.character;
 			mesh.name = config.character;
 			scope.root.add( mesh );
 			scope.root.add( mesh );
-			
+
 			var bb = geometry.boundingBox;
 			var bb = geometry.boundingBox;
 			scope.root.scale.set( config.s, config.s, config.s );
 			scope.root.scale.set( config.s, config.s, config.s );
 			scope.root.position.set( config.x, config.y - bb.min.y * config.s, config.z );
 			scope.root.position.set( config.x, config.y - bb.min.y * config.s, config.z );
@@ -56,15 +56,15 @@ THREE.UCSCharacter = function() {
 			mesh.receiveShadow = true;
 			mesh.receiveShadow = true;
 
 
 			scope.mixer.clipAction( geometry.animations[0], mesh ).play();
 			scope.mixer.clipAction( geometry.animations[0], mesh ).play();
-			
+
 			scope.setSkin( 0 );
 			scope.setSkin( 0 );
-			
+
 			scope.checkLoadComplete();
 			scope.checkLoadComplete();
 
 
 		} );
 		} );
 
 
 	};
 	};
-	
+
 	this.setSkin = function( index ) {
 	this.setSkin = function( index ) {
 
 
 		if ( mesh && scope.materials ) {
 		if ( mesh && scope.materials ) {
@@ -74,7 +74,7 @@ THREE.UCSCharacter = function() {
 		}
 		}
 
 
 	};
 	};
-	
+
 	this.updateMorphs = function( influences ) {
 	this.updateMorphs = function( influences ) {
 
 
 		if ( mesh ) {
 		if ( mesh ) {
@@ -88,7 +88,7 @@ THREE.UCSCharacter = function() {
 		}
 		}
 
 
 	};
 	};
-	
+
 	function loadTextures( baseUrl, textureUrls ) {
 	function loadTextures( baseUrl, textureUrls ) {
 
 
 		var mapping = THREE.UVMapping;
 		var mapping = THREE.UVMapping;
@@ -96,7 +96,8 @@ THREE.UCSCharacter = function() {
 
 
 		for ( var i = 0; i < textureUrls.length; i ++ ) {
 		for ( var i = 0; i < textureUrls.length; i ++ ) {
 
 
-			textures[ i ] = THREE.ImageUtils.loadTexture( baseUrl + textureUrls[ i ], mapping, scope.checkLoadComplete );
+			textures[ i ] = new THREE.TextureLoader().load( baseUrl + textureUrls[ i ], scope.checkLoadingComplete );
+			textures[ i ].mapping = mapping;
 			textures[ i ].name = textureUrls[ i ];
 			textures[ i ].name = textureUrls[ i ];
 
 
 		}
 		}
@@ -108,7 +109,7 @@ THREE.UCSCharacter = function() {
 	function createMaterials( skins ) {
 	function createMaterials( skins ) {
 
 
 		var materials = [];
 		var materials = [];
-		
+
 		for ( var i = 0; i < skins.length; i ++ ) {
 		for ( var i = 0; i < skins.length; i ++ ) {
 
 
 			materials[ i ] = new THREE.MeshLambertMaterial( {
 			materials[ i ] = new THREE.MeshLambertMaterial( {
@@ -120,7 +121,7 @@ THREE.UCSCharacter = function() {
 			} );
 			} );
 
 
 		}
 		}
-		
+
 		return materials;
 		return materials;
 
 
 	}
 	}

+ 2 - 2
examples/js/loaders/sea3d/SEA3DLoader.js

@@ -1502,7 +1502,7 @@ THREE.SEA3D.prototype.readImage = function( sea ) {
 
 
 	var image = new Image(), texture = new THREE.Texture();
 	var image = new Image(), texture = new THREE.Texture();
 	image.src = this.bufferToTexture( sea.data.buffer );
 	image.src = this.bufferToTexture( sea.data.buffer );
-	
+
 	texture.name = sea.name;
 	texture.name = sea.name;
 	texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 	texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 	texture.flipY = false;
 	texture.flipY = false;
@@ -1583,7 +1583,7 @@ THREE.SEA3D.prototype.readSound = function( sea ) {
 
 
 THREE.SEA3D.prototype.readTextureURL = function( sea ) {
 THREE.SEA3D.prototype.readTextureURL = function( sea ) {
 
 
-	var texture = THREE.ImageUtils.loadTexture( sea.url );
+	var texture = new THREE.TextureLoader().load( sea.url );
 
 
 	texture.name = sea.name;
 	texture.name = sea.name;
 	texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 	texture.wrapS = texture.wrapT = THREE.RepeatWrapping;

+ 2 - 1
examples/misc_animation_authoring.html

@@ -63,7 +63,8 @@
 				scene.add( light );
 				scene.add( light );
 
 
 
 
-				var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif', THREE.UVMapping, render );
+				var texture = new THREE.TextureLoader().load( 'textures/crate.gif', render );
+				texture.mapping = THREE.UVMapping;
 				texture.anisotropy = renderer.getMaxAnisotropy();
 				texture.anisotropy = renderer.getMaxAnisotropy();
 
 
 				var geometry = new THREE.BoxGeometry( 200, 200, 200 );
 				var geometry = new THREE.BoxGeometry( 200, 200, 200 );

+ 1 - 1
examples/misc_controls_deviceorientation.html

@@ -68,7 +68,7 @@
 						geometry.scale( - 1, 1, 1 );
 						geometry.scale( - 1, 1, 1 );
 
 
 						var material = new THREE.MeshBasicMaterial( {
 						var material = new THREE.MeshBasicMaterial( {
-							map: THREE.ImageUtils.loadTexture( 'textures/2294472375_24a3b8ef46_o.jpg' )
+							map: new THREE.TextureLoader().load( 'textures/2294472375_24a3b8ef46_o.jpg' )
 						} );
 						} );
 
 
 						var mesh = new THREE.Mesh( geometry, material );
 						var mesh = new THREE.Mesh( geometry, material );

+ 2 - 2
examples/misc_controls_transform.html

@@ -60,8 +60,8 @@
 				light.position.set( 1, 1, 1 );
 				light.position.set( 1, 1, 1 );
 				scene.add( light );
 				scene.add( light );
 
 
-
-				var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif', THREE.UVMapping, render );
+				var texture = new THREE.TextureLoader().load( 'textures/crate.gif', render );
+				texture.mapping = THREE.UVMapping;
 				texture.anisotropy = renderer.getMaxAnisotropy();
 				texture.anisotropy = renderer.getMaxAnisotropy();
 
 
 				var geometry = new THREE.BoxGeometry( 200, 200, 200 );
 				var geometry = new THREE.BoxGeometry( 200, 200, 200 );

+ 1 - 1
examples/misc_fps.html

@@ -232,7 +232,7 @@
 			function makePlatform( jsonUrl, textureUrl, textureQuality ) {
 			function makePlatform( jsonUrl, textureUrl, textureQuality ) {
 				var placeholder = new THREE.Object3D();
 				var placeholder = new THREE.Object3D();
 
 
-				var texture = THREE.ImageUtils.loadTexture( textureUrl );
+				var texture = new THREE.TextureLoader().load( textureUrl );
 				texture.minFilter = THREE.LinearFilter;
 				texture.minFilter = THREE.LinearFilter;
 				texture.anisotropy = textureQuality;
 				texture.anisotropy = textureQuality;
 
 

+ 4 - 2
examples/misc_ubiquity_test.html

@@ -145,7 +145,9 @@
 
 
 				// SPRITES
 				// SPRITES
 
 
-				THREE.ImageUtils.loadTexture( 'textures/sprite.png', null, function ( texture ) {
+				var textureLoader = new THREE.TextureLoader();
+
+				textureLoader.load( 'textures/sprite.png', function ( texture ) {
 
 
 					var material = new THREE.SpriteMaterial( { map: texture, transparent: true } );
 					var material = new THREE.SpriteMaterial( { map: texture, transparent: true } );
 
 
@@ -159,7 +161,7 @@
 						scene.add( sprite );
 						scene.add( sprite );
 
 
 					}
 					}
-					
+
 				} );
 				} );
 
 
 				for ( var i = 0; i < 50; i ++ ) {
 				for ( var i = 0; i < 50; i ++ ) {

+ 5 - 4
examples/misc_ubiquity_test2.html

@@ -47,10 +47,11 @@
 
 
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 
 
+				var textureLoader = new THREE.TextureLoader();
 
 
 				// MESH - Repeat Pattern
 				// MESH - Repeat Pattern
 
 
-				texture = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg' );
+				texture = textureLoader.load( 'textures/UV_Grid_Sm.jpg' );
 				texture.wrapS = THREE.RepeatWrapping;
 				texture.wrapS = THREE.RepeatWrapping;
 				texture.wrapT = THREE.RepeatWrapping;
 				texture.wrapT = THREE.RepeatWrapping;
 
 
@@ -63,7 +64,7 @@
 
 
 				// SPRITES - from Sprite Sheet
 				// SPRITES - from Sprite Sheet
 
 
-				texture1 = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg', undefined, function() {
+				texture1 = textureLoader.load( 'textures/UV_Grid_Sm.jpg', function() {
 
 
 					texture1.wrapS = THREE.ClampToEdgeWrapping;
 					texture1.wrapS = THREE.ClampToEdgeWrapping;
 					texture1.wrapT = THREE.ClampToEdgeWrapping;
 					texture1.wrapT = THREE.ClampToEdgeWrapping;
@@ -99,7 +100,7 @@
 
 
 				// SPRITES - Repeat Pattern
 				// SPRITES - Repeat Pattern
 
 
-				texture2 = THREE.ImageUtils.loadTexture( 'textures/sprite0.jpg' );
+				texture2 = textureLoader.load( 'textures/sprite0.jpg' );
 				texture2.wrapS = THREE.RepeatWrapping;
 				texture2.wrapS = THREE.RepeatWrapping;
 				texture2.wrapT = THREE.RepeatWrapping;
 				texture2.wrapT = THREE.RepeatWrapping;
 
 
@@ -123,7 +124,7 @@
 
 
 				// SPRITES - PNG
 				// SPRITES - PNG
 
 
-				texture3 = THREE.ImageUtils.loadTexture( 'textures/sprite1.png' );
+				texture3 = textureLoader.load( 'textures/sprite1.png' );
 				texture3.wrapS = THREE.ClampToEdgeWrapping;
 				texture3.wrapS = THREE.ClampToEdgeWrapping;
 				texture3.wrapT = THREE.ClampToEdgeWrapping;
 				texture3.wrapT = THREE.ClampToEdgeWrapping;
 
 

+ 1 - 1
examples/webgl_buffergeometry_custom_attributes_particles.html

@@ -101,7 +101,7 @@
 			uniforms = {
 			uniforms = {
 
 
 				color:     { type: "c", value: new THREE.Color( 0xffffff ) },
 				color:     { type: "c", value: new THREE.Color( 0xffffff ) },
-				texture:   { type: "t", value: THREE.ImageUtils.loadTexture( "textures/sprites/spark1.png" ) }
+				texture:   { type: "t", value: new THREE.TextureLoader().load( "textures/sprites/spark1.png" ) }
 
 
 			};
 			};
 
 

+ 1 - 1
examples/webgl_buffergeometry_instancing_billboards.html

@@ -153,7 +153,7 @@
 
 
 			material = new THREE.RawShaderMaterial( {
 			material = new THREE.RawShaderMaterial( {
 				uniforms: {
 				uniforms: {
-					map: { type: "t", value: THREE.ImageUtils.loadTexture( "textures/sprites/circle.png" ) }
+					map: { type: "t", value: new THREE.TextureLoader().load( "textures/sprites/circle.png" ) }
 				},
 				},
 				vertexShader: document.getElementById( 'vshader' ).textContent,
 				vertexShader: document.getElementById( 'vshader' ).textContent,
 				fragmentShader: document.getElementById( 'fshader' ).textContent,
 				fragmentShader: document.getElementById( 'fshader' ).textContent,

+ 1 - 1
examples/webgl_buffergeometry_instancing_dynamic.html

@@ -241,7 +241,7 @@
 			geometry.addAttribute( 'orientation', orientations ); // per mesh orientation
 			geometry.addAttribute( 'orientation', orientations ); // per mesh orientation
 
 
 			// material
 			// material
-			var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif' );
+			var texture = new THREE.TextureLoader().load( 'textures/crate.gif' );
 			texture.anisotropy = renderer.getMaxAnisotropy();
 			texture.anisotropy = renderer.getMaxAnisotropy();
 
 
 			var material = new THREE.RawShaderMaterial( {
 			var material = new THREE.RawShaderMaterial( {

+ 1 - 1
examples/webgl_buffergeometry_instancing_interleaved_dynamic.html

@@ -211,7 +211,7 @@
 		geometry.addAttribute( 'orientation', orientations ); // per mesh orientation
 		geometry.addAttribute( 'orientation', orientations ); // per mesh orientation
 
 
 		// material
 		// material
-		var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif' );
+		var texture = new THREE.TextureLoader().load( 'textures/crate.gif' );
 		texture.anisotropy = renderer.getMaxAnisotropy();
 		texture.anisotropy = renderer.getMaxAnisotropy();
 
 
 		var material = new THREE.RawShaderMaterial( {
 		var material = new THREE.RawShaderMaterial( {

+ 1 - 1
examples/webgl_custom_attributes.html

@@ -106,7 +106,7 @@
 
 
 				amplitude: { type: "f", value: 1.0 },
 				amplitude: { type: "f", value: 1.0 },
 				color:     { type: "c", value: new THREE.Color( 0xff2200 ) },
 				color:     { type: "c", value: new THREE.Color( 0xff2200 ) },
-				texture:   { type: "t", value: THREE.ImageUtils.loadTexture( "textures/water.jpg" ) },
+				texture:   { type: "t", value: new THREE.TextureLoader().load( "textures/water.jpg" ) },
 
 
 			};
 			};
 
 

+ 1 - 1
examples/webgl_custom_attributes_points.html

@@ -143,7 +143,7 @@
 				uniforms: {
 				uniforms: {
 					amplitude: { type: "f", value: 1.0 },
 					amplitude: { type: "f", value: 1.0 },
 					color:     { type: "c", value: new THREE.Color( 0xffffff ) },
 					color:     { type: "c", value: new THREE.Color( 0xffffff ) },
-					texture:   { type: "t", value: THREE.ImageUtils.loadTexture( "textures/sprites/spark1.png" ) }
+					texture:   { type: "t", value: new THREE.TextureLoader().load( "textures/sprites/spark1.png" ) }
 				},
 				},
 				vertexShader:   document.getElementById( 'vertexshader' ).textContent,
 				vertexShader:   document.getElementById( 'vertexshader' ).textContent,
 				fragmentShader: document.getElementById( 'fragmentshader' ).textContent,
 				fragmentShader: document.getElementById( 'fragmentshader' ).textContent,

+ 1 - 1
examples/webgl_custom_attributes_points2.html

@@ -138,7 +138,7 @@
 
 
 			//
 			//
 
 
-			var texture = THREE.ImageUtils.loadTexture( "textures/sprites/disc.png" );
+			var texture = new THREE.TextureLoader().load( "textures/sprites/disc.png" );
 			texture.wrapS = THREE.RepeatWrapping;
 			texture.wrapS = THREE.RepeatWrapping;
 			texture.wrapT = THREE.RepeatWrapping;
 			texture.wrapT = THREE.RepeatWrapping;
 
 

+ 1 - 1
examples/webgl_custom_attributes_points3.html

@@ -210,7 +210,7 @@
 
 
 			//
 			//
 
 
-			var texture = THREE.ImageUtils.loadTexture( "textures/sprites/ball.png" );
+			var texture = new THREE.TextureLoader().load( "textures/sprites/ball.png" );
 			texture.wrapS = THREE.RepeatWrapping;
 			texture.wrapS = THREE.RepeatWrapping;
 			texture.wrapT = THREE.RepeatWrapping;
 			texture.wrapT = THREE.RepeatWrapping;
 
 

+ 1 - 1
examples/webgl_geometries.html

@@ -49,7 +49,7 @@
 				light.position.set( 0, 1, 0 );
 				light.position.set( 0, 1, 0 );
 				scene.add( light );
 				scene.add( light );
 
 
-				var map = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg' );
+				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 				map.anisotropy = 16;
 
 

+ 1 - 1
examples/webgl_geometries2.html

@@ -54,7 +54,7 @@
 				light.position.set( 0, 0, 1 );
 				light.position.set( 0, 0, 1 );
 				scene.add( light );
 				scene.add( light );
 
 
-				var map = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg' );
+				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 				map.anisotropy = 16;
 
 

+ 1 - 1
examples/webgl_geometry_convex.html

@@ -49,7 +49,7 @@
 				light.position.set( 0, 1, 0 );
 				light.position.set( 0, 1, 0 );
 				scene.add( light );
 				scene.add( light );
 
 
-				var map = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg' );
+				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 				map.anisotropy = 16;
 
 

+ 1 - 1
examples/webgl_geometry_cube.html

@@ -30,7 +30,7 @@
 
 
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 
 
-				var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif' );
+				var texture = new THREE.TextureLoader().load( 'textures/crate.gif' );
 
 
 				var geometry = new THREE.BoxGeometry( 200, 200, 200 );
 				var geometry = new THREE.BoxGeometry( 200, 200, 200 );
 				var material = new THREE.MeshBasicMaterial( { map: texture } );
 				var material = new THREE.MeshBasicMaterial( { map: texture } );

+ 1 - 1
examples/webgl_geometry_dynamic.html

@@ -94,7 +94,7 @@
 
 
 				}
 				}
 
 
-				var texture = THREE.ImageUtils.loadTexture( "textures/water.jpg" );
+				var texture = new THREE.TextureLoader().load( "textures/water.jpg" );
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 				texture.repeat.set( 5, 5 );
 				texture.repeat.set( 5, 5 );
 
 

+ 1 - 1
examples/webgl_geometry_minecraft.html

@@ -181,7 +181,7 @@
 				var geometry = new THREE.BufferGeometry().fromGeometry( tmpGeometry );
 				var geometry = new THREE.BufferGeometry().fromGeometry( tmpGeometry );
 				geometry.computeBoundingSphere();
 				geometry.computeBoundingSphere();
 
 
-				var texture = THREE.ImageUtils.loadTexture( 'textures/minecraft/atlas.png' );
+				var texture = new THREE.TextureLoader().load( 'textures/minecraft/atlas.png' );
 				texture.magFilter = THREE.NearestFilter;
 				texture.magFilter = THREE.NearestFilter;
 				texture.minFilter = THREE.LinearMipMapLinearFilter;
 				texture.minFilter = THREE.LinearMipMapLinearFilter;
 
 

+ 4 - 4
examples/webgl_geometry_minecraft_ao.html

@@ -96,7 +96,7 @@
 				scene.fog = new THREE.FogExp2( 0xffffff, 0.00015 );
 				scene.fog = new THREE.FogExp2( 0xffffff, 0.00015 );
 
 
 				// sides
 				// sides
-				
+
 				var light = new THREE.Color( 0xffffff );
 				var light = new THREE.Color( 0xffffff );
 				var shadow = new THREE.Color( 0x505050 );
 				var shadow = new THREE.Color( 0x505050 );
 
 
@@ -199,7 +199,7 @@
 							colors[ 0 ] = c === 0 ? shadow : light;
 							colors[ 0 ] = c === 0 ? shadow : light;
 							colors[ 1 ] = d === 0 ? shadow : light;
 							colors[ 1 ] = d === 0 ? shadow : light;
 							colors[ 2 ] = a === 0 ? shadow : light;
 							colors[ 2 ] = a === 0 ? shadow : light;
-							
+
 							geometry.merge( py2Geometry, matrix );
 							geometry.merge( py2Geometry, matrix );
 
 
 						} else {
 						} else {
@@ -213,7 +213,7 @@
 							colors[ 0 ] = b === 0 ? shadow : light;
 							colors[ 0 ] = b === 0 ? shadow : light;
 							colors[ 1 ] = c === 0 ? shadow : light;
 							colors[ 1 ] = c === 0 ? shadow : light;
 							colors[ 2 ] = d === 0 ? shadow : light;
 							colors[ 2 ] = d === 0 ? shadow : light;
-							
+
 							geometry.merge( pyGeometry, matrix );
 							geometry.merge( pyGeometry, matrix );
 
 
 						}
 						}
@@ -274,7 +274,7 @@
 
 
 				}
 				}
 
 
-				var texture = THREE.ImageUtils.loadTexture( 'textures/minecraft/atlas.png' );
+				var texture = new THREE.TextureLoader().load( 'textures/minecraft/atlas.png' );
 				texture.magFilter = THREE.NearestFilter;
 				texture.magFilter = THREE.NearestFilter;
 				texture.minFilter = THREE.LinearMipMapLinearFilter;
 				texture.minFilter = THREE.LinearMipMapLinearFilter;
 
 

+ 1 - 1
examples/webgl_geometry_nurbs.html

@@ -152,7 +152,7 @@
 				var knots2 = [0, 0, 0, 0, 1, 1, 1, 1];
 				var knots2 = [0, 0, 0, 0, 1, 1, 1, 1];
 				var nurbsSurface = new THREE.NURBSSurface(degree1, degree2, knots1, knots2, nsControlPoints);
 				var nurbsSurface = new THREE.NURBSSurface(degree1, degree2, knots1, knots2, nsControlPoints);
 
 
-				var map = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg' );
+				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 				map.anisotropy = 16;
 
 

+ 1 - 1
examples/webgl_geometry_teapot.html

@@ -115,7 +115,7 @@
 				cameraControls.addEventListener( 'change', render );
 				cameraControls.addEventListener( 'change', render );
 
 
 				// TEXTURE MAP
 				// TEXTURE MAP
-				var textureMap = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg' );
+				var textureMap = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
 				textureMap.wrapS = textureMap.wrapT = THREE.RepeatWrapping;
 				textureMap.wrapS = textureMap.wrapT = THREE.RepeatWrapping;
 				textureMap.anisotropy = 16;
 				textureMap.anisotropy = 16;
 
 

+ 1 - 1
examples/webgl_hdr.html

@@ -126,7 +126,7 @@
 
 
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 
 
-				var texture = THREE.ImageUtils.loadTexture( "textures/memorial.png" );
+				var texture = new THREE.TextureLoader().load( "textures/memorial.png" );
 				texture.minFilter = THREE.LinearFilter;
 				texture.minFilter = THREE.LinearFilter;
 				texture.magFilter = THREE.NearestFilter;
 				texture.magFilter = THREE.NearestFilter;
 
 

+ 1 - 1
examples/webgl_interactive_points.html

@@ -137,7 +137,7 @@
 
 
 					uniforms: {
 					uniforms: {
 						color:   { type: "c", value: new THREE.Color( 0xffffff ) },
 						color:   { type: "c", value: new THREE.Color( 0xffffff ) },
-						texture: { type: "t", value: THREE.ImageUtils.loadTexture( "textures/sprites/disc.png" ) }
+						texture: { type: "t", value: new THREE.TextureLoader().load( "textures/sprites/disc.png" ) }
 					},
 					},
 					vertexShader: document.getElementById( 'vertexshader' ).textContent,
 					vertexShader: document.getElementById( 'vertexshader' ).textContent,
 					fragmentShader: document.getElementById( 'fragmentshader' ).textContent,
 					fragmentShader: document.getElementById( 'fragmentshader' ).textContent,

+ 1 - 1
examples/webgl_interactive_voxelpainter.html

@@ -67,7 +67,7 @@
 				// cubes
 				// cubes
 
 
 				cubeGeo = new THREE.BoxGeometry( 50, 50, 50 );
 				cubeGeo = new THREE.BoxGeometry( 50, 50, 50 );
-				cubeMaterial = new THREE.MeshLambertMaterial( { color: 0xfeb74c, shading: THREE.FlatShading, map: THREE.ImageUtils.loadTexture( "textures/square-outline-textured.png" ) } );
+				cubeMaterial = new THREE.MeshLambertMaterial( { color: 0xfeb74c, map: new THREE.TextureLoader().load( "textures/square-outline-textured.png" ) } );
 
 
 				// grid
 				// grid
 
 

+ 4 - 3
examples/webgl_lensflares.html

@@ -123,10 +123,11 @@
 				dirLight.color.setHSL( 0.1, 0.7, 0.5 );
 				dirLight.color.setHSL( 0.1, 0.7, 0.5 );
 
 
 				// lens flares
 				// lens flares
+				var textureLoader = new THREE.TextureLoader();
 
 
-				var textureFlare0 = THREE.ImageUtils.loadTexture( "textures/lensflare/lensflare0.png" );
-				var textureFlare2 = THREE.ImageUtils.loadTexture( "textures/lensflare/lensflare2.png" );
-				var textureFlare3 = THREE.ImageUtils.loadTexture( "textures/lensflare/lensflare3.png" );
+				var textureFlare0 = textureLoader.load( "textures/lensflare/lensflare0.png" );
+				var textureFlare2 = textureLoader.load( "textures/lensflare/lensflare2.png" );
+				var textureFlare3 = textureLoader.load( "textures/lensflare/lensflare3.png" );
 
 
 				addLight( 0.55, 0.9, 0.5, 5000, 0, -1000 );
 				addLight( 0.55, 0.9, 0.5, 5000, 0, -1000 );
 				addLight( 0.08, 0.8, 0.5,    0, 0, -1000 );
 				addLight( 0.08, 0.8, 0.5,    0, 0, -1000 );

+ 4 - 3
examples/webgl_lights_pointlights2.html

@@ -115,13 +115,14 @@
 
 
 
 
 				// TEXTURES
 				// TEXTURES
+				var textureLoader = new THREE.TextureLoader();
 
 
-				var texture = THREE.ImageUtils.loadTexture( "textures/disturb.jpg" );
+				var texture = textureLoader.load( "textures/disturb.jpg" );
 				texture.repeat.set( 20, 10 );
 				texture.repeat.set( 20, 10 );
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 				texture.format = THREE.RGBFormat;
 				texture.format = THREE.RGBFormat;
 
 
-				var texture2 = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
+				var texture2 = textureLoader.load( "textures/planets/moon_1024.jpg" );
 				texture2.repeat.set( 2, 1 );
 				texture2.repeat.set( 2, 1 );
 				texture2.wrapS = texture2.wrapT = THREE.RepeatWrapping;
 				texture2.wrapS = texture2.wrapT = THREE.RepeatWrapping;
 				texture2.format = THREE.RGBFormat;
 				texture2.format = THREE.RGBFormat;
@@ -129,7 +130,7 @@
 				// MATERIALS
 				// MATERIALS
 
 
 				var groundMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, map: texture } );
 				var groundMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, map: texture } );
-				var objectMaterial = new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0xffffff, metal: true, map: texture2 } );
+				var objectMaterial = new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0xffffff, map: texture2 } );
 
 
 				// GROUND
 				// GROUND
 
 

+ 1 - 1
examples/webgl_loader_md2.html

@@ -119,7 +119,7 @@
 
 
 				//  GROUND
 				//  GROUND
 
 
-				var gt = THREE.ImageUtils.loadTexture( "textures/terrain/grasslight-big.jpg" );
+				var gt = new THREE.TextureLoader().load( "textures/terrain/grasslight-big.jpg" );
 				var gg = new THREE.PlaneBufferGeometry( 2000, 2000 );
 				var gg = new THREE.PlaneBufferGeometry( 2000, 2000 );
 				var gm = new THREE.MeshPhongMaterial( { color: 0xffffff, map: gt } );
 				var gm = new THREE.MeshPhongMaterial( { color: 0xffffff, map: gt } );
 
 

+ 1 - 1
examples/webgl_loader_md2_control.html

@@ -121,7 +121,7 @@
 
 
 				//  GROUND
 				//  GROUND
 
 
-				var gt = THREE.ImageUtils.loadTexture( "textures/terrain/grasslight-big.jpg" );
+				var gt = new THREE.TextureLoader().load( "textures/terrain/grasslight-big.jpg" );
 				var gg = new THREE.PlaneBufferGeometry( 16000, 16000 );
 				var gg = new THREE.PlaneBufferGeometry( 16000, 16000 );
 				var gm = new THREE.MeshPhongMaterial( { color: 0xffffff, map: gt } );
 				var gm = new THREE.MeshPhongMaterial( { color: 0xffffff, map: gt } );
 
 

+ 5 - 3
examples/webgl_marchingcubes.html

@@ -261,10 +261,12 @@
 				path + 'pz' + format, path + 'nz' + format
 				path + 'pz' + format, path + 'nz' + format
 			];
 			];
 
 
-			var reflectionCube = new THREE.CubeTextureLoader().load( urls );
+			var cubeTextureLoader = new THREE.CubeTextureLoader();
+
+			var reflectionCube = cubeTextureLoader.load( urls );
 			reflectionCube.format = THREE.RGBFormat;
 			reflectionCube.format = THREE.RGBFormat;
 
 
-			var refractionCube = new THREE.CubeTextureLoader().load( urls );
+			var refractionCube = cubeTextureLoader.load( urls );
 			reflectionCube.format = THREE.RGBFormat;
 			reflectionCube.format = THREE.RGBFormat;
 			refractionCube.mapping = THREE.CubeRefractionMapping;
 			refractionCube.mapping = THREE.CubeRefractionMapping;
 
 
@@ -286,7 +288,7 @@
 			dottedMaterial2.uniforms.uBaseColor.value.setRGB( 0, 0, 0 );
 			dottedMaterial2.uniforms.uBaseColor.value.setRGB( 0, 0, 0 );
 			dottedMaterial2.uniforms.uLineColor1.value.setHSL( 0.05, 1.0, 0.5 );
 			dottedMaterial2.uniforms.uLineColor1.value.setHSL( 0.05, 1.0, 0.5 );
 
 
-			var texture = THREE.ImageUtils.loadTexture( "textures/UV_Grid_Sm.jpg" );
+			var texture = new THREE.TextureLoader().load( "textures/UV_Grid_Sm.jpg" );
 			texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 			texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 
 
 			var materials = {
 			var materials = {

+ 11 - 7
examples/webgl_materials_blending_custom.html

@@ -103,6 +103,10 @@
 
 
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 
 
+				// TEXTURE LOADER
+				
+				var textureLoader = new THREE.TextureLoader();
+
 				// BACKGROUND IMAGES
 				// BACKGROUND IMAGES
 
 
 				var x = document.createElement( "canvas" );
 				var x = document.createElement( "canvas" );
@@ -148,23 +152,23 @@
 				mapBg1.repeat.set( 128, 64 );
 				mapBg1.repeat.set( 128, 64 );
 				mapBg1.needsUpdate = true;
 				mapBg1.needsUpdate = true;
 
 
-				var mapBg2 = THREE.ImageUtils.loadTexture( "textures/disturb.jpg" );
+				var mapBg2 = textureLoader.load( "textures/disturb.jpg" );
 				mapBg2.wrapS = mapBg2.wrapT = THREE.RepeatWrapping;
 				mapBg2.wrapS = mapBg2.wrapT = THREE.RepeatWrapping;
 				mapBg2.repeat.set( 8, 4 );
 				mapBg2.repeat.set( 8, 4 );
 
 
-				var mapBg3 = THREE.ImageUtils.loadTexture( "textures/crate.gif" );
+				var mapBg3 = textureLoader.load( "textures/crate.gif" );
 				mapBg3.wrapS = mapBg3.wrapT = THREE.RepeatWrapping;
 				mapBg3.wrapS = mapBg3.wrapT = THREE.RepeatWrapping;
 				mapBg3.repeat.set( 32, 16 );
 				mapBg3.repeat.set( 32, 16 );
 
 
-				var mapBg4 = THREE.ImageUtils.loadTexture( "textures/lava/lavatile.jpg" );
+				var mapBg4 = textureLoader.load( "textures/lava/lavatile.jpg" );
 				mapBg4.wrapS = mapBg4.wrapT = THREE.RepeatWrapping;
 				mapBg4.wrapS = mapBg4.wrapT = THREE.RepeatWrapping;
 				mapBg4.repeat.set( 8, 4 );
 				mapBg4.repeat.set( 8, 4 );
 
 
-				var mapBg5 = THREE.ImageUtils.loadTexture( "textures/water.jpg" );
+				var mapBg5 = textureLoader.load( "textures/water.jpg" );
 				mapBg5.wrapS = mapBg5.wrapT = THREE.RepeatWrapping;
 				mapBg5.wrapS = mapBg5.wrapT = THREE.RepeatWrapping;
 				mapBg5.repeat.set( 8, 4 );
 				mapBg5.repeat.set( 8, 4 );
 
 
-				var mapBg6 = THREE.ImageUtils.loadTexture( "textures/lava/cloud.png" );
+				var mapBg6 = textureLoader.load( "textures/lava/cloud.png" );
 				mapBg6.wrapS = mapBg6.wrapT = THREE.RepeatWrapping;
 				mapBg6.wrapS = mapBg6.wrapT = THREE.RepeatWrapping;
 				mapBg6.repeat.set( 2, 1 );
 				mapBg6.repeat.set( 2, 1 );
 
 
@@ -188,10 +192,10 @@
 
 
 				for ( var i = 0; i < images.length; i ++ ) {
 				for ( var i = 0; i < images.length; i ++ ) {
 
 
-					var map = THREE.ImageUtils.loadTexture( images[ i ] );
+					var map = textureLoader.load( images[ i ] );
 					mapsNoPre.push( map );
 					mapsNoPre.push( map );
 
 
-					var mapPre = THREE.ImageUtils.loadTexture( images[ i ] );
+					var mapPre = textureLoader.load( images[ i ] );
 					mapPre.premultiplyAlpha = true;
 					mapPre.premultiplyAlpha = true;
 					mapPre.needsUpdate = true;
 					mapPre.needsUpdate = true;
 					mapsPre.push( mapPre );
 					mapsPre.push( mapPre );

+ 1 - 1
examples/webgl_materials_bumpmap.html

@@ -115,7 +115,7 @@
 
 
 				//
 				//
 
 
-				var mapHeight = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg" );
+				var mapHeight = new THREE.TextureLoader().load( "obj/leeperrysmith/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg" );
 
 
 				mapHeight.anisotropy = 4;
 				mapHeight.anisotropy = 4;
 				mapHeight.repeat.set( 0.998, 0.998 );
 				mapHeight.repeat.set( 0.998, 0.998 );

+ 5 - 3
examples/webgl_materials_bumpmap_skin.html

@@ -192,19 +192,21 @@
 
 
 			function createScene( geometry, scale ) {
 			function createScene( geometry, scale ) {
 
 
-				var mapHeight = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg" );
+				var textureLoader = new THREE.TextureLoader();
+
+				var mapHeight = textureLoader.load( "obj/leeperrysmith/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg" );
 
 
 				mapHeight.anisotropy = 4;
 				mapHeight.anisotropy = 4;
 				mapHeight.wrapS = mapHeight.wrapT = THREE.RepeatWrapping;
 				mapHeight.wrapS = mapHeight.wrapT = THREE.RepeatWrapping;
 				mapHeight.format = THREE.RGBFormat;
 				mapHeight.format = THREE.RGBFormat;
 
 
-				var mapSpecular = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Map-SPEC.jpg" );
+				var mapSpecular = textureLoader.load( "obj/leeperrysmith/Map-SPEC.jpg" );
 
 
 				mapSpecular.anisotropy = 4;
 				mapSpecular.anisotropy = 4;
 				mapSpecular.wrapS = mapSpecular.wrapT = THREE.RepeatWrapping;
 				mapSpecular.wrapS = mapSpecular.wrapT = THREE.RepeatWrapping;
 				mapSpecular.format = THREE.RGBFormat;
 				mapSpecular.format = THREE.RGBFormat;
 
 
-				var mapColor = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Map-COL.jpg" );
+				var mapColor = textureLoader.load( "obj/leeperrysmith/Map-COL.jpg" );
 
 
 				mapColor.anisotropy = 4;
 				mapColor.anisotropy = 4;
 				mapColor.wrapS = mapColor.wrapT = THREE.RepeatWrapping;
 				mapColor.wrapS = mapColor.wrapT = THREE.RepeatWrapping;

+ 4 - 3
examples/webgl_materials_cubemap_dynamic.html

@@ -241,9 +241,10 @@
 				mlib.body.push( [ "Chrome", new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0xffffff, envMap: cubeTarget, combine: THREE.MultiplyOperation } ) ] );
 				mlib.body.push( [ "Chrome", new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0xffffff, envMap: cubeTarget, combine: THREE.MultiplyOperation } ) ] );
 
 
 				// FLARES
 				// FLARES
+				var textureLoader = new THREE.TextureLoader();
 
 
-				flareA = THREE.ImageUtils.loadTexture( "textures/lensflare2.jpg" );
-				flareB = THREE.ImageUtils.loadTexture( "textures/lensflare0.png" );
+				flareA = textureLoader.load( "textures/lensflare2.jpg" );
+				flareB = textureLoader.load( "textures/lensflare0.png" );
 
 
 				// CARS - VEYRON
 				// CARS - VEYRON
 
 
@@ -493,7 +494,7 @@
 
 
 				// GROUND
 				// GROUND
 
 
-				var texture = THREE.ImageUtils.loadTexture( "textures/cube/Park3Med/ny.jpg" );
+				var texture = new THREE.TextureLoader().load( "textures/cube/Park3Med/ny.jpg" );
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 				texture.repeat.set( 50, 50 );
 				texture.repeat.set( 50, 50 );
 
 

+ 8 - 4
examples/webgl_materials_cubemap_dynamic2.html

@@ -45,14 +45,18 @@
 			lat = 0, onMouseDownLat = 0,
 			lat = 0, onMouseDownLat = 0,
 			phi = 0, theta = 0;
 			phi = 0, theta = 0;
 
 
-			var texture = THREE.ImageUtils.loadTexture( 'textures/2294472375_24a3b8ef46_o.jpg', THREE.UVMapping, function () {
+			var textureLoader = new THREE.TextureLoader();
 
 
-				init();
+			textureLoader.load( 'textures/2294472375_24a3b8ef46_o.jpg', function ( texture ) {
+
+				texture.mapping = THREE.UVMapping;
+
+				init( texture );
 				animate();
 				animate();
 
 
 			} );
 			} );
 
 
-			function init() {
+			function init( texture ) {
 
 
 				camera = new THREE.PerspectiveCamera( fov, window.innerWidth / window.innerHeight, 1, 1000 );
 				camera = new THREE.PerspectiveCamera( fov, window.innerWidth / window.innerHeight, 1, 1000 );
 
 
@@ -67,7 +71,7 @@
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				renderer.setSize( window.innerWidth, window.innerHeight );
 
 
 				cubeCamera = new THREE.CubeCamera( 1, 1000, 256 );
 				cubeCamera = new THREE.CubeCamera( 1, 1000, 256 );
-				cubeCamera.renderTarget.minFilter = THREE.LinearMipMapLinearFilter;
+				cubeCamera.renderTarget.texture.minFilter = THREE.LinearMipMapLinearFilter;
 				scene.add( cubeCamera );
 				scene.add( cubeCamera );
 
 
 				document.body.appendChild( renderer.domElement );
 				document.body.appendChild( renderer.domElement );

+ 8 - 4
examples/webgl_materials_displacementmap.html

@@ -136,13 +136,17 @@
 
 
 				var reflectionCube = new THREE.CubeTextureLoader().load( urls );
 				var reflectionCube = new THREE.CubeTextureLoader().load( urls );
 
 
-				// material
+				// textures
+
+				var textureLoader = new THREE.TextureLoader();
 
 
-				var normalMap = THREE.ImageUtils.loadTexture( "textures/normal/ninja/normal.jpg" );
+				var normalMap = textureLoader.load( "textures/normal/ninja/normal.jpg" );
 
 
-				var aoMap = THREE.ImageUtils.loadTexture( "textures/normal/ninja/ao.jpg" );
+				var aoMap = textureLoader.load( "textures/normal/ninja/ao.jpg" );
 
 
-				var displacementMap = THREE.ImageUtils.loadTexture( "textures/normal/ninja/displacement.jpg" );
+				var displacementMap = textureLoader.load( "textures/normal/ninja/displacement.jpg" );
+
+				// material
 
 
 				var material = new THREE.MeshPhongMaterial( {
 				var material = new THREE.MeshPhongMaterial( {
 
 

+ 4 - 3
examples/webgl_materials_envmaps.html

@@ -82,13 +82,14 @@
 				textureCube.format = THREE.RGBFormat;
 				textureCube.format = THREE.RGBFormat;
 				textureCube.mapping = THREE.CubeReflectionMapping;
 				textureCube.mapping = THREE.CubeReflectionMapping;
 
 
-				textureEquirec = THREE.ImageUtils.loadTexture( "textures/2294472375_24a3b8ef46_o.jpg" );
-				textureEquirec.format = THREE.RGBAFormat;
+				var textureLoader = new THREE.TextureLoader();
+
+				textureEquirec = textureLoader.load( "textures/2294472375_24a3b8ef46_o.jpg" );
 				textureEquirec.mapping = THREE.EquirectangularReflectionMapping;
 				textureEquirec.mapping = THREE.EquirectangularReflectionMapping;
 				textureEquirec.magFilter = THREE.LinearFilter;
 				textureEquirec.magFilter = THREE.LinearFilter;
 				textureEquirec.minFilter = THREE.LinearMipMapLinearFilter;
 				textureEquirec.minFilter = THREE.LinearMipMapLinearFilter;
 
 
-				textureSphere = THREE.ImageUtils.loadTexture( "textures/metal.jpg" );
+				textureSphere = textureLoader.load( "textures/metal.jpg" );
 				textureSphere.mapping = THREE.SphericalReflectionMapping;
 				textureSphere.mapping = THREE.SphericalReflectionMapping;
 
 
 				// Materials
 				// Materials

+ 5 - 3
examples/webgl_materials_normalmap.html

@@ -118,13 +118,15 @@
 				directionalLight.position.set( 1, -0.5, -1 );
 				directionalLight.position.set( 1, -0.5, -1 );
 				scene.add( directionalLight );
 				scene.add( directionalLight );
 
 
+				var textureLoader = new THREE.TextureLoader();
+
 				var material = new THREE.MeshPhongMaterial( {
 				var material = new THREE.MeshPhongMaterial( {
 					color: 0xdddddd,
 					color: 0xdddddd,
 					specular: 0x222222,
 					specular: 0x222222,
 					shininess: 35,
 					shininess: 35,
-					map: THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Map-COL.jpg" ),
-					specularMap: THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Map-SPEC.jpg" ),
-					normalMap: THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ),
+					map: textureLoader.load( "obj/leeperrysmith/Map-COL.jpg" ),
+					specularMap: textureLoader.load( "obj/leeperrysmith/Map-SPEC.jpg" ),
+					normalMap: textureLoader.load( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ),
 					normalScale: new THREE.Vector2( 0.8, 0.8 )
 					normalScale: new THREE.Vector2( 0.8, 0.8 )
 				} );
 				} );
 
 

+ 5 - 2
examples/webgl_materials_parallaxmap.html

@@ -147,9 +147,12 @@
 					vertexShader: shader.vertexShader,
 					vertexShader: shader.vertexShader,
 					uniforms: uniforms
 					uniforms: uniforms
 				};
 				};
+
+				var textureLoader = new THREE.TextureLoader();
+
 				material = new THREE.ShaderMaterial( parameters );
 				material = new THREE.ShaderMaterial( parameters );
-				material.map = THREE.ImageUtils.loadTexture( 'textures/brick_diffuse.jpg' );
-				material.bumpMap = THREE.ImageUtils.loadTexture( 'textures/brick_bump.jpg' );
+				material.map = textureLoader.load( 'textures/brick_diffuse.jpg' );
+				material.bumpMap = textureLoader.load( 'textures/brick_bump.jpg' );
 				material.map.anisotropy = 4;
 				material.map.anisotropy = 4;
 				material.bumpMap.anisotropy = 4;
 				material.bumpMap.anisotropy = 4;
 				uniforms[ 'map' ].value = material.map;
 				uniforms[ 'map' ].value = material.map;

+ 4 - 2
examples/webgl_materials_skin.html

@@ -122,10 +122,12 @@
 
 
 				var uniformsUV = THREE.UniformsUtils.clone( shader.uniforms );
 				var uniformsUV = THREE.UniformsUtils.clone( shader.uniforms );
 
 
-				uniformsUV[ "tNormal" ].value = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );
+				var textureLoader = new THREE.TextureLoader();
+
+				uniformsUV[ "tNormal" ].value = textureLoader.load( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );
 				uniformsUV[ "uNormalScale" ].value = -1.5;
 				uniformsUV[ "uNormalScale" ].value = -1.5;
 
 
-				uniformsUV[ "tDiffuse" ].value = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Map-COL.jpg" );
+				uniformsUV[ "tDiffuse" ].value = textureLoader.load( "obj/leeperrysmith/Map-COL.jpg" );
 
 
 				uniformsUV[ "passID" ].value = 0;
 				uniformsUV[ "passID" ].value = 0;
 
 

+ 4 - 2
examples/webgl_materials_texture_anisotropy.html

@@ -109,16 +109,18 @@
 
 
 				// GROUND
 				// GROUND
 
 
+				var textureLoader = new THREE.TextureLoader();
+
 				var maxAnisotropy = renderer.getMaxAnisotropy();
 				var maxAnisotropy = renderer.getMaxAnisotropy();
 
 
-				var texture1 = THREE.ImageUtils.loadTexture( "textures/crate.gif" );
+				var texture1 = textureLoader.load( "textures/crate.gif" );
 				var material1 = new THREE.MeshPhongMaterial( { color: 0xffffff, map: texture1 } );
 				var material1 = new THREE.MeshPhongMaterial( { color: 0xffffff, map: texture1 } );
 
 
 				texture1.anisotropy = maxAnisotropy;
 				texture1.anisotropy = maxAnisotropy;
 				texture1.wrapS = texture1.wrapT = THREE.RepeatWrapping;
 				texture1.wrapS = texture1.wrapT = THREE.RepeatWrapping;
 				texture1.repeat.set( 512, 512 );
 				texture1.repeat.set( 512, 512 );
 
 
-				var texture2 = THREE.ImageUtils.loadTexture( "textures/crate.gif" );
+				var texture2 = textureLoader.load( "textures/crate.gif" );
 				var material2 = new THREE.MeshPhongMaterial( { color: 0xffffff, map: texture2 } );
 				var material2 = new THREE.MeshPhongMaterial( { color: 0xffffff, map: texture2 } );
 
 
 				texture2.anisotropy = 1;
 				texture2.anisotropy = 1;

+ 5 - 4
examples/webgl_materials_texture_filters.html

@@ -185,13 +185,14 @@
 
 
 				};
 				};
 
 
-				var texturePainting = THREE.ImageUtils.loadTexture( "textures/758px-Canestra_di_frutta_(Caravaggio).jpg", THREE.UVMapping, callbackPainting ),
-					texturePainting2 = new THREE.Texture(),
-					materialPainting = new THREE.MeshBasicMaterial( { color: 0xffffff, map: texturePainting } ),
-					materialPainting2 = new THREE.MeshBasicMaterial( { color: 0xffccaa, map: texturePainting2 } );
+				var texturePainting = new THREE.TextureLoader().load( "textures/758px-Canestra_di_frutta_(Caravaggio).jpg", callbackPainting );
+				var texturePainting2 = new THREE.Texture();
+				var materialPainting = new THREE.MeshBasicMaterial( { color: 0xffffff, map: texturePainting } );
+				var materialPainting2 = new THREE.MeshBasicMaterial( { color: 0xffccaa, map: texturePainting2 } );
 
 
 				texturePainting2.minFilter = texturePainting2.magFilter = THREE.NearestFilter;
 				texturePainting2.minFilter = texturePainting2.magFilter = THREE.NearestFilter;
 				texturePainting.minFilter = texturePainting.magFilter = THREE.LinearFilter;
 				texturePainting.minFilter = texturePainting.magFilter = THREE.LinearFilter;
+				texturePainting.mapping = THREE.UVMapping;
 
 
 
 
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer = new THREE.WebGLRenderer( { antialias: true } );

+ 5 - 5
examples/webgl_materials_texture_manualmipmap.html

@@ -199,14 +199,14 @@
 
 
 				};
 				};
 
 
-				var texturePainting1 = THREE.ImageUtils.loadTexture( "textures/758px-Canestra_di_frutta_(Caravaggio).jpg", THREE.UVMapping, callbackPainting ),
-					texturePainting2 = new THREE.Texture(),
-					materialPainting1 = new THREE.MeshBasicMaterial( { color: 0xffffff, map: texturePainting1 } ),
-					materialPainting2 = new THREE.MeshBasicMaterial( { color: 0xffccaa, map: texturePainting2 } );
+				var texturePainting1 = new THREE.TextureLoader().load( "textures/758px-Canestra_di_frutta_(Caravaggio).jpg", callbackPainting );
+				var texturePainting2 = new THREE.Texture();
+				var materialPainting1 = new THREE.MeshBasicMaterial( { color: 0xffffff, map: texturePainting1 } );
+				var materialPainting2 = new THREE.MeshBasicMaterial( { color: 0xffccaa, map: texturePainting2 } );
 
 
 				texturePainting2.minFilter = texturePainting2.magFilter = THREE.NearestFilter;
 				texturePainting2.minFilter = texturePainting2.magFilter = THREE.NearestFilter;
 				texturePainting1.minFilter = texturePainting1.magFilter = THREE.LinearFilter;
 				texturePainting1.minFilter = texturePainting1.magFilter = THREE.LinearFilter;
-
+				texturePainting1.mapping = THREE.UVMapping;
 
 
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer.setClearColor( scene1.fog.color );
 				renderer.setClearColor( scene1.fog.color );

+ 1 - 1
examples/webgl_materials_variations_basic.html

@@ -63,7 +63,7 @@
 
 
 				// Materials
 				// Materials
 
 
-				var imgTexture = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
+				var imgTexture = new THREE.TextureLoader().load( "textures/planets/moon_1024.jpg" );
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.anisotropy = 16;
 				imgTexture.anisotropy = 16;
 				imgTexture = null;
 				imgTexture = null;

+ 1 - 1
examples/webgl_materials_variations_lambert.html

@@ -63,7 +63,7 @@
 
 
 				// Materials
 				// Materials
 
 
-				var imgTexture = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
+				var imgTexture = new THREE.TextureLoader().load( "textures/planets/moon_1024.jpg" );
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.anisotropy = 16;
 				imgTexture.anisotropy = 16;
 				imgTexture = null;
 				imgTexture = null;

+ 1 - 1
examples/webgl_materials_variations_phong.html

@@ -64,7 +64,7 @@
 
 
 				// Materials
 				// Materials
 
 
-				var imgTexture = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
+				var imgTexture = new THREE.TextureLoader().load( "textures/planets/moon_1024.jpg" );
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.anisotropy = 16;
 				imgTexture.anisotropy = 16;
 				imgTexture = null;
 				imgTexture = null;

+ 1 - 1
examples/webgl_materials_variations_standard.html

@@ -63,7 +63,7 @@
 
 
 				// Materials
 				// Materials
 
 
-				var imgTexture = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
+				var imgTexture = new THREE.TextureLoader().load( "textures/planets/moon_1024.jpg" );
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.anisotropy = 16;
 				imgTexture.anisotropy = 16;
 				imgTexture = null;
 				imgTexture = null;

+ 1 - 1
examples/webgl_materials_variations_standard2.html

@@ -63,7 +63,7 @@
 
 
 				// Materials
 				// Materials
 
 
-				var imgTexture = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
+				var imgTexture = new THREE.TextureLoader().load( "textures/planets/moon_1024.jpg" );
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
 				imgTexture.anisotropy = 16;
 				imgTexture.anisotropy = 16;
 				imgTexture = null;
 				imgTexture = null;

+ 9 - 7
examples/webgl_nearestneighbour.html

@@ -94,14 +94,16 @@
 				controls.movementSpeed = 100;
 				controls.movementSpeed = 100;
 				controls.lookSpeed = 0.1;
 				controls.lookSpeed = 0.1;
 
 
+				var textureLoader = new THREE.TextureLoader();
+
 				var materials = [
 				var materials = [
 
 
-					new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/cube/skybox/px.jpg' ) } ), // right
-					new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/cube/skybox/nx.jpg' ) } ), // left
-					new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/cube/skybox/py.jpg' ) } ), // top
-					new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/cube/skybox/ny.jpg' ) } ), // bottom
-					new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/cube/skybox/pz.jpg' ) } ), // back
-					new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/cube/skybox/nz.jpg' ) } )  // front
+					new THREE.MeshBasicMaterial( { map: textureLoader.load( 'textures/cube/skybox/px.jpg' ) } ), // right
+					new THREE.MeshBasicMaterial( { map: textureLoader.load( 'textures/cube/skybox/nx.jpg' ) } ), // left
+					new THREE.MeshBasicMaterial( { map: textureLoader.load( 'textures/cube/skybox/py.jpg' ) } ), // top
+					new THREE.MeshBasicMaterial( { map: textureLoader.load( 'textures/cube/skybox/ny.jpg' ) } ), // bottom
+					new THREE.MeshBasicMaterial( { map: textureLoader.load( 'textures/cube/skybox/pz.jpg' ) } ), // back
+					new THREE.MeshBasicMaterial( { map: textureLoader.load( 'textures/cube/skybox/nz.jpg' ) } )  // front
 
 
 				];
 				];
 
 
@@ -117,7 +119,7 @@
 				document.body.appendChild( renderer.domElement );
 				document.body.appendChild( renderer.domElement );
 
 
 				// create the custom shader
 				// create the custom shader
-				var imagePreviewTexture = THREE.ImageUtils.loadTexture( 'textures/crate.gif');
+				var imagePreviewTexture = textureLoader.load( 'textures/crate.gif');
 				imagePreviewTexture.minFilter = THREE.LinearMipMapLinearFilter;
 				imagePreviewTexture.minFilter = THREE.LinearMipMapLinearFilter;
 				imagePreviewTexture.magFilter = THREE.LinearFilter;
 				imagePreviewTexture.magFilter = THREE.LinearFilter;
 
 

+ 18 - 18
examples/webgl_objects_update.html

@@ -27,7 +27,7 @@
 			var container, stats;
 			var container, stats;
 
 
 			var camera, scene, renderer;
 			var camera, scene, renderer;
-			
+
 			var objectNewGeometry;
 			var objectNewGeometry;
 			var objectToggleAddRemove;
 			var objectToggleAddRemove;
 			var objectRandomizeFaces;
 			var objectRandomizeFaces;
@@ -53,7 +53,7 @@
 				light.position.set( 0, 1, 0 );
 				light.position.set( 0, 1, 0 );
 				scene.add( light );
 				scene.add( light );
 
 
-				var map = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg' );
+				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 				map.anisotropy = 16;
 
 
@@ -122,7 +122,7 @@
 				window.addEventListener( 'resize', onWindowResize, false );
 				window.addEventListener( 'resize', onWindowResize, false );
 
 
 			}
 			}
-			
+
 			function createObject(material, segments ){
 			function createObject(material, segments ){
 				var geometry = createGeometry(segments);
 				var geometry = createGeometry(segments);
 				var mesh = new THREE.Mesh( geometry , material);
 				var mesh = new THREE.Mesh( geometry , material);
@@ -135,7 +135,7 @@
 				geometry.applyMatrix(matrix.makeRotationFromEuler(euler.set(parseInt(Math.random()*2,10)*Math.PI,parseInt(Math.random()*2,10)*Math.PI,parseInt(Math.random()*2,10)*Math.PI)));
 				geometry.applyMatrix(matrix.makeRotationFromEuler(euler.set(parseInt(Math.random()*2,10)*Math.PI,parseInt(Math.random()*2,10)*Math.PI,parseInt(Math.random()*2,10)*Math.PI)));
 				return geometry;
 				return geometry;
 			}
 			}
-			
+
 			function createMeshFaceMaterial(){
 			function createMeshFaceMaterial(){
 				var materials = [];
 				var materials = [];
 				materials.push(new THREE.MeshBasicMaterial({color: 0xff0000}));
 				materials.push(new THREE.MeshBasicMaterial({color: 0xff0000}));
@@ -167,12 +167,12 @@
 				stats.update();
 				stats.update();
 
 
 			}
 			}
-			
+
 			function randomizeFaces(object){
 			function randomizeFaces(object){
 				for(var i = 0,l=object.geometry.faces.length;i<l;i++){
 				for(var i = 0,l=object.geometry.faces.length;i<l;i++){
-					
+
 					object.geometry.faces[i].materialIndex = Math.floor(Math.random() * 6);
 					object.geometry.faces[i].materialIndex = Math.floor(Math.random() * 6);
-					
+
 				}
 				}
 				object.geometry.groupsNeedUpdate = true;
 				object.geometry.groupsNeedUpdate = true;
 			}
 			}
@@ -180,30 +180,30 @@
 			function render() {
 			function render() {
 
 
 				var timer = Date.now() * 0.001;
 				var timer = Date.now() * 0.001;
-				
+
 				if (parseInt(timer,10)%2 === 0){
 				if (parseInt(timer,10)%2 === 0){
 
 
 					if (scene.children.indexOf(objectToggleAddRemove) === -1) {
 					if (scene.children.indexOf(objectToggleAddRemove) === -1) {
-						
-					
+
+
 						objectNewGeometry.geometry = createGeometry(1);
 						objectNewGeometry.geometry = createGeometry(1);
 						randomizeFaces(objectRandomizeFaces);
 						randomizeFaces(objectRandomizeFaces);
-					
+
 						scene.add(objectToggleAddRemove);
 						scene.add(objectToggleAddRemove);
-						
+
 					}
 					}
-					
+
 				} else {
 				} else {
-					
+
 					if (scene.children.indexOf(objectToggleAddRemove) !== -1) {
 					if (scene.children.indexOf(objectToggleAddRemove) !== -1) {
-											
+
 						objectNewGeometry.geometry = createGeometry(1);
 						objectNewGeometry.geometry = createGeometry(1);
 						randomizeFaces(objectRandomizeFaces);
 						randomizeFaces(objectRandomizeFaces);
-					
+
 						scene.remove(objectToggleAddRemove);
 						scene.remove(objectToggleAddRemove);
-						
+
 					}
 					}
-					
+
 				}
 				}
 
 
 				camera.lookAt( scene.position );
 				camera.lookAt( scene.position );

+ 2 - 2
examples/webgl_panorama_equirectangular.html

@@ -65,11 +65,11 @@
 				geometry.scale( - 1, 1, 1 );
 				geometry.scale( - 1, 1, 1 );
 
 
 				var material = new THREE.MeshBasicMaterial( {
 				var material = new THREE.MeshBasicMaterial( {
-					map: THREE.ImageUtils.loadTexture( 'textures/2294472375_24a3b8ef46_o.jpg' )
+					map: new THREE.TextureLoader().load( 'textures/2294472375_24a3b8ef46_o.jpg' )
 				} );
 				} );
 
 
 				mesh = new THREE.Mesh( geometry, material );
 				mesh = new THREE.Mesh( geometry, material );
-				
+
 				scene.add( mesh );
 				scene.add( mesh );
 
 
 				renderer = new THREE.WebGLRenderer();
 				renderer = new THREE.WebGLRenderer();

+ 11 - 9
examples/webgl_particles_general.html

@@ -6,7 +6,7 @@
     <script src="../build/three.js"></script>
     <script src="../build/three.js"></script>
 	<script src="js/Detector.js"></script>
 	<script src="js/Detector.js"></script>
 	<script src="js/libs/stats.min.js"></script>
 	<script src="js/libs/stats.min.js"></script>
-	<script src="js/controls/OrbitControls.js"></script>	
+	<script src="js/controls/OrbitControls.js"></script>
 	<script src="js/loaders/OBJLoader.js"></script>
 	<script src="js/loaders/OBJLoader.js"></script>
 	<script src='js/libs/dat.gui.min.js'></script>
 	<script src='js/libs/dat.gui.min.js'></script>
 	<script src="js/libs/photons.min.js"></script>
 	<script src="js/libs/photons.min.js"></script>
@@ -113,8 +113,10 @@
 
 
 		smokeType = ParticleSystemIDs.Smoke1;
 		smokeType = ParticleSystemIDs.Smoke1;
 
 
-		var smoke1Atlas = new PHOTONS.Atlas( THREE.ImageUtils.loadTexture( 'textures/campfire/smokeparticle.png' ), true );
-		var smoke2Atlas = PHOTONS.Atlas.createGridAtlas( THREE.ImageUtils.loadTexture( 'textures/campfire/smokeparticles.png' ), 0.0, 1.0, 1.0, 0.0, 4.0, 4.0, false, true );
+    var textureLoader = new THREE.TextureLoader();
+
+		var smoke1Atlas = new PHOTONS.Atlas( textureLoader.load( 'textures/campfire/smokeparticle.png' ), true );
+		var smoke2Atlas = PHOTONS.Atlas.createGridAtlas( textureLoader.load( 'textures/campfire/smokeparticles.png' ), 0.0, 1.0, 1.0, 0.0, 4.0, 4.0, false, true );
 
 
 		var altVertexShader = [
 		var altVertexShader = [
 
 
@@ -316,7 +318,7 @@
 		var particleSystemParams = {
 		var particleSystemParams = {
 
 
 			material: flameMaterial,
 			material: flameMaterial,
-			particleAtlas : PHOTONS.Atlas.createGridAtlas( THREE.ImageUtils.loadTexture( 'textures/campfire/fireloop3.jpg' ), 0.0, 1.0, 1.0, 0.0, 8.0, 8.0, false, true ),
+			particleAtlas : PHOTONS.Atlas.createGridAtlas( new THREE.TextureLoader().load( 'textures/campfire/fireloop3.jpg' ), 0.0, 1.0, 1.0, 0.0, 8.0, 8.0, false, true ),
 			particleReleaseRate : 3,
 			particleReleaseRate : 3,
 			particleLifeSpan : 3,
 			particleLifeSpan : 3,
 			lifespan : 0
 			lifespan : 0
@@ -380,7 +382,7 @@
 		particleSystemParams = {
 		particleSystemParams = {
 
 
 			material: emberMaterial,
 			material: emberMaterial,
-			particleAtlas : new PHOTONS.Atlas( THREE.ImageUtils.loadTexture( 'textures/campfire/Puff.png' ), true ),
+			particleAtlas : new PHOTONS.Atlas( new THREE.TextureLoader().load( 'textures/campfire/Puff.png' ), true ),
 			particleReleaseRate : 18,
 			particleReleaseRate : 18,
 			particleLifeSpan : 3,
 			particleLifeSpan : 3,
 			lifespan : 0
 			lifespan : 0
@@ -543,7 +545,7 @@
 		// create ground
 		// create ground
 		// ---------------------
 		// ---------------------
 
 
-		var groundTexture = new THREE.ImageUtils.loadTexture( 'textures/campfire/grass1.jpg' );
+		var groundTexture = new THREE.TextureLoader().load( 'textures/campfire/grass1.jpg' );
 		groundTexture.wrapS = THREE.RepeatWrapping;
 		groundTexture.wrapS = THREE.RepeatWrapping;
 		groundTexture.wrapT = THREE.RepeatWrapping;
 		groundTexture.wrapT = THREE.RepeatWrapping;
 		groundTexture.repeat.set( 10, 10 );
 		groundTexture.repeat.set( 10, 10 );
@@ -581,7 +583,7 @@
 
 
 			function( mesh ) {
 			function( mesh ) {
 
 
-				mesh.castShadow = true; 
+				mesh.castShadow = true;
 				mesh.receiveShadow = false;
 				mesh.receiveShadow = false;
 
 
 			},
 			},
@@ -614,7 +616,7 @@
 
 
 			function( mesh ) {
 			function( mesh ) {
 
 
-				mesh.castShadow = true;	
+				mesh.castShadow = true;
 				mesh.receiveShadow = true;
 				mesh.receiveShadow = true;
 
 
 			},
 			},
@@ -661,7 +663,7 @@
 
 
 			function( mesh ) {
 			function( mesh ) {
 
 
-				mesh.castShadow = true;	
+				mesh.castShadow = true;
 				mesh.receiveShadow = true;
 				mesh.receiveShadow = true;
 
 
 			},
 			},

+ 1 - 1
examples/webgl_points_billboards.html

@@ -68,7 +68,7 @@
 
 
 				geometry = new THREE.Geometry();
 				geometry = new THREE.Geometry();
 
 
-				sprite = THREE.ImageUtils.loadTexture( "textures/sprites/disc.png" );
+				sprite = new THREE.TextureLoader().load( "textures/sprites/disc.png" );
 
 
 				for ( i = 0; i < 10000; i ++ ) {
 				for ( i = 0; i < 10000; i ++ ) {
 
 

+ 1 - 1
examples/webgl_points_billboards_colors.html

@@ -68,7 +68,7 @@
 
 
 				geometry = new THREE.Geometry();
 				geometry = new THREE.Geometry();
 
 
-				sprite = THREE.ImageUtils.loadTexture( "textures/sprites/ball.png" );
+				sprite = new THREE.TextureLoader().load( "textures/sprites/ball.png" );
 
 
 				for ( i = 0; i < 5000; i ++ ) {
 				for ( i = 0; i < 5000; i ++ ) {
 
 

+ 7 - 5
examples/webgl_points_sprites.html

@@ -69,11 +69,13 @@
 
 
 				geometry = new THREE.Geometry();
 				geometry = new THREE.Geometry();
 
 
-				sprite1 = THREE.ImageUtils.loadTexture( "textures/sprites/snowflake1.png" );
-				sprite2 = THREE.ImageUtils.loadTexture( "textures/sprites/snowflake2.png" );
-				sprite3 = THREE.ImageUtils.loadTexture( "textures/sprites/snowflake3.png" );
-				sprite4 = THREE.ImageUtils.loadTexture( "textures/sprites/snowflake4.png" );
-				sprite5 = THREE.ImageUtils.loadTexture( "textures/sprites/snowflake5.png" );
+				var textureLoader = new THREE.TextureLoader();
+
+				sprite1 = textureLoader.load( "textures/sprites/snowflake1.png" );
+				sprite2 = textureLoader.load( "textures/sprites/snowflake2.png" );
+				sprite3 = textureLoader.load( "textures/sprites/snowflake3.png" );
+				sprite4 = textureLoader.load( "textures/sprites/snowflake4.png" );
+				sprite5 = textureLoader.load( "textures/sprites/snowflake5.png" );
 
 
 				for ( i = 0; i < 10000; i ++ ) {
 				for ( i = 0; i < 10000; i ++ ) {
 
 

+ 6 - 4
examples/webgl_postprocessing_nodes.html

@@ -14,7 +14,7 @@
 				text-align:center;
 				text-align:center;
 				overflow: hidden;
 				overflow: hidden;
 			}
 			}
-			
+
 			#info {
 			#info {
 				color: #fff;
 				color: #fff;
 				position: absolute;
 				position: absolute;
@@ -29,7 +29,7 @@
 		<div id="info">
 		<div id="info">
 			<a href="http://threejs.org" target="_blank">three.js</a> - Node-Based Post-Processing
 			<a href="http://threejs.org" target="_blank">three.js</a> - Node-Based Post-Processing
 		</div>
 		</div>
-	
+
 		<script src="../build/three.min.js"></script>
 		<script src="../build/three.min.js"></script>
 		<script src="js/libs/dat.gui.min.js"></script>
 		<script src="js/libs/dat.gui.min.js"></script>
 
 
@@ -92,10 +92,12 @@
 
 
 			var param = { example: 'color-adjustment' };
 			var param = { example: 'color-adjustment' };
 
 
-			var lensflare2 = new THREE.TextureLoader().load( 'textures/lensflare2.jpg' );
+			var textureLoader = new THREE.TextureLoader();
+
+			var lensflare2 = textureLoader.load( 'textures/lensflare2.jpg' );
 			lensflare2.wrapS = lensflare2.wrapT = THREE.RepeatWrapping;
 			lensflare2.wrapS = lensflare2.wrapT = THREE.RepeatWrapping;
 
 
-			var decalNormal = new THREE.TextureLoader().load( 'textures/decal/decal-normal.jpg' );
+			var decalNormal = textureLoader.load( 'textures/decal/decal-normal.jpg' );
 			decalNormal.wrapS = decalNormal.wrapT = THREE.RepeatWrapping;
 			decalNormal.wrapS = decalNormal.wrapT = THREE.RepeatWrapping;
 
 
 			init();
 			init();

+ 3 - 4
examples/webgl_sandbox.html

@@ -78,11 +78,11 @@
 				var fragmentShader = shader.fragmentShader;
 				var fragmentShader = shader.fragmentShader;
 
 
 				var texture1 = new THREE.CanvasTexture( generateTexture( 0, 0.5, 1 ), THREE.UVMapping );
 				var texture1 = new THREE.CanvasTexture( generateTexture( 0, 0.5, 1 ), THREE.UVMapping );
-				var texture2 = THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' );
+				var texture2 = new THREE.TextureLoader().load( 'textures/land_ocean_ice_cloud_2048.jpg' );
 
 
 				var materials = [
 				var materials = [
 
 
-					new THREE.MeshNormalMaterial( { shading: THREE.SmoothShading } ),
+					new THREE.MeshNormalMaterial(),
 					new THREE.MeshDepthMaterial(),
 					new THREE.MeshDepthMaterial(),
 					new THREE.MeshBasicMaterial( { color: 0x0066ff, blending: THREE.AdditiveBlending, transparent: true, depthWrite: false } ),
 					new THREE.MeshBasicMaterial( { color: 0x0066ff, blending: THREE.AdditiveBlending, transparent: true, depthWrite: false } ),
 					new THREE.MeshBasicMaterial( { color: 0xffaa00, wireframe: true } ),
 					new THREE.MeshBasicMaterial( { color: 0xffaa00, wireframe: true } ),
@@ -90,8 +90,7 @@
 					new THREE.MeshBasicMaterial( { map: texture2 } ),
 					new THREE.MeshBasicMaterial( { map: texture2 } ),
 					new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader, transparent: true } ),
 					new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader, transparent: true } ),
 					new THREE.MeshLambertMaterial( { map: texture2 } ),
 					new THREE.MeshLambertMaterial( { map: texture2 } ),
-					new THREE.MeshLambertMaterial( { color: 0xdddddd, shading: THREE.FlatShading } ),
-					new THREE.MeshLambertMaterial( { color: 0xdddddd, shading: THREE.SmoothShading } ),
+					new THREE.MeshLambertMaterial( { color: 0xdddddd } ),
 					new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading } ),
 					new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading } ),
 					new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading } )
 					new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading } )
 
 

+ 1 - 1
examples/webgl_shader2.html

@@ -199,7 +199,7 @@
 				uniforms2 = {
 				uniforms2 = {
 					time: { type: "f", value: 1.0 },
 					time: { type: "f", value: 1.0 },
 					resolution: { type: "v2", value: new THREE.Vector2() },
 					resolution: { type: "v2", value: new THREE.Vector2() },
-					texture: { type: "t", value: THREE.ImageUtils.loadTexture( "textures/disturb.jpg" ) }
+					texture: { type: "t", value: new THREE.TextureLoader().load( "textures/disturb.jpg" ) }
 				};
 				};
 
 
 				uniforms2.texture.value.wrapS = uniforms2.texture.value.wrapT = THREE.RepeatWrapping;
 				uniforms2.texture.value.wrapS = uniforms2.texture.value.wrapT = THREE.RepeatWrapping;

+ 4 - 2
examples/webgl_shader_lava.html

@@ -149,6 +149,8 @@
 
 
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 
 
+				var textureLoader = new THREE.TextureLoader();
+
 				uniforms = {
 				uniforms = {
 
 
 					fogDensity: { type: "f", value: 0.45 },
 					fogDensity: { type: "f", value: 0.45 },
@@ -156,8 +158,8 @@
 					time: { type: "f", value: 1.0 },
 					time: { type: "f", value: 1.0 },
 					resolution: { type: "v2", value: new THREE.Vector2() },
 					resolution: { type: "v2", value: new THREE.Vector2() },
 					uvScale: { type: "v2", value: new THREE.Vector2( 3.0, 1.0 ) },
 					uvScale: { type: "v2", value: new THREE.Vector2( 3.0, 1.0 ) },
-					texture1: { type: "t", value: THREE.ImageUtils.loadTexture( "textures/lava/cloud.png" ) },
-					texture2: { type: "t", value: THREE.ImageUtils.loadTexture( "textures/lava/lavatile.jpg" ) }
+					texture1: { type: "t", value: textureLoader.load( "textures/lava/cloud.png" ) },
+					texture2: { type: "t", value: textureLoader.load( "textures/lava/lavatile.jpg" ) }
 
 
 				};
 				};
 
 

+ 2 - 2
examples/webgl_shaders_ocean.html

@@ -88,7 +88,7 @@
 				controls.minDistance = 1000.0;
 				controls.minDistance = 1000.0;
 				controls.maxDistance = 5000.0;
 				controls.maxDistance = 5000.0;
 				controls.maxPolarAngle = Math.PI * 0.495;
 				controls.maxPolarAngle = Math.PI * 0.495;
-				controls.center.set( 0, 500, 0 );
+				controls.target.set( 0, 500, 0 );
 
 
 				scene.add( new THREE.AmbientLight( 0x444444 ) );
 				scene.add( new THREE.AmbientLight( 0x444444 ) );
 
 
@@ -97,7 +97,7 @@
 				scene.add( light );
 				scene.add( light );
 
 
 
 
-				waterNormals = new THREE.ImageUtils.loadTexture( 'textures/waternormals.jpg' );
+				waterNormals = new THREE.TextureLoader().load( 'textures/waternormals.jpg' );
 				waterNormals.wrapS = waterNormals.wrapT = THREE.RepeatWrapping;
 				waterNormals.wrapS = waterNormals.wrapT = THREE.RepeatWrapping;
 
 
 				water = new THREE.Water( renderer, camera, scene, {
 				water = new THREE.Water( renderer, camera, scene, {

+ 7 - 5
examples/webgl_shaders_tonemapping.html

@@ -202,16 +202,18 @@
 					shininess: 200
 					shininess: 200
 				} );
 				} );
 
 
-				var earthDiffuse = THREE.ImageUtils.loadTexture( 'textures/planets/earth_atmos_4096.jpg', undefined, function( tex ) {
+				var textureLoader = new THREE.TextureLoader();
+
+				var earthDiffuse = textureLoader.load( 'textures/planets/earth_atmos_4096.jpg', function( tex ) {
 					earthMat.map = tex;
 					earthMat.map = tex;
 					earthMat.needsUpdate = true;
 					earthMat.needsUpdate = true;
 				} );
 				} );
-				var earthSpecular = THREE.ImageUtils.loadTexture( 'textures/planets/earth_specular_2048.jpg', undefined, function( tex ) {
+				var earthSpecular = textureLoader.load( 'textures/planets/earth_specular_2048.jpg', function( tex ) {
 					earthMat.specularMap = tex;
 					earthMat.specularMap = tex;
 					earthMat.needsUpdate = true;
 					earthMat.needsUpdate = true;
 				} );
 				} );
 
 
-				// var earthNormal = THREE.ImageUtils.loadTexture( 'textures/planets/earth-new-normal-2048.jpg', undefined, function( tex ) {
+				// var earthNormal = textureLoader.load( 'textures/planets/earth-new-normal-2048.jpg', function( tex ) {
 				// 	earthMat.normalMap = tex;
 				// 	earthMat.normalMap = tex;
 				// 	earthMat.needsUpdate = true;
 				// 	earthMat.needsUpdate = true;
 				// } );
 				// } );
@@ -223,7 +225,7 @@
 					depthTest: false
 					depthTest: false
 				} );
 				} );
 
 
-				var earthLights = THREE.ImageUtils.loadTexture( 'textures/planets/earth_lights_2048.png', undefined, function( tex ) {
+				var earthLights = textureLoader.load( 'textures/planets/earth_lights_2048.png', function( tex ) {
 					earthLightsMat.map = tex;
 					earthLightsMat.map = tex;
 					earthLightsMat.needsUpdate = true;
 					earthLightsMat.needsUpdate = true;
 				} );
 				} );
@@ -235,7 +237,7 @@
 					depthTest: false
 					depthTest: false
 				} );
 				} );
 
 
-				var earthClouds = THREE.ImageUtils.loadTexture( 'textures/planets/earth_clouds_2048.png', undefined, function( tex ) {
+				var earthClouds = textureLoader.load( 'textures/planets/earth_clouds_2048.png', function( tex ) {
 					earthCloudsMat.map = tex;
 					earthCloudsMat.map = tex;
 					earthCloudsMat.needsUpdate = true;
 					earthCloudsMat.needsUpdate = true;
 				} );
 				} );

+ 4 - 3
examples/webgl_shading_physical.html

@@ -105,19 +105,20 @@
 				cubeCamera = new THREE.CubeCamera( 1, 10000, 128 );
 				cubeCamera = new THREE.CubeCamera( 1, 10000, 128 );
 
 
 				// TEXTURES
 				// TEXTURES
+				var textureLoader = new THREE.TextureLoader();
 
 
-				var textureSquares = new THREE.TextureLoader().load( "textures/patterns/bright_squares256.png" );
+				var textureSquares = textureLoader.load( "textures/patterns/bright_squares256.png" );
 				textureSquares.repeat.set( 50, 50 );
 				textureSquares.repeat.set( 50, 50 );
 				textureSquares.wrapS = textureSquares.wrapT = THREE.RepeatWrapping;
 				textureSquares.wrapS = textureSquares.wrapT = THREE.RepeatWrapping;
 				textureSquares.magFilter = THREE.NearestFilter;
 				textureSquares.magFilter = THREE.NearestFilter;
 				textureSquares.format = THREE.RGBFormat;
 				textureSquares.format = THREE.RGBFormat;
 
 
-				var textureNoiseColor = new THREE.TextureLoader().load( "textures/disturb.jpg" );
+				var textureNoiseColor = textureLoader.load( "textures/disturb.jpg" );
 				textureNoiseColor.repeat.set( 1, 1 );
 				textureNoiseColor.repeat.set( 1, 1 );
 				textureNoiseColor.wrapS = textureNoiseColor.wrapT = THREE.RepeatWrapping;
 				textureNoiseColor.wrapS = textureNoiseColor.wrapT = THREE.RepeatWrapping;
 				textureNoiseColor.format = THREE.RGBFormat;
 				textureNoiseColor.format = THREE.RGBFormat;
 
 
-				var textureLava = new THREE.TextureLoader().load( "textures/lava/lavatile.jpg" );
+				var textureLava = textureLoader.load( "textures/lava/lavatile.jpg" );
 				textureLava.repeat.set( 6, 2 );
 				textureLava.repeat.set( 6, 2 );
 				textureLava.wrapS = textureLava.wrapT = THREE.RepeatWrapping;
 				textureLava.wrapS = textureLava.wrapT = THREE.RepeatWrapping;
 				textureLava.format = THREE.RGBFormat;
 				textureLava.format = THREE.RGBFormat;

+ 7 - 5
examples/webgl_sprites.html

@@ -52,9 +52,11 @@
 				var amount = 200;
 				var amount = 200;
 				var radius = 500;
 				var radius = 500;
 
 
-				var mapA = THREE.ImageUtils.loadTexture( "textures/sprite0.png", undefined, createHUDSprites );
-				var mapB = THREE.ImageUtils.loadTexture( "textures/sprite1.png" );
-				mapC = THREE.ImageUtils.loadTexture( "textures/sprite2.png" );
+				var textureLoader = new THREE.TextureLoader();
+
+				var mapA = textureLoader.load( "textures/sprite0.png", createHUDSprites );
+				var mapB = textureLoader.load( "textures/sprite1.png" );
+				mapC = textureLoader.load( "textures/sprite2.png" );
 
 
 				group = new THREE.Group();
 				group = new THREE.Group();
 
 
@@ -113,7 +115,7 @@
 
 
 				var width = material.map.image.width;
 				var width = material.map.image.width;
 				var height = material.map.image.height;
 				var height = material.map.image.height;
-				
+
 				spriteTL = new THREE.Sprite( material );
 				spriteTL = new THREE.Sprite( material );
 				spriteTL.scale.set( width, height, 1 );
 				spriteTL.scale.set( width, height, 1 );
 				sceneOrtho.add( spriteTL );
 				sceneOrtho.add( spriteTL );
@@ -129,7 +131,7 @@
 				spriteBR = new THREE.Sprite( material );
 				spriteBR = new THREE.Sprite( material );
 				spriteBR.scale.set( width, height, 1 );
 				spriteBR.scale.set( width, height, 1 );
 				sceneOrtho.add( spriteBR );
 				sceneOrtho.add( spriteBR );
-				
+
 				spriteC = new THREE.Sprite( material );
 				spriteC = new THREE.Sprite( material );
 				spriteC.scale.set( width, height, 1 );
 				spriteC.scale.set( width, height, 1 );
 				sceneOrtho.add( spriteC );
 				sceneOrtho.add( spriteC );

+ 10 - 8
examples/webgl_terrain_dynamic.html

@@ -315,10 +315,10 @@
 				var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat };
 				var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat };
 
 
 				heightMap  = new THREE.WebGLRenderTarget( rx, ry, pars );
 				heightMap  = new THREE.WebGLRenderTarget( rx, ry, pars );
-				heightMap.generateMipmaps = false;
+				heightMap.texture.generateMipmaps = false;
 
 
 				normalMap = new THREE.WebGLRenderTarget( rx, ry, pars );
 				normalMap = new THREE.WebGLRenderTarget( rx, ry, pars );
-				normalMap.generateMipmaps = false;
+				normalMap.texture.generateMipmaps = false;
 
 
 				uniformsNoise = {
 				uniformsNoise = {
 
 
@@ -338,23 +338,25 @@
 
 
 				// TEXTURES
 				// TEXTURES
 
 
+				var textureLoader = new THREE.TextureLoader();
+
 				var specularMap = new THREE.WebGLRenderTarget( 2048, 2048, pars );
 				var specularMap = new THREE.WebGLRenderTarget( 2048, 2048, pars );
-				specularMap.generateMipmaps = false;
+				specularMap.texture.generateMipmaps = false;
 
 
-				var diffuseTexture1 = THREE.ImageUtils.loadTexture( "textures/terrain/grasslight-big.jpg", null, function () {
+				var diffuseTexture1 = textureLoader.load( "textures/terrain/grasslight-big.jpg", function () {
 
 
 					loadTextures();
 					loadTextures();
 					applyShader( THREE.LuminosityShader, diffuseTexture1, specularMap );
 					applyShader( THREE.LuminosityShader, diffuseTexture1, specularMap );
 
 
 				} );
 				} );
 
 
-				var diffuseTexture2 = THREE.ImageUtils.loadTexture( "textures/terrain/backgrounddetailed6.jpg", null, loadTextures );
-				var detailTexture = THREE.ImageUtils.loadTexture( "textures/terrain/grasslight-big-nm.jpg", null, loadTextures );
+				var diffuseTexture2 = textureLoader.load( "textures/terrain/backgrounddetailed6.jpg", loadTextures );
+				var detailTexture = textureLoader.load( "textures/terrain/grasslight-big-nm.jpg", loadTextures );
 
 
 				diffuseTexture1.wrapS = diffuseTexture1.wrapT = THREE.RepeatWrapping;
 				diffuseTexture1.wrapS = diffuseTexture1.wrapT = THREE.RepeatWrapping;
 				diffuseTexture2.wrapS = diffuseTexture2.wrapT = THREE.RepeatWrapping;
 				diffuseTexture2.wrapS = diffuseTexture2.wrapT = THREE.RepeatWrapping;
 				detailTexture.wrapS = detailTexture.wrapT = THREE.RepeatWrapping;
 				detailTexture.wrapS = detailTexture.wrapT = THREE.RepeatWrapping;
-				specularMap.wrapS = specularMap.wrapT = THREE.RepeatWrapping;
+				specularMap.texture.wrapS = specularMap.texture.wrapT = THREE.RepeatWrapping;
 
 
 				// TERRAIN SHADER
 				// TERRAIN SHADER
 
 
@@ -459,7 +461,7 @@
 				renderTargetParameters = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat, stencilBuffer: false };
 				renderTargetParameters = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat, stencilBuffer: false };
 
 
 				renderTarget = new THREE.WebGLRenderTarget( SCREEN_WIDTH, SCREEN_HEIGHT, renderTargetParameters );
 				renderTarget = new THREE.WebGLRenderTarget( SCREEN_WIDTH, SCREEN_HEIGHT, renderTargetParameters );
-				renderTarget.generateMipmaps = false;
+				renderTarget.texture.generateMipmaps = false;
 
 
 				effectBloom = new THREE.BloomPass( 0.6 );
 				effectBloom = new THREE.BloomPass( 0.6 );
 				var effectBleach = new THREE.ShaderPass( THREE.BleachBypassShader );
 				var effectBleach = new THREE.ShaderPass( THREE.BleachBypassShader );