super-three 0.133.3 → 0.136.0

package/examples/js/loaders/GLTFLoader.js

@@ -23,6 +23,11 @@
 
 				return new GLTFTextureWebPExtension( parser );
 
+			} );
+			this.register( function ( parser ) {
+
+				return new GLTFMaterialsSheenExtension( parser );
+
 			} );
 			this.register( function ( parser ) {
 
@@ -291,6 +296,17 @@
 
 		}
 
+		parseAsync( data, path ) {
+
+			const scope = this;
+			return new Promise( function ( resolve, reject ) {
+
+				scope.parse( data, path, resolve, reject );
+
+			} );
+
+		}
+
 	}
 	/* GLTFREGISTRY */
 
@@ -336,6 +352,7 @@
 		KHR_MATERIALS_CLEARCOAT: 'KHR_materials_clearcoat',
 		KHR_MATERIALS_IOR: 'KHR_materials_ior',
 		KHR_MATERIALS_PBR_SPECULAR_GLOSSINESS: 'KHR_materials_pbrSpecularGlossiness',
+		KHR_MATERIALS_SHEEN: 'KHR_materials_sheen',
 		KHR_MATERIALS_SPECULAR: 'KHR_materials_specular',
 		KHR_MATERIALS_TRANSMISSION: 'KHR_materials_transmission',
 		KHR_MATERIALS_UNLIT: 'KHR_materials_unlit',
@@ -592,6 +609,77 @@
 
 		}
 
+	}
+	/**
+ * Sheen Materials Extension
+ *
+ * Specification: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_sheen
+ */
+
+
+	class GLTFMaterialsSheenExtension {
+
+		constructor( parser ) {
+
+			this.parser = parser;
+			this.name = EXTENSIONS.KHR_MATERIALS_SHEEN;
+
+		}
+
+		getMaterialType( materialIndex ) {
+
+			const parser = this.parser;
+			const materialDef = parser.json.materials[ materialIndex ];
+			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) return null;
+			return THREE.MeshPhysicalMaterial;
+
+		}
+
+		extendMaterialParams( materialIndex, materialParams ) {
+
+			const parser = this.parser;
+			const materialDef = parser.json.materials[ materialIndex ];
+
+			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
+
+				return Promise.resolve();
+
+			}
+
+			const pending = [];
+			materialParams.sheenColor = new THREE.Color( 0, 0, 0 );
+			materialParams.sheenRoughness = 0;
+			materialParams.sheen = 1;
+			const extension = materialDef.extensions[ this.name ];
+
+			if ( extension.sheenColorFactor !== undefined ) {
+
+				materialParams.sheenColor.fromArray( extension.sheenColorFactor );
+
+			}
+
+			if ( extension.sheenRoughnessFactor !== undefined ) {
+
+				materialParams.sheenRoughness = extension.sheenRoughnessFactor;
+
+			}
+
+			if ( extension.sheenColorTexture !== undefined ) {
+
+				pending.push( parser.assignTexture( materialParams, 'sheenColorMap', extension.sheenColorTexture ) );
+
+			}
+
+			if ( extension.sheenRoughnessTexture !== undefined ) {
+
+				pending.push( parser.assignTexture( materialParams, 'sheenRoughnessMap', extension.sheenRoughnessTexture ) );
+
+			}
+
+			return Promise.all( pending );
+
+		}
+
 	}
 	/**
  * Transmission Materials Extension
@@ -698,7 +786,7 @@
 
 			materialParams.attenuationDistance = extension.attenuationDistance || 0;
 			const colorArray = extension.attenuationColor || [ 1, 1, 1 ];
-			materialParams.attenuationTint = new THREE.Color( colorArray[ 0 ], colorArray[ 1 ], colorArray[ 2 ] );
+			materialParams.attenuationColor = new THREE.Color( colorArray[ 0 ], colorArray[ 1 ], colorArray[ 2 ] );
 			return Promise.all( pending );
 
 		}
@@ -794,11 +882,11 @@
 			}
 
 			const colorArray = extension.specularColorFactor || [ 1, 1, 1 ];
-			materialParams.specularTint = new THREE.Color( colorArray[ 0 ], colorArray[ 1 ], colorArray[ 2 ] );
+			materialParams.specularColor = new THREE.Color( colorArray[ 0 ], colorArray[ 1 ], colorArray[ 2 ] );
 
 			if ( extension.specularColorTexture !== undefined ) {
 
-				pending.push( parser.assignTexture( materialParams, 'specularTintMap', extension.specularColorTexture ).then( function ( texture ) {
+				pending.push( parser.assignTexture( materialParams, 'specularColorMap', extension.specularColorTexture ).then( function ( texture ) {
 
 					texture.encoding = THREE.sRGBEncoding;
 
@@ -1222,7 +1310,7 @@
 	/**
  * Specular-Glossiness Extension
  *
- * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness
+ * Specification: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Archived/KHR_materials_pbrSpecularGlossiness
  */
 
 	/**
@@ -1658,34 +1746,10 @@
 		MASK: 'MASK',
 		BLEND: 'BLEND'
 	};
-	/* UTILITY FUNCTIONS */
-
-	function resolveURL( url, path ) {
-
-		// Invalid URL
-		if ( typeof url !== 'string' || url === '' ) return ''; // Host Relative URL
-
-		if ( /^https?:\/\//i.test( path ) && /^\//.test( url ) ) {
-
-			path = path.replace( /(^https?:\/\/[^\/]+).*/i, '$1' );
-
-		} // Absolute URL http://,https://,//
-
-
-		if ( /^(https?:)?\/\//i.test( url ) ) return url; // Data URI
-
-		if ( /^data:.*,.*$/i.test( url ) ) return url; // Blob URL
-
-		if ( /^blob:.*$/i.test( url ) ) return url; // Relative URL
-
-		return path + url;
-
-	}
 	/**
  * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#default-material
  */
 
-
 	function createDefaultMaterial( cache ) {
 
 		if ( cache[ 'DefaultMaterial' ] === undefined ) {
@@ -1942,7 +2006,7 @@
 			this.nodeNamesUsed = {}; // Use an THREE.ImageBitmapLoader if imageBitmaps are supported. Moves much of the
 			// expensive work of uploading a texture to the GPU off the main thread.
 
-			if ( typeof createImageBitmap !== 'undefined' && /Firefox/.test( navigator.userAgent ) === false ) {
+			if ( typeof createImageBitmap !== 'undefined' && /Firefox|Safari/.test( navigator.userAgent ) === false ) {
 
 				this.textureLoader = new THREE.ImageBitmapLoader( this.options.manager );
 
@@ -2312,7 +2376,7 @@
 			const options = this.options;
 			return new Promise( function ( resolve, reject ) {
 
-				loader.load( resolveURL( bufferDef.uri, options.path ), resolve, undefined, function () {
+				loader.load( THREE.LoaderUtils.resolveURL( bufferDef.uri, options.path ), resolve, undefined, function () {
 
 					reject( new Error( 'THREE.GLTFLoader: Failed to load buffer "' + bufferDef.uri + '".' ) );
 
@@ -2547,7 +2611,7 @@
 
 					}
 
-					loader.load( resolveURL( sourceURI, options.path ), onLoad, undefined, reject );
+					loader.load( THREE.LoaderUtils.resolveURL( sourceURI, options.path ), onLoad, undefined, reject );
 
 				} );
 
@@ -3255,10 +3319,9 @@
 
 					if ( PATH_PROPERTIES[ target.path ] === PATH_PROPERTIES.weights ) {
 
-						// Node may be a THREE.Group (glTF mesh with several primitives) or a THREE.Mesh.
 						node.traverse( function ( object ) {
 
-							if ( object.isMesh === true && object.morphTargetInfluences ) {
+							if ( object.morphTargetInfluences ) {
 
 								targetNames.push( object.name ? object.name : object.uuid );
 

package/examples/js/loaders/HDRCubeTextureLoader.js

@@ -28,14 +28,6 @@
 
 			switch ( texture.type ) {
 
-				case THREE.UnsignedByteType:
-					texture.encoding = THREE.RGBEEncoding;
-					texture.format = THREE.RGBAFormat;
-					texture.minFilter = THREE.NearestFilter;
-					texture.magFilter = THREE.NearestFilter;
-					texture.generateMipmaps = false;
-					break;
-
 				case THREE.FloatType:
 					texture.encoding = THREE.LinearEncoding;
 					texture.format = THREE.RGBFormat;

package/examples/js/loaders/KTX2Loader.js

@@ -17,6 +17,8 @@
 
 	const _taskCache = new WeakMap();
 
+	let _activeLoaders = 0;
+
 	class KTX2Loader extends THREE.Loader {
 
 		constructor( manager ) {
@@ -61,6 +63,14 @@
 				bptcSupported: renderer.extensions.has( 'EXT_texture_compression_bptc' ),
 				pvrtcSupported: renderer.extensions.has( 'WEBGL_compressed_texture_pvrtc' ) || renderer.extensions.has( 'WEBKIT_WEBGL_compressed_texture_pvrtc' )
 			};
+
+			if ( renderer.capabilities.isWebGL2 ) {
+
+				// https://github.com/mrdoob/three.js/pull/22928
+				this.workerConfig.etc1Supported = false;
+
+			}
+
 			return this;
 
 		}
@@ -109,6 +119,15 @@
 
 				} );
 
+				if ( _activeLoaders > 0 ) {
+
+					// Each instance loads a transcoder and allocates workers, increasing network and memory cost.
+					console.warn( 'THREE.KTX2Loader: Multiple active KTX2 loaders may cause performance issues.' + ' Use a single KTX2Loader instance, or call .dispose() on old instances.' );
+
+				}
+
+				_activeLoaders ++;
+
 			}
 
 			return this.transcoderPending;
@@ -207,6 +226,7 @@
 
 			URL.revokeObjectURL( this.workerSourceURL );
 			this.workerPool.dispose();
+			_activeLoaders --;
 			return this;
 
 		}
@@ -475,8 +495,8 @@
 		}, {
 			if: 'etc1Supported',
 			basisFormat: [ BasisFormat.ETC1S, BasisFormat.UASTC_4x4 ],
-			transcoderFormat: [ TranscoderFormat.ETC1, TranscoderFormat.ETC1 ],
-			engineFormat: [ EngineFormat.RGB_ETC1_Format, EngineFormat.RGB_ETC1_Format ],
+			transcoderFormat: [ TranscoderFormat.ETC1 ],
+			engineFormat: [ EngineFormat.RGB_ETC1_Format ],
 			priorityETC1S: 2,
 			priorityUASTC: 4,
 			needsPowerOfTwo: false
@@ -511,6 +531,7 @@
 				const opt = options[ i ];
 				if ( ! config[ opt.if ] ) continue;
 				if ( ! opt.basisFormat.includes( basisFormat ) ) continue;
+				if ( hasAlpha && opt.transcoderFormat.length < 2 ) continue;
 				if ( opt.needsPowerOfTwo && ! ( isPowerOfTwo( width ) && isPowerOfTwo( height ) ) ) continue;
 				transcoderFormat = opt.transcoderFormat[ hasAlpha ? 1 : 0 ];
 				engineFormat = opt.engineFormat[ hasAlpha ? 1 : 0 ];

package/examples/js/loaders/KTXLoader.js

@@ -4,7 +4,7 @@
  * for description see https://www.khronos.org/opengles/sdk/tools/KTX/
  * for file layout see https://www.khronos.org/opengles/sdk/tools/KTX/file_format_spec/
  *
- * ported from https://github.com/BabylonJS/Babylon.js/blob/master/src/Tools/babylon.khronosTextureContainer.ts
+ * ported from https://github.com/BabylonJS/Babylon.js/blob/master/src/Misc/khronosTextureContainer.ts
  */
 
 	class KTXLoader extends THREE.CompressedTextureLoader {

package/examples/js/loaders/LDrawLoader.js

@@ -916,11 +916,13 @@
 				mainEdgeColourCode: parentScope ? parentScope.mainEdgeColourCode : '24',
 				currentMatrix: new THREE.Matrix4(),
 				matrix: new THREE.Matrix4(),
+				type: 'Model',
+				groupObject: null,
 				// If false, it is a root material scope previous to parse
 				isFromParse: true,
-				faces: null,
-				lineSegments: null,
-				conditionalSegments: null,
+				faces: [],
+				lineSegments: [],
+				conditionalSegments: [],
 				totalFaces: 0,
 				// If true, this object is the start of a construction step
 				startingConstructionStep: false
@@ -1135,21 +1137,11 @@
 					break;
 
 				case FINISH_TYPE_PEARLESCENT:
-					// Try to imitate pearlescency by setting the specular to the complementary of the color, and low shininess
-					const specular = new THREE.Color( colour );
-					const hsl = specular.getHSL( {
-						h: 0,
-						s: 0,
-						l: 0
-					} );
-					hsl.h = ( hsl.h + 0.5 ) % 1;
-					hsl.l = Math.min( 1, hsl.l + ( 1 - hsl.l ) * 0.7 );
-					specular.setHSL( hsl.h, hsl.s, hsl.l );
-					material = new THREE.MeshPhongMaterial( {
+					// Try to imitate pearlescency by making the surface glossy
+					material = new THREE.MeshStandardMaterial( {
 						color: colour,
-						specular: specular,
-						shininess: 10,
-						reflectivity: 0.3
+						roughness: 0.3,
+						metalness: 0.25
 					} );
 					break;
 
@@ -1375,21 +1367,9 @@
 
 								case '!LDRAW_ORG':
 									type = lp.getToken();
-									currentParseScope.faces = [];
-									currentParseScope.lineSegments = [];
-									currentParseScope.conditionalSegments = [];
-									currentParseScope.type = type;
-									const isRoot = ! parentParseScope.isFromParse;
-
-									if ( isRoot || scope.separateObjects && ! isPrimitiveType( type ) ) {
-
-										currentParseScope.groupObject = new THREE.Group();
-										currentParseScope.groupObject.userData.startingConstructionStep = currentParseScope.startingConstructionStep;
-
-									} // If the scale of the object is negated then the triangle winding order
+									currentParseScope.type = type; // If the scale of the object is negated then the triangle winding order
 									// needs to be flipped.
 
-
 									if ( currentParseScope.matrix.determinant() < 0 && ( scope.separateObjects && isPrimitiveType( type ) || ! scope.separateObjects ) ) {
 
 										currentParseScope.inverted = ! currentParseScope.inverted;
@@ -1709,6 +1689,14 @@
 			currentParseScope.subobjects = subobjects;
 			currentParseScope.numSubobjects = subobjects.length;
 			currentParseScope.subobjectIndex = 0;
+			const isRoot = ! parentParseScope.isFromParse;
+
+			if ( isRoot || scope.separateObjects && ! isPrimitiveType( type ) ) {
+
+				currentParseScope.groupObject = new THREE.Group();
+				currentParseScope.groupObject.userData.startingConstructionStep = currentParseScope.startingConstructionStep;
+
+			}
 
 		}
 
@@ -1737,6 +1725,13 @@
 
 		finalizeObject( subobjectParseScope ) {
 
+			// fail gracefully if an object could not be loaded
+			if ( subobjectParseScope === null ) {
+
+				return;
+
+			}
+
 			const parentParseScope = subobjectParseScope.parentScope; // Smooth the normals if this is a part or if this is a case where the subpart
 			// is added directly into the parent model (meaning it will never get smoothed by
 			// being added to a part)
@@ -1919,6 +1914,7 @@
 				} ).catch( function () {
 
 					console.warn( 'LDrawLoader: Subobject "' + subobject.fileName + '" could not be found.' );
+					return null;
 
 				} );
 

package/examples/js/loaders/LUT3dlLoader.js

@@ -102,6 +102,7 @@
 			texture.wrapS = THREE.ClampToEdgeWrapping;
 			texture.wrapT = THREE.ClampToEdgeWrapping;
 			texture.generateMipmaps = false;
+			texture.needsUpdate = true;
 			const texture3D = new THREE.DataTexture3D();
 			texture3D.image.data = data;
 			texture3D.image.width = size;
@@ -115,6 +116,7 @@
 			texture3D.wrapT = THREE.ClampToEdgeWrapping;
 			texture3D.wrapR = THREE.ClampToEdgeWrapping;
 			texture3D.generateMipmaps = false;
+			texture3D.needsUpdate = true;
 			return {
 				size,
 				texture,

package/examples/js/loaders/LUTCubeLoader.js

@@ -108,6 +108,7 @@
 			texture.wrapS = THREE.ClampToEdgeWrapping;
 			texture.wrapT = THREE.ClampToEdgeWrapping;
 			texture.generateMipmaps = false;
+			texture.needsUpdate = true;
 			const texture3D = new THREE.DataTexture3D();
 			texture3D.image.data = data;
 			texture3D.image.width = size;
@@ -121,6 +122,7 @@
 			texture3D.wrapT = THREE.ClampToEdgeWrapping;
 			texture3D.wrapR = THREE.ClampToEdgeWrapping;
 			texture3D.generateMipmaps = false;
+			texture3D.needsUpdate = true;
 			return {
 				title,
 				size,

package/examples/js/loaders/LWOLoader.js

@@ -6,10 +6,10 @@
  * @desc Load files in LWO3 and LWO2 format on Three.js
  *
  * LWO3 format specification:
- * 	http://static.lightwave3d.com/sdk/2018/html/filefmts/lwo3.html
+ *  https://static.lightwave3d.com/sdk/2019/html/filefmts/lwo3.html
  *
  * LWO2 format specification:
- * 	http://static.lightwave3d.com/sdk/2018/html/filefmts/lwo2.html
+ *  https://static.lightwave3d.com/sdk/2019/html/filefmts/lwo2.html
  *
  **/
 
@@ -391,7 +391,7 @@
 
 					case 'Roughness':
 						maps.roughnessMap = texture;
-						maps.roughness = 0.5;
+						maps.roughness = 1;
 						break;
 
 					case 'Specular':
@@ -410,7 +410,7 @@
 
 					case 'Metallic':
 						maps.metalnessMap = texture;
-						maps.metalness = 0.5;
+						maps.metalness = 1;
 						break;
 
 					case 'Transparency':
@@ -525,7 +525,7 @@
 			}
 
 			if ( attributes[ 'Bump Height' ] ) params.bumpScale = attributes[ 'Bump Height' ].value * 0.1;
-			if ( attributes[ 'Refraction Index' ] ) params.refractionRatio = 1 / attributes[ 'Refraction Index' ].value;
+			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 );
@@ -639,10 +639,12 @@
 
 					if ( attributes.metalness !== undefined ) {
 
-						delete attributes.metalness;
+						attributes.metalness = 1; // For most transparent materials metalness should be set to 1 if not otherwise defined. If set to 0 no refraction will be visible
 
 					}
 
+					attributes.opacity = 1; // transparency fades out refraction, forcing opacity to 1 ensures a closer visual match to the material in Lightwave.
+
 				} else envMap.mapping = THREE.EquirectangularReflectionMapping;
 
 				maps.envMap = envMap;