super-three 0.136.1 → 0.144.0

package/examples/jsm/lines/Wireframe.js

@@ -16,11 +16,13 @@ class Wireframe extends Mesh {
 
 		super( geometry, material );
 
+		this.isWireframe = true;
+
 		this.type = 'Wireframe';
 
 	}
 
-	// for backwards-compatability, but could be a method of LineSegmentsGeometry...
+	// for backwards-compatibility, but could be a method of LineSegmentsGeometry...
 
 	computeLineDistances() {
 
@@ -51,6 +53,4 @@ class Wireframe extends Mesh {
 
 }
 
-Wireframe.prototype.isWireframe = true;
-
 export { Wireframe };

package/examples/jsm/lines/WireframeGeometry2.js

@@ -9,6 +9,8 @@ class WireframeGeometry2 extends LineSegmentsGeometry {
 
 		super();
 
+		this.isWireframeGeometry2 = true;
+
 		this.type = 'WireframeGeometry2';
 
 		this.fromWireframeGeometry( new WireframeGeometry( geometry ) );
@@ -19,6 +21,4 @@ class WireframeGeometry2 extends LineSegmentsGeometry {
 
 }
 
-WireframeGeometry2.prototype.isWireframeGeometry2 = true;
-
 export { WireframeGeometry2 };

package/examples/jsm/loaders/3DMLoader.js

@@ -21,6 +21,7 @@ import {
 	CanvasTexture,
 	LinearFilter,
 	ClampToEdgeWrapping,
+	RepeatWrapping,
 	TextureLoader
 } from 'three';
 
@@ -288,8 +289,8 @@ class Rhino3dmLoader extends Loader {
 
 				}
 
-				map.wrapS = texture.wrapU === 0 ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
-				map.wrapT = texture.wrapV === 0 ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
+				map.wrapS = texture.wrapU === 0 ? RepeatWrapping : ClampToEdgeWrapping;
+				map.wrapT = texture.wrapV === 0 ? RepeatWrapping : ClampToEdgeWrapping;
 				map.repeat.set( texture.repeat[ 0 ], texture.repeat[ 1 ] );
 
 			}

package/examples/jsm/loaders/3MFLoader.js

@@ -97,15 +97,12 @@ class ThreeMFLoader extends Loader {
 			let relsName;
 			let modelRelsName;
 			const modelPartNames = [];
-			const printTicketPartNames = [];
 			const texturesPartNames = [];
-			const otherPartNames = [];
 
 			let modelRels;
 			const modelParts = {};
 			const printTicketParts = {};
 			const texturesParts = {};
-			const otherParts = {};
 
 			try {
 
@@ -136,18 +133,10 @@ class ThreeMFLoader extends Loader {
 
 					modelPartNames.push( file );
 
-				} else if ( file.match( /^3D\/Metadata\/.*\.xml$/ ) ) {
-
-					printTicketPartNames.push( file );
-
 				} else if ( file.match( /^3D\/Textures?\/.*/ ) ) {
 
 					texturesPartNames.push( file );
 
-				} else if ( file.match( /^3D\/Other\/.*/ ) ) {
-
-					otherPartNames.push( file );
-
 				}
 
 			}
@@ -225,8 +214,7 @@ class ThreeMFLoader extends Loader {
 				modelRels: modelRels,
 				model: modelParts,
 				printTicket: printTicketParts,
-				texture: texturesParts,
-				other: otherParts
+				texture: texturesParts
 			};
 
 		}
@@ -1004,7 +992,7 @@ class ThreeMFLoader extends Loader {
 
 		}
 
-		function buildVertexColorMesh( colorgroup, triangleProperties, meshData, objects, modelData, objectData ) {
+		function buildVertexColorMesh( colorgroup, triangleProperties, meshData, objectData ) {
 
 			// geometry
 
@@ -1117,7 +1105,7 @@ class ThreeMFLoader extends Loader {
 
 					case 'vertexColors':
 						const colorgroup = modelData.resources.colorgroup[ resourceId ];
-						meshes.push( buildVertexColorMesh( colorgroup, triangleProperties, meshData, objects, modelData, objectData ) );
+						meshes.push( buildVertexColorMesh( colorgroup, triangleProperties, meshData, objectData ) );
 						break;
 
 					case 'default':
@@ -1131,6 +1119,16 @@ class ThreeMFLoader extends Loader {
 
 			}
 
+			if ( objectData.name ) {
+
+				for ( let i = 0; i < meshes.length; i ++ ) {
+
+					meshes[ i ].name = objectData.name;
+
+				}
+
+			}
+
 			return meshes;
 
 		}
@@ -1161,7 +1159,7 @@ class ThreeMFLoader extends Loader {
 
 		}
 
-		function analyzeObject( modelData, meshData, objectData ) {
+		function analyzeObject( meshData, objectData ) {
 
 			const resourceMap = {};
 
@@ -1190,7 +1188,7 @@ class ThreeMFLoader extends Loader {
 
 			const group = new Group();
 
-			const resourceMap = analyzeObject( modelData, meshData, objectData );
+			const resourceMap = analyzeObject( meshData, objectData );
 			const meshes = buildMeshes( resourceMap, meshData, objects, modelData, textureData, objectData );
 
 			for ( let i = 0, l = meshes.length; i < l; i ++ ) {
@@ -1356,6 +1354,12 @@ class ThreeMFLoader extends Loader {
 
 			}
 
+			if ( objectData.name ) {
+
+				objects[ objectData.id ].name = objectData.name;
+
+			}
+
 		}
 
 		function buildObjects( data3mf ) {

package/examples/jsm/loaders/AMFLoader.js

@@ -101,7 +101,7 @@ class AMFLoader extends Loader {
 
 				for ( file in zip ) {
 
-					if ( file.toLowerCase().substr( - 4 ) === '.amf' ) {
+					if ( file.toLowerCase().slice( - 4 ) === '.amf' ) {
 
 						break;
 

package/examples/jsm/loaders/ColladaLoader.js

@@ -36,7 +36,8 @@ import {
 	TextureLoader,
 	Vector2,
 	Vector3,
-	VectorKeyframeTrack
+	VectorKeyframeTrack,
+	sRGBEncoding
 } from 'three';
 import { TGALoader } from '../loaders/TGALoader.js';
 
@@ -1469,11 +1470,11 @@ class ColladaLoader extends Loader {
 
 		function parseEffectExtraTechniqueBump( xml ) {
 
-			var data = {};
+			const data = {};
 
-			for ( var i = 0, l = xml.childNodes.length; i < l; i ++ ) {
+			for ( let i = 0, l = xml.childNodes.length; i < l; i ++ ) {
 
-				var child = xml.childNodes[ i ];
+				const child = xml.childNodes[ i ];
 
 				if ( child.nodeType !== 1 ) continue;
 
@@ -1579,7 +1580,7 @@ class ColladaLoader extends Loader {
 
 			material.name = data.name || '';
 
-			function getTexture( textureObject ) {
+			function getTexture( textureObject, encoding = null ) {
 
 				const sampler = effect.profile.samplers[ textureObject.id ];
 				let image = null;
@@ -1627,6 +1628,12 @@ class ColladaLoader extends Loader {
 
 						}
 
+						if ( encoding !== null ) {
+
+							texture.encoding = encoding;
+
+						}
+
 						return texture;
 
 					} else {
@@ -1657,7 +1664,7 @@ class ColladaLoader extends Loader {
 
 					case 'diffuse':
 						if ( parameter.color ) material.color.fromArray( parameter.color );
-						if ( parameter.texture ) material.map = getTexture( parameter.texture );
+						if ( parameter.texture ) material.map = getTexture( parameter.texture, sRGBEncoding );
 						break;
 					case 'specular':
 						if ( parameter.color && material.specular ) material.specular.fromArray( parameter.color );
@@ -1667,20 +1674,24 @@ class ColladaLoader extends Loader {
 						if ( parameter.texture ) material.normalMap = getTexture( parameter.texture );
 						break;
 					case 'ambient':
-						if ( parameter.texture ) material.lightMap = getTexture( parameter.texture );
+						if ( parameter.texture ) material.lightMap = getTexture( parameter.texture, sRGBEncoding );
 						break;
 					case 'shininess':
 						if ( parameter.float && material.shininess ) material.shininess = parameter.float;
 						break;
 					case 'emission':
 						if ( parameter.color && material.emissive ) material.emissive.fromArray( parameter.color );
-						if ( parameter.texture ) material.emissiveMap = getTexture( parameter.texture );
+						if ( parameter.texture ) material.emissiveMap = getTexture( parameter.texture, sRGBEncoding );
 						break;
 
 				}
 
 			}
 
+			material.color.convertSRGBToLinear();
+			if ( material.specular ) material.specular.convertSRGBToLinear();
+			if ( material.emissive ) material.emissive.convertSRGBToLinear();
+
 			//
 
 			let transparent = parameters[ 'transparent' ];
@@ -2015,7 +2026,7 @@ class ColladaLoader extends Loader {
 
 					case 'color':
 						const array = parseFloats( child.textContent );
-						data.color = new Color().fromArray( array );
+						data.color = new Color().fromArray( array ).convertSRGBToLinear();
 						break;
 
 					case 'falloff_angle':
@@ -2481,7 +2492,7 @@ class ColladaLoader extends Loader {
 							break;
 
 						case 'COLOR':
-							buildGeometryData( primitive, sources[ input.id ], input.offset, color.array );
+							buildGeometryData( primitive, sources[ input.id ], input.offset, color.array, true );
 							color.stride = sources[ input.id ].stride;
 							break;
 
@@ -2520,7 +2531,7 @@ class ColladaLoader extends Loader {
 
 		}
 
-		function buildGeometryData( primitive, source, offset, array ) {
+		function buildGeometryData( primitive, source, offset, array, isColor = false ) {
 
 			const indices = primitive.p;
 			const stride = primitive.stride;
@@ -2537,6 +2548,22 @@ class ColladaLoader extends Loader {
 
 				}
 
+				if ( isColor ) {
+
+					// convert the vertex colors from srgb to linear if present
+					const startIndex = array.length - sourceStride - 1;
+					tempColor.setRGB(
+						array[ startIndex + 0 ],
+						array[ startIndex + 1 ],
+						array[ startIndex + 2 ]
+					).convertSRGBToLinear();
+
+					array[ startIndex + 0 ] = tempColor.r;
+					array[ startIndex + 1 ] = tempColor.g;
+					array[ startIndex + 2 ] = tempColor.b;
+
+				}
+
 			}
 
 			const sourceArray = source.array;
@@ -2974,7 +3001,7 @@ class ColladaLoader extends Loader {
 						const param = child.getElementsByTagName( 'param' )[ 0 ];
 						data.axis = param.textContent;
 						const tmpJointIndex = data.axis.split( 'inst_' ).pop().split( 'axis' )[ 0 ];
-						data.jointIndex = tmpJointIndex.substr( 0, tmpJointIndex.length - 1 );
+						data.jointIndex = tmpJointIndex.substring( 0, tmpJointIndex.length - 1 );
 						break;
 
 				}
@@ -3981,6 +4008,7 @@ class ColladaLoader extends Loader {
 
 		//
 
+		const tempColor = new Color();
 		const animations = [];
 		let kinematics = {};
 		let count = 0;
@@ -4038,6 +4066,7 @@ class ColladaLoader extends Loader {
 
 		if ( asset.upAxis === 'Z_UP' ) {
 
+			console.warn( 'THREE.ColladaLoader: You are loading an asset with a Z-UP coordinate system. The loader just rotates the asset to transform it into Y-UP. The vertex data are not converted, see #24289.' );
 			scene.quaternion.setFromEuler( new Euler( - Math.PI / 2, 0, 0 ) );
 
 		}

package/examples/jsm/loaders/DDSLoader.js

@@ -27,18 +27,18 @@ class DDSLoader extends CompressedTextureLoader {
 
 		const DDS_MAGIC = 0x20534444;
 
-		// let DDSD_CAPS = 0x1;
-		// let DDSD_HEIGHT = 0x2;
-		// let DDSD_WIDTH = 0x4;
-		// let DDSD_PITCH = 0x8;
-		// let DDSD_PIXELFORMAT = 0x1000;
+		// const DDSD_CAPS = 0x1;
+		// const DDSD_HEIGHT = 0x2;
+		// const DDSD_WIDTH = 0x4;
+		// const DDSD_PITCH = 0x8;
+		// const DDSD_PIXELFORMAT = 0x1000;
 		const DDSD_MIPMAPCOUNT = 0x20000;
-		// let DDSD_LINEARSIZE = 0x80000;
-		// let DDSD_DEPTH = 0x800000;
+		// const DDSD_LINEARSIZE = 0x80000;
+		// const DDSD_DEPTH = 0x800000;
 
-		// let DDSCAPS_COMPLEX = 0x8;
-		// let DDSCAPS_MIPMAP = 0x400000;
-		// let DDSCAPS_TEXTURE = 0x1000;
+		// const DDSCAPS_COMPLEX = 0x8;
+		// const DDSCAPS_MIPMAP = 0x400000;
+		// const DDSCAPS_TEXTURE = 0x1000;
 
 		const DDSCAPS2_CUBEMAP = 0x200;
 		const DDSCAPS2_CUBEMAP_POSITIVEX = 0x400;
@@ -47,14 +47,14 @@ class DDSLoader extends CompressedTextureLoader {
 		const DDSCAPS2_CUBEMAP_NEGATIVEY = 0x2000;
 		const DDSCAPS2_CUBEMAP_POSITIVEZ = 0x4000;
 		const DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000;
-		// let DDSCAPS2_VOLUME = 0x200000;
+		// const DDSCAPS2_VOLUME = 0x200000;
 
-		// let DDPF_ALPHAPIXELS = 0x1;
-		// let DDPF_ALPHA = 0x2;
-		const DDPF_FOURCC = 0x4;
-		// let DDPF_RGB = 0x40;
-		// let DDPF_YUV = 0x200;
-		// let DDPF_LUMINANCE = 0x20000;
+		// const DDPF_ALPHAPIXELS = 0x1;
+		// const DDPF_ALPHA = 0x2;
+		// const DDPF_FOURCC = 0x4;
+		// const DDPF_RGB = 0x40;
+		// const DDPF_YUV = 0x200;
+		// const DDPF_LUMINANCE = 0x20000;
 
 		function fourCCToInt32( value ) {
 
@@ -122,7 +122,7 @@ class DDSLoader extends CompressedTextureLoader {
 
 		const off_mipmapCount = 7;
 
-		const off_pfFlags = 20;
+		// const off_pfFlags = 20;
 		const off_pfFourCC = 21;
 		const off_RGBBitCount = 22;
 		const off_RBitMask = 23;
@@ -130,10 +130,10 @@ class DDSLoader extends CompressedTextureLoader {
 		const off_BBitMask = 25;
 		const off_ABitMask = 26;
 
-		// let off_caps = 27;
+		// const off_caps = 27;
 		const off_caps2 = 28;
-		// let off_caps3 = 29;
-		// let off_caps4 = 30;
+		// const off_caps3 = 29;
+		// const off_caps4 = 30;
 
 		// Parse header
 
@@ -146,13 +146,6 @@ class DDSLoader extends CompressedTextureLoader {
 
 		}
 
-		if ( ! header[ off_pfFlags ] & DDPF_FOURCC ) {
-
-			console.error( 'THREE.DDSLoader.parse: Unsupported format, must contain a FourCC code.' );
-			return dds;
-
-		}
-
 		let blockBytes;
 
 		const fourCC = header[ off_pfFourCC ];

package/examples/jsm/loaders/DRACOLoader.js

@@ -73,21 +73,12 @@ class DRACOLoader extends Loader {
 
 		loader.load( url, ( buffer ) => {
 
-			const taskConfig = {
-				attributeIDs: this.defaultAttributeIDs,
-				attributeTypes: this.defaultAttributeTypes,
-				useUniqueIDs: false
-			};
-
-			this.decodeGeometry( buffer, taskConfig )
-				.then( onLoad )
-				.catch( onError );
+			this.decodeDracoFile( buffer, onLoad ).catch( onError );
 
 		}, onProgress, onError );
 
 	}
 
-	/** @deprecated Kept for backward-compatibility with previous DRACOLoader versions. */
 	decodeDracoFile( buffer, callback, attributeIDs, attributeTypes ) {
 
 		const taskConfig = {
@@ -96,29 +87,12 @@ class DRACOLoader extends Loader {
 			useUniqueIDs: !! attributeIDs
 		};
 
-		this.decodeGeometry( buffer, taskConfig ).then( callback );
+		return this.decodeGeometry( buffer, taskConfig ).then( callback );
 
 	}
 
 	decodeGeometry( buffer, taskConfig ) {
 
-		// TODO: For backward-compatibility, support 'attributeTypes' objects containing
-		// references (rather than names) to typed array constructors. These must be
-		// serialized before sending them to the worker.
-		for ( const attribute in taskConfig.attributeTypes ) {
-
-			const type = taskConfig.attributeTypes[ attribute ];
-
-			if ( type.BYTES_PER_ELEMENT !== undefined ) {
-
-				taskConfig.attributeTypes[ attribute ] = type.name;
-
-			}
-
-		}
-
-		//
-
 		const taskKey = JSON.stringify( taskConfig );
 
 		// Check for an existing task using this buffer. A transferred buffer cannot be transferred