super-three 0.133.4 → 0.136.1

package/examples/js/loaders/MMDLoader.js

@@ -287,7 +287,6 @@
 	/*
 	 * base64 encoded defalut toon textures toon00.bmp - toon10.bmp.
 	 * We don't need to request external toon image files.
-	 * This idea is from http://www20.atpages.jp/katwat/three.js_r58/examples/mytest37/mmd.three.js
 	 */
 
 

package/examples/js/loaders/NRRDLoader.js

@@ -207,7 +207,10 @@
 				if ( ! headerObject.vectors ) {
 
 					//if no space direction is set, let's use the identity
-					headerObject.vectors = [ new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ), new THREE.Vector3( 0, 0, 1 ) ]; //apply spacing if defined
+					headerObject.vectors = [];
+					headerObject.vectors.push( [ 1, 0, 0 ] );
+					headerObject.vectors.push( [ 0, 1, 0 ] );
+					headerObject.vectors.push( [ 0, 0, 1 ] ); //apply spacing if defined
 
 					if ( headerObject.spacings ) {
 
@@ -215,7 +218,11 @@
 
 							if ( ! isNaN( headerObject.spacings[ i ] ) ) {
 
-								headerObject.vectors[ i ].multiplyScalar( headerObject.spacings[ i ] );
+								for ( let j = 0; j <= 2; j ++ ) {
+
+									headerObject.vectors[ i ][ j ] *= headerObject.spacings[ i ];
+
+								}
 
 							}
 

package/examples/js/loaders/OBJLoader.js

@@ -583,8 +583,6 @@
 
 					/*
         	 * http://paulbourke.net/dataformats/obj/
-        	 * or
-        	 * http://www.cs.utah.edu/~boulos/cs3505/obj_spec.pdf
         	 *
         	 * From chapter "Grouping" Syntax explanation "s group_number":
         	 * "group_number is the smoothing group number. To turn off smoothing groups, use a value of 0 or off.

package/examples/js/loaders/PLYLoader.js

@@ -79,7 +79,7 @@
 
 			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 );
@@ -343,25 +343,50 @@
 
 			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/js/loaders/RGBELoader.js

@@ -220,7 +220,8 @@
 					const scanline_width = w;
 
 					if ( // run length encoding is not allowed so read flat
-						scanline_width < 8 || scanline_width > 0x7fff || 2 !== buffer[ 0 ] || 2 !== buffer[ 1 ] || buffer[ 2 ] & 0x80 ) {
+						scanline_width < 8 || scanline_width > 0x7fff || // this file is not run length encoded
+      2 !== buffer[ 0 ] || 2 !== buffer[ 1 ] || buffer[ 2 ] & 0x80 ) {
 
 						// return the flat buffer
 						return new Uint8Array( buffer );
@@ -342,6 +343,7 @@
 				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;
 
 			};
 
@@ -353,6 +355,7 @@
 				destArray[ destOffset + 0 ] = THREE.DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 0 ] * scale, 65504 ) );
 				destArray[ destOffset + 1 ] = THREE.DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 1 ] * scale, 65504 ) );
 				destArray[ destOffset + 2 ] = THREE.DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 2 ] * scale, 65504 ) );
+				destArray[ destOffset + 3 ] = THREE.DataUtils.toHalfFloat( 1 );
 
 			};
 
@@ -373,40 +376,31 @@
 
 					switch ( this.type ) {
 
-						case THREE.UnsignedByteType:
-							data = image_rgba_data;
-							format = THREE.RGBEFormat; // handled as THREE.RGBAFormat in shaders
-
-							type = THREE.UnsignedByteType;
-							break;
-
 						case THREE.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 = THREE.RGBFormat;
 							type = THREE.FloatType;
 							break;
 
 						case THREE.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 = THREE.RGBFormat;
 							type = THREE.HalfFloatType;
 							break;
 
@@ -448,14 +442,6 @@
 
 				switch ( texture.type ) {
 
-					case THREE.UnsignedByteType:
-						texture.encoding = THREE.RGBEEncoding;
-						texture.minFilter = THREE.NearestFilter;
-						texture.magFilter = THREE.NearestFilter;
-						texture.generateMipmaps = false;
-						texture.flipY = true;
-						break;
-
 					case THREE.FloatType:
 						texture.encoding = THREE.LinearEncoding;
 						texture.minFilter = THREE.LinearFilter;

package/examples/js/loaders/RGBMLoader.js

@@ -2,6 +2,28 @@
 
 	class RGBMLoader extends THREE.DataTextureLoader {
 
+		constructor( manager ) {
+
+			super( manager );
+			this.type = THREE.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 THREE.CubeTexture();
@@ -32,7 +54,7 @@
 
 			}
 
-			texture.encoding = THREE.RGBM7Encoding;
+			texture.type = this.type;
 			texture.format = THREE.RGBAFormat;
 			texture.minFilter = THREE.LinearFilter;
 			texture.generateMipmaps = false;
@@ -44,14 +66,42 @@
 
 			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 === THREE.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 === THREE.HalfFloatType ) {
+
+					output[ i + 0 ] = THREE.DataUtils.toHalfFloat( Math.min( r * a * this.maxRange, 65504 ) );
+					output[ i + 1 ] = THREE.DataUtils.toHalfFloat( Math.min( g * a * this.maxRange, 65504 ) );
+					output[ i + 2 ] = THREE.DataUtils.toHalfFloat( Math.min( b * a * this.maxRange, 65504 ) );
+					output[ i + 3 ] = THREE.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: THREE.RGBAFormat,
-				type: THREE.UnsignedByteType,
-				flipY: true,
-				encoding: THREE.RGBM7Encoding
+				type: this.type,
+				flipY: true
 			};
 
 		}
@@ -343,7 +393,7 @@
 
 		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/js/loaders/SVGLoader.js

@@ -225,7 +225,7 @@
 
 								}
 
-								if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
+								if ( j === 0 ) firstPoint.copy( point );
 
 							}
 
@@ -382,7 +382,7 @@
 
 								}
 
-								if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
+								if ( j === 0 ) firstPoint.copy( point );
 
 							}
 
@@ -560,7 +560,9 @@
 
 					for ( let j = 0; j < selectorList.length; j ++ ) {
 
-						stylesheets[ selectorList[ j ] ] = Object.assign( stylesheets[ selectorList[ j ] ] || {}, stylesheet.style );
+						// Remove empty rules
+						const definitions = Object.fromEntries( Object.entries( stylesheet.style ).filter( ( [ _, v ] ) => v !== '' ) );
+						stylesheets[ selectorList[ j ] ] = Object.assign( stylesheets[ selectorList[ j ] ] || {}, definitions );
 
 					}
 
@@ -1887,6 +1889,7 @@
 				}
 
 				return {
+					curves: p.curves,
 					points: points,
 					isCW: THREE.ShapeUtils.isClockWise( points ),
 					identifier: identifier ++,
@@ -1904,12 +1907,15 @@
 
 				if ( ! amIAHole.isHole ) {
 
-					const shape = new THREE.Shape( p.points );
+					const shape = new THREE.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 THREE.Path( path.points ) );
+						const hole = simplePaths[ h.identifier ];
+						const path = new THREE.Path();
+						path.curves = hole.curves;
+						shape.holes.push( path );
 
 					} );
 					shapesToReturn.push( shape );