Merge branch 'master' of https://github.com/MiiBond/three.js into dev

examples/webgl_materials_texture_compressed.html

@@ -37,7 +37,7 @@
 			leaf texture by <a href="http://opengameart.org/node/10505">lauris71</a>, explosion texture by <a href="http://opengameart.org/node/7728">bart</a>
 		</div>
 
-		<script src="../build/three.min.js"></script>
+		<script src="../build/three.js"></script>
 
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
@@ -82,7 +82,13 @@
 				var map4 = THREE.ImageUtils.loadCompressedTexture( 'textures/compressed/explosion_dxt5_mip.dds' );
 				map4.anisotropy = 4;
 
-				var material1 = new THREE.MeshBasicMaterial( { map: map1 } );
+				var cubemap = THREE.ImageUtils.loadCompressedTextureCube( 'textures/compressed/Mountains.dds', new THREE.CubeReflectionMapping, function( cubemap ) {
+					cubemap.magFilter = cubemap.minFilter = THREE.LinearFilter;
+					material1.envMap = cubemap;
+					material1.needsUpdate = true;
+				} );
+
+				var material1 = new THREE.MeshBasicMaterial( { map: map1, envMap: true } );
 				var material2 = new THREE.MeshBasicMaterial( { map: map2 } );
 				var material3 = new THREE.MeshBasicMaterial( { map: map3, alphaTest: 0.5, side: THREE.DoubleSide } );
 				var material4 = new THREE.MeshBasicMaterial( { map: map4, side: THREE.DoubleSide, blending: THREE.AdditiveBlending, depthTest: false, transparent: true } );

src/extras/ImageUtils.js

@@ -103,7 +103,7 @@ THREE.ImageUtils = {
 				if ( images.loadCount === 6 ) {
 
 					texture.needsUpdate = true;
-					if ( onLoad ) onLoad();
+					if ( onLoad ) onLoad( texture );
 
 				}
 
@@ -158,7 +158,7 @@ THREE.ImageUtils = {
 
 					texture.format = dds.format;
 					texture.needsUpdate = true;
-					if ( onLoad ) onLoad();
+					if ( onLoad ) onLoad( texture );
 
 				}
 
@@ -166,22 +166,55 @@ THREE.ImageUtils = {
 
 		}
 
-		for ( var i = 0, il = array.length; i < il; ++ i ) {
+		if ( array instanceof Array ) {
+			for ( var i = 0, il = array.length; i < il; ++ i ) {
 
-			var cubeImage = {};
-			images[ i ] = cubeImage;
+				var cubeImage = {};
+				images[ i ] = cubeImage;
+
+				var request = new XMLHttpRequest();
+
+				request.onload = generateCubeFaceCallback( request, cubeImage );
+				request.onerror = onError;
+
+				var url = array[ i ];
+
+				request.open( 'GET', url, true );
+				request.responseType = "arraybuffer";
+				request.send( null );
 
+			}
+		}
+		//If the compressed cubemap texture is stored in a single DDS file.
+		else {
+			var url = array;
 			var request = new XMLHttpRequest();
 
-			request.onload = generateCubeFaceCallback( request, cubeImage );
-			request.onerror = onError;
+			request.onload = function( ) {
+				var buffer = request.response;
+				var dds = THREE.ImageUtils.parseDDS( buffer, true );
+				if ( dds.isCubemap ) {
+					var faces = dds.mipmaps.length / dds.mipmapCount;
+					for ( var f = 0; f < faces; f++ ) {
+						images[ f ] = { mipmaps : []};
+						for ( var i = 0; i < dds.mipmapCount; i++ ) {
+							images[ f ].mipmaps.push( dds.mipmaps[ f * dds.mipmapCount + i ] );
+							images[ f ].format = dds.format;
+							images[ f ].width = dds.width;
+							images[ f ].height = dds.height;
+						}
+					}
 
-			var url = array[ i ];
+					texture.format = dds.format;
+					texture.needsUpdate = true;
+					if ( onLoad ) onLoad( texture );
+				}
+			}
+			request.onerror = onError;
 
 			request.open( 'GET', url, true );
 			request.responseType = "arraybuffer";
 			request.send( null );
-
 		}
 
 		return texture;
@@ -268,6 +301,11 @@ THREE.ImageUtils = {
 		var off_pfFlags = 20;
 		var off_pfFourCC = 21;
 
+		var off_caps = 27;
+		var off_caps2 = 28;
+		var off_caps3 = 29;
+		var off_caps4 = 30;
+
 		// Parse header
 
 		var header = new Int32Array( buffer, 0, headerLengthInt );
@@ -290,64 +328,74 @@ THREE.ImageUtils = {
 
 		var fourCC = header[ off_pfFourCC ];
 
-        switch ( fourCC ) {
+    switch ( fourCC ) {
 
 			case FOURCC_DXT1:
 
 				blockBytes = 8;
-                dds.format = THREE.RGB_S3TC_DXT1_Format;
-                break;
+        dds.format = THREE.RGB_S3TC_DXT1_Format;
+        break;
 
-            case FOURCC_DXT3:
+      case FOURCC_DXT3:
 
-                blockBytes = 16;
-                dds.format = THREE.RGBA_S3TC_DXT3_Format;
-                break;
+        blockBytes = 16;
+        dds.format = THREE.RGBA_S3TC_DXT3_Format;
+        break;
 
-            case FOURCC_DXT5:
+      case FOURCC_DXT5:
 
-                blockBytes = 16;
-                dds.format = THREE.RGBA_S3TC_DXT5_Format;
-                break;
+        blockBytes = 16;
+        dds.format = THREE.RGBA_S3TC_DXT5_Format;
+        break;
 
-            default:
+      default:
 
-                console.error( "ImageUtils.parseDDS(): Unsupported FourCC code: ", int32ToFourCC( fourCC ) );
-                return dds;
+        console.error( "ImageUtils.parseDDS(): Unsupported FourCC code: ", int32ToFourCC( fourCC ) );
+        return dds;
 
-        }
+    }
 
 		dds.mipmapCount = 1;
 
-        if ( header[ off_flags ] & DDSD_MIPMAPCOUNT && loadMipmaps !== false ) {
+    if ( header[ off_flags ] & DDSD_MIPMAPCOUNT && loadMipmaps !== false ) {
 
-            dds.mipmapCount = Math.max( 1, header[ off_mipmapCount ] );
+        dds.mipmapCount = Math.max( 1, header[ off_mipmapCount ] );
 
-        }
+    }
+
+    //TODO: Verify that all faces of the cubemap are present with DDSCAPS2_CUBEMAP_POSITIVEX, etc.
+    dds.isCubemap = header[ off_caps2 ] & DDSCAPS2_CUBEMAP ? true : false;
+    	
 
-        dds.width = header[ off_width ];
-        dds.height = header[ off_height ];
+    dds.width = header[ off_width ];
+    dds.height = header[ off_height ];
 
-        var dataOffset = header[ off_size ] + 4;
+    var dataOffset = header[ off_size ] + 4;
 
 		// Extract mipmaps buffers
 
 		var width = dds.width;
 		var height = dds.height;
 
-		for ( var i = 0; i < dds.mipmapCount; i ++ ) {
+		var faces = dds.isCubemap ? 6 : 1;
 
-			var dataLength = Math.max( 4, width ) / 4 * Math.max( 4, height ) / 4 * blockBytes;
-			var byteArray = new Uint8Array( buffer, dataOffset, dataLength );
+		for ( var face = 0; face < faces; face++ ) {
+			for ( var i = 0; i < dds.mipmapCount; i ++ ) {
 
-			var mipmap = { "data": byteArray, "width": width, "height": height };
-			dds.mipmaps.push( mipmap );
+				var dataLength = Math.max( 4, width ) / 4 * Math.max( 4, height ) / 4 * blockBytes;
+				var byteArray = new Uint8Array( buffer, dataOffset, dataLength );
 
-			dataOffset += dataLength;
+				var mipmap = { "data": byteArray, "width": width, "height": height };
+				dds.mipmaps.push( mipmap );
 
-			width = Math.max( width * 0.5, 1 );
-			height = Math.max( height * 0.5, 1 );
+				dataOffset += dataLength;
 
+				width = Math.max( width * 0.5, 1 );
+				height = Math.max( height * 0.5, 1 );
+
+			}
+			width = dds.width;
+			height = dds.height;
 		}
 
 		return dds;

src/renderers/WebGLRenderer.js

@@ -364,6 +364,12 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 	};
 
+	this.deallocateTextureCube = function ( texture ) {
+    
+		_gl.deleteTexture( texture.__webglTextureCube );
+
+  };
+
 	this.deallocateRenderTarget = function ( renderTarget ) {
 
 		if ( !renderTarget || ! renderTarget.__webglTexture ) return;