super-three 0.136.1 → 0.144.0

package/examples/js/exporters/PLYExporter.js

@@ -17,30 +17,16 @@
 
 		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 );
@@ -62,6 +48,7 @@
 			};
 			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,
@@ -75,13 +62,6 @@
 
 					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' );
@@ -100,10 +80,19 @@
 					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 includeIndices = excludeAttributes.indexOf( 'index' ) === - 1;
+			const tempColor = new THREE.Color();
+			includeIndices = includeIndices && excludeAttributes.indexOf( 'index' ) === - 1;
 			includeNormals = includeNormals && excludeAttributes.indexOf( 'normal' ) === - 1;
 			includeColors = includeColors && excludeAttributes.indexOf( 'color' ) === - 1;
 			includeUVs = includeUVs && excludeAttributes.indexOf( 'uv' ) === - 1;
@@ -184,9 +173,7 @@
 
 					for ( let i = 0, l = vertices.count; i < l; i ++ ) {
 
-						vertex.x = vertices.getX( i );
-						vertex.y = vertices.getY( i );
-						vertex.z = vertices.getZ( i );
+						vertex.fromBufferAttribute( vertices, i );
 						vertex.applyMatrix4( mesh.matrixWorld ); // Position information
 
 						output.setFloat32( vOffset, vertex.x, options.littleEndian );
@@ -200,9 +187,7 @@
 
 							if ( normals != null ) {
 
-								vertex.x = normals.getX( i );
-								vertex.y = normals.getY( i );
-								vertex.z = normals.getZ( i );
+								vertex.fromBufferAttribute( normals, i );
 								vertex.applyMatrix3( normalMatrixWorld ).normalize();
 								output.setFloat32( vOffset, vertex.x, options.littleEndian );
 								vOffset += 4;
@@ -234,7 +219,7 @@
 								output.setFloat32( vOffset, uvs.getY( i ), options.littleEndian );
 								vOffset += 4;
 
-							} else if ( includeUVs !== false ) {
+							} else {
 
 								output.setFloat32( vOffset, 0, options.littleEndian );
 								vOffset += 4;
@@ -243,18 +228,19 @@
 
 							}
 
-						} // Color information
+						} // THREE.Color information
 
 
 						if ( includeColors === true ) {
 
 							if ( colors != null ) {
 
-								output.setUint8( vOffset, Math.floor( colors.getX( i ) * 255 ) );
+								tempColor.fromBufferAttribute( colors, i ).convertLinearToSRGB();
+								output.setUint8( vOffset, Math.floor( tempColor.r * 255 ) );
 								vOffset += 1;
-								output.setUint8( vOffset, Math.floor( colors.getY( i ) * 255 ) );
+								output.setUint8( vOffset, Math.floor( tempColor.g * 255 ) );
 								vOffset += 1;
-								output.setUint8( vOffset, Math.floor( colors.getZ( i ) * 255 ) );
+								output.setUint8( vOffset, Math.floor( tempColor.b * 255 ) );
 								vOffset += 1;
 
 							} else {
@@ -334,9 +320,7 @@
 
 					for ( let i = 0, l = vertices.count; i < l; i ++ ) {
 
-						vertex.x = vertices.getX( i );
-						vertex.y = vertices.getY( i );
-						vertex.z = vertices.getZ( i );
+						vertex.fromBufferAttribute( vertices, i );
 						vertex.applyMatrix4( mesh.matrixWorld ); // Position information
 
 						let line = vertex.x + ' ' + vertex.y + ' ' + vertex.z; // Normal information
@@ -345,9 +329,7 @@
 
 							if ( normals != null ) {
 
-								vertex.x = normals.getX( i );
-								vertex.y = normals.getY( i );
-								vertex.z = normals.getZ( i );
+								vertex.fromBufferAttribute( normals, i );
 								vertex.applyMatrix3( normalMatrixWorld ).normalize();
 								line += ' ' + vertex.x + ' ' + vertex.y + ' ' + vertex.z;
 
@@ -366,20 +348,21 @@
 
 								line += ' ' + uvs.getX( i ) + ' ' + uvs.getY( i );
 
-							} else if ( includeUVs !== false ) {
+							} else {
 
 								line += ' 0 0';
 
 							}
 
-						} // Color information
+						} // THREE.Color information
 
 
 						if ( includeColors === true ) {
 
 							if ( colors != null ) {
 
-								line += ' ' + Math.floor( colors.getX( i ) * 255 ) + ' ' + Math.floor( colors.getY( i ) * 255 ) + ' ' + Math.floor( colors.getZ( i ) * 255 );
+								tempColor.fromBufferAttribute( colors, i ).convertLinearToSRGB();
+								line += ' ' + Math.floor( tempColor.r * 255 ) + ' ' + Math.floor( tempColor.g * 255 ) + ' ' + Math.floor( tempColor.b * 255 );
 
 							} else {
 

package/examples/js/exporters/STLExporter.js

@@ -22,13 +22,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;

package/examples/js/exporters/USDZExporter.js

@@ -375,13 +375,32 @@ ${array.join( '' )}
             float outputs:g
             float outputs:b
             float3 outputs:rgb
+            ${material.transparent || material.alphaTest > 0.0 ? 'float outputs:a' : ''}
         }`;
 
 		}
 
+		if ( material.side === THREE.DoubleSide ) {
+
+			console.warn( 'THREE.USDZExporter: USDZ does not support double sided materials', material );
+
+		}
+
 		if ( material.map !== null ) {
 
 			inputs.push( `${pad}color3f inputs:diffuseColor.connect = </Materials/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:rgb>` );
+
+			if ( material.transparent ) {
+
+				inputs.push( `${pad}float inputs:opacity.connect = </Materials/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:a>` );
+
+			} else if ( material.alphaTest > 0.0 ) {
+
+				inputs.push( `${pad}float inputs:opacity.connect = </Materials/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:a>` );
+				inputs.push( `${pad}float inputs:opacityThreshold = ${material.alphaTest}` );
+
+			}
+
 			samplers.push( buildTexture( material.map, 'diffuse', material.color ) );
 
 		} else {

package/examples/js/geometries/ConvexGeometry.js

@@ -11,7 +11,7 @@
 
 			if ( THREE.ConvexHull === undefined ) {
 
-				console.error( 'THREE.ConvexBufferGeometry: ConvexBufferGeometry relies on THREE.ConvexHull' );
+				console.error( 'THREE.ConvexGeometry: ConvexGeometry relies on THREE.ConvexHull' );
 
 			}
 

package/examples/js/geometries/DecalGeometry.js

@@ -45,13 +45,6 @@
 				const vertex = new THREE.Vector3();
 				const normal = new THREE.Vector3(); // handle different geometry types
 
-				if ( mesh.geometry.isGeometry === true ) {
-
-					console.error( 'THREE.DecalGeometry no longer supports THREE.Geometry. Use THREE.BufferGeometry instead.' );
-					return;
-
-				}
-
 				const geometry = mesh.geometry;
 				const positionAttribute = geometry.attributes.position;
 				const normalAttribute = geometry.attributes.normal; // first, create an array of 'DecalVertex' objects

package/examples/js/geometries/LightningStrike.js

@@ -106,6 +106,7 @@
 		constructor( rayParameters = {} ) {
 
 			super();
+			this.isLightningStrike = true;
 			this.type = 'LightningStrike'; // Set parameters, and set undefined parameters to default values
 
 			this.init( LightningStrike.copyParameters( rayParameters, rayParameters ) ); // Creates and populates the mesh
@@ -856,9 +857,8 @@
 
 		}
 
-	}
+	} // Ray states
 
-	LightningStrike.prototype.isLightningStrike = true; // Ray states
 
 	LightningStrike.RAY_INITIALIZED = 0;
 	LightningStrike.RAY_UNBORN = 1;

package/examples/js/geometries/ParametricGeometries.js

@@ -173,9 +173,9 @@
 
 				u *= Math.PI;
 				v *= 2 * Math.PI;
-				var x = size * Math.sin( u ) * Math.cos( v );
-				var y = size * Math.sin( u ) * Math.sin( v );
-				var z = size * Math.cos( u );
+				const x = size * Math.sin( u ) * Math.cos( v );
+				const y = size * Math.sin( u ) * Math.sin( v );
+				const z = size * Math.cos( u );
 				target.set( x, y, z );
 
 			}

package/examples/js/geometries/ParametricGeometry.js

@@ -26,14 +26,7 @@
 			const p0 = new THREE.Vector3(),
 				p1 = new THREE.Vector3();
 			const pu = new THREE.Vector3(),
-				pv = new THREE.Vector3();
-
-			if ( func.length < 3 ) {
-
-				console.error( 'THREE.ParametricGeometry: Function must now modify a THREE.Vector3 as third parameter.' );
-
-			} // generate vertices, normals and uvs
-
+				pv = new THREE.Vector3(); // generate vertices, normals and uvs
 
 			const sliceCount = slices + 1;
 

package/examples/js/geometries/TextGeometry.js

@@ -23,21 +23,23 @@
 
 			const font = parameters.font;
 
-			if ( ! ( font && font.isFont ) ) {
+			if ( font === undefined ) {
 
-				console.error( 'THREE.TextGeometry: font parameter is not an instance of THREE.Font.' );
-				return new THREE.BufferGeometry();
+				super(); // generate default extrude geometry
 
-			}
+			} else {
+
+				const shapes = font.generateShapes( text, parameters.size ); // translate parameters to THREE.ExtrudeGeometry API
 
-			const shapes = font.generateShapes( text, parameters.size ); // translate parameters to THREE.ExtrudeGeometry API
+				parameters.depth = parameters.height !== undefined ? parameters.height : 50; // defaults
 
-			parameters.depth = parameters.height !== undefined ? parameters.height : 50; // defaults
+				if ( parameters.bevelThickness === undefined ) parameters.bevelThickness = 10;
+				if ( parameters.bevelSize === undefined ) parameters.bevelSize = 8;
+				if ( parameters.bevelEnabled === undefined ) parameters.bevelEnabled = false;
+				super( shapes, parameters );
+
+			}
 
-			if ( parameters.bevelThickness === undefined ) parameters.bevelThickness = 10;
-			if ( parameters.bevelSize === undefined ) parameters.bevelSize = 8;
-			if ( parameters.bevelEnabled === undefined ) parameters.bevelEnabled = false;
-			super( shapes, parameters );
 			this.type = 'TextGeometry';
 
 		}

package/examples/js/helpers/OctreeHelper.js

@@ -0,0 +1,74 @@
+( function () {
+
+	class OctreeHelper extends THREE.LineSegments {
+
+		constructor( octree, color = 0xffff00 ) {
+
+			const vertices = [];
+
+			function traverse( tree ) {
+
+				for ( let i = 0; i < tree.length; i ++ ) {
+
+					const min = tree[ i ].box.min;
+					const max = tree[ i ].box.max;
+					vertices.push( max.x, max.y, max.z );
+					vertices.push( min.x, max.y, max.z ); // 0, 1
+
+					vertices.push( min.x, max.y, max.z );
+					vertices.push( min.x, min.y, max.z ); // 1, 2
+
+					vertices.push( min.x, min.y, max.z );
+					vertices.push( max.x, min.y, max.z ); // 2, 3
+
+					vertices.push( max.x, min.y, max.z );
+					vertices.push( max.x, max.y, max.z ); // 3, 0
+
+					vertices.push( max.x, max.y, min.z );
+					vertices.push( min.x, max.y, min.z ); // 4, 5
+
+					vertices.push( min.x, max.y, min.z );
+					vertices.push( min.x, min.y, min.z ); // 5, 6
+
+					vertices.push( min.x, min.y, min.z );
+					vertices.push( max.x, min.y, min.z ); // 6, 7
+
+					vertices.push( max.x, min.y, min.z );
+					vertices.push( max.x, max.y, min.z ); // 7, 4
+
+					vertices.push( max.x, max.y, max.z );
+					vertices.push( max.x, max.y, min.z ); // 0, 4
+
+					vertices.push( min.x, max.y, max.z );
+					vertices.push( min.x, max.y, min.z ); // 1, 5
+
+					vertices.push( min.x, min.y, max.z );
+					vertices.push( min.x, min.y, min.z ); // 2, 6
+
+					vertices.push( max.x, min.y, max.z );
+					vertices.push( max.x, min.y, min.z ); // 3, 7
+
+					traverse( tree[ i ].subTrees );
+
+				}
+
+			}
+
+			traverse( octree.subTrees );
+			const geometry = new THREE.BufferGeometry();
+			geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( vertices, 3 ) );
+			super( geometry, new THREE.LineBasicMaterial( {
+				color: color,
+				toneMapped: false
+			} ) );
+			this.octree = octree;
+			this.color = color;
+			this.type = 'OctreeHelper';
+
+		}
+
+	}
+
+	THREE.OctreeHelper = OctreeHelper;
+
+} )();

package/examples/js/helpers/VertexNormalsHelper.js

@@ -10,22 +10,8 @@
 
 		constructor( object, size = 1, color = 0xff0000 ) {
 
-			let nNormals = 0;
-			const objGeometry = object.geometry;
-
-			if ( objGeometry && objGeometry.isGeometry ) {
-
-				console.error( 'THREE.VertexNormalsHelper no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-				return;
-
-			} else if ( objGeometry && objGeometry.isBufferGeometry ) {
-
-				nNormals = objGeometry.attributes.normal.count;
-
-			} //
-
-
 			const geometry = new THREE.BufferGeometry();
+			const nNormals = object.geometry.attributes.normal.count;
 			const positions = new THREE.Float32BufferAttribute( nNormals * 2 * 3, 3 );
 			geometry.setAttribute( 'position', positions );
 			super( geometry, new THREE.LineBasicMaterial( {
@@ -52,12 +38,7 @@
 
 			const objGeometry = this.object.geometry;
 
-			if ( objGeometry && objGeometry.isGeometry ) {
-
-				console.error( 'THREE.VertexNormalsHelper no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-				return;
-
-			} else if ( objGeometry && objGeometry.isBufferGeometry ) {
+			if ( objGeometry ) {
 
 				const objPos = objGeometry.attributes.position;
 				const objNorm = objGeometry.attributes.normal;
@@ -65,9 +46,9 @@
 
 				for ( let j = 0, jl = objPos.count; j < jl; j ++ ) {
 
-					_v1.set( objPos.getX( j ), objPos.getY( j ), objPos.getZ( j ) ).applyMatrix4( matrixWorld );
+					_v1.fromBufferAttribute( objPos, j ).applyMatrix4( matrixWorld );
 
-					_v2.set( objNorm.getX( j ), objNorm.getY( j ), objNorm.getZ( j ) );
+					_v2.fromBufferAttribute( objNorm, j );
 
 					_v2.applyMatrix3( _normalMatrix ).normalize().multiplyScalar( this.size ).add( _v1 );
 

package/examples/js/helpers/VertexTangentsHelper.js

@@ -8,18 +8,8 @@
 
 		constructor( object, size = 1, color = 0x00ffff ) {
 
-			const objGeometry = object.geometry;
-
-			if ( ! ( objGeometry && objGeometry.isBufferGeometry ) ) {
-
-				console.error( 'THREE.VertexTangentsHelper: geometry not an instance of THREE.BufferGeometry.', objGeometry );
-				return;
-
-			}
-
-			const nTangents = objGeometry.attributes.tangent.count; //
-
 			const geometry = new THREE.BufferGeometry();
+			const nTangents = object.geometry.attributes.tangent.count;
 			const positions = new THREE.Float32BufferAttribute( nTangents * 2 * 3, 3 );
 			geometry.setAttribute( 'position', positions );
 			super( geometry, new THREE.LineBasicMaterial( {
@@ -48,9 +38,9 @@
 
 			for ( let j = 0, jl = objPos.count; j < jl; j ++ ) {
 
-				_v1.set( objPos.getX( j ), objPos.getY( j ), objPos.getZ( j ) ).applyMatrix4( matrixWorld );
+				_v1.fromBufferAttribute( objPos, j ).applyMatrix4( matrixWorld );
 
-				_v2.set( objTan.getX( j ), objTan.getY( j ), objTan.getZ( j ) );
+				_v2.fromBufferAttribute( objTan, j );
 
 				_v2.transformDirection( matrixWorld ).multiplyScalar( this.size ).add( _v1 );