super-three 0.133.4 → 0.136.1

package/examples/jsm/loaders/LUT3dlLoader.js

@@ -1,11 +1,11 @@
 // http://download.autodesk.com/us/systemdocs/help/2011/lustre/index.html?url=./files/WSc4e151a45a3b785a24c3d9a411df9298473-7ffd.htm,topicNumber=d0e9492
-
+// https://community.foundry.com/discuss/topic/103636/format-spec-for-3dl?mode=Post&postID=895258
 import {
 	Loader,
 	FileLoader,
 	DataTexture,
 	DataTexture3D,
-	RGBFormat,
+	RGBAFormat,
 	UnsignedByteType,
 	ClampToEdgeWrapping,
 	LinearFilter,
@@ -69,7 +69,7 @@ export class LUT3dlLoader extends Loader {
 
 		}
 
-		const dataArray = new Array( size * size * size * 3 );
+		const dataArray = new Array( size * size * size * 4 );
 		let index = 0;
 		let maxOutputValue = 0.0;
 		for ( let i = 1, l = lines.length; i < l; i ++ ) {
@@ -88,21 +88,26 @@ export class LUT3dlLoader extends Loader {
 
 			// b grows first, then g, then r
 			const pixelIndex = bLayer * size * size + gLayer * size + rLayer;
-			dataArray[ 3 * pixelIndex + 0 ] = r;
-			dataArray[ 3 * pixelIndex + 1 ] = g;
-			dataArray[ 3 * pixelIndex + 2 ] = b;
+			dataArray[ 4 * pixelIndex + 0 ] = r;
+			dataArray[ 4 * pixelIndex + 1 ] = g;
+			dataArray[ 4 * pixelIndex + 2 ] = b;
+			dataArray[ 4 * pixelIndex + 3 ] = 1.0;
 			index += 1;
 
 		}
 
-		// Find the apparent bit depth of the stored RGB values and scale the
+		// Find the apparent bit depth of the stored RGB values and map the
 		// values to [ 0, 255 ].
 		const bits = Math.ceil( Math.log2( maxOutputValue ) );
 		const maxBitValue = Math.pow( 2.0, bits );
-		for ( let i = 0, l = dataArray.length; i < l; i ++ ) {
+		for ( let i = 0, l = dataArray.length; i < l; i += 4 ) {
 
-			const val = dataArray[ i ];
-			dataArray[ i ] = 255 * val / maxBitValue;
+			const r = dataArray[ i + 0 ];
+			const g = dataArray[ i + 1 ];
+			const b = dataArray[ i + 2 ];
+			dataArray[ i + 0 ] = 255 * r / maxBitValue; // r
+			dataArray[ i + 1 ] = 255 * g / maxBitValue; // g
+			dataArray[ i + 2 ] = 255 * b / maxBitValue; // b
 
 		}
 
@@ -111,20 +116,21 @@ export class LUT3dlLoader extends Loader {
 		texture.image.data = data;
 		texture.image.width = size;
 		texture.image.height = size * size;
-		texture.format = RGBFormat;
+		texture.format = RGBAFormat;
 		texture.type = UnsignedByteType;
 		texture.magFilter = LinearFilter;
 		texture.minFilter = LinearFilter;
 		texture.wrapS = ClampToEdgeWrapping;
 		texture.wrapT = ClampToEdgeWrapping;
 		texture.generateMipmaps = false;
+		texture.needsUpdate = true;
 
 		const texture3D = new DataTexture3D();
 		texture3D.image.data = data;
 		texture3D.image.width = size;
 		texture3D.image.height = size;
 		texture3D.image.depth = size;
-		texture3D.format = RGBFormat;
+		texture3D.format = RGBAFormat;
 		texture3D.type = UnsignedByteType;
 		texture3D.magFilter = LinearFilter;
 		texture3D.minFilter = LinearFilter;
@@ -132,6 +138,7 @@ export class LUT3dlLoader extends Loader {
 		texture3D.wrapT = ClampToEdgeWrapping;
 		texture3D.wrapR = ClampToEdgeWrapping;
 		texture3D.generateMipmaps = false;
+		texture3D.needsUpdate = true;
 
 		return {
 			size,

package/examples/jsm/loaders/LUTCubeLoader.js

@@ -6,7 +6,6 @@ import {
 	Vector3,
 	DataTexture,
 	DataTexture3D,
-	RGBFormat,
 	UnsignedByteType,
 	ClampToEdgeWrapping,
 	LinearFilter,
@@ -77,7 +76,7 @@ export class LUTCubeLoader extends Loader {
 					// more precision than can be captured with Uint8Array.
 					const sizeToken = split[ 1 ];
 					size = parseFloat( sizeToken );
-					data = new Uint8Array( size * size * size * 3 );
+					data = new Uint8Array( size * size * size * 4 );
 					break;
 				case 'DOMAIN_MIN':
 					domainMin.x = parseFloat( split[ 1 ] );
@@ -107,7 +106,8 @@ export class LUTCubeLoader extends Loader {
 					data[ currIndex + 0 ] = r * 255;
 					data[ currIndex + 1 ] = g * 255;
 					data[ currIndex + 2 ] = b * 255;
-					currIndex += 3;
+					data[ currIndex + 3 ] = 255;
+					currIndex += 4;
 
 			}
 
@@ -117,20 +117,19 @@ export class LUTCubeLoader extends Loader {
 		texture.image.data = data;
 		texture.image.width = size;
 		texture.image.height = size * size;
-		texture.format = RGBFormat;
 		texture.type = UnsignedByteType;
 		texture.magFilter = LinearFilter;
 		texture.minFilter = LinearFilter;
 		texture.wrapS = ClampToEdgeWrapping;
 		texture.wrapT = ClampToEdgeWrapping;
 		texture.generateMipmaps = false;
+		texture.needsUpdate = true;
 
 		const texture3D = new DataTexture3D();
 		texture3D.image.data = data;
 		texture3D.image.width = size;
 		texture3D.image.height = size;
 		texture3D.image.depth = size;
-		texture3D.format = RGBFormat;
 		texture3D.type = UnsignedByteType;
 		texture3D.magFilter = LinearFilter;
 		texture3D.minFilter = LinearFilter;
@@ -138,6 +137,7 @@ export class LUTCubeLoader extends Loader {
 		texture3D.wrapT = ClampToEdgeWrapping;
 		texture3D.wrapR = ClampToEdgeWrapping;
 		texture3D.generateMipmaps = false;
+		texture3D.needsUpdate = true;
 
 		return {
 			title,

package/examples/jsm/loaders/LWOLoader.js

@@ -4,10 +4,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
  *
  **/
 
@@ -465,7 +465,7 @@ class MaterialParser {
 					break;
 				case 'Roughness':
 					maps.roughnessMap = texture;
-					maps.roughness = 0.5;
+					maps.roughness = 1;
 					break;
 				case 'Specular':
 					maps.specularMap = texture;
@@ -480,7 +480,7 @@ class MaterialParser {
 					break;
 				case 'Metallic':
 					maps.metalnessMap = texture;
-					maps.metalness = 0.5;
+					maps.metalness = 1;
 					break;
 				case 'Transparency':
 				case 'Alpha':
@@ -591,7 +591,7 @@ class MaterialParser {
 
 		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 );
@@ -707,10 +707,12 @@ class MaterialParser {
 
 				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 = EquirectangularReflectionMapping;
 
 			maps.envMap = envMap;