super-three 0.136.0 → 0.141.0

package/examples/js/loaders/RGBMLoader.js

@@ -134,8 +134,7 @@
 			if ( i != 0 ) for ( var j = 0; j < len; j ++ ) prev[ j ] = img[ j ];
 			if ( frm.blend == 0 ) UPNG._copyTile( fdata, fw, fh, img, w, h, fx, fy, 0 ); else if ( frm.blend == 1 ) UPNG._copyTile( fdata, fw, fh, img, w, h, fx, fy, 1 );
 			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 ); else if ( frm.dispose == 2 ) for ( var j = 0; j < len; j ++ ) img[ j ] = prev[ j ];
+			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 ];
 
 		}
 
@@ -391,9 +390,10 @@
 		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 ) {
 
@@ -471,13 +471,11 @@
 
 				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 );
 
 				}
@@ -490,7 +488,7 @@
 				var nz = 0,
 					off = offset;
 				nz = bin.nextZero( data, off );
-				var keyw = bin.readASCII( data, off, nz - off );
+				keyw = bin.readASCII( data, off, nz - off );
 				off = nz + 1;
 				var cflag = data[ off ];
 				off += 2;
@@ -500,12 +498,10 @@
 				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 );
 
 				}
@@ -1087,6 +1083,7 @@
 
 			var y = 0,
 				row = starting_row[ pass ];
+			var val;
 
 			while ( row < h ) {
 
@@ -1097,7 +1094,7 @@
 
 					if ( bpp == 1 ) {
 
-						var val = data[ cdi >> 3 ];
+						val = data[ cdi >> 3 ];
 						val = val >> 7 - ( cdi & 7 ) & 1;
 						img[ row * bpl + ( col >> 3 ) ] |= val << 7 - ( ( col & 7 ) << 0 );
 
@@ -1105,7 +1102,7 @@
 
 					if ( bpp == 2 ) {
 
-						var val = data[ cdi >> 3 ];
+						val = data[ cdi >> 3 ];
 						val = val >> 6 - ( cdi & 7 ) & 3;
 						img[ row * bpl + ( col >> 2 ) ] |= val << 6 - ( ( col & 3 ) << 1 );
 
@@ -1113,7 +1110,7 @@
 
 					if ( bpp == 4 ) {
 
-						var val = data[ cdi >> 3 ];
+						val = data[ cdi >> 3 ];
 						val = val >> 4 - ( cdi & 7 ) & 15;
 						img[ row * bpl + ( col >> 1 ) ] |= val << 4 - ( ( col & 1 ) << 2 );
 

package/examples/js/loaders/STLLoader.js

@@ -134,7 +134,7 @@
 				// Check if each byte in query matches the corresponding byte from the current offset
 				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/js/loaders/SVGLoader.js

@@ -53,7 +53,7 @@
 
 				if ( node.nodeType !== 1 ) return;
 				const transform = getNodeTransform( node );
-				let traverseChildNodes = true;
+				let isDefsNode = false;
 				let path = null;
 
 				switch ( node.nodeName ) {
@@ -105,12 +105,13 @@
 						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 ) {
@@ -146,16 +147,23 @@
 
 				}
 
-				if ( traverseChildNodes ) {
+				const childNodes = node.childNodes;
 
-					const nodes = node.childNodes;
+				for ( let i = 0; i < childNodes.length; i ++ ) {
 
-					for ( let i = 0; i < nodes.length; i ++ ) {
+					const node = childNodes[ i ];
 
-						parseNode( nodes[ i ], style );
+					if ( isDefsNode && node.nodeName !== 'style' && node.nodeName !== 'defs' ) {
+
+						// 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 ) {
@@ -192,7 +200,7 @@
 
 					const command = commands[ i ];
 					const type = command.charAt( 0 );
-					const data = command.substr( 1 ).trim();
+					const data = command.slice( 1 ).trim();
 
 					if ( isFirstPoint === true ) {
 
@@ -560,7 +568,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 );
 
 					}
 
@@ -1258,8 +1268,8 @@
 
 						if ( openParPos > 0 && openParPos < closeParPos ) {
 
-							const transformType = transformText.substr( 0, openParPos );
-							const array = parseFloats( transformText.substr( openParPos + 1, closeParPos - openParPos - 1 ) );
+							const transformType = transformText.slice( 0, openParPos );
+							const array = parseFloats( transformText.slice( openParPos + 1 ) );
 							currentTransform.identity();
 
 							switch ( transformType ) {

package/examples/js/loaders/VOXLoader.js

@@ -59,13 +59,12 @@
 
 				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
 
 				if ( id === 'SIZE' ) {
@@ -211,7 +210,7 @@
 
 	}
 
-	class VOXDataTexture3D extends THREE.DataTexture3D {
+	class VOXData3DTexture extends THREE.Data3DTexture {
 
 		constructor( chunk ) {
 
@@ -242,7 +241,7 @@
 
 	}
 
-	THREE.VOXDataTexture3D = VOXDataTexture3D;
+	THREE.VOXData3DTexture = VOXData3DTexture;
 	THREE.VOXLoader = VOXLoader;
 	THREE.VOXMesh = VOXMesh;
 

package/examples/js/loaders/VRMLLoader.js

@@ -1166,6 +1166,7 @@
 						color.r = value;
 						color.g = value;
 						color.b = value;
+						color.a = 1;
 						break;
 
 					case TEXTURE_TYPE.INTENSITY_ALPHA:
@@ -1182,6 +1183,7 @@
 						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:
@@ -1247,10 +1249,8 @@
 							const width = fieldValues[ 0 ];
 							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,
@@ -1261,27 +1261,15 @@
 							for ( let j = 3, k = 0, jl = fieldValues.length; j < jl; j ++, k ++ ) {
 
 								parseHexColor( fieldValues[ j ], textureType, color );
-
-								if ( useAlpha === true ) {
-
-									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;
-
-								}
+								const stride = k * 4;
+								data[ stride + 0 ] = color.r;
+								data[ stride + 1 ] = color.g;
+								data[ stride + 2 ] = color.b;
+								data[ stride + 3 ] = color.a;
 
 							}
 
-							texture = new THREE.DataTexture( data, width, height, useAlpha === true ? THREE.RGBAFormat : THREE.RGBFormat );
+							texture = new THREE.DataTexture( data, width, height );
 							texture.needsUpdate = true;
 							texture.__type = textureType; // needed for material modifications