super-three 0.137.0 → 0.141.0

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

@@ -73,14 +73,11 @@
 				let relsName;
 				let modelRelsName;
 				const modelPartNames = [];
-				const printTicketPartNames = [];
 				const texturesPartNames = [];
-				const otherPartNames = [];
 				let modelRels;
 				const modelParts = {};
 				const printTicketParts = {};
 				const texturesParts = {};
-				const otherParts = {};
 
 				try {
 
@@ -111,18 +108,10 @@
 
 						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 );
-
 					}
 
 				} //
@@ -195,8 +184,7 @@
 					modelRels: modelRels,
 					model: modelParts,
 					printTicket: printTicketParts,
-					texture: texturesParts,
-					other: otherParts
+					texture: texturesParts
 				};
 
 			}
@@ -909,7 +897,7 @@
 
 			}
 
-			function buildVertexColorMesh( colorgroup, triangleProperties, meshData, objects, modelData, objectData ) {
+			function buildVertexColorMesh( colorgroup, triangleProperties, meshData, objectData ) {
 
 				// geometry
 				const geometry = new THREE.BufferGeometry();
@@ -1008,7 +996,7 @@
 
 						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':
@@ -1022,6 +1010,16 @@
 
 				}
 
+				if ( objectData.name ) {
+
+					for ( let i = 0; i < meshes.length; i ++ ) {
+
+						meshes[ i ].name = objectData.name;
+
+					}
+
+				}
+
 				return meshes;
 
 			}
@@ -1052,7 +1050,7 @@
 
 			}
 
-			function analyzeObject( modelData, meshData, objectData ) {
+			function analyzeObject( meshData, objectData ) {
 
 				const resourceMap = {};
 				const triangleProperties = meshData[ 'triangleProperties' ];
@@ -1075,7 +1073,7 @@
 			function buildGroup( meshData, objects, modelData, textureData, objectData ) {
 
 				const group = new THREE.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 ++ ) {
@@ -1231,6 +1229,12 @@
 
 				}
 
+				if ( objectData.name ) {
+
+					objects[ objectData.id ].name = objectData.name;
+
+				}
+
 			}
 
 			function buildObjects( data3mf ) {

package/examples/js/loaders/AMFLoader.js

@@ -88,7 +88,7 @@
 
 					for ( file in zip ) {
 
-						if ( file.toLowerCase().substr( - 4 ) === '.amf' ) {
+						if ( file.toLowerCase().slice( - 4 ) === '.amf' ) {
 
 							break;
 

package/examples/js/loaders/ColladaLoader.js

@@ -1333,11 +1333,11 @@
 
 			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;
 
 					switch ( child.nodeName ) {
@@ -1443,7 +1443,7 @@
 
 				material.name = data.name || '';
 
-				function getTexture( textureObject ) {
+				function getTexture( textureObject, encoding = null ) {
 
 					const sampler = effect.profile.samplers[ textureObject.id ];
 					let image = null; // get image
@@ -1485,6 +1485,12 @@
 
 							}
 
+							if ( encoding !== null ) {
+
+								texture.encoding = encoding;
+
+							}
+
 							return texture;
 
 						} else {
@@ -1513,7 +1519,7 @@
 
 						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, THREE.sRGBEncoding );
 							break;
 
 						case 'specular':
@@ -1526,7 +1532,7 @@
 							break;
 
 						case 'ambient':
-							if ( parameter.texture ) material.lightMap = getTexture( parameter.texture );
+							if ( parameter.texture ) material.lightMap = getTexture( parameter.texture, THREE.sRGBEncoding );
 							break;
 
 						case 'shininess':
@@ -1535,13 +1541,16 @@
 
 						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, THREE.sRGBEncoding );
 							break;
 
 					}
 
-				} //
+				}
 
+				material.color.convertSRGBToLinear();
+				if ( material.specular ) material.specular.convertSRGBToLinear();
+				if ( material.emissive ) material.emissive.convertSRGBToLinear(); //
 
 				let transparent = parameters[ 'transparent' ];
 				let transparency = parameters[ 'transparency' ]; // <transparency> does not exist but <transparent>
@@ -1851,7 +1860,7 @@
 
 						case 'color':
 							const array = parseFloats( child.textContent );
-							data.color = new THREE.Color().fromArray( array );
+							data.color = new THREE.Color().fromArray( array ).convertSRGBToLinear();
 							break;
 
 						case 'falloff_angle':
@@ -2310,7 +2319,7 @@
 								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;
 
@@ -2345,7 +2354,7 @@
 
 			}
 
-			function buildGeometryData( primitive, source, offset, array ) {
+			function buildGeometryData( primitive, source, offset, array, isColor = false ) {
 
 				const indices = primitive.p;
 				const stride = primitive.stride;
@@ -2362,6 +2371,17 @@
 
 					}
 
+					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;
@@ -2785,7 +2805,7 @@
 							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;
 
 					}
@@ -3721,6 +3741,7 @@
 			} //
 
 
+			const tempColor = new THREE.Color();
 			const animations = [];
 			let kinematics = {};
 			let count = 0; //

package/examples/js/loaders/DDSLoader.js

@@ -21,17 +21,17 @@
 			// All values and structures referenced from:
 			// http://msdn.microsoft.com/en-us/library/bb943991.aspx/
 
-			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_MIPMAPCOUNT = 0x20000; // let DDSD_LINEARSIZE = 0x80000;
-			// let DDSD_DEPTH = 0x800000;
-			// let DDSCAPS_COMPLEX = 0x8;
-			// let DDSCAPS_MIPMAP = 0x400000;
-			// let DDSCAPS_TEXTURE = 0x1000;
+			const DDS_MAGIC = 0x20534444; // const DDSD_CAPS = 0x1;
+			// const DDSD_HEIGHT = 0x2;
+			// const DDSD_WIDTH = 0x4;
+			// const DDSD_PITCH = 0x8;
+			// const DDSD_PIXELFORMAT = 0x1000;
+
+			const DDSD_MIPMAPCOUNT = 0x20000; // const DDSD_LINEARSIZE = 0x80000;
+			// const DDSD_DEPTH = 0x800000;
+			// const DDSCAPS_COMPLEX = 0x8;
+			// const DDSCAPS_MIPMAP = 0x400000;
+			// const DDSCAPS_TEXTURE = 0x1000;
 
 			const DDSCAPS2_CUBEMAP = 0x200;
 			const DDSCAPS2_CUBEMAP_POSITIVEX = 0x400;
@@ -39,13 +39,13 @@
 			const DDSCAPS2_CUBEMAP_POSITIVEY = 0x1000;
 			const DDSCAPS2_CUBEMAP_NEGATIVEY = 0x2000;
 			const DDSCAPS2_CUBEMAP_POSITIVEZ = 0x4000;
-			const DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000; // let 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 DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000; // const DDSCAPS2_VOLUME = 0x200000;
+			// 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 ) {
 
@@ -111,17 +111,17 @@
 			const off_flags = 2;
 			const off_height = 3;
 			const off_width = 4;
-			const off_mipmapCount = 7;
-			const off_pfFlags = 20;
+			const off_mipmapCount = 7; // const off_pfFlags = 20;
+
 			const off_pfFourCC = 21;
 			const off_RGBBitCount = 22;
 			const off_RBitMask = 23;
 			const off_GBitMask = 24;
 			const off_BBitMask = 25;
-			const off_ABitMask = 26; // let off_caps = 27;
+			const off_ABitMask = 26; // const off_caps = 27;
 
-			const off_caps2 = 28; // let off_caps3 = 29;
-			// let off_caps4 = 30;
+			const off_caps2 = 28; // const off_caps3 = 29;
+			// const off_caps4 = 30;
 			// Parse header
 
 			const header = new Int32Array( buffer, 0, headerLengthInt );
@@ -133,13 +133,6 @@
 
 			}
 
-			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 ];
 			let isRGBAUncompressed = false;