super-three 0.141.0 → 0.147.0

package/examples/js/loaders/PLYLoader.js

@@ -24,19 +24,28 @@
  *	diffuse_blue: 'blue'
  * } );
  *
+ * Custom properties outside of the defaults for position, uv, normal
+ * and color attributes can be added using the setCustomPropertyMapping method.
+ * For example, the following maps the element properties “custom_property_a”
+ * and “custom_property_b” to an attribute “customAttribute” with an item size of 2.
+ * Attribute item sizes are set from the number of element properties in the property array.
+ *
+ * loader.setCustomPropertyMapping( {
+ *	customAttribute: ['custom_property_a', 'custom_property_b'],
+ * } );
+ *
  */
 
 	const _color = new THREE.Color();
-
 	class PLYLoader extends THREE.Loader {
 
 		constructor( manager ) {
 
 			super( manager );
 			this.propertyNameMapping = {};
+			this.customPropertyMapping = {};
 
 		}
-
 		load( url, onLoad, onProgress, onError ) {
 
 			const scope = this;
@@ -70,22 +79,24 @@
 			}, onProgress, onError );
 
 		}
-
 		setPropertyNameMapping( mapping ) {
 
 			this.propertyNameMapping = mapping;
 
 		}
+		setCustomPropertyNameMapping( mapping ) {
+
+			this.customPropertyMapping = mapping;
 
+		}
 		parse( data ) {
 
 			function parseHeader( data ) {
 
-				const patternHeader = /^ply([\s\S]*)end_header\r?\n/;
+				const patternHeader = /^ply([\s\S]*)end_header(\r\n|\r|\n)/;
 				let headerText = '';
 				let headerLength = 0;
 				const result = patternHeader.exec( data );
-
 				if ( result !== null ) {
 
 					headerText = result[ 1 ];
@@ -99,15 +110,13 @@
 					headerLength: headerLength,
 					objInfo: ''
 				};
-				const lines = headerText.split( '\n' );
+				const lines = headerText.split( /\r\n|\r|\n/ );
 				let currentElement;
-
 				function make_ply_element_property( propertValues, propertyNameMapping ) {
 
 					const property = {
 						type: propertValues[ 0 ]
 					};
-
 					if ( property.type === 'list' ) {
 
 						property.name = propertValues[ 3 ];
@@ -138,18 +147,15 @@
 					const lineValues = line.split( /\s+/ );
 					const lineType = lineValues.shift();
 					line = lineValues.join( ' ' );
-
 					switch ( lineType ) {
 
 						case 'format':
 							header.format = lineValues[ 0 ];
 							header.version = lineValues[ 1 ];
 							break;
-
 						case 'comment':
 							header.comments.push( line );
 							break;
-
 						case 'element':
 							if ( currentElement !== undefined ) {
 
@@ -162,15 +168,12 @@
 							currentElement.count = parseInt( lineValues[ 1 ] );
 							currentElement.properties = [];
 							break;
-
 						case 'property':
 							currentElement.properties.push( make_ply_element_property( lineValues, scope.propertyNameMapping ) );
 							break;
-
 						case 'obj_info':
 							header.objInfo = line;
 							break;
-
 						default:
 							console.log( 'unhandled', lineType, lineValues );
 
@@ -205,7 +208,6 @@
 					case 'int32':
 					case 'uint32':
 						return parseInt( n );
-
 					case 'float':
 					case 'double':
 					case 'float32':
@@ -220,14 +222,12 @@
 
 				const values = line.split( /\s+/ );
 				const element = {};
-
 				for ( let i = 0; i < properties.length; i ++ ) {
 
 					if ( properties[ i ].type === 'list' ) {
 
 						const list = [];
 						const n = parseASCIINumber( values.shift(), properties[ i ].countType );
-
 						for ( let j = 0; j < n; j ++ ) {
 
 							list.push( parseASCIINumber( values.shift(), properties[ i ].itemType ) );
@@ -248,9 +248,8 @@
 
 			}
 
-			function parseASCII( data, header ) {
+			function createBuffer() {
 
-				// PLY ascii format specification, as per http://en.wikipedia.org/wiki/PLY_(file_format)
 				const buffer = {
 					indices: [],
 					vertices: [],
@@ -259,25 +258,37 @@
 					faceVertexUvs: [],
 					colors: []
 				};
+				for ( const customProperty of Object.keys( scope.customPropertyMapping ) ) {
+
+					buffer[ customProperty ] = [];
+
+				}
+
+				return buffer;
+
+			}
+
+			function parseASCII( data, header ) {
+
+				// PLY ascii format specification, as per http://en.wikipedia.org/wiki/PLY_(file_format)
+
+				const buffer = createBuffer();
 				let result;
 				const patternBody = /end_header\s([\s\S]*)$/;
 				let body = '';
-
 				if ( ( result = patternBody.exec( data ) ) !== null ) {
 
 					body = result[ 1 ];
 
 				}
 
-				const lines = body.split( '\n' );
+				const lines = body.split( /\r\n|\r|\n/ );
 				let currentElement = 0;
 				let currentElementCount = 0;
-
 				for ( let i = 0; i < lines.length; i ++ ) {
 
 					let line = lines[ i ];
 					line = line.trim();
-
 					if ( line === '' ) {
 
 						continue;
@@ -303,7 +314,9 @@
 
 			function postProcess( buffer ) {
 
-				let geometry = new THREE.BufferGeometry(); // mandatory buffer data
+				let geometry = new THREE.BufferGeometry();
+
+				// mandatory buffer data
 
 				if ( buffer.indices.length > 0 ) {
 
@@ -311,7 +324,9 @@
 
 				}
 
-				geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( buffer.vertices, 3 ) ); // optional buffer data
+				geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( buffer.vertices, 3 ) );
+
+				// optional buffer data
 
 				if ( buffer.normals.length > 0 ) {
 
@@ -338,6 +353,18 @@
 
 				}
 
+				// custom buffer data
+
+				for ( const customProperty of Object.keys( scope.customPropertyMapping ) ) {
+
+					if ( buffer[ customProperty ].length > 0 ) {
+
+						geometry.setAttribute( customProperty, new THREE.Float32BufferAttribute( buffer[ customProperty ], scope.customPropertyMapping[ customProperty ].length ) );
+
+					}
+
+				}
+
 				geometry.computeBoundingSphere();
 				return geometry;
 
@@ -369,11 +396,9 @@
 				const attrR = findAttrName( [ 'red', 'diffuse_red', 'r', 'diffuse_r' ] );
 				const attrG = findAttrName( [ 'green', 'diffuse_green', 'g', 'diffuse_g' ] );
 				const attrB = findAttrName( [ 'blue', 'diffuse_blue', 'b', 'diffuse_b' ] );
-
 				if ( elementName === 'vertex' ) {
 
 					buffer.vertices.push( element[ attrX ], element[ attrY ], element[ attrZ ] );
-
 					if ( attrNX !== null && attrNY !== null && attrNZ !== null ) {
 
 						buffer.normals.push( element[ attrNX ], element[ attrNY ], element[ attrNZ ] );
@@ -389,21 +414,27 @@
 					if ( attrR !== null && attrG !== null && attrB !== null ) {
 
 						_color.setRGB( element[ attrR ] / 255.0, element[ attrG ] / 255.0, element[ attrB ] / 255.0 ).convertSRGBToLinear();
-
 						buffer.colors.push( _color.r, _color.g, _color.b );
 
 					}
 
+					for ( const customProperty of Object.keys( scope.customPropertyMapping ) ) {
+
+						for ( const elementProperty of scope.customPropertyMapping[ customProperty ] ) {
+
+							buffer[ customProperty ].push( element[ elementProperty ] );
+
+						}
+
+					}
+
 				} else if ( elementName === 'face' ) {
 
 					const vertex_indices = element.vertex_indices || element.vertex_index; // issue #9338
-
 					const texcoord = element.texcoord;
-
 					if ( vertex_indices.length === 3 ) {
 
 						buffer.indices.push( vertex_indices[ 0 ], vertex_indices[ 1 ], vertex_indices[ 2 ] );
-
 						if ( texcoord && texcoord.length === 6 ) {
 
 							buffer.faceVertexUvs.push( texcoord[ 0 ], texcoord[ 1 ] );
@@ -431,31 +462,24 @@
 					case 'int8':
 					case 'char':
 						return [ dataview.getInt8( at ), 1 ];
-
 					case 'uint8':
 					case 'uchar':
 						return [ dataview.getUint8( at ), 1 ];
-
 					case 'int16':
 					case 'short':
 						return [ dataview.getInt16( at, little_endian ), 2 ];
-
 					case 'uint16':
 					case 'ushort':
 						return [ dataview.getUint16( at, little_endian ), 2 ];
-
 					case 'int32':
 					case 'int':
 						return [ dataview.getInt32( at, little_endian ), 4 ];
-
 					case 'uint32':
 					case 'uint':
 						return [ dataview.getUint32( at, little_endian ), 4 ];
-
 					case 'float32':
 					case 'float':
 						return [ dataview.getFloat32( at, little_endian ), 4 ];
-
 					case 'float64':
 					case 'double':
 						return [ dataview.getFloat64( at, little_endian ), 8 ];
@@ -469,7 +493,6 @@
 				const element = {};
 				let result,
 					read = 0;
-
 				for ( let i = 0; i < properties.length; i ++ ) {
 
 					if ( properties[ i ].type === 'list' ) {
@@ -478,7 +501,6 @@
 						result = binaryRead( dataview, at + read, properties[ i ].countType, little_endian );
 						const n = result[ 0 ];
 						read += result[ 1 ];
-
 						for ( let j = 0; j < n; j ++ ) {
 
 							result = binaryRead( dataview, at + read, properties[ i ].itemType, little_endian );
@@ -505,19 +527,11 @@
 
 			function parseBinary( data, header ) {
 
-				const buffer = {
-					indices: [],
-					vertices: [],
-					normals: [],
-					uvs: [],
-					faceVertexUvs: [],
-					colors: []
-				};
+				const buffer = createBuffer();
 				const little_endian = header.format === 'binary_little_endian';
 				const body = new DataView( data, header.headerLength );
 				let result,
 					loc = 0;
-
 				for ( let currentElement = 0; currentElement < header.elements.length; currentElement ++ ) {
 
 					for ( let currentElementCount = 0; currentElementCount < header.elements[ currentElement ].count; currentElementCount ++ ) {
@@ -533,12 +547,12 @@
 
 				return postProcess( buffer );
 
-			} //
+			}
 
+			//
 
 			let geometry;
 			const scope = this;
-
 			if ( data instanceof ArrayBuffer ) {
 
 				const text = THREE.LoaderUtils.decodeText( new Uint8Array( data ) );

package/examples/js/loaders/PRWMLoader.js

@@ -5,11 +5,11 @@
  */
 
 	let bigEndianPlatform = null;
+
 	/**
 	 * Check if the endianness of the platform is big-endian (most significant bit first)
 	 * @returns {boolean} True if big-endian, false if little-endian
 	 */
-
 	function isBigEndianPlatform() {
 
 		if ( bigEndianPlatform === null ) {
@@ -18,20 +18,19 @@
 				uint8Array = new Uint8Array( buffer ),
 				uint16Array = new Uint16Array( buffer );
 			uint8Array[ 0 ] = 0xAA; // set first byte
-
 			uint8Array[ 1 ] = 0xBB; // set second byte
-
 			bigEndianPlatform = uint16Array[ 0 ] === 0xAABB;
 
 		}
 
 		return bigEndianPlatform;
 
-	} // match the values defined in the spec to the TypedArray types
-
+	}
 
-	const InvertedEncodingTypes = [ null, Float32Array, null, Int8Array, Int16Array, null, Int32Array, Uint8Array, Uint16Array, null, Uint32Array ]; // define the method to use on a DataView, corresponding the TypedArray type
+	// match the values defined in the spec to the TypedArray types
+	const InvertedEncodingTypes = [ null, Float32Array, null, Int8Array, Int16Array, null, Int32Array, Uint8Array, Uint16Array, null, Uint32Array ];
 
+	// define the method to use on a DataView, corresponding the TypedArray type
 	const getMethods = {
 		Uint16Array: 'getUint16',
 		Uint32Array: 'getUint32',
@@ -40,12 +39,10 @@
 		Float32Array: 'getFloat32',
 		Float64Array: 'getFloat64'
 	};
-
 	function copyFromBuffer( sourceArrayBuffer, viewType, position, length, fromBigEndian ) {
 
 		const bytesPerElement = viewType.BYTES_PER_ELEMENT;
 		let result;
-
 		if ( fromBigEndian === isBigEndianPlatform() || bytesPerElement === 1 ) {
 
 			result = new viewType( sourceArrayBuffer, position, length );
@@ -56,7 +53,6 @@
 				getMethod = getMethods[ viewType.name ],
 				littleEndian = ! fromBigEndian;
 			result = new viewType( length );
-
 			for ( let i = 0; i < length; i ++ ) {
 
 				result[ i ] = readView[ getMethod ]( i * bytesPerElement, littleEndian );
@@ -80,7 +76,6 @@
 			attributesNumber = flags & 0x1F;
 		let valuesNumber = 0,
 			indicesNumber = 0;
-
 		if ( bigEndian ) {
 
 			valuesNumber = ( array[ 2 ] << 16 ) + ( array[ 3 ] << 8 ) + array[ 4 ];
@@ -92,8 +87,8 @@
 			indicesNumber = array[ 5 ] + ( array[ 6 ] << 8 ) + ( array[ 7 ] << 16 );
 
 		}
-		/** PRELIMINARY CHECKS **/
 
+		/** PRELIMINARY CHECKS **/
 
 		if ( version === 0 ) {
 
@@ -118,21 +113,18 @@
 			}
 
 		}
-		/** PARSING **/
 
+		/** PARSING **/
 
 		let pos = 8;
 		const attributes = {};
-
 		for ( let i = 0; i < attributesNumber; i ++ ) {
 
 			let attributeName = '';
-
 			while ( pos < array.length ) {
 
 				const char = array[ pos ];
 				pos ++;
-
 				if ( char === 0 ) {
 
 					break;
@@ -150,8 +142,9 @@
 			const cardinality = ( flags >> 4 & 0x03 ) + 1;
 			const encodingType = flags & 0x0F;
 			const arrayType = InvertedEncodingTypes[ encodingType ];
-			pos ++; // padding to next multiple of 4
+			pos ++;
 
+			// padding to next multiple of 4
 			pos = Math.ceil( pos / 4 ) * 4;
 			const values = copyFromBuffer( buffer, arrayType, pos, cardinality * valuesNumber, bigEndian );
 			pos += arrayType.BYTES_PER_ELEMENT * cardinality * valuesNumber;
@@ -165,7 +158,6 @@
 
 		pos = Math.ceil( pos / 4 ) * 4;
 		let indices = null;
-
 		if ( indexedGeometry ) {
 
 			indices = copyFromBuffer( buffer, indicesType === 1 ? Uint32Array : Uint16Array, pos, indicesNumber, bigEndian );
@@ -178,8 +170,9 @@
 			indices: indices
 		};
 
-	} // Define the public interface
+	}
 
+	// Define the public interface
 
 	class PRWMLoader extends THREE.Loader {
 
@@ -188,7 +181,6 @@
 			super( manager );
 
 		}
-
 		load( url, onLoad, onProgress, onError ) {
 
 			const scope = this;
@@ -223,13 +215,11 @@
 			}, onProgress, onError );
 
 		}
-
 		parse( arrayBuffer ) {
 
 			const data = decodePrwm( arrayBuffer ),
 				attributesKey = Object.keys( data.attributes ),
 				bufferGeometry = new THREE.BufferGeometry();
-
 			for ( let i = 0; i < attributesKey.length; i ++ ) {
 
 				const attribute = data.attributes[ attributesKey[ i ] ];
@@ -246,7 +236,6 @@
 			return bufferGeometry;
 
 		}
-
 		static isBigEndianPlatform() {
 
 			return isBigEndianPlatform();

package/examples/js/loaders/PVRLoader.js

@@ -13,7 +13,6 @@
 			super( manager );
 
 		}
-
 		parse( buffer, loadMipmaps ) {
 
 			const headerLengthInt = 13;
@@ -23,15 +22,16 @@
 				header: header,
 				loadMipmaps: loadMipmaps
 			};
-
 			if ( header[ 0 ] === 0x03525650 ) {
 
 				// PVR v3
+
 				return _parseV3( pvrDatas );
 
 			} else if ( header[ 11 ] === 0x21525650 ) {
 
 				// PVR v2
+
 				return _parseV2( pvrDatas );
 
 			} else {
@@ -43,7 +43,6 @@
 		}
 
 	}
-
 	function _parseV3( pvrDatas ) {
 
 		const header = pvrDatas.header;
@@ -55,7 +54,6 @@
 			// numSurfs = header[ 9 ],
 			numFaces = header[ 10 ],
 			numMipmaps = header[ 11 ];
-
 		switch ( pixelFormat ) {
 
 			case 0:
@@ -63,25 +61,21 @@
 				bpp = 2;
 				format = THREE.RGB_PVRTC_2BPPV1_Format;
 				break;
-
 			case 1:
 				// PVRTC 2bpp RGBA
 				bpp = 2;
 				format = THREE.RGBA_PVRTC_2BPPV1_Format;
 				break;
-
 			case 2:
 				// PVRTC 4bpp RGB
 				bpp = 4;
 				format = THREE.RGB_PVRTC_4BPPV1_Format;
 				break;
-
 			case 3:
 				// PVRTC 4bpp RGBA
 				bpp = 4;
 				format = THREE.RGBA_PVRTC_4BPPV1_Format;
 				break;
-
 			default:
 				console.error( 'THREE.PVRLoader: Unsupported PVR format:', pixelFormat );
 
@@ -120,9 +114,7 @@
 			PVRTC_4 = 25;
 		const formatFlags = flags & TYPE_MASK;
 		let bpp, format;
-
 		const _hasAlpha = bitmaskAlpha > 0;
-
 		if ( formatFlags === PVRTC_4 ) {
 
 			format = _hasAlpha ? THREE.RGBA_PVRTC_4BPPV1_Format : THREE.RGB_PVRTC_4BPPV1_Format;
@@ -145,9 +137,10 @@
 		pvrDatas.width = width;
 		pvrDatas.height = height;
 		pvrDatas.numSurfaces = numSurfs;
-		pvrDatas.numMipmaps = numMipmaps + 1; // guess cubemap type seems tricky in v2
-		// it juste a pvr containing 6 surface (no explicit cubemap type)
+		pvrDatas.numMipmaps = numMipmaps + 1;
 
+		// guess cubemap type seems tricky in v2
+		// it juste a pvr containing 6 surface (no explicit cubemap type)
 		pvrDatas.isCubemap = numSurfs === 6;
 		return _extract( pvrDatas );
 
@@ -173,7 +166,6 @@
 			heightBlocks = 0;
 		const bpp = pvrDatas.bpp,
 			numSurfs = pvrDatas.numSurfaces;
-
 		if ( bpp === 2 ) {
 
 			blockWidth = 8;
@@ -189,18 +181,17 @@
 		blockSize = blockWidth * blockHeight * bpp / 8;
 		pvr.mipmaps.length = pvrDatas.numMipmaps * numSurfs;
 		let mipLevel = 0;
-
 		while ( mipLevel < pvrDatas.numMipmaps ) {
 
 			const sWidth = pvrDatas.width >> mipLevel,
 				sHeight = pvrDatas.height >> mipLevel;
 			widthBlocks = sWidth / blockWidth;
-			heightBlocks = sHeight / blockHeight; // Clamp to minimum number of blocks
+			heightBlocks = sHeight / blockHeight;
 
+			// Clamp to minimum number of blocks
 			if ( widthBlocks < 2 ) widthBlocks = 2;
 			if ( heightBlocks < 2 ) heightBlocks = 2;
 			dataSize = widthBlocks * heightBlocks * blockSize;
-
 			for ( let surfIndex = 0; surfIndex < numSurfs; surfIndex ++ ) {
 
 				const byteArray = new Uint8Array( buffer, dataOffset, dataSize );