super-three 0.136.0 → 0.141.0

package/examples/jsm/loaders/RGBMLoader.js

@@ -151,7 +151,7 @@ UPNG.toRGBA8 = function ( out ) {
 
 		frms.push( img.buffer.slice( 0 ) );
 
-		if ( frm.dispose == 0 ) {} else if ( frm.dispose == 1 ) UPNG._copyTile( empty, fw, fh, img, w, h, fx, fy, 0 );
+		if ( frm.dispose == 1 ) UPNG._copyTile( empty, fw, fh, img, w, h, fx, fy, 0 );
 		else if ( frm.dispose == 2 ) for ( var j = 0; j < len; j ++ ) img[ j ] = prev[ j ];
 
 	}
@@ -285,7 +285,7 @@ UPNG.toRGBA8.decodeImage = function ( data, w, h, out ) {
 			var off = y * bpl, to = y * w;
 			if ( depth == 1 ) for ( var x = 0; x < w; x ++ ) {
 
-				var gr = 255 * ( ( data[ off + ( x >>> 3 ) ] >>> ( 7 - ( ( x & 7 ) ) ) ) & 1 ), al = ( gr == tr * 255 ) ? 0 : 255; bf32[ to + x ] = ( al << 24 ) | ( gr << 16 ) | ( gr << 8 ) | gr;
+				var gr = 255 * ( ( data[ off + ( x >>> 3 ) ] >>> ( 7 - ( x & 7 ) ) ) & 1 ), al = ( gr == tr * 255 ) ? 0 : 255; bf32[ to + x ] = ( al << 24 ) | ( gr << 16 ) | ( gr << 8 ) | gr;
 
 			}
 			else if ( depth == 2 ) for ( var x = 0; x < w; x ++ ) {
@@ -326,9 +326,10 @@ UPNG.decode = function ( buff ) {
 	var out = { tabs: {}, frames: [] };
 	var dd = new Uint8Array( data.length ), doff = 0;	 // put all IDAT data into it
 	var fd, foff = 0;	// frames
+	var text, keyw, bfr;
 
 	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 ) {
 
@@ -387,12 +388,12 @@ UPNG.decode = function ( buff ) {
 
 			if ( out.tabs[ type ] == null ) out.tabs[ type ] = {};
 			var nz = bin.nextZero( data, offset );
-			var keyw = bin.readASCII( data, offset, nz - offset );
-			var text, tl = offset + len - nz - 1;
+			keyw = bin.readASCII( data, offset, nz - offset );
+			var tl = offset + len - nz - 1;
 			if ( type == 'tEXt' ) text = bin.readASCII( data, nz + 1, tl );
 			else {
 
-				var bfr = UPNG.decode._inflate( data.slice( nz + 2, nz + 2 + tl ) );
+				bfr = UPNG.decode._inflate( data.slice( nz + 2, nz + 2 + tl ) );
 				text = bin.readUTF8( bfr, 0, bfr.length );
 
 			}
@@ -404,17 +405,17 @@ UPNG.decode = function ( buff ) {
 			if ( out.tabs[ type ] == null ) out.tabs[ type ] = {};
 			var nz = 0, off = offset;
 			nz = bin.nextZero( data, off );
-			var keyw = bin.readASCII( data, off, nz - off ); off = nz + 1;
+			keyw = bin.readASCII( data, off, nz - off ); off = nz + 1;
 			var cflag = data[ off ]; off += 2;
 			nz = bin.nextZero( data, off );
 			bin.readASCII( data, off, nz - off ); off = nz + 1;
 			nz = bin.nextZero( data, off );
 			bin.readUTF8( data, off, nz - off ); off = nz + 1;
-			var text, tl = len - ( off - offset );
+			var tl = len - ( off - offset );
 			if ( cflag == 0 ) text = bin.readUTF8( data, off, tl );
 			else {
 
-				var bfr = UPNG.decode._inflate( data.slice( off, off + tl ) );
+				bfr = UPNG.decode._inflate( data.slice( off, off + tl ) );
 				text = bin.readUTF8( bfr, 0, bfr.length );
 
 			}
@@ -809,6 +810,8 @@ UPNG.decode._readInterlace = function ( data, out ) {
 		UPNG.decode._filterZero( data, out, di, sw, sh );
 
 		var y = 0, row = starting_row[ pass ];
+		var val;
+
 		while ( row < h ) {
 
 			var col = starting_col[ pass ];
@@ -818,21 +821,21 @@ UPNG.decode._readInterlace = function ( data, out ) {
 
 				if ( bpp == 1 ) {
 
-					var val = data[ cdi >> 3 ]; val = ( val >> ( 7 - ( cdi & 7 ) ) ) & 1;
+					val = data[ cdi >> 3 ]; val = ( val >> ( 7 - ( cdi & 7 ) ) ) & 1;
 					img[ row * bpl + ( col >> 3 ) ] |= ( val << ( 7 - ( ( col & 7 ) << 0 ) ) );
 
 				}
 
 				if ( bpp == 2 ) {
 
-					var val = data[ cdi >> 3 ]; val = ( val >> ( 6 - ( cdi & 7 ) ) ) & 3;
+					val = data[ cdi >> 3 ]; val = ( val >> ( 6 - ( cdi & 7 ) ) ) & 3;
 					img[ row * bpl + ( col >> 2 ) ] |= ( val << ( 6 - ( ( col & 3 ) << 1 ) ) );
 
 				}
 
 				if ( bpp == 4 ) {
 
-					var val = data[ cdi >> 3 ]; val = ( val >> ( 4 - ( cdi & 7 ) ) ) & 15;
+					val = data[ cdi >> 3 ]; val = ( val >> ( 4 - ( cdi & 7 ) ) ) & 15;
 					img[ row * bpl + ( col >> 1 ) ] |= ( val << ( 4 - ( ( col & 1 ) << 2 ) ) );
 
 				}

package/examples/jsm/loaders/STLLoader.js

@@ -151,7 +151,7 @@ class STLLoader extends Loader {
 
 			for ( let i = 0, il = query.length; i < il; i ++ ) {
 
-				if ( query[ i ] !== reader.getUint8( offset + i, false ) ) return false;
+				if ( query[ i ] !== reader.getUint8( offset + i ) ) return false;
 
 			}
 

package/examples/jsm/loaders/SVGLoader.js

@@ -71,7 +71,7 @@ class SVGLoader extends Loader {
 
 			const transform = getNodeTransform( node );
 
-			let traverseChildNodes = true;
+			let isDefsNode = false;
 
 			let path = null;
 
@@ -124,12 +124,14 @@ class SVGLoader extends Loader {
 					break;
 
 				case 'defs':
-					traverseChildNodes = false;
+					isDefsNode = true;
 					break;
 
 				case 'use':
 					style = parseStyle( node, style );
-					const usedNodeId = node.href.baseVal.substring( 1 );
+
+					const href = node.getAttributeNS( 'http://www.w3.org/1999/xlink', 'href' ) || '';
+					const usedNodeId = href.substring( 1 );
 					const usedNode = node.viewportElement.getElementById( usedNodeId );
 					if ( usedNode ) {
 
@@ -164,18 +166,26 @@ class SVGLoader extends Loader {
 
 			}
 
-			if ( traverseChildNodes ) {
+			const childNodes = node.childNodes;
+
+			for ( let i = 0; i < childNodes.length; i ++ ) {
 
-				const nodes = node.childNodes;
+				const node = childNodes[ i ];
 
-				for ( let i = 0; i < nodes.length; i ++ ) {
+				if ( isDefsNode && node.nodeName !== 'style' && node.nodeName !== 'defs' ) {
 
-					parseNode( nodes[ i ], style );
+					// Ignore everything in defs except CSS style definitions
+					// and nested defs, because it is OK by the standard to have
+					// <style/> there.
+					continue;
 
 				}
 
+				parseNode( node, style );
+
 			}
 
+
 			if ( transform ) {
 
 				transformStack.pop();
@@ -216,7 +226,7 @@ class SVGLoader extends Loader {
 				const command = commands[ i ];
 
 				const type = command.charAt( 0 );
-				const data = command.substr( 1 ).trim();
+				const data = command.slice( 1 ).trim();
 
 				if ( isFirstPoint === true ) {
 
@@ -659,9 +669,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
 					);
 
 				}
@@ -1430,9 +1445,9 @@ class SVGLoader extends Loader {
 
 					if ( openParPos > 0 && openParPos < closeParPos ) {
 
-						const transformType = transformText.substr( 0, openParPos );
+						const transformType = transformText.slice( 0, openParPos );
 
-						const array = parseFloats( transformText.substr( openParPos + 1, closeParPos - openParPos - 1 ) );
+						const array = parseFloats( transformText.slice( openParPos + 1 ) );
 
 						currentTransform.identity();
 

package/examples/jsm/loaders/TTFLoader.js

@@ -2,7 +2,7 @@ import {
 	FileLoader,
 	Loader
 } from 'three';
-import { opentype } from '../libs/opentype.module.min.js';
+import opentype from '../libs/opentype.module.js';
 
 /**
  * Requires opentype.js to be included in the project.

package/examples/jsm/loaders/VOXLoader.js

@@ -1,6 +1,6 @@
 import {
 	BufferGeometry,
-	DataTexture3D,
+	Data3DTexture,
 	FileLoader,
 	Float32BufferAttribute,
 	Loader,
@@ -107,12 +107,12 @@ class VOXLoader extends Loader {
 
 			for ( let j = 0; j < 4; j ++ ) {
 
-				id += String.fromCharCode( data.getUint8( i ++, true ) );
+				id += String.fromCharCode( data.getUint8( i ++ ) );
 
 			}
 
 			const chunkSize = data.getUint32( i, true ); i += 4;
-			data.getUint32( i, true ); i += 4; // childChunks
+			i += 4; // childChunks
 
 			if ( id === 'SIZE' ) {
 
@@ -266,7 +266,7 @@ class VOXMesh extends Mesh {
 
 }
 
-class VOXDataTexture3D extends DataTexture3D {
+class VOXData3DTexture extends Data3DTexture {
 
 	constructor( chunk ) {
 
@@ -302,4 +302,4 @@ class VOXDataTexture3D extends DataTexture3D {
 
 }
 
-export { VOXLoader, VOXMesh, VOXDataTexture3D };
+export { VOXLoader, VOXMesh, VOXData3DTexture };

package/examples/jsm/loaders/VRMLLoader.js

@@ -24,8 +24,6 @@ import {
 	Points,
 	PointsMaterial,
 	Quaternion,
-	RGBAFormat,
-	RGBFormat,
 	RepeatWrapping,
 	Scene,
 	ShapeUtils,
@@ -1265,6 +1263,7 @@ class VRMLLoader extends Loader {
 					color.r = value;
 					color.g = value;
 					color.b = value;
+					color.a = 1;
 					break;
 
 				case TEXTURE_TYPE.INTENSITY_ALPHA:
@@ -1281,6 +1280,7 @@ class VRMLLoader extends Loader {
 					color.r = parseInt( '0x' + hex.substring( 2, 4 ) );
 					color.g = parseInt( '0x' + hex.substring( 4, 6 ) );
 					color.b = parseInt( '0x' + hex.substring( 6, 8 ) );
+					color.a = 1;
 					break;
 
 				case TEXTURE_TYPE.RGBA:
@@ -1348,11 +1348,9 @@ class VRMLLoader extends Loader {
 						const height = fieldValues[ 1 ];
 						const num_components = fieldValues[ 2 ];
 
-						const useAlpha = ( num_components === 2 || num_components === 4 );
 						const textureType = getTextureType( num_components );
 
-						const size = ( ( useAlpha === true ) ? 4 : 3 ) * ( width * height );
-						const data = new Uint8Array( size );
+						const data = new Uint8Array( 4 * width * height );
 
 						const color = { r: 0, g: 0, b: 0, a: 0 };
 
@@ -1360,28 +1358,16 @@ class VRMLLoader extends Loader {
 
 							parseHexColor( fieldValues[ j ], textureType, color );
 
-							if ( useAlpha === true ) {
+							const stride = k * 4;
 
-								const stride = k * 4;
-
-								data[ stride + 0 ] = color.r;
-								data[ stride + 1 ] = color.g;
-								data[ stride + 2 ] = color.b;
-								data[ stride + 3 ] = color.a;
-
-							} else {
-
-								const stride = k * 3;
-
-								data[ stride + 0 ] = color.r;
-								data[ stride + 1 ] = color.g;
-								data[ stride + 2 ] = color.b;
-
-							}
+							data[ stride + 0 ] = color.r;
+							data[ stride + 1 ] = color.g;
+							data[ stride + 2 ] = color.b;
+							data[ stride + 3 ] = color.a;
 
 						}
 
-						texture = new DataTexture( data, width, height, ( useAlpha === true ) ? RGBAFormat : RGBFormat );
+						texture = new DataTexture( data, width, height );
 						texture.needsUpdate = true;
 						texture.__type = textureType; // needed for material modifications
 						break;