super-three 0.141.0 → 0.147.0

package/examples/js/exporters/MMDExporter.js

@@ -42,7 +42,6 @@
 
 				if ( Math.abs( num ) < 1e-6 ) num = 0;
 				let a = num.toString();
-
 				if ( a.indexOf( '.' ) === - 1 ) {
 
 					a += '.';
@@ -60,7 +59,6 @@
 			function toStringsFromArray( array ) {
 
 				const a = [];
-
 				for ( let i = 0, il = array.length; i < il; i ++ ) {
 
 					a.push( toStringsFromNumber( array[ i ] ) );
@@ -84,16 +82,15 @@
 			array.push( ( skin.name !== '' ? skin.name.replace( /\s/g, '_' ) : 'skin' ) + '.osm;' );
 			array.push( bones.length + ';' );
 			array.push( '' );
-
 			for ( let i = 0, il = bones.length; i < il; i ++ ) {
 
 				const bone = bones[ i ];
 				const bone2 = bones2[ i ];
+
 				/*
        * use the bone matrix saved before solving IK.
        * see CCDIKSolver for the detail.
        */
-
 				if ( useOriginalBones === true && bone.userData.ik !== undefined && bone.userData.ik.originalMatrix !== undefined ) {
 
 					matrix.fromArray( bone.userData.ik.originalMatrix );
@@ -107,8 +104,9 @@
 				position.setFromMatrixPosition( matrix );
 				quaternion.setFromRotationMatrix( matrix );
 				const pArray = position.sub( bone2.position ).toArray();
-				const qArray = quaternion2.copy( bone2.quaternion ).conjugate().multiply( quaternion ).toArray(); // right to left
+				const qArray = quaternion2.copy( bone2.quaternion ).conjugate().multiply( quaternion ).toArray();
 
+				// right to left
 				pArray[ 2 ] = - pArray[ 2 ];
 				qArray[ 0 ] = - qArray[ 0 ];
 				qArray[ 1 ] = - qArray[ 1 ];
@@ -126,21 +124,18 @@
 
 		}
 
-	} // Unicode to Shift_JIS table
-
+	}
 
+	// Unicode to Shift_JIS table
 	let u2sTable;
-
 	function unicodeToShiftjis( str ) {
 
 		if ( u2sTable === undefined ) {
 
 			const encoder = new MMDParser.CharsetEncoder(); // eslint-disable-line no-undef
-
 			const table = encoder.s2uTable;
 			u2sTable = {};
 			const keys = Object.keys( table );
-
 			for ( let i = 0, il = keys.length; i < il; i ++ ) {
 
 				let key = keys[ i ];
@@ -153,12 +148,10 @@
 		}
 
 		const array = [];
-
 		for ( let i = 0, il = str.length; i < il; i ++ ) {
 
 			const code = str.charCodeAt( i );
 			const value = u2sTable[ code ];
-
 			if ( value === undefined ) {
 
 				throw new Error( 'cannot convert charcode 0x' + code.toString( 16 ) );

package/examples/js/exporters/OBJExporter.js

@@ -13,7 +13,6 @@
 			const normal = new THREE.Vector3();
 			const uv = new THREE.Vector2();
 			const face = [];
-
 			function parseMesh( mesh ) {
 
 				let nbVertex = 0;
@@ -22,71 +21,75 @@
 				const geometry = mesh.geometry;
 				const normalMatrixWorld = new THREE.Matrix3();
 
-				if ( geometry.isBufferGeometry !== true ) {
-
-					throw new Error( 'THREE.OBJExporter: Geometry is not of type THREE.BufferGeometry.' );
-
-				} // shortcuts
-
-
+				// shortcuts
 				const vertices = geometry.getAttribute( 'position' );
 				const normals = geometry.getAttribute( 'normal' );
 				const uvs = geometry.getAttribute( 'uv' );
-				const indices = geometry.getIndex(); // name of the mesh object
+				const indices = geometry.getIndex();
 
-				output += 'o ' + mesh.name + '\n'; // name of the mesh material
+				// name of the mesh object
+				output += 'o ' + mesh.name + '\n';
 
+				// name of the mesh material
 				if ( mesh.material && mesh.material.name ) {
 
 					output += 'usemtl ' + mesh.material.name + '\n';
 
-				} // vertices
+				}
 
+				// vertices
 
 				if ( vertices !== undefined ) {
 
 					for ( let i = 0, l = vertices.count; i < l; i ++, nbVertex ++ ) {
 
-						vertex.fromBufferAttribute( vertices, i ); // transform the vertex to world space
+						vertex.fromBufferAttribute( vertices, i );
 
-						vertex.applyMatrix4( mesh.matrixWorld ); // transform the vertex to export format
+						// transform the vertex to world space
+						vertex.applyMatrix4( mesh.matrixWorld );
 
+						// transform the vertex to export format
 						output += 'v ' + vertex.x + ' ' + vertex.y + ' ' + vertex.z + '\n';
 
 					}
 
-				} // uvs
+				}
 
+				// uvs
 
 				if ( uvs !== undefined ) {
 
 					for ( let i = 0, l = uvs.count; i < l; i ++, nbVertexUvs ++ ) {
 
-						uv.fromBufferAttribute( uvs, i ); // transform the uv to export format
+						uv.fromBufferAttribute( uvs, i );
 
+						// transform the uv to export format
 						output += 'vt ' + uv.x + ' ' + uv.y + '\n';
 
 					}
 
-				} // normals
+				}
 
+				// normals
 
 				if ( normals !== undefined ) {
 
 					normalMatrixWorld.getNormalMatrix( mesh.matrixWorld );
-
 					for ( let i = 0, l = normals.count; i < l; i ++, nbNormals ++ ) {
 
-						normal.fromBufferAttribute( normals, i ); // transform the normal to world space
+						normal.fromBufferAttribute( normals, i );
 
-						normal.applyMatrix3( normalMatrixWorld ).normalize(); // transform the normal to export format
+						// transform the normal to world space
+						normal.applyMatrix3( normalMatrixWorld ).normalize();
 
+						// transform the normal to export format
 						output += 'vn ' + normal.x + ' ' + normal.y + ' ' + normal.z + '\n';
 
 					}
 
-				} // faces
+				}
 
+				// faces
 
 				if ( indices !== null ) {
 
@@ -97,9 +100,9 @@
 							const j = indices.getX( i + m ) + 1;
 							face[ m ] = indexVertex + j + ( normals || uvs ? '/' + ( uvs ? indexVertexUvs + j : '' ) + ( normals ? '/' + ( indexNormals + j ) : '' ) : '' );
 
-						} // transform the face to export format
-
+						}
 
+						// transform the face to export format
 						output += 'f ' + face.join( ' ' ) + '\n';
 
 					}
@@ -113,16 +116,16 @@
 							const j = i + m + 1;
 							face[ m ] = indexVertex + j + ( normals || uvs ? '/' + ( uvs ? indexVertexUvs + j : '' ) + ( normals ? '/' + ( indexNormals + j ) : '' ) : '' );
 
-						} // transform the face to export format
-
+						}
 
+						// transform the face to export format
 						output += 'f ' + face.join( ' ' ) + '\n';
 
 					}
 
-				} // update index
-
+				}
 
+				// update index
 				indexVertex += nbVertex;
 				indexVertexUvs += nbVertexUvs;
 				indexNormals += nbNormals;
@@ -135,25 +138,21 @@
 				const geometry = line.geometry;
 				const type = line.type;
 
-				if ( geometry.isBufferGeometry !== true ) {
-
-					throw new Error( 'THREE.OBJExporter: Geometry is not of type THREE.BufferGeometry.' );
-
-				} // shortcuts
-
-
-				const vertices = geometry.getAttribute( 'position' ); // name of the line object
+				// shortcuts
+				const vertices = geometry.getAttribute( 'position' );
 
+				// name of the line object
 				output += 'o ' + line.name + '\n';
-
 				if ( vertices !== undefined ) {
 
 					for ( let i = 0, l = vertices.count; i < l; i ++, nbVertex ++ ) {
 
-						vertex.fromBufferAttribute( vertices, i ); // transform the vertex to world space
+						vertex.fromBufferAttribute( vertices, i );
 
-						vertex.applyMatrix4( line.matrixWorld ); // transform the vertex to export format
+						// transform the vertex to world space
+						vertex.applyMatrix4( line.matrixWorld );
 
+						// transform the vertex to export format
 						output += 'v ' + vertex.x + ' ' + vertex.y + ' ' + vertex.z + '\n';
 
 					}
@@ -163,7 +162,6 @@
 				if ( type === 'Line' ) {
 
 					output += 'l ';
-
 					for ( let j = 1, l = vertices.count; j <= l; j ++ ) {
 
 						output += indexVertex + j + ' ';
@@ -182,9 +180,9 @@
 
 					}
 
-				} // update index
-
+				}
 
+				// update index
 				indexVertex += nbVertex;
 
 			}
@@ -193,17 +191,9 @@
 
 				let nbVertex = 0;
 				const geometry = points.geometry;
-
-				if ( geometry.isBufferGeometry !== true ) {
-
-					throw new Error( 'THREE.OBJExporter: Geometry is not of type THREE.BufferGeometry.' );
-
-				}
-
 				const vertices = geometry.getAttribute( 'position' );
 				const colors = geometry.getAttribute( 'color' );
 				output += 'o ' + points.name + '\n';
-
 				if ( vertices !== undefined ) {
 
 					for ( let i = 0, l = vertices.count; i < l; i ++, nbVertex ++ ) {
@@ -211,7 +201,6 @@
 						vertex.fromBufferAttribute( vertices, i );
 						vertex.applyMatrix4( points.matrixWorld );
 						output += 'v ' + vertex.x + ' ' + vertex.y + ' ' + vertex.z;
-
 						if ( colors !== undefined ) {
 
 							color.fromBufferAttribute( colors, i ).convertLinearToSRGB();
@@ -224,7 +213,6 @@
 					}
 
 					output += 'p ';
-
 					for ( let j = 1, l = vertices.count; j <= l; j ++ ) {
 
 						output += indexVertex + j + ' ';
@@ -233,9 +221,9 @@
 
 					output += '\n';
 
-				} // update index
-
+				}
 
+				// update index
 				indexVertex += nbVertex;
 
 			}

package/examples/js/exporters/PLYExporter.js

@@ -17,30 +17,15 @@
 
 		parse( object, onDone, options ) {
 
-			if ( onDone && typeof onDone === 'object' ) {
-
-				console.warn( 'THREE.PLYExporter: The options parameter is now the third argument to the "parse" function. See the documentation for the new API.' );
-				options = onDone;
-				onDone = undefined;
-
-			} // Iterate over the valid meshes in the object
-
-
+			// Iterate over the valid meshes in the object
 			function traverseMeshes( cb ) {
 
 				object.traverse( function ( child ) {
 
-					if ( child.isMesh === true ) {
+					if ( child.isMesh === true || child.isPoints ) {
 
 						const mesh = child;
 						const geometry = mesh.geometry;
-
-						if ( geometry.isBufferGeometry !== true ) {
-
-							throw new Error( 'THREE.PLYExporter: Geometry is not of type THREE.BufferGeometry.' );
-
-						}
-
 						if ( geometry.hasAttribute( 'position' ) === true ) {
 
 							cb( mesh, geometry );
@@ -51,9 +36,9 @@
 
 				} );
 
-			} // Default options
-
+			}
 
+			// Default options
 			const defaultOptions = {
 				binary: false,
 				excludeAttributes: [],
@@ -62,11 +47,13 @@
 			};
 			options = Object.assign( defaultOptions, options );
 			const excludeAttributes = options.excludeAttributes;
+			let includeIndices = true;
 			let includeNormals = false;
 			let includeColors = false;
-			let includeUVs = false; // count the vertices, check which properties are used,
-			// and cache the BufferGeometry
+			let includeUVs = false;
 
+			// count the vertices, check which properties are used,
+			// and cache the BufferGeometry
 			let vertexCount = 0;
 			let faceCount = 0;
 			object.traverse( function ( child ) {
@@ -75,19 +62,11 @@
 
 					const mesh = child;
 					const geometry = mesh.geometry;
-
-					if ( geometry.isBufferGeometry !== true ) {
-
-						throw new Error( 'THREE.PLYExporter: Geometry is not of type THREE.BufferGeometry.' );
-
-					}
-
 					const vertices = geometry.getAttribute( 'position' );
 					const normals = geometry.getAttribute( 'normal' );
 					const uvs = geometry.getAttribute( 'uv' );
 					const colors = geometry.getAttribute( 'color' );
 					const indices = geometry.getIndex();
-
 					if ( vertices === undefined ) {
 
 						return;
@@ -100,15 +79,22 @@
 					if ( uvs !== undefined ) includeUVs = true;
 					if ( colors !== undefined ) includeColors = true;
 
+				} else if ( child.isPoints ) {
+
+					const mesh = child;
+					const geometry = mesh.geometry;
+					const vertices = geometry.getAttribute( 'position' );
+					vertexCount += vertices.count;
+					includeIndices = false;
+
 				}
 
 			} );
 			const tempColor = new THREE.Color();
-			const includeIndices = excludeAttributes.indexOf( 'index' ) === - 1;
+			includeIndices = includeIndices && excludeAttributes.indexOf( 'index' ) === - 1;
 			includeNormals = includeNormals && excludeAttributes.indexOf( 'normal' ) === - 1;
 			includeColors = includeColors && excludeAttributes.indexOf( 'color' ) === - 1;
 			includeUVs = includeUVs && excludeAttributes.indexOf( 'uv' ) === - 1;
-
 			if ( includeIndices && faceCount !== Math.floor( faceCount ) ) {
 
 				// point cloud meshes will not have an index array and may not have a
@@ -120,9 +106,9 @@
 			}
 
 			const indexByteCount = 4;
-			let header = 'ply\n' + `format ${options.binary ? options.littleEndian ? 'binary_little_endian' : 'binary_big_endian' : 'ascii'} 1.0\n` + `element vertex ${vertexCount}\n` + // position
+			let header = 'ply\n' + `format ${options.binary ? options.littleEndian ? 'binary_little_endian' : 'binary_big_endian' : 'ascii'} 1.0\n` + `element vertex ${vertexCount}\n` +
+    // position
     'property float x\n' + 'property float y\n' + 'property float z\n';
-
 			if ( includeNormals === true ) {
 
 				// normal
@@ -151,23 +137,25 @@
 
 			}
 
-			header += 'end_header\n'; // Generate attribute data
+			header += 'end_header\n';
 
+			// Generate attribute data
 			const vertex = new THREE.Vector3();
 			const normalMatrixWorld = new THREE.Matrix3();
 			let result = null;
-
 			if ( options.binary === true ) {
 
 				// Binary File Generation
-				const headerBin = new TextEncoder().encode( header ); // 3 position values at 4 bytes
+				const headerBin = new TextEncoder().encode( header );
+
+				// 3 position values at 4 bytes
 				// 3 normal values at 4 bytes
 				// 3 color channels with 1 byte
 				// 2 uv values at 4 bytes
+				const vertexListLength = vertexCount * ( 4 * 3 + ( includeNormals ? 4 * 3 : 0 ) + ( includeColors ? 3 : 0 ) + ( includeUVs ? 4 * 2 : 0 ) );
 
-				const vertexListLength = vertexCount * ( 4 * 3 + ( includeNormals ? 4 * 3 : 0 ) + ( includeColors ? 3 : 0 ) + ( includeUVs ? 4 * 2 : 0 ) ); // 1 byte shape desciptor
+				// 1 byte shape desciptor
 				// 3 vertex indices at ${indexByteCount} bytes
-
 				const faceListLength = includeIndices ? faceCount * ( indexByteCount * 3 + 1 ) : 0;
 				const output = new DataView( new ArrayBuffer( headerBin.length + vertexListLength + faceListLength ) );
 				new Uint8Array( output.buffer ).set( headerBin, 0 );
@@ -182,19 +170,20 @@
 					const colors = geometry.getAttribute( 'color' );
 					const indices = geometry.getIndex();
 					normalMatrixWorld.getNormalMatrix( mesh.matrixWorld );
-
 					for ( let i = 0, l = vertices.count; i < l; i ++ ) {
 
 						vertex.fromBufferAttribute( vertices, i );
-						vertex.applyMatrix4( mesh.matrixWorld ); // Position information
+						vertex.applyMatrix4( mesh.matrixWorld );
 
+						// Position information
 						output.setFloat32( vOffset, vertex.x, options.littleEndian );
 						vOffset += 4;
 						output.setFloat32( vOffset, vertex.y, options.littleEndian );
 						vOffset += 4;
 						output.setFloat32( vOffset, vertex.z, options.littleEndian );
-						vOffset += 4; // Normal information
+						vOffset += 4;
 
+						// Normal information
 						if ( includeNormals === true ) {
 
 							if ( normals != null ) {
@@ -219,9 +208,9 @@
 
 							}
 
-						} // UV information
-
+						}
 
+						// UV information
 						if ( includeUVs === true ) {
 
 							if ( uvs != null ) {
@@ -240,9 +229,9 @@
 
 							}
 
-						} // THREE.Color information
-
+						}
 
+						// THREE.Color information
 						if ( includeColors === true ) {
 
 							if ( colors != null ) {
@@ -273,6 +262,7 @@
 					if ( includeIndices === true ) {
 
 						// Create the face list
+
 						if ( indices !== null ) {
 
 							for ( let i = 0, l = indices.count; i < l; i += 3 ) {
@@ -305,10 +295,10 @@
 
 						}
 
-					} // Save the amount of verts we've already written so we can offset
-					// the face index on the next mesh
-
+					}
 
+					// Save the amount of verts we've already written so we can offset
+					// the face index on the next mesh
 					writtenVertices += vertices.count;
 
 				} );
@@ -328,15 +318,18 @@
 					const uvs = geometry.getAttribute( 'uv' );
 					const colors = geometry.getAttribute( 'color' );
 					const indices = geometry.getIndex();
-					normalMatrixWorld.getNormalMatrix( mesh.matrixWorld ); // form each line
+					normalMatrixWorld.getNormalMatrix( mesh.matrixWorld );
 
+					// form each line
 					for ( let i = 0, l = vertices.count; i < l; i ++ ) {
 
 						vertex.fromBufferAttribute( vertices, i );
-						vertex.applyMatrix4( mesh.matrixWorld ); // Position information
+						vertex.applyMatrix4( mesh.matrixWorld );
 
-						let line = vertex.x + ' ' + vertex.y + ' ' + vertex.z; // Normal information
+						// Position information
+						let line = vertex.x + ' ' + vertex.y + ' ' + vertex.z;
 
+						// Normal information
 						if ( includeNormals === true ) {
 
 							if ( normals != null ) {
@@ -351,9 +344,9 @@
 
 							}
 
-						} // UV information
-
+						}
 
+						// UV information
 						if ( includeUVs === true ) {
 
 							if ( uvs != null ) {
@@ -366,9 +359,9 @@
 
 							}
 
-						} // THREE.Color information
-
+						}
 
+						// THREE.Color information
 						if ( includeColors === true ) {
 
 							if ( colors != null ) {
@@ -386,9 +379,9 @@
 
 						vertexList += line + '\n';
 
-					} // Create the face list
-
+					}
 
+					// Create the face list
 					if ( includeIndices === true ) {
 
 						if ( indices !== null ) {

package/examples/js/exporters/STLExporter.js

@@ -13,7 +13,9 @@
 
 		parse( scene, options = {} ) {
 
-			const binary = options.binary !== undefined ? options.binary : false; //
+			const binary = options.binary !== undefined ? options.binary : false;
+
+			//
 
 			const objects = [];
 			let triangles = 0;
@@ -22,13 +24,6 @@
 				if ( object.isMesh ) {
 
 					const geometry = object.geometry;
-
-					if ( geometry.isBufferGeometry !== true ) {
-
-						throw new Error( 'THREE.STLExporter: Geometry is not of type THREE.BufferGeometry.' );
-
-					}
-
 					const index = geometry.index;
 					const positionAttribute = geometry.getAttribute( 'position' );
 					triangles += index !== null ? index.count / 3 : positionAttribute.count / 3;
@@ -64,17 +59,16 @@
 			const cb = new THREE.Vector3();
 			const ab = new THREE.Vector3();
 			const normal = new THREE.Vector3();
-
 			for ( let i = 0, il = objects.length; i < il; i ++ ) {
 
 				const object = objects[ i ].object3d;
 				const geometry = objects[ i ].geometry;
 				const index = geometry.index;
 				const positionAttribute = geometry.getAttribute( 'position' );
-
 				if ( index !== null ) {
 
 					// indexed geometry
+
 					for ( let j = 0; j < index.count; j += 3 ) {
 
 						const a = index.getX( j + 0 );
@@ -87,6 +81,7 @@
 				} else {
 
 					// non-indexed geometry
+
 					for ( let j = 0; j < positionAttribute.count; j += 3 ) {
 
 						const a = j + 0;
@@ -107,13 +102,11 @@
 			}
 
 			return output;
-
 			function writeFace( a, b, c, positionAttribute, object ) {
 
 				vA.fromBufferAttribute( positionAttribute, a );
 				vB.fromBufferAttribute( positionAttribute, b );
 				vC.fromBufferAttribute( positionAttribute, c );
-
 				if ( object.isSkinnedMesh === true ) {
 
 					object.boneTransform( a, vA );
@@ -129,7 +122,6 @@
 				writeVertex( vA );
 				writeVertex( vB );
 				writeVertex( vC );
-
 				if ( binary === true ) {
 
 					output.setUint16( offset, 0, true );
@@ -150,7 +142,6 @@
 				ab.subVectors( vA, vB );
 				cb.cross( ab ).normalize();
 				normal.copy( cb ).normalize();
-
 				if ( binary === true ) {
 
 					output.setFloat32( offset, normal.x, true );