super-three 0.133.4 → 0.136.1

package/examples/jsm/loaders/PLYLoader.js

@@ -88,7 +88,7 @@ class PLYLoader extends Loader {
 
 		function parseHeader( data ) {
 
-			const patternHeader = /ply([\s\S]*)end_header\r?\n/;
+			const patternHeader = /^ply([\s\S]*)end_header\r?\n/;
 			let headerText = '';
 			let headerLength = 0;
 			const result = patternHeader.exec( data );
@@ -363,25 +363,51 @@ class PLYLoader extends Loader {
 
 		function handleElement( buffer, elementName, element ) {
 
+			function findAttrName( names ) {
+
+				for ( let i = 0, l = names.length; i < l; i ++ ) {
+
+					const name = names[ i ];
+
+					if ( name in element ) return name;
+
+				}
+
+				return null;
+
+			}
+
+			const attrX = findAttrName( [ 'x', 'px', 'posx' ] ) || 'x';
+			const attrY = findAttrName( [ 'y', 'py', 'posy' ] ) || 'y';
+			const attrZ = findAttrName( [ 'z', 'pz', 'posz' ] ) || 'z';
+			const attrNX = findAttrName( [ 'nx', 'normalx' ] );
+			const attrNY = findAttrName( [ 'ny', 'normaly' ] );
+			const attrNZ = findAttrName( [ 'nz', 'normalz' ] );
+			const attrS = findAttrName( [ 's', 'u', 'texture_u', 'tx' ] );
+			const attrT = findAttrName( [ 't', 'v', 'texture_v', 'ty' ] );
+			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.x, element.y, element.z );
+				buffer.vertices.push( element[ attrX ], element[ attrY ], element[ attrZ ] );
 
-				if ( 'nx' in element && 'ny' in element && 'nz' in element ) {
+				if ( attrNX !== null && attrNY !== null && attrNZ !== null ) {
 
-					buffer.normals.push( element.nx, element.ny, element.nz );
+					buffer.normals.push( element[ attrNX ], element[ attrNY ], element[ attrNZ ] );
 
 				}
 
-				if ( 's' in element && 't' in element ) {
+				if ( attrS !== null && attrT !== null ) {
 
-					buffer.uvs.push( element.s, element.t );
+					buffer.uvs.push( element[ attrS ], element[ attrT ] );
 
 				}
 
-				if ( 'red' in element && 'green' in element && 'blue' in element ) {
+				if ( attrR !== null && attrG !== null && attrB !== null ) {
 
-					buffer.colors.push( element.red / 255.0, element.green / 255.0, element.blue / 255.0 );
+					buffer.colors.push( element[ attrR ] / 255.0, element[ attrG ] / 255.0, element[ attrB ] / 255.0 );
 
 				}
 

package/examples/jsm/loaders/RGBELoader.js

@@ -4,12 +4,7 @@ import {
 	FloatType,
 	HalfFloatType,
 	LinearEncoding,
-	LinearFilter,
-	NearestFilter,
-	RGBEEncoding,
-	RGBEFormat,
-	RGBFormat,
-	UnsignedByteType
+	LinearFilter
 } from 'three';
 
 // https://github.com/mrdoob/three.js/issues/5552
@@ -346,6 +341,7 @@ class RGBELoader extends DataTextureLoader {
 			destArray[ destOffset + 0 ] = sourceArray[ sourceOffset + 0 ] * scale;
 			destArray[ destOffset + 1 ] = sourceArray[ sourceOffset + 1 ] * scale;
 			destArray[ destOffset + 2 ] = sourceArray[ sourceOffset + 2 ] * scale;
+			destArray[ destOffset + 3 ] = 1;
 
 		};
 
@@ -358,6 +354,7 @@ class RGBELoader extends DataTextureLoader {
 			destArray[ destOffset + 0 ] = DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 0 ] * scale, 65504 ) );
 			destArray[ destOffset + 1 ] = DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 1 ] * scale, 65504 ) );
 			destArray[ destOffset + 2 ] = DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 2 ] * scale, 65504 ) );
+			destArray[ destOffset + 3 ] = DataUtils.toHalfFloat( 1 );
 
 		};
 
@@ -378,42 +375,33 @@ class RGBELoader extends DataTextureLoader {
 
 				switch ( this.type ) {
 
-					case UnsignedByteType:
-
-						data = image_rgba_data;
-						format = RGBEFormat; // handled as THREE.RGBAFormat in shaders
-						type = UnsignedByteType;
-						break;
-
 					case FloatType:
 
 						numElements = image_rgba_data.length / 4;
-						const floatArray = new Float32Array( numElements * 3 );
+						const floatArray = new Float32Array( numElements * 4 );
 
 						for ( let j = 0; j < numElements; j ++ ) {
 
-							RGBEByteToRGBFloat( image_rgba_data, j * 4, floatArray, j * 3 );
+							RGBEByteToRGBFloat( image_rgba_data, j * 4, floatArray, j * 4 );
 
 						}
 
 						data = floatArray;
-						format = RGBFormat;
 						type = FloatType;
 						break;
 
 					case HalfFloatType:
 
 						numElements = image_rgba_data.length / 4;
-						const halfArray = new Uint16Array( numElements * 3 );
+						const halfArray = new Uint16Array( numElements * 4 );
 
 						for ( let j = 0; j < numElements; j ++ ) {
 
-							RGBEByteToRGBHalf( image_rgba_data, j * 4, halfArray, j * 3 );
+							RGBEByteToRGBHalf( image_rgba_data, j * 4, halfArray, j * 4 );
 
 						}
 
 						data = halfArray;
-						format = RGBFormat;
 						type = HalfFloatType;
 						break;
 
@@ -455,15 +443,6 @@ class RGBELoader extends DataTextureLoader {
 
 			switch ( texture.type ) {
 
-				case UnsignedByteType:
-
-					texture.encoding = RGBEEncoding;
-					texture.minFilter = NearestFilter;
-					texture.magFilter = NearestFilter;
-					texture.generateMipmaps = false;
-					texture.flipY = true;
-					break;
-
 				case FloatType:
 
 					texture.encoding = LinearEncoding;

package/examples/jsm/loaders/RGBMLoader.js

@@ -1,14 +1,37 @@
 import {
 	DataTextureLoader,
-	UnsignedByteType,
 	RGBAFormat,
 	LinearFilter,
 	CubeTexture,
-	RGBM7Encoding
+	HalfFloatType,
+	DataUtils
 } from 'three';
 
 class RGBMLoader extends DataTextureLoader {
 
+	constructor( manager ) {
+
+		super( manager );
+
+		this.type = HalfFloatType;
+		this.maxRange = 7; // more information about this property at https://iwasbeingirony.blogspot.com/2010/06/difference-between-rgbm-and-rgbd.html
+
+	}
+
+	setDataType( value ) {
+
+		this.type = value;
+		return this;
+
+	}
+
+	setMaxRange( value ) {
+
+		this.maxRange = value;
+		return this;
+
+	}
+
 	loadCubemap( urls, onLoad, onProgress, onError ) {
 
 		const texture = new CubeTexture();
@@ -43,7 +66,7 @@ class RGBMLoader extends DataTextureLoader {
 
 		}
 
-		texture.encoding = RGBM7Encoding;
+		texture.type = this.type;
 		texture.format = RGBAFormat;
 		texture.minFilter = LinearFilter;
 		texture.generateMipmaps = false;
@@ -57,14 +80,45 @@ class RGBMLoader extends DataTextureLoader {
 		const img = UPNG.decode( buffer );
 		const rgba = UPNG.toRGBA8( img )[ 0 ];
 
+		const data = new Uint8Array( rgba );
+		const size = img.width * img.height * 4;
+
+		const output = ( this.type === HalfFloatType ) ? new Uint16Array( size ) : new Float32Array( size );
+
+		// decode RGBM
+
+		for ( let i = 0; i < data.length; i += 4 ) {
+
+			const r = data[ i + 0 ] / 255;
+			const g = data[ i + 1 ] / 255;
+			const b = data[ i + 2 ] / 255;
+			const a = data[ i + 3 ] / 255;
+
+			if ( this.type === HalfFloatType ) {
+
+				output[ i + 0 ] = DataUtils.toHalfFloat( Math.min( r * a * this.maxRange, 65504 ) );
+				output[ i + 1 ] = DataUtils.toHalfFloat( Math.min( g * a * this.maxRange, 65504 ) );
+				output[ i + 2 ] = DataUtils.toHalfFloat( Math.min( b * a * this.maxRange, 65504 ) );
+				output[ i + 3 ] = DataUtils.toHalfFloat( 1 );
+
+			} else {
+
+				output[ i + 0 ] = r * a * this.maxRange;
+				output[ i + 1 ] = g * a * this.maxRange;
+				output[ i + 2 ] = b * a * this.maxRange;
+				output[ i + 3 ] = 1;
+
+			}
+
+		}
+
 		return {
 			width: img.width,
 			height: img.height,
-			data: new Uint8Array( rgba ),
+			data: output,
 			format: RGBAFormat,
-			type: UnsignedByteType,
-			flipY: true,
-			encoding: RGBM7Encoding
+			type: this.type,
+			flipY: true
 		};
 
 	}
@@ -274,7 +328,7 @@ UPNG.decode = function ( buff ) {
 	var fd, foff = 0;	// frames
 
 	var mgck = [ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a ];
-	for ( var i = 0; i < 8; i ++ ) if ( data[ i ] != mgck[ i ] ) throw 'The input is not a PNG file!';
+	for ( var i = 0; i < 8; i ++ ) if ( data[ i ] != mgck[ i ] ) throw new Error( 'The input is not a PNG file!' );
 
 	while ( offset < data.length ) {
 

package/examples/jsm/loaders/SVGLoader.js

@@ -248,7 +248,7 @@ class SVGLoader extends Loader {
 
 							}
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
+							if ( j === 0 ) firstPoint.copy( point );
 
 						}
 
@@ -440,7 +440,7 @@ class SVGLoader extends Loader {
 
 							}
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
+							if ( j === 0 ) firstPoint.copy( point );
 
 						}
 
@@ -659,9 +659,14 @@ class SVGLoader extends Loader {
 
 				for ( let j = 0; j < selectorList.length; j ++ ) {
 
+					// Remove empty rules
+					const definitions = Object.fromEntries(
+						Object.entries( stylesheet.style ).filter( ( [ , v ] ) => v !== '' )
+					);
+
 					stylesheets[ selectorList[ j ] ] = Object.assign(
 						stylesheets[ selectorList[ j ] ] || {},
-						stylesheet.style
+						definitions
 					);
 
 				}
@@ -2084,7 +2089,7 @@ class SVGLoader extends Loader {
 
 			}
 
-			return { points: points, isCW: ShapeUtils.isClockWise( points ), identifier: identifier ++, boundingBox: new Box2( new Vector2( minX, minY ), new Vector2( maxX, maxY ) ) };
+			return { curves: p.curves, points: points, isCW: ShapeUtils.isClockWise( points ), identifier: identifier ++, boundingBox: new Box2( new Vector2( minX, minY ), new Vector2( maxX, maxY ) ) };
 
 		} );
 
@@ -2101,12 +2106,15 @@ class SVGLoader extends Loader {
 
 			if ( ! amIAHole.isHole ) {
 
-				const shape = new Shape( p.points );
+				const shape = new Shape();
+				shape.curves = p.curves;
 				const holes = isAHole.filter( h => h.isHole && h.for === p.identifier );
 				holes.forEach( h => {
 
-					const path = simplePaths[ h.identifier ];
-					shape.holes.push( new Path( path.points ) );
+					const hole = simplePaths[ h.identifier ];
+					const path = new Path();
+					path.curves = hole.curves;
+					shape.holes.push( path );
 
 				} );
 				shapesToReturn.push( shape );