CompressedTextureLoader: Refactor parsing.

examples/js/loaders/DDSLoader.js

@@ -6,267 +6,268 @@ THREE.DDSLoader = function ( manager ) {
 
 	THREE.CompressedTextureLoader.call( this, manager );
 
-	this._parser = THREE.DDSLoader.parse;
-
 };
 
-THREE.DDSLoader.prototype = Object.create( THREE.CompressedTextureLoader.prototype );
-THREE.DDSLoader.prototype.constructor = THREE.DDSLoader;
+THREE.DDSLoader.prototype = Object.assign( Object.create( THREE.CompressedTextureLoader.prototype ), {
 
-THREE.DDSLoader.parse = function ( buffer, loadMipmaps ) {
+	constructor: THREE.DDSLoader,
 
-	var dds = { mipmaps: [], width: 0, height: 0, format: null, mipmapCount: 1 };
+	parse: function ( buffer, loadMipmaps ) {
 
-	// Adapted from @toji's DDS utils
-	// https://github.com/toji/webgl-texture-utils/blob/master/texture-util/dds.js
+		var dds = { mipmaps: [], width: 0, height: 0, format: null, mipmapCount: 1 };
 
-	// All values and structures referenced from:
-	// http://msdn.microsoft.com/en-us/library/bb943991.aspx/
+		// Adapted from @toji's DDS utils
+		// https://github.com/toji/webgl-texture-utils/blob/master/texture-util/dds.js
 
-	var DDS_MAGIC = 0x20534444;
+		// All values and structures referenced from:
+		// http://msdn.microsoft.com/en-us/library/bb943991.aspx/
 
-	var DDSD_CAPS = 0x1,
-		DDSD_HEIGHT = 0x2,
-		DDSD_WIDTH = 0x4,
-		DDSD_PITCH = 0x8,
-		DDSD_PIXELFORMAT = 0x1000,
-		DDSD_MIPMAPCOUNT = 0x20000,
-		DDSD_LINEARSIZE = 0x80000,
-		DDSD_DEPTH = 0x800000;
+		var DDS_MAGIC = 0x20534444;
 
-	var DDSCAPS_COMPLEX = 0x8,
-		DDSCAPS_MIPMAP = 0x400000,
-		DDSCAPS_TEXTURE = 0x1000;
+		var DDSD_CAPS = 0x1,
+			DDSD_HEIGHT = 0x2,
+			DDSD_WIDTH = 0x4,
+			DDSD_PITCH = 0x8,
+			DDSD_PIXELFORMAT = 0x1000,
+			DDSD_MIPMAPCOUNT = 0x20000,
+			DDSD_LINEARSIZE = 0x80000,
+			DDSD_DEPTH = 0x800000;
 
-	var DDSCAPS2_CUBEMAP = 0x200,
-		DDSCAPS2_CUBEMAP_POSITIVEX = 0x400,
-		DDSCAPS2_CUBEMAP_NEGATIVEX = 0x800,
-		DDSCAPS2_CUBEMAP_POSITIVEY = 0x1000,
-		DDSCAPS2_CUBEMAP_NEGATIVEY = 0x2000,
-		DDSCAPS2_CUBEMAP_POSITIVEZ = 0x4000,
-		DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000,
-		DDSCAPS2_VOLUME = 0x200000;
+		var DDSCAPS_COMPLEX = 0x8,
+			DDSCAPS_MIPMAP = 0x400000,
+			DDSCAPS_TEXTURE = 0x1000;
 
-	var DDPF_ALPHAPIXELS = 0x1,
-		DDPF_ALPHA = 0x2,
-		DDPF_FOURCC = 0x4,
-		DDPF_RGB = 0x40,
-		DDPF_YUV = 0x200,
-		DDPF_LUMINANCE = 0x20000;
+		var DDSCAPS2_CUBEMAP = 0x200,
+			DDSCAPS2_CUBEMAP_POSITIVEX = 0x400,
+			DDSCAPS2_CUBEMAP_NEGATIVEX = 0x800,
+			DDSCAPS2_CUBEMAP_POSITIVEY = 0x1000,
+			DDSCAPS2_CUBEMAP_NEGATIVEY = 0x2000,
+			DDSCAPS2_CUBEMAP_POSITIVEZ = 0x4000,
+			DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000,
+			DDSCAPS2_VOLUME = 0x200000;
 
-	function fourCCToInt32( value ) {
+		var DDPF_ALPHAPIXELS = 0x1,
+			DDPF_ALPHA = 0x2,
+			DDPF_FOURCC = 0x4,
+			DDPF_RGB = 0x40,
+			DDPF_YUV = 0x200,
+			DDPF_LUMINANCE = 0x20000;
 
-		return value.charCodeAt( 0 ) +
-			( value.charCodeAt( 1 ) << 8 ) +
-			( value.charCodeAt( 2 ) << 16 ) +
-			( value.charCodeAt( 3 ) << 24 );
+		function fourCCToInt32( value ) {
 
-	}
+			return value.charCodeAt( 0 ) +
+				( value.charCodeAt( 1 ) << 8 ) +
+				( value.charCodeAt( 2 ) << 16 ) +
+				( value.charCodeAt( 3 ) << 24 );
 
-	function int32ToFourCC( value ) {
+		}
 
-		return String.fromCharCode(
-			value & 0xff,
-			( value >> 8 ) & 0xff,
-			( value >> 16 ) & 0xff,
-			( value >> 24 ) & 0xff
-		);
+		function int32ToFourCC( value ) {
 
-	}
+			return String.fromCharCode(
+				value & 0xff,
+				( value >> 8 ) & 0xff,
+				( value >> 16 ) & 0xff,
+				( value >> 24 ) & 0xff
+			);
 
-	function loadARGBMip( buffer, dataOffset, width, height ) {
+		}
+
+		function loadARGBMip( buffer, dataOffset, width, height ) {
 
-		var dataLength = width * height * 4;
-		var srcBuffer = new Uint8Array( buffer, dataOffset, dataLength );
-		var byteArray = new Uint8Array( dataLength );
-		var dst = 0;
-		var src = 0;
-		for ( var y = 0; y < height; y ++ ) {
+			var dataLength = width * height * 4;
+			var srcBuffer = new Uint8Array( buffer, dataOffset, dataLength );
+			var byteArray = new Uint8Array( dataLength );
+			var dst = 0;
+			var src = 0;
+			for ( var y = 0; y < height; y ++ ) {
 
-			for ( var x = 0; x < width; x ++ ) {
+				for ( var x = 0; x < width; x ++ ) {
 
-				var b = srcBuffer[ src ]; src ++;
-				var g = srcBuffer[ src ]; src ++;
-				var r = srcBuffer[ src ]; src ++;
-				var a = srcBuffer[ src ]; src ++;
-				byteArray[ dst ] = r; dst ++;	//r
-				byteArray[ dst ] = g; dst ++;	//g
-				byteArray[ dst ] = b; dst ++;	//b
-				byteArray[ dst ] = a; dst ++;	//a
+					var b = srcBuffer[ src ]; src ++;
+					var g = srcBuffer[ src ]; src ++;
+					var r = srcBuffer[ src ]; src ++;
+					var a = srcBuffer[ src ]; src ++;
+					byteArray[ dst ] = r; dst ++;	//r
+					byteArray[ dst ] = g; dst ++;	//g
+					byteArray[ dst ] = b; dst ++;	//b
+					byteArray[ dst ] = a; dst ++;	//a
+
+				}
 
 			}
+			return byteArray;
 
 		}
-		return byteArray;
 
-	}
+		var FOURCC_DXT1 = fourCCToInt32( "DXT1" );
+		var FOURCC_DXT3 = fourCCToInt32( "DXT3" );
+		var FOURCC_DXT5 = fourCCToInt32( "DXT5" );
+		var FOURCC_ETC1 = fourCCToInt32( "ETC1" );
 
-	var FOURCC_DXT1 = fourCCToInt32( "DXT1" );
-	var FOURCC_DXT3 = fourCCToInt32( "DXT3" );
-	var FOURCC_DXT5 = fourCCToInt32( "DXT5" );
-	var FOURCC_ETC1 = fourCCToInt32( "ETC1" );
+		var headerLengthInt = 31; // The header length in 32 bit ints
 
-	var headerLengthInt = 31; // The header length in 32 bit ints
+		// Offsets into the header array
 
-	// Offsets into the header array
+		var off_magic = 0;
 
-	var off_magic = 0;
+		var off_size = 1;
+		var off_flags = 2;
+		var off_height = 3;
+		var off_width = 4;
 
-	var off_size = 1;
-	var off_flags = 2;
-	var off_height = 3;
-	var off_width = 4;
+		var off_mipmapCount = 7;
 
-	var off_mipmapCount = 7;
+		var off_pfFlags = 20;
+		var off_pfFourCC = 21;
+		var off_RGBBitCount = 22;
+		var off_RBitMask = 23;
+		var off_GBitMask = 24;
+		var off_BBitMask = 25;
+		var off_ABitMask = 26;
 
-	var off_pfFlags = 20;
-	var off_pfFourCC = 21;
-	var off_RGBBitCount = 22;
-	var off_RBitMask = 23;
-	var off_GBitMask = 24;
-	var off_BBitMask = 25;
-	var off_ABitMask = 26;
+		var off_caps = 27;
+		var off_caps2 = 28;
+		var off_caps3 = 29;
+		var off_caps4 = 30;
 
-	var off_caps = 27;
-	var off_caps2 = 28;
-	var off_caps3 = 29;
-	var off_caps4 = 30;
+		// Parse header
 
-	// Parse header
+		var header = new Int32Array( buffer, 0, headerLengthInt );
 
-	var header = new Int32Array( buffer, 0, headerLengthInt );
+		if ( header[ off_magic ] !== DDS_MAGIC ) {
 
-	if ( header[ off_magic ] !== DDS_MAGIC ) {
+			console.error( 'THREE.DDSLoader.parse: Invalid magic number in DDS header.' );
+			return dds;
 
-		console.error( 'THREE.DDSLoader.parse: Invalid magic number in DDS header.' );
-		return dds;
+		}
 
-	}
+		if ( ! header[ off_pfFlags ] & DDPF_FOURCC ) {
 
-	if ( ! header[ off_pfFlags ] & DDPF_FOURCC ) {
+			console.error( 'THREE.DDSLoader.parse: Unsupported format, must contain a FourCC code.' );
+			return dds;
 
-		console.error( 'THREE.DDSLoader.parse: Unsupported format, must contain a FourCC code.' );
-		return dds;
+		}
 
-	}
+		var blockBytes;
 
-	var blockBytes;
+		var fourCC = header[ off_pfFourCC ];
 
-	var fourCC = header[ off_pfFourCC ];
+		var isRGBAUncompressed = false;
 
-	var isRGBAUncompressed = false;
+		switch ( fourCC ) {
 
-	switch ( fourCC ) {
+			case FOURCC_DXT1:
 
-		case FOURCC_DXT1:
+				blockBytes = 8;
+				dds.format = THREE.RGB_S3TC_DXT1_Format;
+				break;
 
-			blockBytes = 8;
-			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;
+			case FOURCC_ETC1:
 
-		case FOURCC_ETC1:
+				blockBytes = 8;
+				dds.format = THREE.RGB_ETC1_Format;
+				break;
 
-			blockBytes = 8;
-			dds.format = THREE.RGB_ETC1_Format;
-			break;
+			default:
 
-		default:
+				if ( header[ off_RGBBitCount ] === 32
+					&& header[ off_RBitMask ] & 0xff0000
+					&& header[ off_GBitMask ] & 0xff00
+					&& header[ off_BBitMask ] & 0xff
+					&& header[ off_ABitMask ] & 0xff000000 ) {
 
-			if ( header[ off_RGBBitCount ] === 32
-				&& header[ off_RBitMask ] & 0xff0000
-				&& header[ off_GBitMask ] & 0xff00
-				&& header[ off_BBitMask ] & 0xff
-				&& header[ off_ABitMask ] & 0xff000000 ) {
+					isRGBAUncompressed = true;
+					blockBytes = 64;
+					dds.format = THREE.RGBAFormat;
 
-				isRGBAUncompressed = true;
-				blockBytes = 64;
-				dds.format = THREE.RGBAFormat;
+				} else {
 
-			} else {
+					console.error( 'THREE.DDSLoader.parse: Unsupported FourCC code ', int32ToFourCC( fourCC ) );
+					return dds;
 
-				console.error( 'THREE.DDSLoader.parse: Unsupported FourCC code ', int32ToFourCC( fourCC ) );
-				return dds;
+				}
 
-			}
+		}
 
-	}
+		dds.mipmapCount = 1;
 
-	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 ] );
+		}
 
-	}
+		var caps2 = header[ off_caps2 ];
+		dds.isCubemap = caps2 & DDSCAPS2_CUBEMAP ? true : false;
+		if ( dds.isCubemap && (
+			! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEX ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEX ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEY ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEY ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEZ ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEZ )
+		) ) {
 
-	var caps2 = header[ off_caps2 ];
-	dds.isCubemap = caps2 & DDSCAPS2_CUBEMAP ? true : false;
-	if ( dds.isCubemap && (
-		! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEX ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEX ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEY ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEY ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEZ ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEZ )
-	) ) {
-
-		console.error( 'THREE.DDSLoader.parse: Incomplete cubemap faces' );
-		return dds;
+			console.error( 'THREE.DDSLoader.parse: Incomplete cubemap faces' );
+			return dds;
 
-	}
+		}
 
-	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
+		// Extract mipmaps buffers
 
-	var faces = dds.isCubemap ? 6 : 1;
+		var faces = dds.isCubemap ? 6 : 1;
 
-	for ( var face = 0; face < faces; face ++ ) {
+		for ( var face = 0; face < faces; face ++ ) {
 
-		var width = dds.width;
-		var height = dds.height;
+			var width = dds.width;
+			var height = dds.height;
 
-		for ( var i = 0; i < dds.mipmapCount; i ++ ) {
+			for ( var i = 0; i < dds.mipmapCount; i ++ ) {
 
-			if ( isRGBAUncompressed ) {
+				if ( isRGBAUncompressed ) {
 
-				var byteArray = loadARGBMip( buffer, dataOffset, width, height );
-				var dataLength = byteArray.length;
+					var byteArray = loadARGBMip( buffer, dataOffset, width, height );
+					var dataLength = byteArray.length;
 
-			} else {
+				} else {
 
-				var dataLength = Math.max( 4, width ) / 4 * Math.max( 4, height ) / 4 * blockBytes;
-				var byteArray = new Uint8Array( buffer, dataOffset, dataLength );
+					var dataLength = Math.max( 4, width ) / 4 * Math.max( 4, height ) / 4 * blockBytes;
+					var byteArray = new Uint8Array( buffer, dataOffset, dataLength );
 
-			}
+				}
+
+				var mipmap = { "data": byteArray, "width": width, "height": height };
+				dds.mipmaps.push( mipmap );
 
-			var mipmap = { "data": byteArray, "width": width, "height": height };
-			dds.mipmaps.push( mipmap );
+				dataOffset += dataLength;
 
-			dataOffset += dataLength;
+				width = Math.max( width >> 1, 1 );
+				height = Math.max( height >> 1, 1 );
 
-			width = Math.max( width >> 1, 1 );
-			height = Math.max( height >> 1, 1 );
+			}
 
 		}
 
-	}
+		return dds;
 
-	return dds;
+	}
 
-};
+} );

examples/js/loaders/KTXLoader.js

@@ -12,27 +12,28 @@ THREE.KTXLoader = function ( manager ) {
 
 	THREE.CompressedTextureLoader.call( this, manager );
 
-	this._parser = THREE.KTXLoader.parse;
-
 };
 
-THREE.KTXLoader.prototype = Object.create( THREE.CompressedTextureLoader.prototype );
-THREE.KTXLoader.prototype.constructor = THREE.KTXLoader;
+THREE.KTXLoader.prototype = Object.assign( Object.create( THREE.CompressedTextureLoader.prototype ), {
 
-THREE.KTXLoader.parse = function ( buffer, loadMipmaps ) {
+	constructor: THREE.KTXLoader,
 
-	var ktx = new KhronosTextureContainer( buffer, 1 );
+	parse: function ( buffer, loadMipmaps ) {
 
-	return {
-		mipmaps: ktx.mipmaps( loadMipmaps ),
-		width: ktx.pixelWidth,
-		height: ktx.pixelHeight,
-		format: ktx.glInternalFormat,
-		isCubemap: ktx.numberOfFaces === 6,
-		mipmapCount: ktx.numberOfMipmapLevels
-	};
+		var ktx = new KhronosTextureContainer( buffer, 1 );
 
-};
+		return {
+			mipmaps: ktx.mipmaps( loadMipmaps ),
+			width: ktx.pixelWidth,
+			height: ktx.pixelHeight,
+			format: ktx.glInternalFormat,
+			isCubemap: ktx.numberOfFaces === 6,
+			mipmapCount: ktx.numberOfMipmapLevels
+		};
+
+	}
+
+} );
 
 var KhronosTextureContainer = ( function () {
 

examples/js/loaders/PVRLoader.js

@@ -12,44 +12,44 @@ THREE.PVRLoader = function ( manager ) {
 
 	THREE.CompressedTextureLoader.call( this, manager );
 
-	this._parser = THREE.PVRLoader.parse;
-
 };
 
-THREE.PVRLoader.prototype = Object.create( THREE.CompressedTextureLoader.prototype );
-THREE.PVRLoader.prototype.constructor = THREE.PVRLoader;
+THREE.PVRLoader.prototype = Object.assign( Object.create( THREE.CompressedTextureLoader.prototype ), {
 
+	constructor: THREE.PVRLoader,
 
-THREE.PVRLoader.parse = function ( buffer, loadMipmaps ) {
+	parse: function ( buffer, loadMipmaps ) {
 
-	var headerLengthInt = 13;
-	var header = new Uint32Array( buffer, 0, headerLengthInt );
+		var headerLengthInt = 13;
+		var header = new Uint32Array( buffer, 0, headerLengthInt );
 
-	var pvrDatas = {
-		buffer: buffer,
-		header: header,
-		loadMipmaps: loadMipmaps
-	};
+		var pvrDatas = {
+			buffer: buffer,
+			header: header,
+			loadMipmaps: loadMipmaps
+		};
 
-	if ( header[ 0 ] === 0x03525650 ) {
+		if ( header[ 0 ] === 0x03525650 ) {
 
-		// PVR v3
+			// PVR v3
 
-		return THREE.PVRLoader._parseV3( pvrDatas );
+			return THREE.PVRLoader._parseV3( pvrDatas );
 
-	} else if ( header[ 11 ] === 0x21525650 ) {
+		} else if ( header[ 11 ] === 0x21525650 ) {
 
-		// PVR v2
+			// PVR v2
 
-		return THREE.PVRLoader._parseV2( pvrDatas );
+			return THREE.PVRLoader._parseV2( pvrDatas );
 
-	} else {
+		} else {
 
-		console.error( 'THREE.PVRLoader: Unknown PVR format.' );
+			console.error( 'THREE.PVRLoader: Unknown PVR format.' );
+
+		}
 
 	}
 
-};
+} );
 
 THREE.PVRLoader._parseV3 = function ( pvrDatas ) {
 

examples/jsm/loaders/DDSLoader.d.ts

@@ -18,5 +18,4 @@ export class DDSLoader extends CompressedTextureLoader {
   constructor(manager?: LoadingManager);
 
   parse(buffer: ArrayBuffer, loadMipmaps: boolean) : DDS;
-  _parser(buffer: ArrayBuffer, loadMipmaps: boolean) : DDS;
 }

examples/jsm/loaders/DDSLoader.js

@@ -15,269 +15,270 @@ var DDSLoader = function ( manager ) {
 
 	CompressedTextureLoader.call( this, manager );
 
-	this._parser = DDSLoader.parse;
-
 };
 
-DDSLoader.prototype = Object.create( CompressedTextureLoader.prototype );
-DDSLoader.prototype.constructor = DDSLoader;
+DDSLoader.prototype = Object.assign( Object.create( CompressedTextureLoader.prototype ), {
 
-DDSLoader.parse = function ( buffer, loadMipmaps ) {
+	constructor: DDSLoader,
 
-	var dds = { mipmaps: [], width: 0, height: 0, format: null, mipmapCount: 1 };
+	parse: function ( buffer, loadMipmaps ) {
 
-	// Adapted from @toji's DDS utils
-	// https://github.com/toji/webgl-texture-utils/blob/master/texture-util/dds.js
+		var dds = { mipmaps: [], width: 0, height: 0, format: null, mipmapCount: 1 };
 
-	// All values and structures referenced from:
-	// http://msdn.microsoft.com/en-us/library/bb943991.aspx/
+		// Adapted from @toji's DDS utils
+		// https://github.com/toji/webgl-texture-utils/blob/master/texture-util/dds.js
 
-	var DDS_MAGIC = 0x20534444;
+		// All values and structures referenced from:
+		// http://msdn.microsoft.com/en-us/library/bb943991.aspx/
 
-	var DDSD_CAPS = 0x1,
-		DDSD_HEIGHT = 0x2,
-		DDSD_WIDTH = 0x4,
-		DDSD_PITCH = 0x8,
-		DDSD_PIXELFORMAT = 0x1000,
-		DDSD_MIPMAPCOUNT = 0x20000,
-		DDSD_LINEARSIZE = 0x80000,
-		DDSD_DEPTH = 0x800000;
+		var DDS_MAGIC = 0x20534444;
 
-	var DDSCAPS_COMPLEX = 0x8,
-		DDSCAPS_MIPMAP = 0x400000,
-		DDSCAPS_TEXTURE = 0x1000;
+		var DDSD_CAPS = 0x1,
+			DDSD_HEIGHT = 0x2,
+			DDSD_WIDTH = 0x4,
+			DDSD_PITCH = 0x8,
+			DDSD_PIXELFORMAT = 0x1000,
+			DDSD_MIPMAPCOUNT = 0x20000,
+			DDSD_LINEARSIZE = 0x80000,
+			DDSD_DEPTH = 0x800000;
 
-	var DDSCAPS2_CUBEMAP = 0x200,
-		DDSCAPS2_CUBEMAP_POSITIVEX = 0x400,
-		DDSCAPS2_CUBEMAP_NEGATIVEX = 0x800,
-		DDSCAPS2_CUBEMAP_POSITIVEY = 0x1000,
-		DDSCAPS2_CUBEMAP_NEGATIVEY = 0x2000,
-		DDSCAPS2_CUBEMAP_POSITIVEZ = 0x4000,
-		DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000,
-		DDSCAPS2_VOLUME = 0x200000;
+		var DDSCAPS_COMPLEX = 0x8,
+			DDSCAPS_MIPMAP = 0x400000,
+			DDSCAPS_TEXTURE = 0x1000;
 
-	var DDPF_ALPHAPIXELS = 0x1,
-		DDPF_ALPHA = 0x2,
-		DDPF_FOURCC = 0x4,
-		DDPF_RGB = 0x40,
-		DDPF_YUV = 0x200,
-		DDPF_LUMINANCE = 0x20000;
+		var DDSCAPS2_CUBEMAP = 0x200,
+			DDSCAPS2_CUBEMAP_POSITIVEX = 0x400,
+			DDSCAPS2_CUBEMAP_NEGATIVEX = 0x800,
+			DDSCAPS2_CUBEMAP_POSITIVEY = 0x1000,
+			DDSCAPS2_CUBEMAP_NEGATIVEY = 0x2000,
+			DDSCAPS2_CUBEMAP_POSITIVEZ = 0x4000,
+			DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000,
+			DDSCAPS2_VOLUME = 0x200000;
 
-	function fourCCToInt32( value ) {
+		var DDPF_ALPHAPIXELS = 0x1,
+			DDPF_ALPHA = 0x2,
+			DDPF_FOURCC = 0x4,
+			DDPF_RGB = 0x40,
+			DDPF_YUV = 0x200,
+			DDPF_LUMINANCE = 0x20000;
 
-		return value.charCodeAt( 0 ) +
-			( value.charCodeAt( 1 ) << 8 ) +
-			( value.charCodeAt( 2 ) << 16 ) +
-			( value.charCodeAt( 3 ) << 24 );
+		function fourCCToInt32( value ) {
 
-	}
+			return value.charCodeAt( 0 ) +
+				( value.charCodeAt( 1 ) << 8 ) +
+				( value.charCodeAt( 2 ) << 16 ) +
+				( value.charCodeAt( 3 ) << 24 );
 
-	function int32ToFourCC( value ) {
+		}
 
-		return String.fromCharCode(
-			value & 0xff,
-			( value >> 8 ) & 0xff,
-			( value >> 16 ) & 0xff,
-			( value >> 24 ) & 0xff
-		);
+		function int32ToFourCC( value ) {
 
-	}
+			return String.fromCharCode(
+				value & 0xff,
+				( value >> 8 ) & 0xff,
+				( value >> 16 ) & 0xff,
+				( value >> 24 ) & 0xff
+			);
 
-	function loadARGBMip( buffer, dataOffset, width, height ) {
+		}
+
+		function loadARGBMip( buffer, dataOffset, width, height ) {
 
-		var dataLength = width * height * 4;
-		var srcBuffer = new Uint8Array( buffer, dataOffset, dataLength );
-		var byteArray = new Uint8Array( dataLength );
-		var dst = 0;
-		var src = 0;
-		for ( var y = 0; y < height; y ++ ) {
+			var dataLength = width * height * 4;
+			var srcBuffer = new Uint8Array( buffer, dataOffset, dataLength );
+			var byteArray = new Uint8Array( dataLength );
+			var dst = 0;
+			var src = 0;
+			for ( var y = 0; y < height; y ++ ) {
 
-			for ( var x = 0; x < width; x ++ ) {
+				for ( var x = 0; x < width; x ++ ) {
 
-				var b = srcBuffer[ src ]; src ++;
-				var g = srcBuffer[ src ]; src ++;
-				var r = srcBuffer[ src ]; src ++;
-				var a = srcBuffer[ src ]; src ++;
-				byteArray[ dst ] = r; dst ++;	//r
-				byteArray[ dst ] = g; dst ++;	//g
-				byteArray[ dst ] = b; dst ++;	//b
-				byteArray[ dst ] = a; dst ++;	//a
+					var b = srcBuffer[ src ]; src ++;
+					var g = srcBuffer[ src ]; src ++;
+					var r = srcBuffer[ src ]; src ++;
+					var a = srcBuffer[ src ]; src ++;
+					byteArray[ dst ] = r; dst ++;	//r
+					byteArray[ dst ] = g; dst ++;	//g
+					byteArray[ dst ] = b; dst ++;	//b
+					byteArray[ dst ] = a; dst ++;	//a
+
+				}
 
 			}
+			return byteArray;
 
 		}
-		return byteArray;
 
-	}
+		var FOURCC_DXT1 = fourCCToInt32( "DXT1" );
+		var FOURCC_DXT3 = fourCCToInt32( "DXT3" );
+		var FOURCC_DXT5 = fourCCToInt32( "DXT5" );
+		var FOURCC_ETC1 = fourCCToInt32( "ETC1" );
 
-	var FOURCC_DXT1 = fourCCToInt32( "DXT1" );
-	var FOURCC_DXT3 = fourCCToInt32( "DXT3" );
-	var FOURCC_DXT5 = fourCCToInt32( "DXT5" );
-	var FOURCC_ETC1 = fourCCToInt32( "ETC1" );
+		var headerLengthInt = 31; // The header length in 32 bit ints
 
-	var headerLengthInt = 31; // The header length in 32 bit ints
+		// Offsets into the header array
 
-	// Offsets into the header array
+		var off_magic = 0;
 
-	var off_magic = 0;
+		var off_size = 1;
+		var off_flags = 2;
+		var off_height = 3;
+		var off_width = 4;
 
-	var off_size = 1;
-	var off_flags = 2;
-	var off_height = 3;
-	var off_width = 4;
+		var off_mipmapCount = 7;
 
-	var off_mipmapCount = 7;
+		var off_pfFlags = 20;
+		var off_pfFourCC = 21;
+		var off_RGBBitCount = 22;
+		var off_RBitMask = 23;
+		var off_GBitMask = 24;
+		var off_BBitMask = 25;
+		var off_ABitMask = 26;
 
-	var off_pfFlags = 20;
-	var off_pfFourCC = 21;
-	var off_RGBBitCount = 22;
-	var off_RBitMask = 23;
-	var off_GBitMask = 24;
-	var off_BBitMask = 25;
-	var off_ABitMask = 26;
+		var off_caps = 27;
+		var off_caps2 = 28;
+		var off_caps3 = 29;
+		var off_caps4 = 30;
 
-	var off_caps = 27;
-	var off_caps2 = 28;
-	var off_caps3 = 29;
-	var off_caps4 = 30;
+		// Parse header
 
-	// Parse header
+		var header = new Int32Array( buffer, 0, headerLengthInt );
 
-	var header = new Int32Array( buffer, 0, headerLengthInt );
+		if ( header[ off_magic ] !== DDS_MAGIC ) {
 
-	if ( header[ off_magic ] !== DDS_MAGIC ) {
+			console.error( 'THREE.DDSLoader.parse: Invalid magic number in DDS header.' );
+			return dds;
 
-		console.error( 'THREE.DDSLoader.parse: Invalid magic number in DDS header.' );
-		return dds;
+		}
 
-	}
+		if ( ! header[ off_pfFlags ] & DDPF_FOURCC ) {
 
-	if ( ! header[ off_pfFlags ] & DDPF_FOURCC ) {
+			console.error( 'THREE.DDSLoader.parse: Unsupported format, must contain a FourCC code.' );
+			return dds;
 
-		console.error( 'THREE.DDSLoader.parse: Unsupported format, must contain a FourCC code.' );
-		return dds;
+		}
 
-	}
+		var blockBytes;
 
-	var blockBytes;
+		var fourCC = header[ off_pfFourCC ];
 
-	var fourCC = header[ off_pfFourCC ];
+		var isRGBAUncompressed = false;
 
-	var isRGBAUncompressed = false;
+		switch ( fourCC ) {
 
-	switch ( fourCC ) {
+			case FOURCC_DXT1:
 
-		case FOURCC_DXT1:
+				blockBytes = 8;
+				dds.format = RGB_S3TC_DXT1_Format;
+				break;
 
-			blockBytes = 8;
-			dds.format = RGB_S3TC_DXT1_Format;
-			break;
+			case FOURCC_DXT3:
 
-		case FOURCC_DXT3:
+				blockBytes = 16;
+				dds.format = RGBA_S3TC_DXT3_Format;
+				break;
 
-			blockBytes = 16;
-			dds.format = RGBA_S3TC_DXT3_Format;
-			break;
+			case FOURCC_DXT5:
 
-		case FOURCC_DXT5:
+				blockBytes = 16;
+				dds.format = RGBA_S3TC_DXT5_Format;
+				break;
 
-			blockBytes = 16;
-			dds.format = RGBA_S3TC_DXT5_Format;
-			break;
+			case FOURCC_ETC1:
 
-		case FOURCC_ETC1:
+				blockBytes = 8;
+				dds.format = RGB_ETC1_Format;
+				break;
 
-			blockBytes = 8;
-			dds.format = RGB_ETC1_Format;
-			break;
+			default:
 
-		default:
+				if ( header[ off_RGBBitCount ] === 32
+					&& header[ off_RBitMask ] & 0xff0000
+					&& header[ off_GBitMask ] & 0xff00
+					&& header[ off_BBitMask ] & 0xff
+					&& header[ off_ABitMask ] & 0xff000000 ) {
 
-			if ( header[ off_RGBBitCount ] === 32
-				&& header[ off_RBitMask ] & 0xff0000
-				&& header[ off_GBitMask ] & 0xff00
-				&& header[ off_BBitMask ] & 0xff
-				&& header[ off_ABitMask ] & 0xff000000 ) {
+					isRGBAUncompressed = true;
+					blockBytes = 64;
+					dds.format = RGBAFormat;
 
-				isRGBAUncompressed = true;
-				blockBytes = 64;
-				dds.format = RGBAFormat;
+				} else {
 
-			} else {
+					console.error( 'THREE.DDSLoader.parse: Unsupported FourCC code ', int32ToFourCC( fourCC ) );
+					return dds;
 
-				console.error( 'THREE.DDSLoader.parse: Unsupported FourCC code ', int32ToFourCC( fourCC ) );
-				return dds;
+				}
 
-			}
+		}
 
-	}
+		dds.mipmapCount = 1;
 
-	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 ] );
+		}
 
-	}
+		var caps2 = header[ off_caps2 ];
+		dds.isCubemap = caps2 & DDSCAPS2_CUBEMAP ? true : false;
+		if ( dds.isCubemap && (
+			! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEX ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEX ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEY ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEY ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEZ ) ||
+			! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEZ )
+		) ) {
 
-	var caps2 = header[ off_caps2 ];
-	dds.isCubemap = caps2 & DDSCAPS2_CUBEMAP ? true : false;
-	if ( dds.isCubemap && (
-		! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEX ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEX ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEY ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEY ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_POSITIVEZ ) ||
-		! ( caps2 & DDSCAPS2_CUBEMAP_NEGATIVEZ )
-	) ) {
-
-		console.error( 'THREE.DDSLoader.parse: Incomplete cubemap faces' );
-		return dds;
+			console.error( 'THREE.DDSLoader.parse: Incomplete cubemap faces' );
+			return dds;
 
-	}
+		}
 
-	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
+		// Extract mipmaps buffers
 
-	var faces = dds.isCubemap ? 6 : 1;
+		var faces = dds.isCubemap ? 6 : 1;
 
-	for ( var face = 0; face < faces; face ++ ) {
+		for ( var face = 0; face < faces; face ++ ) {
 
-		var width = dds.width;
-		var height = dds.height;
+			var width = dds.width;
+			var height = dds.height;
 
-		for ( var i = 0; i < dds.mipmapCount; i ++ ) {
+			for ( var i = 0; i < dds.mipmapCount; i ++ ) {
 
-			if ( isRGBAUncompressed ) {
+				if ( isRGBAUncompressed ) {
 
-				var byteArray = loadARGBMip( buffer, dataOffset, width, height );
-				var dataLength = byteArray.length;
+					var byteArray = loadARGBMip( buffer, dataOffset, width, height );
+					var dataLength = byteArray.length;
 
-			} else {
+				} else {
 
-				var dataLength = Math.max( 4, width ) / 4 * Math.max( 4, height ) / 4 * blockBytes;
-				var byteArray = new Uint8Array( buffer, dataOffset, dataLength );
+					var dataLength = Math.max( 4, width ) / 4 * Math.max( 4, height ) / 4 * blockBytes;
+					var byteArray = new Uint8Array( buffer, dataOffset, dataLength );
 
-			}
+				}
+
+				var mipmap = { "data": byteArray, "width": width, "height": height };
+				dds.mipmaps.push( mipmap );
 
-			var mipmap = { "data": byteArray, "width": width, "height": height };
-			dds.mipmaps.push( mipmap );
+				dataOffset += dataLength;
 
-			dataOffset += dataLength;
+				width = Math.max( width >> 1, 1 );
+				height = Math.max( height >> 1, 1 );
 
-			width = Math.max( width >> 1, 1 );
-			height = Math.max( height >> 1, 1 );
+			}
 
 		}
 
-	}
+		return dds;
 
-	return dds;
+	}
 
-};
+} );
 
 export { DDSLoader };

examples/jsm/loaders/KTXLoader.d.ts

@@ -18,5 +18,4 @@ export class KTXLoader extends CompressedTextureLoader {
   constructor(manager?: LoadingManager);
 
   parse(buffer: ArrayBuffer, loadMipmaps: boolean) : KTX;
-  _parser(buffer: ArrayBuffer, loadMipmaps: boolean) : KTX;
 }

examples/jsm/loaders/KTXLoader.js

@@ -16,27 +16,28 @@ var KTXLoader = function ( manager ) {
 
 	CompressedTextureLoader.call( this, manager );
 
-	this._parser = KTXLoader.parse;
-
 };
 
-KTXLoader.prototype = Object.create( CompressedTextureLoader.prototype );
-KTXLoader.prototype.constructor = KTXLoader;
+KTXLoader.prototype = Object.assign( Object.create( CompressedTextureLoader.prototype ), {
 
-KTXLoader.parse = function ( buffer, loadMipmaps ) {
+	constructor: KTXLoader,
 
-	var ktx = new KhronosTextureContainer( buffer, 1 );
+	parse: function ( buffer, loadMipmaps ) {
 
-	return {
-		mipmaps: ktx.mipmaps( loadMipmaps ),
-		width: ktx.pixelWidth,
-		height: ktx.pixelHeight,
-		format: ktx.glInternalFormat,
-		isCubemap: ktx.numberOfFaces === 6,
-		mipmapCount: ktx.numberOfMipmapLevels
-	};
+		var ktx = new KhronosTextureContainer( buffer, 1 );
 
-};
+		return {
+			mipmaps: ktx.mipmaps( loadMipmaps ),
+			width: ktx.pixelWidth,
+			height: ktx.pixelHeight,
+			format: ktx.glInternalFormat,
+			isCubemap: ktx.numberOfFaces === 6,
+			mipmapCount: ktx.numberOfMipmapLevels
+		};
+
+	}
+
+} );
 
 var KhronosTextureContainer = ( function () {
 

examples/jsm/loaders/PVRLoader.d.ts

@@ -16,6 +16,5 @@ export interface PVR {
 export class PVRLoader extends CompressedTextureLoader {
   constructor(manager?: LoadingManager);
 
-  parse(buffer: ArrayBuffer, loadMipmaps: boolean) : PVR;
-  _parser(buffer: ArrayBuffer, loadMipmaps: boolean) : PVR;
+  parse(buffer: ArrayBuffer, loadMipmaps: boolean): PVR;
 }

examples/jsm/loaders/PVRLoader.js

@@ -20,44 +20,44 @@ var PVRLoader = function ( manager ) {
 
 	CompressedTextureLoader.call( this, manager );
 
-	this._parser = PVRLoader.parse;
-
 };
 
-PVRLoader.prototype = Object.create( CompressedTextureLoader.prototype );
-PVRLoader.prototype.constructor = PVRLoader;
+PVRLoader.prototype = Object.assign( Object.create( CompressedTextureLoader.prototype ), {
 
+	constructor: PVRLoader,
 
-PVRLoader.parse = function ( buffer, loadMipmaps ) {
+	parse: function ( buffer, loadMipmaps ) {
 
-	var headerLengthInt = 13;
-	var header = new Uint32Array( buffer, 0, headerLengthInt );
+		var headerLengthInt = 13;
+		var header = new Uint32Array( buffer, 0, headerLengthInt );
 
-	var pvrDatas = {
-		buffer: buffer,
-		header: header,
-		loadMipmaps: loadMipmaps
-	};
+		var pvrDatas = {
+			buffer: buffer,
+			header: header,
+			loadMipmaps: loadMipmaps
+		};
 
-	if ( header[ 0 ] === 0x03525650 ) {
+		if ( header[ 0 ] === 0x03525650 ) {
 
-		// PVR v3
+			// PVR v3
 
-		return PVRLoader._parseV3( pvrDatas );
+			return PVRLoader._parseV3( pvrDatas );
 
-	} else if ( header[ 11 ] === 0x21525650 ) {
+		} else if ( header[ 11 ] === 0x21525650 ) {
 
-		// PVR v2
+			// PVR v2
 
-		return PVRLoader._parseV2( pvrDatas );
+			return PVRLoader._parseV2( pvrDatas );
 
-	} else {
+		} else {
 
-		console.error( 'THREE.PVRLoader: Unknown PVR format.' );
+			console.error( 'THREE.PVRLoader: Unknown PVR format.' );
+
+		}
 
 	}
 
-};
+} );
 
 PVRLoader._parseV3 = function ( pvrDatas ) {
 

src/loaders/CompressedTextureLoader.js

@@ -13,9 +13,6 @@ function CompressedTextureLoader( manager ) {
 
 	Loader.call( this, manager );
 
-	// override in sub classes
-	this._parser = null;
-
 }
 
 CompressedTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
@@ -39,7 +36,7 @@ CompressedTextureLoader.prototype = Object.assign( Object.create( Loader.prototy
 
 			loader.load( url[ i ], function ( buffer ) {
 
-				var texDatas = scope._parser( buffer, true );
+				var texDatas = scope.parse( buffer, true );
 
 				images[ i ] = {
 					width: texDatas.width,
@@ -82,7 +79,7 @@ CompressedTextureLoader.prototype = Object.assign( Object.create( Loader.prototy
 
 			loader.load( url, function ( buffer ) {
 
-				var texDatas = scope._parser( buffer, true );
+				var texDatas = scope.parse( buffer, true );
 
 				if ( texDatas.isCubemap ) {