super-three 0.141.0 → 0.147.0

package/examples/js/loaders/DDSLoader.js

@@ -7,7 +7,6 @@
 			super( manager );
 
 		}
-
 		parse( buffer, loadMipmaps ) {
 
 			const dds = {
@@ -16,19 +15,25 @@
 				height: 0,
 				format: null,
 				mipmapCount: 1
-			}; // Adapted from @toji's DDS utils
+			};
+
+			// Adapted from @toji's DDS utils
 			// https://github.com/toji/webgl-texture-utils/blob/master/texture-util/dds.js
+
 			// All values and structures referenced from:
 			// http://msdn.microsoft.com/en-us/library/bb943991.aspx/
 
-			const DDS_MAGIC = 0x20534444; // const DDSD_CAPS = 0x1;
+			const DDS_MAGIC = 0x20534444;
+
+			// const DDSD_CAPS = 0x1;
 			// const DDSD_HEIGHT = 0x2;
 			// const DDSD_WIDTH = 0x4;
 			// const DDSD_PITCH = 0x8;
 			// const DDSD_PIXELFORMAT = 0x1000;
-
-			const DDSD_MIPMAPCOUNT = 0x20000; // const DDSD_LINEARSIZE = 0x80000;
+			const DDSD_MIPMAPCOUNT = 0x20000;
+			// const DDSD_LINEARSIZE = 0x80000;
 			// const DDSD_DEPTH = 0x800000;
+
 			// const DDSCAPS_COMPLEX = 0x8;
 			// const DDSCAPS_MIPMAP = 0x400000;
 			// const DDSCAPS_TEXTURE = 0x1000;
@@ -39,7 +44,9 @@
 			const DDSCAPS2_CUBEMAP_POSITIVEY = 0x1000;
 			const DDSCAPS2_CUBEMAP_NEGATIVEY = 0x2000;
 			const DDSCAPS2_CUBEMAP_POSITIVEZ = 0x4000;
-			const DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000; // const DDSCAPS2_VOLUME = 0x200000;
+			const DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000;
+			// const DDSCAPS2_VOLUME = 0x200000;
+
 			// const DDPF_ALPHAPIXELS = 0x1;
 			// const DDPF_ALPHA = 0x2;
 			// const DDPF_FOURCC = 0x4;
@@ -66,7 +73,6 @@
 				const byteArray = new Uint8Array( dataLength );
 				let dst = 0;
 				let src = 0;
-
 				for ( let y = 0; y < height; y ++ ) {
 
 					for ( let x = 0; x < width; x ++ ) {
@@ -81,13 +87,10 @@
 						src ++;
 						byteArray[ dst ] = r;
 						dst ++; //r
-
 						byteArray[ dst ] = g;
 						dst ++; //g
-
 						byteArray[ dst ] = b;
 						dst ++; //b
-
 						byteArray[ dst ] = a;
 						dst ++; //a
 
@@ -104,6 +107,7 @@
 			const FOURCC_DXT5 = fourCCToInt32( 'DXT5' );
 			const FOURCC_ETC1 = fourCCToInt32( 'ETC1' );
 			const headerLengthInt = 31; // The header length in 32 bit ints
+
 			// Offsets into the header array
 
 			const off_magic = 0;
@@ -111,21 +115,24 @@
 			const off_flags = 2;
 			const off_height = 3;
 			const off_width = 4;
-			const off_mipmapCount = 7; // const off_pfFlags = 20;
+			const off_mipmapCount = 7;
 
+			// const off_pfFlags = 20;
 			const off_pfFourCC = 21;
 			const off_RGBBitCount = 22;
 			const off_RBitMask = 23;
 			const off_GBitMask = 24;
 			const off_BBitMask = 25;
-			const off_ABitMask = 26; // const off_caps = 27;
+			const off_ABitMask = 26;
 
-			const off_caps2 = 28; // const off_caps3 = 29;
+			// const off_caps = 27;
+			const off_caps2 = 28;
+			// const off_caps3 = 29;
 			// const off_caps4 = 30;
+
 			// Parse header
 
 			const header = new Int32Array( buffer, 0, headerLengthInt );
-
 			if ( header[ off_magic ] !== DDS_MAGIC ) {
 
 				console.error( 'THREE.DDSLoader.parse: Invalid magic number in DDS header.' );
@@ -136,29 +143,24 @@
 			let blockBytes;
 			const fourCC = header[ off_pfFourCC ];
 			let isRGBAUncompressed = false;
-
 			switch ( fourCC ) {
 
 				case FOURCC_DXT1:
 					blockBytes = 8;
 					dds.format = THREE.RGB_S3TC_DXT1_Format;
 					break;
-
 				case FOURCC_DXT3:
 					blockBytes = 16;
 					dds.format = THREE.RGBA_S3TC_DXT3_Format;
 					break;
-
 				case FOURCC_DXT5:
 					blockBytes = 16;
 					dds.format = THREE.RGBA_S3TC_DXT5_Format;
 					break;
-
 				case FOURCC_ETC1:
 					blockBytes = 8;
 					dds.format = THREE.RGB_ETC1_Format;
 					break;
-
 				default:
 					if ( header[ off_RGBBitCount ] === 32 && header[ off_RBitMask ] & 0xff0000 && header[ off_GBitMask ] & 0xff00 && header[ off_BBitMask ] & 0xff && header[ off_ABitMask ] & 0xff000000 ) {
 
@@ -176,7 +178,6 @@
 			}
 
 			dds.mipmapCount = 1;
-
 			if ( header[ off_flags ] & DDSD_MIPMAPCOUNT && loadMipmaps !== false ) {
 
 				dds.mipmapCount = Math.max( 1, header[ off_mipmapCount ] );
@@ -185,7 +186,6 @@
 
 			const 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' );
@@ -195,19 +195,18 @@
 
 			dds.width = header[ off_width ];
 			dds.height = header[ off_height ];
-			let dataOffset = header[ off_size ] + 4; // Extract mipmaps buffers
+			let dataOffset = header[ off_size ] + 4;
 
-			const faces = dds.isCubemap ? 6 : 1;
+			// Extract mipmaps buffers
 
+			const faces = dds.isCubemap ? 6 : 1;
 			for ( let face = 0; face < faces; face ++ ) {
 
 				let width = dds.width;
 				let height = dds.height;
-
 				for ( let i = 0; i < dds.mipmapCount; i ++ ) {
 
 					let byteArray, dataLength;
-
 					if ( isRGBAUncompressed ) {
 
 						byteArray = loadARGBMip( buffer, dataOffset, width, height );

package/examples/js/loaders/DRACOLoader.js

@@ -1,7 +1,6 @@
 ( function () {
 
 	const _taskCache = new WeakMap();
-
 	class DRACOLoader extends THREE.Loader {
 
 		constructor( manager ) {
@@ -29,28 +28,24 @@
 			};
 
 		}
-
 		setDecoderPath( path ) {
 
 			this.decoderPath = path;
 			return this;
 
 		}
-
 		setDecoderConfig( config ) {
 
 			this.decoderConfig = config;
 			return this;
 
 		}
-
 		setWorkerLimit( workerLimit ) {
 
 			this.workerLimit = workerLimit;
 			return this;
 
 		}
-
 		load( url, onLoad, onProgress, onError ) {
 
 			const loader = new THREE.FileLoader( this.manager );
@@ -60,19 +55,11 @@
 			loader.setWithCredentials( this.withCredentials );
 			loader.load( url, buffer => {
 
-				const taskConfig = {
-					attributeIDs: this.defaultAttributeIDs,
-					attributeTypes: this.defaultAttributeTypes,
-					useUniqueIDs: false
-				};
-				this.decodeGeometry( buffer, taskConfig ).then( onLoad ).catch( onError );
+				this.decodeDracoFile( buffer, onLoad ).catch( onError );
 
 			}, onProgress, onError );
 
 		}
-		/** @deprecated Kept for backward-compatibility with previous DRACOLoader versions. */
-
-
 		decodeDracoFile( buffer, callback, attributeIDs, attributeTypes ) {
 
 			const taskConfig = {
@@ -80,35 +67,18 @@
 				attributeTypes: attributeTypes || this.defaultAttributeTypes,
 				useUniqueIDs: !! attributeIDs
 			};
-			this.decodeGeometry( buffer, taskConfig ).then( callback );
+			return this.decodeGeometry( buffer, taskConfig ).then( callback );
 
 		}
-
 		decodeGeometry( buffer, taskConfig ) {
 
-			// TODO: For backward-compatibility, support 'attributeTypes' objects containing
-			// references (rather than names) to typed array constructors. These must be
-			// serialized before sending them to the worker.
-			for ( const attribute in taskConfig.attributeTypes ) {
-
-				const type = taskConfig.attributeTypes[ attribute ];
+			const taskKey = JSON.stringify( taskConfig );
 
-				if ( type.BYTES_PER_ELEMENT !== undefined ) {
-
-					taskConfig.attributeTypes[ attribute ] = type.name;
-
-				}
-
-			} //
-
-
-			const taskKey = JSON.stringify( taskConfig ); // Check for an existing task using this buffer. A transferred buffer cannot be transferred
+			// Check for an existing task using this buffer. A transferred buffer cannot be transferred
 			// again from this thread.
-
 			if ( _taskCache.has( buffer ) ) {
 
 				const cachedTask = _taskCache.get( buffer );
-
 				if ( cachedTask.key === taskKey ) {
 
 					return cachedTask.promise;
@@ -123,14 +93,16 @@
 
 				}
 
-			} //
+			}
 
+			//
 
 			let worker;
 			const taskID = this.workerNextTaskID ++;
-			const taskCost = buffer.byteLength; // Obtain a worker and assign a task, and construct a geometry instance
-			// when the task completes.
+			const taskCost = buffer.byteLength;
 
+			// Obtain a worker and assign a task, and construct a geometry instance
+			// when the task completes.
 			const geometryPending = this._getWorker( taskID, taskCost ).then( _worker => {
 
 				worker = _worker;
@@ -145,37 +117,39 @@
 						id: taskID,
 						taskConfig,
 						buffer
-					}, [ buffer ] ); // this.debug();
+					}, [ buffer ] );
 
-				} );
+					// this.debug();
 
-			} ).then( message => this._createGeometry( message.geometry ) ); // Remove task from the task list.
-			// Note: replaced '.finally()' with '.catch().then()' block - iOS 11 support (#19416)
+				} );
 
+			} ).then( message => this._createGeometry( message.geometry ) );
 
+			// Remove task from the task list.
+			// Note: replaced '.finally()' with '.catch().then()' block - iOS 11 support (#19416)
 			geometryPending.catch( () => true ).then( () => {
 
 				if ( worker && taskID ) {
 
-					this._releaseTask( worker, taskID ); // this.debug();
+					this._releaseTask( worker, taskID );
+
+					// this.debug();
 
 				}
 
-			} ); // Cache the task result.
+			} );
 
+			// Cache the task result.
 			_taskCache.set( buffer, {
 				key: taskKey,
 				promise: geometryPending
 			} );
-
 			return geometryPending;
 
 		}
-
 		_createGeometry( geometryData ) {
 
 			const geometry = new THREE.BufferGeometry();
-
 			if ( geometryData.index ) {
 
 				geometry.setIndex( new THREE.BufferAttribute( geometryData.index.array, 1 ) );
@@ -195,7 +169,6 @@
 			return geometry;
 
 		}
-
 		_loadLibrary( url, responseType ) {
 
 			const loader = new THREE.FileLoader( this.manager );
@@ -209,21 +182,17 @@
 			} );
 
 		}
-
 		preload() {
 
 			this._initDecoder();
-
 			return this;
 
 		}
-
 		_initDecoder() {
 
 			if ( this.decoderPending ) return this.decoderPending;
 			const useJS = typeof WebAssembly !== 'object' || this.decoderConfig.type === 'js';
 			const librariesPending = [];
-
 			if ( useJS ) {
 
 				librariesPending.push( this._loadLibrary( 'draco_decoder.js', 'text' ) );
@@ -238,7 +207,6 @@
 			this.decoderPending = Promise.all( librariesPending ).then( libraries => {
 
 				const jsContent = libraries[ 0 ];
-
 				if ( ! useJS ) {
 
 					this.decoderConfig.wasmBinary = libraries[ 1 ];
@@ -253,7 +221,6 @@
 			return this.decoderPending;
 
 		}
-
 		_getWorker( taskID, taskCost ) {
 
 			return this._initDecoder().then( () => {
@@ -268,23 +235,17 @@
 						type: 'init',
 						decoderConfig: this.decoderConfig
 					} );
-
 					worker.onmessage = function ( e ) {
 
 						const message = e.data;
-
 						switch ( message.type ) {
 
 							case 'decode':
 								worker._callbacks[ message.id ].resolve( message );
-
 								break;
-
 							case 'error':
 								worker._callbacks[ message.id ].reject( message );
-
 								break;
-
 							default:
 								console.error( 'THREE.DRACOLoader: Unexpected message, "' + message.type + '"' );
 
@@ -312,7 +273,6 @@
 			} );
 
 		}
-
 		_releaseTask( worker, taskID ) {
 
 			worker._taskLoad -= worker._taskCosts[ taskID ];
@@ -320,13 +280,11 @@
 			delete worker._taskCosts[ taskID ];
 
 		}
-
 		debug() {
 
 			console.log( 'Task load: ', this.workerPool.map( worker => worker._taskLoad ) );
 
 		}
-
 		dispose() {
 
 			for ( let i = 0; i < this.workerPool.length; ++ i ) {
@@ -341,25 +299,21 @@
 		}
 
 	}
-	/* WEB WORKER */
 
+	/* WEB WORKER */
 
 	function DRACOWorker() {
 
 		let decoderConfig;
 		let decoderPending;
-
 		onmessage = function ( e ) {
 
 			const message = e.data;
-
 			switch ( message.type ) {
 
 				case 'init':
 					decoderConfig = message.decoderConfig;
-					decoderPending = new Promise( function ( resolve
-						/*, reject*/
-					) {
+					decoderPending = new Promise( function ( resolve /*, reject*/ ) {
 
 						decoderConfig.onModuleLoaded = function ( draco ) {
 
@@ -373,8 +327,8 @@
 						DracoDecoderModule( decoderConfig ); // eslint-disable-line no-undef
 
 					} );
-					break;
 
+					break;
 				case 'decode':
 					const buffer = message.buffer;
 					const taskConfig = message.taskConfig;
@@ -384,7 +338,6 @@
 						const decoder = new draco.Decoder();
 						const decoderBuffer = new draco.DecoderBuffer();
 						decoderBuffer.Init( new Int8Array( buffer ), buffer.byteLength );
-
 						try {
 
 							const geometry = decodeGeometry( draco, decoder, decoderBuffer, taskConfig );
@@ -426,7 +379,6 @@
 			let dracoGeometry;
 			let decodingStatus;
 			const geometryType = decoder.GetEncodedGeometryType( decoderBuffer );
-
 			if ( geometryType === draco.TRIANGULAR_MESH ) {
 
 				dracoGeometry = new draco.Mesh();
@@ -452,17 +404,19 @@
 			const geometry = {
 				index: null,
 				attributes: []
-			}; // Gather all vertex attributes.
+			};
 
+			// Gather all vertex attributes.
 			for ( const attributeName in attributeIDs ) {
 
 				const attributeType = self[ attributeTypes[ attributeName ] ];
 				let attribute;
-				let attributeID; // A Draco file may be created with default vertex attributes, whose attribute IDs
+				let attributeID;
+
+				// A Draco file may be created with default vertex attributes, whose attribute IDs
 				// are mapped 1:1 from their semantic name (POSITION, NORMAL, ...). Alternatively,
 				// a Draco file may contain a custom set of attributes, identified by known unique
 				// IDs. glTF files always do the latter, and `.drc` files typically do the former.
-
 				if ( taskConfig.useUniqueIDs ) {
 
 					attributeID = attributeIDs[ attributeName ];
@@ -478,9 +432,9 @@
 
 				geometry.attributes.push( decodeAttribute( draco, decoder, dracoGeometry, attributeName, attributeType, attribute ) );
 
-			} // Add index.
-
+			}
 
+			// Add index.
 			if ( geometryType === draco.TRIANGULAR_MESH ) {
 
 				geometry.index = decodeIndex( draco, decoder, dracoGeometry );
@@ -497,14 +451,10 @@
 			const numFaces = dracoGeometry.num_faces();
 			const numIndices = numFaces * 3;
 			const byteLength = numIndices * 4;
-
 			const ptr = draco._malloc( byteLength );
-
 			decoder.GetTrianglesUInt32Array( dracoGeometry, byteLength, ptr );
 			const index = new Uint32Array( draco.HEAPF32.buffer, ptr, numIndices ).slice();
-
 			draco._free( ptr );
-
 			return {
 				array: index,
 				itemSize: 1
@@ -519,14 +469,10 @@
 			const numValues = numPoints * numComponents;
 			const byteLength = numValues * attributeType.BYTES_PER_ELEMENT;
 			const dataType = getDracoDataType( draco, attributeType );
-
 			const ptr = draco._malloc( byteLength );
-
 			decoder.GetAttributeDataArrayForAllPoints( dracoGeometry, attribute, dataType, byteLength, ptr );
 			const array = new attributeType( draco.HEAPF32.buffer, ptr, numValues ).slice();
-
 			draco._free( ptr );
-
 			return {
 				name: attributeName,
 				array: array,
@@ -541,22 +487,16 @@
 
 				case Float32Array:
 					return draco.DT_FLOAT32;
-
 				case Int8Array:
 					return draco.DT_INT8;
-
 				case Int16Array:
 					return draco.DT_INT16;
-
 				case Int32Array:
 					return draco.DT_INT32;
-
 				case Uint8Array:
 					return draco.DT_UINT8;
-
 				case Uint16Array:
 					return draco.DT_UINT16;
-
 				case Uint32Array:
 					return draco.DT_UINT32;