super-three 0.133.5 → 0.135.0

package/examples/js/csm/CSMFrustum.js

@@ -0,0 +1,133 @@
+( function () {
+
+	const inverseProjectionMatrix = new THREE.Matrix4();
+
+	class CSMFrustum {
+
+		constructor( data ) {
+
+			data = data || {};
+			this.vertices = {
+				near: [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ],
+				far: [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ]
+			};
+
+			if ( data.projectionMatrix !== undefined ) {
+
+				this.setFromProjectionMatrix( data.projectionMatrix, data.maxFar || 10000 );
+
+			}
+
+		}
+
+		setFromProjectionMatrix( projectionMatrix, maxFar ) {
+
+			const isOrthographic = projectionMatrix.elements[ 2 * 4 + 3 ] === 0;
+			inverseProjectionMatrix.copy( projectionMatrix ).invert(); // 3 --- 0  vertices.near/far order
+			// |     |
+			// 2 --- 1
+			// clip space spans from [-1, 1]
+
+			this.vertices.near[ 0 ].set( 1, 1, - 1 );
+			this.vertices.near[ 1 ].set( 1, - 1, - 1 );
+			this.vertices.near[ 2 ].set( - 1, - 1, - 1 );
+			this.vertices.near[ 3 ].set( - 1, 1, - 1 );
+			this.vertices.near.forEach( function ( v ) {
+
+				v.applyMatrix4( inverseProjectionMatrix );
+
+			} );
+			this.vertices.far[ 0 ].set( 1, 1, 1 );
+			this.vertices.far[ 1 ].set( 1, - 1, 1 );
+			this.vertices.far[ 2 ].set( - 1, - 1, 1 );
+			this.vertices.far[ 3 ].set( - 1, 1, 1 );
+			this.vertices.far.forEach( function ( v ) {
+
+				v.applyMatrix4( inverseProjectionMatrix );
+				const absZ = Math.abs( v.z );
+
+				if ( isOrthographic ) {
+
+					v.z *= Math.min( maxFar / absZ, 1.0 );
+
+				} else {
+
+					v.multiplyScalar( Math.min( maxFar / absZ, 1.0 ) );
+
+				}
+
+			} );
+			return this.vertices;
+
+		}
+
+		split( breaks, target ) {
+
+			while ( breaks.length > target.length ) {
+
+				target.push( new CSMFrustum() );
+
+			}
+
+			target.length = breaks.length;
+
+			for ( let i = 0; i < breaks.length; i ++ ) {
+
+				const cascade = target[ i ];
+
+				if ( i === 0 ) {
+
+					for ( let j = 0; j < 4; j ++ ) {
+
+						cascade.vertices.near[ j ].copy( this.vertices.near[ j ] );
+
+					}
+
+				} else {
+
+					for ( let j = 0; j < 4; j ++ ) {
+
+						cascade.vertices.near[ j ].lerpVectors( this.vertices.near[ j ], this.vertices.far[ j ], breaks[ i - 1 ] );
+
+					}
+
+				}
+
+				if ( i === breaks.length - 1 ) {
+
+					for ( let j = 0; j < 4; j ++ ) {
+
+						cascade.vertices.far[ j ].copy( this.vertices.far[ j ] );
+
+					}
+
+				} else {
+
+					for ( let j = 0; j < 4; j ++ ) {
+
+						cascade.vertices.far[ j ].lerpVectors( this.vertices.near[ j ], this.vertices.far[ j ], breaks[ i ] );
+
+					}
+
+				}
+
+			}
+
+		}
+
+		toSpace( cameraMatrix, target ) {
+
+			for ( var i = 0; i < 4; i ++ ) {
+
+				target.vertices.near[ i ].copy( this.vertices.near[ i ] ).applyMatrix4( cameraMatrix );
+				target.vertices.far[ i ].copy( this.vertices.far[ i ] ).applyMatrix4( cameraMatrix );
+
+			}
+
+		}
+
+	}
+
+	THREE.CSMFrustum = CSMFrustum;
+
+} )();

package/examples/js/exporters/GLTFExporter.js

@@ -30,6 +30,11 @@
 				return new GLTFMaterialsVolumeExtension( writer );
 
 			} );
+			this.register( function ( writer ) {
+
+				return new GLTFMaterialsClearcoatExtension( writer );
+
+			} );
 
 		}
 
@@ -60,11 +65,19 @@
    * Parse scenes and generate GLTF output
    * @param  {Scene or [THREE.Scenes]} input   THREE.Scene or Array of THREE.Scenes
    * @param  {Function} onDone  Callback on completed
+   * @param  {Function} onError  Callback on errors
    * @param  {Object} options options
    */
 
 
-		parse( input, onDone, options ) {
+		parse( input, onDone, onError, options ) {
+
+			if ( typeof onError === 'object' ) {
+
+				console.warn( 'THREE.GLTFExporter: parse() expects options as the fourth argument now.' );
+				options = onError;
+
+			}
 
 			const writer = new GLTFWriter();
 			const plugins = [];
@@ -76,7 +89,18 @@
 			}
 
 			writer.setPlugins( plugins );
-			writer.write( input, onDone, options );
+			writer.write( input, onDone, options ).catch( onError );
+
+		}
+
+		parseAsync( input, options ) {
+
+			const scope = this;
+			return new Promise( function ( resolve, reject ) {
+
+				scope.parse( input, resolve, reject, options );
+
+			} );
 
 		}
 
@@ -337,7 +361,7 @@
    */
 
 
-		write( input, onDone, options ) {
+		async write( input, onDone, options ) {
 
 			this.options = Object.assign( {}, {
 				// default options
@@ -359,86 +383,83 @@
 			}
 
 			this.processInput( input );
+			await Promise.all( this.pending );
 			const writer = this;
-			Promise.all( this.pending ).then( function () {
-
-				const buffers = writer.buffers;
-				const json = writer.json;
-				const options = writer.options;
-				const extensionsUsed = writer.extensionsUsed; // Merge buffers.
-
-				const blob = new Blob( buffers, {
-					type: 'application/octet-stream'
-				} ); // Declare extensions.
-
-				const extensionsUsedList = Object.keys( extensionsUsed );
-				if ( extensionsUsedList.length > 0 ) json.extensionsUsed = extensionsUsedList; // Update bytelength of the single buffer.
-
-				if ( json.buffers && json.buffers.length > 0 ) json.buffers[ 0 ].byteLength = blob.size;
-
-				if ( options.binary === true ) {
-
-					// https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#glb-file-format-specification
-					const reader = new window.FileReader();
-					reader.readAsArrayBuffer( blob );
+			const buffers = writer.buffers;
+			const json = writer.json;
+			options = writer.options;
+			const extensionsUsed = writer.extensionsUsed; // Merge buffers.
 
-					reader.onloadend = function () {
+			const blob = new Blob( buffers, {
+				type: 'application/octet-stream'
+			} ); // Declare extensions.
 
-						// Binary chunk.
-						const binaryChunk = getPaddedArrayBuffer( reader.result );
-						const binaryChunkPrefix = new DataView( new ArrayBuffer( GLB_CHUNK_PREFIX_BYTES ) );
-						binaryChunkPrefix.setUint32( 0, binaryChunk.byteLength, true );
-						binaryChunkPrefix.setUint32( 4, GLB_CHUNK_TYPE_BIN, true ); // JSON chunk.
+			const extensionsUsedList = Object.keys( extensionsUsed );
+			if ( extensionsUsedList.length > 0 ) json.extensionsUsed = extensionsUsedList; // Update bytelength of the single buffer.
 
-						const jsonChunk = getPaddedArrayBuffer( stringToArrayBuffer( JSON.stringify( json ) ), 0x20 );
-						const jsonChunkPrefix = new DataView( new ArrayBuffer( GLB_CHUNK_PREFIX_BYTES ) );
-						jsonChunkPrefix.setUint32( 0, jsonChunk.byteLength, true );
-						jsonChunkPrefix.setUint32( 4, GLB_CHUNK_TYPE_JSON, true ); // GLB header.
+			if ( json.buffers && json.buffers.length > 0 ) json.buffers[ 0 ].byteLength = blob.size;
 
-						const header = new ArrayBuffer( GLB_HEADER_BYTES );
-						const headerView = new DataView( header );
-						headerView.setUint32( 0, GLB_HEADER_MAGIC, true );
-						headerView.setUint32( 4, GLB_VERSION, true );
-						const totalByteLength = GLB_HEADER_BYTES + jsonChunkPrefix.byteLength + jsonChunk.byteLength + binaryChunkPrefix.byteLength + binaryChunk.byteLength;
-						headerView.setUint32( 8, totalByteLength, true );
-						const glbBlob = new Blob( [ header, jsonChunkPrefix, jsonChunk, binaryChunkPrefix, binaryChunk ], {
-							type: 'application/octet-stream'
-						} );
-						const glbReader = new window.FileReader();
-						glbReader.readAsArrayBuffer( glbBlob );
+			if ( options.binary === true ) {
 
-						glbReader.onloadend = function () {
+				// https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#glb-file-format-specification
+				const reader = new window.FileReader();
+				reader.readAsArrayBuffer( blob );
 
-							onDone( glbReader.result );
+				reader.onloadend = function () {
 
-						};
+					// Binary chunk.
+					const binaryChunk = getPaddedArrayBuffer( reader.result );
+					const binaryChunkPrefix = new DataView( new ArrayBuffer( GLB_CHUNK_PREFIX_BYTES ) );
+					binaryChunkPrefix.setUint32( 0, binaryChunk.byteLength, true );
+					binaryChunkPrefix.setUint32( 4, GLB_CHUNK_TYPE_BIN, true ); // JSON chunk.
+
+					const jsonChunk = getPaddedArrayBuffer( stringToArrayBuffer( JSON.stringify( json ) ), 0x20 );
+					const jsonChunkPrefix = new DataView( new ArrayBuffer( GLB_CHUNK_PREFIX_BYTES ) );
+					jsonChunkPrefix.setUint32( 0, jsonChunk.byteLength, true );
+					jsonChunkPrefix.setUint32( 4, GLB_CHUNK_TYPE_JSON, true ); // GLB header.
+
+					const header = new ArrayBuffer( GLB_HEADER_BYTES );
+					const headerView = new DataView( header );
+					headerView.setUint32( 0, GLB_HEADER_MAGIC, true );
+					headerView.setUint32( 4, GLB_VERSION, true );
+					const totalByteLength = GLB_HEADER_BYTES + jsonChunkPrefix.byteLength + jsonChunk.byteLength + binaryChunkPrefix.byteLength + binaryChunk.byteLength;
+					headerView.setUint32( 8, totalByteLength, true );
+					const glbBlob = new Blob( [ header, jsonChunkPrefix, jsonChunk, binaryChunkPrefix, binaryChunk ], {
+						type: 'application/octet-stream'
+					} );
+					const glbReader = new window.FileReader();
+					glbReader.readAsArrayBuffer( glbBlob );
+
+					glbReader.onloadend = function () {
+
+						onDone( glbReader.result );
 
 					};
 
-				} else {
+				};
 
-					if ( json.buffers && json.buffers.length > 0 ) {
+			} else {
 
-						const reader = new window.FileReader();
-						reader.readAsDataURL( blob );
+				if ( json.buffers && json.buffers.length > 0 ) {
 
-						reader.onloadend = function () {
+					const reader = new window.FileReader();
+					reader.readAsDataURL( blob );
 
-							const base64data = reader.result;
-							json.buffers[ 0 ].uri = base64data;
-							onDone( json );
+					reader.onloadend = function () {
 
-						};
+						const base64data = reader.result;
+						json.buffers[ 0 ].uri = base64data;
+						onDone( json );
 
-					} else {
+					};
 
-						onDone( json );
+				} else {
 
-					}
+					onDone( json );
 
 				}
 
-			} );
+			}
 
 		}
 		/**
@@ -2066,6 +2087,69 @@
 
 		}
 
+	}
+	/**
+ * Clearcoat Materials Extension
+ *
+ * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_clearcoat
+ */
+
+
+	class GLTFMaterialsClearcoatExtension {
+
+		constructor( writer ) {
+
+			this.writer = writer;
+			this.name = 'KHR_materials_clearcoat';
+
+		}
+
+		writeMaterial( material, materialDef ) {
+
+			if ( ! material.isMeshPhysicalMaterial ) return;
+			const writer = this.writer;
+			const extensionsUsed = writer.extensionsUsed;
+			const extensionDef = {};
+			extensionDef.clearcoatFactor = material.clearcoat;
+
+			if ( material.clearcoatMap ) {
+
+				const clearcoatMapDef = {
+					index: writer.processTexture( material.clearcoatMap )
+				};
+				writer.applyTextureTransform( clearcoatMapDef, material.clearcoatMap );
+				extensionDef.clearcoatTexture = clearcoatMapDef;
+
+			}
+
+			extensionDef.clearcoatRoughnessFactor = material.clearcoatRoughness;
+
+			if ( material.clearcoatRoughnessMap ) {
+
+				const clearcoatRoughnessMapDef = {
+					index: writer.processTexture( material.clearcoatRoughnessMap )
+				};
+				writer.applyTextureTransform( clearcoatRoughnessMapDef, material.clearcoatRoughnessMap );
+				extensionDef.clearcoatRoughnessTexture = clearcoatRoughnessMapDef;
+
+			}
+
+			if ( material.clearcoatNormalMap ) {
+
+				const clearcoatNormalMapDef = {
+					index: writer.processTexture( material.clearcoatNormalMap )
+				};
+				writer.applyTextureTransform( clearcoatNormalMapDef, material.clearcoatNormalMap );
+				extensionDef.clearcoatNormalTexture = clearcoatNormalMapDef;
+
+			}
+
+			materialDef.extensions = materialDef.extensions || {};
+			materialDef.extensions[ this.name ] = extensionDef;
+			extensionsUsed[ this.name ] = true;
+
+		}
+
 	}
 	/**
  * Transmission Materials Extension
@@ -2126,7 +2210,7 @@
 
 		writeMaterial( material, materialDef ) {
 
-			if ( ! material.isMeshPhysicalMaterial || material.thickness === 0 ) return;
+			if ( ! material.isMeshPhysicalMaterial || material.transmission === 0 ) return;
 			const writer = this.writer;
 			const extensionsUsed = writer.extensionsUsed;
 			const extensionDef = {};
@@ -2143,7 +2227,7 @@
 			}
 
 			extensionDef.attenuationDistance = material.attenuationDistance;
-			extensionDef.attenuationColor = material.attenuationTint.toArray();
+			extensionDef.attenuationColor = material.attenuationColor.toArray();
 			materialDef.extensions = materialDef.extensions || {};
 			materialDef.extensions[ this.name ] = extensionDef;
 			extensionsUsed[ this.name ] = true;

package/examples/js/exporters/USDZExporter.js

@@ -13,26 +13,34 @@
 			const textures = {};
 			scene.traverseVisible( object => {
 
-				if ( object.isMesh && object.material.isMeshStandardMaterial ) {
+				if ( object.isMesh ) {
 
-					const geometry = object.geometry;
-					const material = object.material;
-					const geometryFileName = 'geometries/Geometry_' + geometry.id + '.usd';
+					if ( object.material.isMeshStandardMaterial ) {
 
-					if ( ! ( geometryFileName in files ) ) {
+						const geometry = object.geometry;
+						const material = object.material;
+						const geometryFileName = 'geometries/Geometry_' + geometry.id + '.usd';
 
-						const meshObject = buildMeshObject( geometry );
-						files[ geometryFileName ] = buildUSDFileAsString( meshObject );
+						if ( ! ( geometryFileName in files ) ) {
 
-					}
+							const meshObject = buildMeshObject( geometry );
+							files[ geometryFileName ] = buildUSDFileAsString( meshObject );
 
-					if ( ! ( material.uuid in materials ) ) {
+						}
 
-						materials[ material.uuid ] = material;
+						if ( ! ( material.uuid in materials ) ) {
 
-					}
+							materials[ material.uuid ] = material;
+
+						}
 
-					output += buildXform( object, geometry, material );
+						output += buildXform( object, geometry, material );
+
+					} else {
+
+						console.warn( 'THREE.USDZExporter: Unsupported material type (USDZ only supports MeshStandardMaterial)', object );
+
+					}
 
 				}
 
@@ -228,25 +236,33 @@ def "Geometry"
 
 	function buildMeshVertexCount( geometry ) {
 
-		const count = geometry.index !== null ? geometry.index.array.length : geometry.attributes.position.count;
+		const count = geometry.index !== null ? geometry.index.count : geometry.attributes.position.count;
 		return Array( count / 3 ).fill( 3 ).join( ', ' );
 
 	}
 
 	function buildMeshVertexIndices( geometry ) {
 
-		if ( geometry.index !== null ) {
+		const index = geometry.index;
+		const array = [];
 
-			return geometry.index.array.join( ', ' );
+		if ( index !== null ) {
 
-		}
+			for ( let i = 0; i < index.count; i ++ ) {
 
-		const array = [];
-		const length = geometry.attributes.position.count;
+				array.push( index.getX( i ) );
 
-		for ( let i = 0; i < length; i ++ ) {
+			}
+
+		} else {
 
-			array.push( i );
+			const length = geometry.attributes.position.count;
+
+			for ( let i = 0; i < length; i ++ ) {
+
+				array.push( i );
+
+			}
 
 		}
 
@@ -264,11 +280,13 @@ def "Geometry"
 		}
 
 		const array = [];
-		const data = attribute.array;
 
-		for ( let i = 0; i < data.length; i += 3 ) {
+		for ( let i = 0; i < attribute.count; i ++ ) {
 
-			array.push( `(${data[ i + 0 ].toPrecision( PRECISION )}, ${data[ i + 1 ].toPrecision( PRECISION )}, ${data[ i + 2 ].toPrecision( PRECISION )})` );
+			const x = attribute.getX( i );
+			const y = attribute.getY( i );
+			const z = attribute.getZ( i );
+			array.push( `(${x.toPrecision( PRECISION )}, ${y.toPrecision( PRECISION )}, ${z.toPrecision( PRECISION )})` );
 
 		}
 
@@ -286,11 +304,12 @@ def "Geometry"
 		}
 
 		const array = [];
-		const data = attribute.array;
 
-		for ( let i = 0; i < data.length; i += 2 ) {
+		for ( let i = 0; i < attribute.count; i ++ ) {
 
-			array.push( `(${data[ i + 0 ].toPrecision( PRECISION )}, ${1 - data[ i + 1 ].toPrecision( PRECISION )})` );
+			const x = attribute.getX( i );
+			const y = attribute.getY( i );
+			array.push( `(${x.toPrecision( PRECISION )}, ${1 - y.toPrecision( PRECISION )})` );
 
 		}