Updated CanvasRenderer and some examples to handle the `Texture( image, mapping)` approach.

examples/canvasrenderer_sandbox.html

@@ -49,7 +49,14 @@
 		<script type="text/javascript" src="../src/materials/MeshFaceMaterial.js"></script>
 		<script type="text/javascript" src="../src/materials/ParticleBasicMaterial.js"></script>
 		<script type="text/javascript" src="../src/materials/ParticleCircleMaterial.js"></script>
-		<script type="text/javascript" src="../src/materials/textures/Texture.js"></script>
+		<script type="text/javascript" src="../src/materials/Texture.js"></script>
+		<script type="text/javascript" src="../src/materials/mappings/CubeReflectionMapping.js"></script>
+		<script type="text/javascript" src="../src/materials/mappings/CubeRefractionMapping.js"></script>
+		<script type="text/javascript" src="../src/materials/mappings/LatitudeReflectionMapping.js"></script>
+		<script type="text/javascript" src="../src/materials/mappings/LatitudeRefractionMapping.js"></script>
+		<script type="text/javascript" src="../src/materials/mappings/SphericalReflectionMapping.js"></script>
+		<script type="text/javascript" src="../src/materials/mappings/SphericalRefractionMapping.js"></script>
+		<script type="text/javascript" src="../src/materials/mappings/UVMapping.js"></script>
 		<script type="text/javascript" src="../src/scenes/Scene.js"></script>
 		<script type="text/javascript" src="../src/renderers/Projector.js"></script>
 		<script type="text/javascript" src="../src/renderers/CanvasRenderer.js"></script>
@@ -133,12 +140,12 @@
 				objects = [];
 
 				geometry = new Sphere( 100, 16, 8 );
-				material = new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/envmap.png', THREE.ReflectionMapping ) } );
+				material = new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalReflectionMapping() ) } );
 
 				for ( var i = 0; i < 10; i ++ ) {
 
 					sphere = new THREE.Mesh( geometry, material );
-					// sphere.overdraw = true;
+					sphere.overdraw = true;
 
 					sphere.position.x = Math.random() * 1000 - 500;
 					sphere.position.y = Math.random() * 1000 - 500;

examples/geometry_earth.html

@@ -68,12 +68,12 @@
 
 				scene = new THREE.Scene();
 
-				mesh = new THREE.Mesh( new Plane( 300, 300, 3, 3 ), new THREE.MeshBasicMaterial( { map: ImageUtils.loadTexture( 'textures/shadow.png', THREE.UVMapping ) } ) );
+				mesh = new THREE.Mesh( new Plane( 300, 300, 3, 3 ), new THREE.MeshBasicMaterial( { map: ImageUtils.loadTexture( 'textures/shadow.png' ) } ) );
 				mesh.position.y = - 250;
 				mesh.rotation.x = - 90 * Math.PI / 180;
 				scene.addObject(mesh);
 
-				mesh = new THREE.Mesh( new Sphere( 200, 20, 20 ), new THREE.MeshBasicMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg', THREE.UVMapping ) } ) );
+				mesh = new THREE.Mesh( new Sphere( 200, 20, 20 ), new THREE.MeshBasicMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ) );
 				mesh.overdraw = true;
 				scene.addObject(mesh);
 

examples/geometry_panorama.html

@@ -98,7 +98,7 @@
 
 			function loadTexture( path ) {
 
-				var material = new THREE.MeshBasicMaterial( { map: new THREE.Texture( texture_placeholder, THREE.UVMapping ) } );
+				var material = new THREE.MeshBasicMaterial( { map: new THREE.Texture( texture_placeholder ) } );
 
 				var image = new Image();
 

examples/geometry_panorama_fisheye.html

@@ -107,7 +107,7 @@
 
 			function loadTexture( path ) {
 
-				var material = new THREE.MeshBasicMaterial( { map: new THREE.Texture( texture_placeholder, THREE.UVMapping ) } );
+				var material = new THREE.MeshBasicMaterial( { map: new THREE.Texture( texture_placeholder ) } );
 
 				var image = new Image();
 

examples/geometry_terrain.html

@@ -69,7 +69,7 @@
 
 				var heightMap = height( 1024, 1024 );
 
-				var texture = new THREE.Texture( shadow( heightMap ), THREE.UVMapping );
+				var texture = new THREE.Texture( shadow( heightMap ) );
 				texture.loaded = true;
 
 				var material = new THREE.MeshBasicMaterial( { map: texture } );

examples/materials.html

@@ -78,9 +78,9 @@
 				// materials.push( { material: new THREE.MeshPhongMaterial( { ambient: 0x030383, color: 0xf55555, specular: 0x66f6f6, shininess: 10, shading: THREE.FlatShading } ), overdraw: true, doubleSided: false } );
 				materials.push( { material: new THREE.MeshDepthMaterial( { near: 1, far: 2000 } ), overdraw: true, doubleSided: false } );
 				materials.push( { material: new THREE.MeshNormalMaterial(), overdraw: true, doubleSided: false } );
-				materials.push( { material: new THREE.MeshBasicMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg', THREE.UVMapping ) } ), overdraw: false, doubleSided: false } );
-				materials.push( { material: new THREE.MeshLambertMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg', THREE.UVMapping ) } ), overdraw: false, doubleSided: false } );
-				materials.push( { material: new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/envmap.png', THREE.ReflectionMapping ) } ), overdraw: false, doubleSided: false } );
+				materials.push( { material: new THREE.MeshBasicMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ), overdraw: false, doubleSided: false } );
+				materials.push( { material: new THREE.MeshLambertMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ), overdraw: false, doubleSided: false } );
+				materials.push( { material: new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalReflectionMapping() ) } ), overdraw: false, doubleSided: false } );
 
 				for ( var i = 0, l = geometry.faces.length; i < l; i ++ ) {
 

examples/materials_reflection.html

@@ -64,7 +64,7 @@
 				geometry = new WaltHead();
 				geometry.computeVertexNormals();
 
-				mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/metal.jpg', THREE.ReflectionMapping ) } ) );
+				mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ) } ) );
 				mesh.overdraw = true;
 				scene.addObject( mesh );
 

examples/materials_video.html

@@ -81,7 +81,7 @@
 				textureContext.fillStyle = '#000000';
 				textureContext.fillRect( 0, 0, 480, 204 );
 
-				var map = new THREE.Texture( texture, THREE.UVMapping );
+				var map = new THREE.Texture( texture );
 				map.loaded = true;
 
 				var material = new THREE.MeshBasicMaterial( { map: map } );
@@ -98,7 +98,7 @@
 				textureReflectionGradient.addColorStop( 0.2, 'rgba(240, 240, 240, 1)' );
 				textureReflectionGradient.addColorStop( 1, 'rgba(240, 240, 240, 0.8)' );
 
-				var materialReflection = new THREE.MeshBasicMaterial( { map: new THREE.Texture( textureReflection, THREE.UVMapping ) } );
+				var materialReflection = new THREE.MeshBasicMaterial( { map: new THREE.Texture( textureReflection ) } );
 
 				//
 

src/materials/MeshShaderMaterial.js

@@ -19,7 +19,7 @@ THREE.MeshShaderMaterial = function ( parameters ) {
 
 	this.fragment_shader = "void main() {}";
 	this.vertex_shader = "void main() {}";
-    this.uniforms = {};
+	this.uniforms = {};
 
 	this.shading = THREE.SmoothShading;
 	this.blending = THREE.NormalBlending;
@@ -31,10 +31,10 @@ THREE.MeshShaderMaterial = function ( parameters ) {
 
 	if ( parameters ) {
 
-        if ( parameters.fragment_shader !== undefined ) this.fragment_shader = parameters.fragment_shader;
-        if ( parameters.vertex_shader !== undefined ) this.vertex_shader = parameters.vertex_shader;
+		if ( parameters.fragment_shader !== undefined ) this.fragment_shader = parameters.fragment_shader;
+		if ( parameters.vertex_shader !== undefined ) this.vertex_shader = parameters.vertex_shader;
 
-        if ( parameters.uniforms !== undefined ) this.uniforms = parameters.uniforms;
+		if ( parameters.uniforms !== undefined ) this.uniforms = parameters.uniforms;
 
 		if ( parameters.shading !== undefined ) this.shading = parameters.shading;
 		if ( parameters.blending !== undefined ) this.blending = parameters.blending;
@@ -50,7 +50,7 @@ THREE.MeshShaderMaterial = function ( parameters ) {
 
 		return 'THREE.MeshShaderMaterial (<br/>' +
 			'id: ' + this.id + '<br/>' +
-        
+
 			'blending: ' + this.blending + '<br/>' +
 			'wireframe: ' + this.wireframe + '<br/>' +
 			'wireframe_linewidth: ' + this.wireframe_linewidth +'<br/>' +

src/materials/textures/TextureCube.js

-/**
- * @author mr.doob / http://mrdoob.com/
- * @author alteredq / http://alteredqualia.com/
- * }
- */
-
-THREE.TextureCube = function ( image, mapping ) {
-
-	this.image = image;
-	this.mapping = mapping ? mapping : THREE.ReflectionMap;
-
-	this.toString = function () {
-
-		return 'THREE.TextureCube (<br/>' +
-			'image: ' + this.image + '<br/>' +
-			'mapping: ' + this.mapping + '<br/>' +
-			')';
-
-	};
-
-};

utils/build.py

@@ -122,8 +122,14 @@ def buildCommon(debug):
 		'materials/ParticleBasicMaterial.js',
 		'materials/ParticleCircleMaterial.js',
 		'materials/ParticleDOMMaterial.js',
-		'materials/textures/Texture.js',
-		'materials/textures/TextureCube.js',
+		'materials/Texture.js',
+		'materials/mappings/CubeReflectionMapping.js',
+		'materials/mappings/CubeRefractionMapping.js',
+		'materials/mappings/LatitudeReflectionMapping.js',
+		'materials/mappings/LatitudeRefractionMapping.js',
+		'materials/mappings/SphericalReflectionMapping.js',
+		'materials/mappings/SphericalRefractionMapping.js',
+		'materials/mappings/UVMapping.js',
 		'scenes/Scene.js',
 		'renderers/Projector.js',
 		'renderers/DOMRenderer.js',
@@ -175,8 +181,14 @@ def buildExtras(debug):
 		'materials/ParticleBasicMaterial.js',
 		'materials/ParticleCircleMaterial.js',
 		'materials/ParticleDOMMaterial.js',
-		'materials/textures/Texture.js',
-		'materials/textures/TextureCube.js',
+		'materials/Texture.js',
+		'materials/mappings/CubeReflectionMapping.js',
+		'materials/mappings/CubeRefractionMapping.js',
+		'materials/mappings/LatitudeReflectionMapping.js',
+		'materials/mappings/LatitudeRefractionMapping.js',
+		'materials/mappings/SphericalReflectionMapping.js',
+		'materials/mappings/SphericalRefractionMapping.js',
+		'materials/mappings/UVMapping.js',
 		'scenes/Scene.js',
 		'renderers/Projector.js',
 		'renderers/DOMRenderer.js',
@@ -235,7 +247,14 @@ def buildCanvas(debug):
 		'materials/MeshFaceMaterial.js',
 		'materials/ParticleBasicMaterial.js',
 		'materials/ParticleCircleMaterial.js',
-		'materials/textures/Texture.js',
+		'materials/Texture.js',
+		'materials/mappings/CubeReflectionMapping.js',
+		'materials/mappings/CubeRefractionMapping.js',
+		'materials/mappings/LatitudeReflectionMapping.js',
+		'materials/mappings/LatitudeRefractionMapping.js',
+		'materials/mappings/SphericalReflectionMapping.js',
+		'materials/mappings/SphericalRefractionMapping.js',
+		'materials/mappings/UVMapping.js',
 		'scenes/Scene.js',
 		'renderers/Projector.js',
 		'renderers/CanvasRenderer.js',
@@ -285,8 +304,14 @@ def buildWebGL(debug):
 		'materials/MeshShaderMaterial.js',
 		'materials/ParticleBasicMaterial.js',
 		'materials/ParticleCircleMaterial.js',
-		'materials/textures/Texture.js',
-		'materials/textures/TextureCube.js',
+		'materials/Texture.js',
+		'materials/mappings/CubeReflectionMapping.js',
+		'materials/mappings/CubeRefractionMapping.js',
+		'materials/mappings/LatitudeReflectionMapping.js',
+		'materials/mappings/LatitudeRefractionMapping.js',
+		'materials/mappings/SphericalReflectionMapping.js',
+		'materials/mappings/SphericalRefractionMapping.js',
+		'materials/mappings/UVMapping.js',
 		'scenes/Scene.js',
 		'renderers/WebGLRenderer.js',
 	]