super-three 0.137.0 → 0.141.0

package/examples/js/loaders/LUT3dlLoader.js

@@ -110,7 +110,7 @@
 			texture.wrapT = THREE.ClampToEdgeWrapping;
 			texture.generateMipmaps = false;
 			texture.needsUpdate = true;
-			const texture3D = new THREE.DataTexture3D();
+			const texture3D = new THREE.Data3DTexture();
 			texture3D.image.data = data;
 			texture3D.image.width = size;
 			texture3D.image.height = size;

package/examples/js/loaders/LUTCubeLoader.js

@@ -109,7 +109,7 @@
 			texture.wrapT = THREE.ClampToEdgeWrapping;
 			texture.generateMipmaps = false;
 			texture.needsUpdate = true;
-			const texture3D = new THREE.DataTexture3D();
+			const texture3D = new THREE.Data3DTexture();
 			texture3D.image.data = data;
 			texture3D.image.width = size;
 			texture3D.image.height = size;

package/examples/js/loaders/LWOLoader.js

@@ -277,6 +277,8 @@
 			params = Object.assign( maps, params );
 			params = Object.assign( params, attributes );
 			const materialType = this.getMaterialType( connections.attributes );
+			if ( materialType !== THREE.MeshPhongMaterial ) delete params.refractionRatio; // PBR materials do not support "refractionRatio"
+
 			return new materialType( params );
 
 		}
@@ -525,7 +527,6 @@
 			}
 
 			if ( attributes[ 'Bump Height' ] ) params.bumpScale = attributes[ 'Bump Height' ].value * 0.1;
-			if ( attributes[ 'Refraction Index' ] ) params.refractionRatio = 0.98 / attributes[ 'Refraction Index' ].value;
 			this.parsePhysicalAttributes( params, attributes, maps );
 			this.parseStandardAttributes( params, attributes, maps );
 			this.parsePhongAttributes( params, attributes, maps );
@@ -576,6 +577,7 @@
 
 		parsePhongAttributes( params, attributes, maps ) {
 
+			if ( attributes[ 'Refraction Index' ] ) params.refractionRatio = 0.98 / attributes[ 'Refraction Index' ].value;
 			if ( attributes.Diffuse ) params.color.multiplyScalar( attributes.Diffuse.value );
 
 			if ( attributes.Reflection ) {
@@ -955,7 +957,7 @@
 
 		const index = url.indexOf( dir );
 		if ( index === - 1 ) return './';
-		return url.substr( 0, index );
+		return url.slice( 0, index );
 
 	}
 

package/examples/js/loaders/LogLuvLoader.js

@@ -54,7 +54,6 @@
 		bin.readUshort( data, offset );
 		offset += 2;
 		var ifdo = bin.readUint( data, offset );
-		offset += 4;
 		var ifds = [];
 
 		while ( true ) {
@@ -430,7 +429,7 @@
 			if ( prm.debug ) console.log( '   '.repeat( depth ), tag, type, UTIF.tags[ tag ], arr );
 			ifd[ 't' + tag ] = arr;
 
-			if ( tag == 330 && ifd[ 't272' ] && ifd[ 't272' ][ 0 ] == 'DSLR-A100' ) {} else if ( tag == 330 || tag == 34665 || tag == 34853 || tag == 50740 && bin.readUshort( data, bin.readUint( arr, 0 ) ) < 300 || tag == 61440 ) {
+			if ( tag == 330 || tag == 34665 || tag == 34853 || tag == 50740 && bin.readUshort( data, bin.readUint( arr, 0 ) ) < 300 || tag == 61440 ) {
 
 				var oarr = tag == 50740 ? [ bin.readUint( arr, 0 ) ] : arr;
 				var subfd = [];

package/examples/js/loaders/MMDLoader.js

@@ -1823,6 +1823,7 @@
 		constructor( parameters ) {
 
 			super();
+			this.isMMDToonMaterial = true;
 			this._matcapCombine = THREE.AddOperation;
 			this.emissiveIntensity = 1.0;
 			this.normalMapType = THREE.TangentSpaceNormalMap;
@@ -1863,7 +1864,7 @@
 			} );
 			this.uniforms = THREE.UniformsUtils.clone( THREE.MMDToonShader.uniforms ); // merged from MeshToon/Phong/MatcapMaterial
 
-			const exposePropertyNames = [ 'specular', 'shininess', 'opacity', 'diffuse', 'map', 'matcap', 'gradientMap', 'lightMap', 'lightMapIntensity', 'aoMap', 'aoMapIntensity', 'emissive', 'emissiveMap', 'bumpMap', 'bumpScale', 'normalMap', 'normalScale', 'displacemantBias', 'displacemantMap', 'displacemantScale', 'specularMap', 'alphaMap', 'envMap', 'reflectivity', 'refractionRatio' ];
+			const exposePropertyNames = [ 'specular', 'opacity', 'diffuse', 'map', 'matcap', 'gradientMap', 'lightMap', 'lightMapIntensity', 'aoMap', 'aoMapIntensity', 'emissive', 'emissiveMap', 'bumpMap', 'bumpScale', 'normalMap', 'normalScale', 'displacemantBias', 'displacemantMap', 'displacemantScale', 'specularMap', 'alphaMap', 'envMap', 'reflectivity', 'refractionRatio' ];
 
 			for ( const propertyName of exposePropertyNames ) {
 
@@ -1880,8 +1881,23 @@
 					}
 				} );
 
-			}
+			} // Special path for shininess to handle zero shininess properly
+
+
+			this._shininess = 30;
+			Object.defineProperty( this, 'shininess', {
+				get: function () {
+
+					return this._shininess;
+
+				},
+				set: function ( value ) {
+
+					this._shininess = value;
+					this.uniforms.shininess.value = Math.max( this._shininess, 1e-4 ); // To prevent pow( 0.0, 0.0 )
 
+				}
+			} );
 			Object.defineProperty( this, 'color', Object.getOwnPropertyDescriptor( this, 'diffuse' ) );
 			this.setValues( parameters );
 
@@ -1903,8 +1919,6 @@
 
 	}
 
-	MMDToonMaterial.prototype.isMMDToonMaterial = true;
-
 	THREE.MMDLoader = MMDLoader;
 
 } )();

package/examples/js/loaders/NRRDLoader.js

@@ -172,7 +172,7 @@
 
 						headerObject.isNrrd = true;
 
-					} else if ( l.match( /^#/ ) ) {} else if ( m = l.match( /(.*):(.*)/ ) ) {
+					} else if ( ! l.match( /^#/ ) && ( m = l.match( /(.*):(.*)/ ) ) ) {
 
 						field = m[ 1 ].trim();
 						data = m[ 2 ].trim();

package/examples/js/loaders/OBJLoader.js

@@ -18,6 +18,8 @@
 
 	const _cb = new THREE.Vector3();
 
+	const _color = new THREE.Color();
+
 	function ParserState() {
 
 		const state = {
@@ -464,7 +466,9 @@
 
 							if ( data.length >= 7 ) {
 
-								state.colors.push( parseFloat( data[ 4 ] ), parseFloat( data[ 5 ] ), parseFloat( data[ 6 ] ) );
+								_color.setRGB( parseFloat( data[ 4 ] ), parseFloat( data[ 5 ] ), parseFloat( data[ 6 ] ) ).convertSRGBToLinear();
+
+								state.colors.push( _color.r, _color.g, _color.b );
 
 							} else {
 
@@ -487,7 +491,7 @@
 
 				} else if ( lineFirstChar === 'f' ) {
 
-					const lineData = line.substr( 1 ).trim();
+					const lineData = line.slice( 1 ).trim();
 					const vertexData = lineData.split( /\s+/ );
 					const faceVertices = []; // Parse the face vertex data into an easy to work with format
 
@@ -541,7 +545,7 @@
 
 				} else if ( lineFirstChar === 'p' ) {
 
-					const lineData = line.substr( 1 ).trim();
+					const lineData = line.slice( 1 ).trim();
 					const pointData = lineData.split( ' ' );
 					state.addPointGeometry( pointData );
 
@@ -551,8 +555,8 @@
 					// or
 					// g group_name
 					// WORKAROUND: https://bugs.chromium.org/p/v8/issues/detail?id=2869
-					// let name = result[ 0 ].substr( 1 ).trim();
-					const name = ( ' ' + result[ 0 ].substr( 1 ).trim() ).substr( 1 );
+					// let name = result[ 0 ].slice( 1 ).trim();
+					const name = ( ' ' + result[ 0 ].slice( 1 ).trim() ).slice( 1 );
 					state.startObject( name );
 
 				} else if ( _material_use_pattern.test( line ) ) {

package/examples/js/loaders/PCDLoader.js

@@ -21,7 +21,7 @@
 
 				try {
 
-					onLoad( scope.parse( data, url ) );
+					onLoad( scope.parse( data ) );
 
 				} catch ( e ) {
 
@@ -43,7 +43,7 @@
 
 		}
 
-		parse( data, url ) {
+		parse( data ) {
 
 			// from https://gitlab.com/taketwo/three-pcd-loader/blob/master/decompress-lzf.js
 			function decompressLZF( inData, outLength ) {
@@ -108,10 +108,10 @@
 
 				const PCDheader = {};
 				const result1 = data.search( /[\r\n]DATA\s(\S*)\s/i );
-				const result2 = /[\r\n]DATA\s(\S*)\s/i.exec( data.substr( result1 - 1 ) );
+				const result2 = /[\r\n]DATA\s(\S*)\s/i.exec( data.slice( result1 - 1 ) );
 				PCDheader.data = result2[ 1 ];
 				PCDheader.headerLen = result2[ 0 ].length + result1;
-				PCDheader.str = data.substr( 0, PCDheader.headerLen ); // remove comments
+				PCDheader.str = data.slice( 0, PCDheader.headerLen ); // remove comments
 
 				PCDheader.str = PCDheader.str.replace( /\#.*/gi, '' ); // parse
 
@@ -126,7 +126,7 @@
 				PCDheader.points = /POINTS (.*)/i.exec( PCDheader.str ); // evaluate
 
 				if ( PCDheader.version !== null ) PCDheader.version = parseFloat( PCDheader.version[ 1 ] );
-				if ( PCDheader.fields !== null ) PCDheader.fields = PCDheader.fields[ 1 ].split( ' ' );
+				PCDheader.fields = PCDheader.fields !== null ? PCDheader.fields[ 1 ].split( ' ' ) : [];
 				if ( PCDheader.type !== null ) PCDheader.type = PCDheader.type[ 1 ].split( ' ' );
 				if ( PCDheader.width !== null ) PCDheader.width = parseInt( PCDheader.width[ 1 ] );
 				if ( PCDheader.height !== null ) PCDheader.height = parseInt( PCDheader.height[ 1 ] );
@@ -199,7 +199,7 @@
 			if ( PCDheader.data === 'ascii' ) {
 
 				const offset = PCDheader.offset;
-				const pcdData = textData.substr( PCDheader.headerLen );
+				const pcdData = textData.slice( PCDheader.headerLen );
 				const lines = pcdData.split( '\n' );
 
 				for ( let i = 0, l = lines.length; i < l; i ++ ) {
@@ -217,7 +217,21 @@
 
 					if ( offset.rgb !== undefined ) {
 
-						const rgb = parseFloat( line[ offset.rgb ] );
+						const rgb_field_index = PCDheader.fields.findIndex( field => field === 'rgb' );
+						const rgb_type = PCDheader.type[ rgb_field_index ];
+						const float = parseFloat( line[ offset.rgb ] );
+						let rgb = float;
+
+						if ( rgb_type === 'F' ) {
+
+							// treat float values as int
+							// https://github.com/daavoo/pyntcloud/pull/204/commits/7b4205e64d5ed09abe708b2e91b615690c24d518
+							const farr = new Float32Array( 1 );
+							farr[ 0 ] = float;
+							rgb = new Int32Array( farr.buffer )[ 0 ];
+
+						}
+
 						const r = rgb >> 16 & 0x0000ff;
 						const g = rgb >> 8 & 0x0000ff;
 						const b = rgb >> 0 & 0x0000ff;
@@ -338,12 +352,7 @@
 			} // build point cloud
 
 
-			const mesh = new THREE.Points( geometry, material );
-			let name = url.split( '' ).reverse().join( '' );
-			name = /([^\/]*)/.exec( name );
-			name = name[ 1 ].split( '' ).reverse().join( '' );
-			mesh.name = name;
-			return mesh;
+			return new THREE.Points( geometry, material );
 
 		}
 

package/examples/js/loaders/PDBLoader.js

@@ -52,7 +52,7 @@
 
 			function capitalize( text ) {
 
-				return text.charAt( 0 ).toUpperCase() + text.substr( 1 ).toLowerCase();
+				return text.charAt( 0 ).toUpperCase() + text.slice( 1 ).toLowerCase();
 
 			}
 
@@ -64,7 +64,7 @@
 
 			function parseBond( start, length, satom, i ) {
 
-				const eatom = parseInt( lines[ i ].substr( start, length ) );
+				const eatom = parseInt( lines[ i ].slice( start, start + length ) );
 
 				if ( eatom ) {
 
@@ -271,17 +271,17 @@
 
 			for ( let i = 0, l = lines.length; i < l; i ++ ) {
 
-				if ( lines[ i ].substr( 0, 4 ) === 'ATOM' || lines[ i ].substr( 0, 6 ) === 'HETATM' ) {
+				if ( lines[ i ].slice( 0, 4 ) === 'ATOM' || lines[ i ].slice( 0, 6 ) === 'HETATM' ) {
 
-					const x = parseFloat( lines[ i ].substr( 30, 7 ) );
-					const y = parseFloat( lines[ i ].substr( 38, 7 ) );
-					const z = parseFloat( lines[ i ].substr( 46, 7 ) );
-					const index = parseInt( lines[ i ].substr( 6, 5 ) ) - 1;
-					let e = trim( lines[ i ].substr( 76, 2 ) ).toLowerCase();
+					const x = parseFloat( lines[ i ].slice( 30, 37 ) );
+					const y = parseFloat( lines[ i ].slice( 38, 45 ) );
+					const z = parseFloat( lines[ i ].slice( 46, 53 ) );
+					const index = parseInt( lines[ i ].slice( 6, 11 ) ) - 1;
+					let e = trim( lines[ i ].slice( 76, 78 ) ).toLowerCase();
 
 					if ( e === '' ) {
 
-						e = trim( lines[ i ].substr( 12, 2 ) ).toLowerCase();
+						e = trim( lines[ i ].slice( 12, 14 ) ).toLowerCase();
 
 					}
 
@@ -289,9 +289,9 @@
 					atoms.push( atomData );
 					_atomMap[ index ] = atomData;
 
-				} else if ( lines[ i ].substr( 0, 6 ) === 'CONECT' ) {
+				} else if ( lines[ i ].slice( 0, 6 ) === 'CONECT' ) {
 
-					const satom = parseInt( lines[ i ].substr( 6, 5 ) );
+					const satom = parseInt( lines[ i ].slice( 6, 11 ) );
 					parseBond( 11, 5, satom, i );
 					parseBond( 16, 5, satom, i );
 					parseBond( 21, 5, satom, i );

package/examples/js/loaders/PLYLoader.js

@@ -26,6 +26,8 @@
  *
  */
 
+	const _color = new THREE.Color();
+
 	class PLYLoader extends THREE.Loader {
 
 		constructor( manager ) {
@@ -386,7 +388,9 @@
 
 					if ( attrR !== null && attrG !== null && attrB !== null ) {
 
-						buffer.colors.push( element[ attrR ] / 255.0, element[ attrG ] / 255.0, element[ attrB ] / 255.0 );
+						_color.setRGB( element[ attrR ] / 255.0, element[ attrG ] / 255.0, element[ attrB ] / 255.0 ).convertSRGBToLinear();
+
+						buffer.colors.push( _color.r, _color.g, _color.b );
 
 					}
 

package/examples/js/loaders/RGBELoader.js

@@ -171,13 +171,13 @@
 
 						if ( match = line.match( gamma_re ) ) {
 
-							header.gamma = parseFloat( match[ 1 ], 10 );
+							header.gamma = parseFloat( match[ 1 ] );
 
 						}
 
 						if ( match = line.match( exposure_re ) ) {
 
-							header.exposure = parseFloat( match[ 1 ], 10 );
+							header.exposure = parseFloat( match[ 1 ] );
 
 						}
 
@@ -371,7 +371,7 @@
 
 				if ( RGBE_RETURN_FAILURE !== image_rgba_data ) {
 
-					let data, format, type;
+					let data, type;
 					let numElements;
 
 					switch ( this.type ) {
@@ -417,7 +417,6 @@
 						header: rgbe_header_info.string,
 						gamma: rgbe_header_info.gamma,
 						exposure: rgbe_header_info.exposure,
-						format: format,
 						type: type
 					};
 
@@ -443,13 +442,6 @@
 				switch ( texture.type ) {
 
 					case THREE.FloatType:
-						texture.encoding = THREE.LinearEncoding;
-						texture.minFilter = THREE.LinearFilter;
-						texture.magFilter = THREE.LinearFilter;
-						texture.generateMipmaps = false;
-						texture.flipY = true;
-						break;
-
 					case THREE.HalfFloatType:
 						texture.encoding = THREE.LinearEncoding;
 						texture.minFilter = THREE.LinearFilter;

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,6 +390,7 @@
 		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 new Error( 'The input is not a PNG file!' );
@@ -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/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,7 +105,7 @@
 						break;
 
 					case 'defs':
-						traverseChildNodes = false;
+						isDefsNode = true;
 						break;
 
 					case 'use':
@@ -147,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 ) {
@@ -193,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 ) {
 
@@ -1261,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;