Browse Source

Simplified CompressedTexture and CompressedTextureLoader.

Mr.doob 11 years ago
parent
commit
80e075fcaa
2 changed files with 11 additions and 15 deletions
  1. 2 14
      src/loaders/CompressedTextureLoader.js
  2. 9 1
      src/textures/CompressedTexture.js

+ 2 - 14
src/loaders/CompressedTextureLoader.js

@@ -23,23 +23,13 @@ THREE.CompressedTextureLoader.prototype = {
 		var texture = new THREE.CompressedTexture();
 		texture.image = images;
 
-		// no flipping for cube textures
-		// (also flipping doesn't work for compressed textures )
-
-		texture.flipY = false;
-
-		// can't generate mipmaps for compressed textures
-		// mips must be embedded in DDS files
-
-		texture.generateMipmaps = false;
+	var loader = new THREE.XHRLoader();
+	loader.setResponseType( 'arraybuffer' );
 
 		if ( url instanceof Array ) {
 
 			var loaded = 0;
 
-			var loader = new THREE.XHRLoader();
-			loader.setResponseType( 'arraybuffer' );
-
 			var loadTexture = function ( i ) {
 
 				loader.load( url[ i ], function ( buffer ) {
@@ -78,8 +68,6 @@ THREE.CompressedTextureLoader.prototype = {
 
 			// compressed cubemap texture stored in a single DDS file
 
-			var loader = new THREE.XHRLoader();
-			loader.setResponseType( 'arraybuffer' );
 			loader.load( url, function ( buffer ) {
 
 				var texDatas = scope._parser( buffer, true );

+ 9 - 1
src/textures/CompressedTexture.js

@@ -9,7 +9,15 @@ THREE.CompressedTexture = function ( mipmaps, width, height, format, type, mappi
 	this.image = { width: width, height: height };
 	this.mipmaps = mipmaps;
 
-	this.generateMipmaps = false; // WebGL currently can't generate mipmaps for compressed textures, they must be embedded in DDS file
+	// no flipping for cube textures
+	// (also flipping doesn't work for compressed textures )
+
+	this.flipY = false;
+
+	// can't generate mipmaps for compressed textures
+	// mips must be embedded in DDS files
+
+	this.generateMipmaps = false;
 
 };