super-three 0.136.0 → 0.141.0

package/examples/js/lines/Line2.js

@@ -7,14 +7,13 @@
 		} ) ) {
 
 			super( geometry, material );
+			this.isLine2 = true;
 			this.type = 'Line2';
 
 		}
 
 	}
 
-	Line2.prototype.isLine2 = true;
-
 	THREE.Line2 = Line2;
 
 } )();

package/examples/js/lines/LineGeometry.js

@@ -5,6 +5,7 @@
 		constructor() {
 
 			super();
+			this.isLineGeometry = true;
 			this.type = 'LineGeometry';
 
 		}
@@ -12,10 +13,10 @@
 		setPositions( array ) {
 
 			// converts [ x1, y1, z1,  x2, y2, z2, ... ] to pairs format
-			var length = array.length - 3;
-			var points = new Float32Array( 2 * length );
+			const length = array.length - 3;
+			const points = new Float32Array( 2 * length );
 
-			for ( var i = 0; i < length; i += 3 ) {
+			for ( let i = 0; i < length; i += 3 ) {
 
 				points[ 2 * i ] = array[ i ];
 				points[ 2 * i + 1 ] = array[ i + 1 ];
@@ -34,10 +35,10 @@
 		setColors( array ) {
 
 			// converts [ r1, g1, b1,  r2, g2, b2, ... ] to pairs format
-			var length = array.length - 3;
-			var colors = new Float32Array( 2 * length );
+			const length = array.length - 3;
+			const colors = new Float32Array( 2 * length );
 
-			for ( var i = 0; i < length; i += 3 ) {
+			for ( let i = 0; i < length; i += 3 ) {
 
 				colors[ 2 * i ] = array[ i ];
 				colors[ 2 * i + 1 ] = array[ i + 1 ];
@@ -55,19 +56,9 @@
 
 		fromLine( line ) {
 
-			var geometry = line.geometry;
-
-			if ( geometry.isGeometry ) {
-
-				console.error( 'THREE.LineGeometry no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-				return;
-
-			} else if ( geometry.isBufferGeometry ) {
-
-				this.setPositions( geometry.attributes.position.array ); // assumes non-indexed
-
-			} // set colors, maybe
-
+			const geometry = line.geometry;
+			this.setPositions( geometry.attributes.position.array ); // assumes non-indexed
+			// set colors, maybe
 
 			return this;
 
@@ -75,8 +66,6 @@
 
 	}
 
-	LineGeometry.prototype.isLineGeometry = true;
-
 	THREE.LineGeometry = LineGeometry;
 
 } )();

package/examples/js/lines/LineMaterial.js

@@ -218,7 +218,7 @@
 				vec4 clip = projectionMatrix * worldPos;
 
 				// shift the depth of the projected points so the line
-				// segements overlap neatly
+				// segments overlap neatly
 				vec3 clipPose = ( position.y < 0.5 ) ? ndcStart : ndcEnd;
 				clip.z = clipPose.z * clip.w;
 
@@ -445,6 +445,7 @@
 				clipping: true // required for clipping support
 
 			} );
+			this.isLineMaterial = true;
 			Object.defineProperties( this, {
 				color: {
 					enumerable: true,
@@ -636,8 +637,6 @@
 
 	}
 
-	LineMaterial.prototype.isLineMaterial = true;
-
 	THREE.LineMaterial = LineMaterial;
 
 } )();

package/examples/js/lines/LineSegments2.js

@@ -22,11 +22,13 @@
 
 	const _sphere = new THREE.Sphere();
 
-	const _clipToWorldVector = new THREE.Vector4(); // Returns the margin required to expand by in world space given the distance from the camera,
+	const _clipToWorldVector = new THREE.Vector4();
+
+	let _ray, _instanceStart, _instanceEnd, _lineWidth; // Returns the margin required to expand by in world space given the distance from the camera,
 	// line width, resolution, and camera projection
 
 
-	function getWorldSpaceHalfWidth( camera, distance, lineWidth, resolution ) {
+	function getWorldSpaceHalfWidth( camera, distance, resolution ) {
 
 		// transform into clip space, adjust the x and y values by the pixel width offset, then
 		// transform back into world space to get world offset. Note clip space is [-1, 1] so full
@@ -35,8 +37,8 @@
 
 		_clipToWorldVector.multiplyScalar( 1.0 / _clipToWorldVector.w );
 
-		_clipToWorldVector.x = lineWidth / resolution.width;
-		_clipToWorldVector.y = lineWidth / resolution.height;
+		_clipToWorldVector.x = _lineWidth / resolution.width;
+		_clipToWorldVector.y = _lineWidth / resolution.height;
 
 		_clipToWorldVector.applyMatrix4( camera.projectionMatrixInverse );
 
@@ -46,234 +48,308 @@
 
 	}
 
-	class LineSegments2 extends THREE.Mesh {
+	function raycastWorldUnits( lineSegments, intersects ) {
 
-		constructor( geometry = new THREE.LineSegmentsGeometry(), material = new THREE.LineMaterial( {
-			color: Math.random() * 0xffffff
-		} ) ) {
+		for ( let i = 0, l = _instanceStart.count; i < l; i ++ ) {
 
-			super( geometry, material );
-			this.type = 'LineSegments2';
+			_line.start.fromBufferAttribute( _instanceStart, i );
 
-		} // for backwards-compatability, but could be a method of THREE.LineSegmentsGeometry...
+			_line.end.fromBufferAttribute( _instanceEnd, i );
 
+			const pointOnLine = new THREE.Vector3();
+			const point = new THREE.Vector3();
 
-		computeLineDistances() {
+			_ray.distanceSqToSegment( _line.start, _line.end, point, pointOnLine );
 
-			const geometry = this.geometry;
-			const instanceStart = geometry.attributes.instanceStart;
-			const instanceEnd = geometry.attributes.instanceEnd;
-			const lineDistances = new Float32Array( 2 * instanceStart.count );
+			const isInside = point.distanceTo( pointOnLine ) < _lineWidth * 0.5;
 
-			for ( let i = 0, j = 0, l = instanceStart.count; i < l; i ++, j += 2 ) {
+			if ( isInside ) {
 
-				_start.fromBufferAttribute( instanceStart, i );
+				intersects.push( {
+					point,
+					pointOnLine,
+					distance: _ray.origin.distanceTo( point ),
+					object: lineSegments,
+					face: null,
+					faceIndex: i,
+					uv: null,
+					uv2: null
+				} );
 
-				_end.fromBufferAttribute( instanceEnd, i );
+			}
 
-				lineDistances[ j ] = j === 0 ? 0 : lineDistances[ j - 1 ];
-				lineDistances[ j + 1 ] = lineDistances[ j ] + _start.distanceTo( _end );
+		}
 
-			}
+	}
 
-			const instanceDistanceBuffer = new THREE.InstancedInterleavedBuffer( lineDistances, 2, 1 ); // d0, d1
+	function raycastScreenSpace( lineSegments, camera, intersects ) {
 
-			geometry.setAttribute( 'instanceDistanceStart', new THREE.InterleavedBufferAttribute( instanceDistanceBuffer, 1, 0 ) ); // d0
+		const projectionMatrix = camera.projectionMatrix;
+		const material = lineSegments.material;
+		const resolution = material.resolution;
+		const matrixWorld = lineSegments.matrixWorld;
+		const geometry = lineSegments.geometry;
+		const instanceStart = geometry.attributes.instanceStart;
+		const instanceEnd = geometry.attributes.instanceEnd;
+		const near = - camera.near; //
+		// pick a point 1 unit out along the ray to avoid the ray origin
+		// sitting at the camera origin which will cause "w" to be 0 when
+		// applying the projection matrix.
 
-			geometry.setAttribute( 'instanceDistanceEnd', new THREE.InterleavedBufferAttribute( instanceDistanceBuffer, 1, 1 ) ); // d1
+		_ray.at( 1, _ssOrigin ); // ndc space [ - 1.0, 1.0 ]
 
-			return this;
 
-		}
+		_ssOrigin.w = 1;
 
-		raycast( raycaster, intersects ) {
+		_ssOrigin.applyMatrix4( camera.matrixWorldInverse );
 
-			if ( raycaster.camera === null ) {
+		_ssOrigin.applyMatrix4( projectionMatrix );
 
-				console.error( 'LineSegments2: "Raycaster.camera" needs to be set in order to raycast against LineSegments2.' );
+		_ssOrigin.multiplyScalar( 1 / _ssOrigin.w ); // screen space
 
-			}
 
-			const threshold = raycaster.params.Line2 !== undefined ? raycaster.params.Line2.threshold || 0 : 0;
-			const ray = raycaster.ray;
-			const camera = raycaster.camera;
-			const projectionMatrix = camera.projectionMatrix;
-			const matrixWorld = this.matrixWorld;
-			const geometry = this.geometry;
-			const material = this.material;
-			const resolution = material.resolution;
-			const lineWidth = material.linewidth + threshold;
-			const instanceStart = geometry.attributes.instanceStart;
-			const instanceEnd = geometry.attributes.instanceEnd; // camera forward is negative
+		_ssOrigin.x *= resolution.x / 2;
+		_ssOrigin.y *= resolution.y / 2;
+		_ssOrigin.z = 0;
 
-			const near = - camera.near; //
-			// check if we intersect the sphere bounds
+		_ssOrigin3.copy( _ssOrigin );
 
-			if ( geometry.boundingSphere === null ) {
+		_mvMatrix.multiplyMatrices( camera.matrixWorldInverse, matrixWorld );
 
-				geometry.computeBoundingSphere();
+		for ( let i = 0, l = instanceStart.count; i < l; i ++ ) {
 
-			}
+			_start4.fromBufferAttribute( instanceStart, i );
 
-			_sphere.copy( geometry.boundingSphere ).applyMatrix4( matrixWorld );
+			_end4.fromBufferAttribute( instanceEnd, i );
 
-			const distanceToSphere = Math.max( camera.near, _sphere.distanceToPoint( ray.origin ) ); // increase the sphere bounds by the worst case line screen space width
+			_start4.w = 1;
+			_end4.w = 1; // camera space
 
-			const sphereMargin = getWorldSpaceHalfWidth( camera, distanceToSphere, lineWidth, resolution );
-			_sphere.radius += sphereMargin;
+			_start4.applyMatrix4( _mvMatrix );
 
-			if ( raycaster.ray.intersectsSphere( _sphere ) === false ) {
+			_end4.applyMatrix4( _mvMatrix ); // skip the segment if it's entirely behind the camera
 
-				return;
 
-			} //
-			// check if we intersect the box bounds
+			const isBehindCameraNear = _start4.z > near && _end4.z > near;
 
+			if ( isBehindCameraNear ) {
 
-			if ( geometry.boundingBox === null ) {
+				continue;
 
-				geometry.computeBoundingBox();
+			} // trim the segment if it extends behind camera near
+
+
+			if ( _start4.z > near ) {
+
+				const deltaDist = _start4.z - _end4.z;
+				const t = ( _start4.z - near ) / deltaDist;
+
+				_start4.lerp( _end4, t );
+
+			} else if ( _end4.z > near ) {
+
+				const deltaDist = _end4.z - _start4.z;
+				const t = ( _end4.z - near ) / deltaDist;
+
+				_end4.lerp( _start4, t );
+
+			} // clip space
+
+
+			_start4.applyMatrix4( projectionMatrix );
+
+			_end4.applyMatrix4( projectionMatrix ); // ndc space [ - 1.0, 1.0 ]
+
+
+			_start4.multiplyScalar( 1 / _start4.w );
+
+			_end4.multiplyScalar( 1 / _end4.w ); // screen space
+
+
+			_start4.x *= resolution.x / 2;
+			_start4.y *= resolution.y / 2;
+			_end4.x *= resolution.x / 2;
+			_end4.y *= resolution.y / 2; // create 2d segment
+
+			_line.start.copy( _start4 );
+
+			_line.start.z = 0;
+
+			_line.end.copy( _end4 );
+
+			_line.end.z = 0; // get closest point on ray to segment
+
+			const param = _line.closestPointToPointParameter( _ssOrigin3, true );
+
+			_line.at( param, _closestPoint ); // check if the intersection point is within clip space
+
+
+			const zPos = THREE.MathUtils.lerp( _start4.z, _end4.z, param );
+			const isInClipSpace = zPos >= - 1 && zPos <= 1;
+
+			const isInside = _ssOrigin3.distanceTo( _closestPoint ) < _lineWidth * 0.5;
+
+			if ( isInClipSpace && isInside ) {
+
+				_line.start.fromBufferAttribute( instanceStart, i );
+
+				_line.end.fromBufferAttribute( instanceEnd, i );
+
+				_line.start.applyMatrix4( matrixWorld );
+
+				_line.end.applyMatrix4( matrixWorld );
+
+				const pointOnLine = new THREE.Vector3();
+				const point = new THREE.Vector3();
+
+				_ray.distanceSqToSegment( _line.start, _line.end, point, pointOnLine );
+
+				intersects.push( {
+					point: point,
+					pointOnLine: pointOnLine,
+					distance: _ray.origin.distanceTo( point ),
+					object: lineSegments,
+					face: null,
+					faceIndex: i,
+					uv: null,
+					uv2: null
+				} );
 
 			}
 
-			_box.copy( geometry.boundingBox ).applyMatrix4( matrixWorld );
+		}
+
+	}
 
-			const distanceToBox = Math.max( camera.near, _box.distanceToPoint( ray.origin ) ); // increase the box bounds by the worst case line screen space width
+	class LineSegments2 extends THREE.Mesh {
 
-			const boxMargin = getWorldSpaceHalfWidth( camera, distanceToBox, lineWidth, resolution );
-			_box.max.x += boxMargin;
-			_box.max.y += boxMargin;
-			_box.max.z += boxMargin;
-			_box.min.x -= boxMargin;
-			_box.min.y -= boxMargin;
-			_box.min.z -= boxMargin;
+		constructor( geometry = new THREE.LineSegmentsGeometry(), material = new THREE.LineMaterial( {
+			color: Math.random() * 0xffffff
+		} ) ) {
 
-			if ( raycaster.ray.intersectsBox( _box ) === false ) {
+			super( geometry, material );
+			this.isLineSegments2 = true;
+			this.type = 'LineSegments2';
 
-				return;
+		} // for backwards-compatibility, but could be a method of THREE.LineSegmentsGeometry...
 
-			} //
-			// pick a point 1 unit out along the ray to avoid the ray origin
-			// sitting at the camera origin which will cause "w" to be 0 when
-			// applying the projection matrix.
 
+		computeLineDistances() {
 
-			ray.at( 1, _ssOrigin ); // ndc space [ - 1.0, 1.0 ]
+			const geometry = this.geometry;
+			const instanceStart = geometry.attributes.instanceStart;
+			const instanceEnd = geometry.attributes.instanceEnd;
+			const lineDistances = new Float32Array( 2 * instanceStart.count );
+
+			for ( let i = 0, j = 0, l = instanceStart.count; i < l; i ++, j += 2 ) {
 
-			_ssOrigin.w = 1;
+				_start.fromBufferAttribute( instanceStart, i );
 
-			_ssOrigin.applyMatrix4( camera.matrixWorldInverse );
+				_end.fromBufferAttribute( instanceEnd, i );
 
-			_ssOrigin.applyMatrix4( projectionMatrix );
+				lineDistances[ j ] = j === 0 ? 0 : lineDistances[ j - 1 ];
+				lineDistances[ j + 1 ] = lineDistances[ j ] + _start.distanceTo( _end );
 
-			_ssOrigin.multiplyScalar( 1 / _ssOrigin.w ); // screen space
+			}
 
+			const instanceDistanceBuffer = new THREE.InstancedInterleavedBuffer( lineDistances, 2, 1 ); // d0, d1
 
-			_ssOrigin.x *= resolution.x / 2;
-			_ssOrigin.y *= resolution.y / 2;
-			_ssOrigin.z = 0;
+			geometry.setAttribute( 'instanceDistanceStart', new THREE.InterleavedBufferAttribute( instanceDistanceBuffer, 1, 0 ) ); // d0
 
-			_ssOrigin3.copy( _ssOrigin );
+			geometry.setAttribute( 'instanceDistanceEnd', new THREE.InterleavedBufferAttribute( instanceDistanceBuffer, 1, 1 ) ); // d1
 
-			_mvMatrix.multiplyMatrices( camera.matrixWorldInverse, matrixWorld );
+			return this;
 
-			for ( let i = 0, l = instanceStart.count; i < l; i ++ ) {
+		}
 
-				_start4.fromBufferAttribute( instanceStart, i );
+		raycast( raycaster, intersects ) {
 
-				_end4.fromBufferAttribute( instanceEnd, i );
+			const worldUnits = this.material.worldUnits;
+			const camera = raycaster.camera;
 
-				_start4.w = 1;
-				_end4.w = 1; // camera space
+			if ( camera === null && ! worldUnits ) {
 
-				_start4.applyMatrix4( _mvMatrix );
+				console.error( 'LineSegments2: "Raycaster.camera" needs to be set in order to raycast against LineSegments2 while worldUnits is set to false.' );
 
-				_end4.applyMatrix4( _mvMatrix ); // skip the segment if it's entirely behind the camera
+			}
 
+			const threshold = raycaster.params.Line2 !== undefined ? raycaster.params.Line2.threshold || 0 : 0;
+			_ray = raycaster.ray;
+			const matrixWorld = this.matrixWorld;
+			const geometry = this.geometry;
+			const material = this.material;
+			_lineWidth = material.linewidth + threshold;
+			_instanceStart = geometry.attributes.instanceStart;
+			_instanceEnd = geometry.attributes.instanceEnd; // check if we intersect the sphere bounds
 
-				var isBehindCameraNear = _start4.z > near && _end4.z > near;
+			if ( geometry.boundingSphere === null ) {
 
-				if ( isBehindCameraNear ) {
+				geometry.computeBoundingSphere();
 
-					continue;
+			}
 
-				} // trim the segment if it extends behind camera near
+			_sphere.copy( geometry.boundingSphere ).applyMatrix4( matrixWorld ); // increase the sphere bounds by the worst case line screen space width
 
 
-				if ( _start4.z > near ) {
+			let sphereMargin;
 
-					const deltaDist = _start4.z - _end4.z;
-					const t = ( _start4.z - near ) / deltaDist;
+			if ( worldUnits ) {
 
-					_start4.lerp( _end4, t );
+				sphereMargin = _lineWidth * 0.5;
 
-				} else if ( _end4.z > near ) {
+			} else {
 
-					const deltaDist = _end4.z - _start4.z;
-					const t = ( _end4.z - near ) / deltaDist;
+				const distanceToSphere = Math.max( camera.near, _sphere.distanceToPoint( _ray.origin ) );
+				sphereMargin = getWorldSpaceHalfWidth( camera, distanceToSphere, material.resolution );
 
-					_end4.lerp( _start4, t );
+			}
 
-				} // clip space
+			_sphere.radius += sphereMargin;
 
+			if ( _ray.intersectsSphere( _sphere ) === false ) {
 
-				_start4.applyMatrix4( projectionMatrix );
+				return;
 
-				_end4.applyMatrix4( projectionMatrix ); // ndc space [ - 1.0, 1.0 ]
+			} // check if we intersect the box bounds
 
 
-				_start4.multiplyScalar( 1 / _start4.w );
+			if ( geometry.boundingBox === null ) {
 
-				_end4.multiplyScalar( 1 / _end4.w ); // screen space
+				geometry.computeBoundingBox();
 
+			}
 
-				_start4.x *= resolution.x / 2;
-				_start4.y *= resolution.y / 2;
-				_end4.x *= resolution.x / 2;
-				_end4.y *= resolution.y / 2; // create 2d segment
+			_box.copy( geometry.boundingBox ).applyMatrix4( matrixWorld ); // increase the box bounds by the worst case line width
 
-				_line.start.copy( _start4 );
 
-				_line.start.z = 0;
+			let boxMargin;
 
-				_line.end.copy( _end4 );
+			if ( worldUnits ) {
 
-				_line.end.z = 0; // get closest point on ray to segment
+				boxMargin = _lineWidth * 0.5;
 
-				const param = _line.closestPointToPointParameter( _ssOrigin3, true );
+			} else {
 
-				_line.at( param, _closestPoint ); // check if the intersection point is within clip space
+				const distanceToBox = Math.max( camera.near, _box.distanceToPoint( _ray.origin ) );
+				boxMargin = getWorldSpaceHalfWidth( camera, distanceToBox, material.resolution );
 
+			}
 
-				const zPos = THREE.MathUtils.lerp( _start4.z, _end4.z, param );
-				const isInClipSpace = zPos >= - 1 && zPos <= 1;
-				const isInside = _ssOrigin3.distanceTo( _closestPoint ) < lineWidth * 0.5;
+			_box.expandByScalar( boxMargin );
 
-				if ( isInClipSpace && isInside ) {
+			if ( _ray.intersectsBox( _box ) === false ) {
 
-					_line.start.fromBufferAttribute( instanceStart, i );
+				return;
 
-					_line.end.fromBufferAttribute( instanceEnd, i );
+			}
 
-					_line.start.applyMatrix4( matrixWorld );
+			if ( worldUnits ) {
 
-					_line.end.applyMatrix4( matrixWorld );
+				raycastWorldUnits( this, intersects );
 
-					const pointOnLine = new THREE.Vector3();
-					const point = new THREE.Vector3();
-					ray.distanceSqToSegment( _line.start, _line.end, point, pointOnLine );
-					intersects.push( {
-						point: point,
-						pointOnLine: pointOnLine,
-						distance: ray.origin.distanceTo( point ),
-						object: this,
-						face: null,
-						faceIndex: i,
-						uv: null,
-						uv2: null
-					} );
+			} else {
 
-				}
+				raycastScreenSpace( this, camera, intersects );
 
 			}
 
@@ -281,8 +357,6 @@
 
 	}
 
-	LineSegments2.prototype.isLineSegments2 = true;
-
 	THREE.LineSegments2 = LineSegments2;
 
 } )();

package/examples/js/lines/LineSegmentsGeometry.js

@@ -9,6 +9,7 @@
 		constructor() {
 
 			super();
+			this.isLineSegmentsGeometry = true;
 			this.type = 'LineSegmentsGeometry';
 			const positions = [ - 1, 2, 0, 1, 2, 0, - 1, 1, 0, 1, 1, 0, - 1, 0, 0, 1, 0, 0, - 1, - 1, 0, 1, - 1, 0 ];
 			const uvs = [ - 1, 2, 1, 2, - 1, 1, 1, 1, - 1, - 1, 1, - 1, - 1, - 2, 1, - 2 ];
@@ -124,18 +125,8 @@
 		fromLineSegments( lineSegments ) {
 
 			const geometry = lineSegments.geometry;
-
-			if ( geometry.isGeometry ) {
-
-				console.error( 'THREE.LineSegmentsGeometry no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-				return;
-
-			} else if ( geometry.isBufferGeometry ) {
-
-				this.setPositions( geometry.attributes.position.array ); // assumes non-indexed
-
-			} // set colors, maybe
-
+			this.setPositions( geometry.attributes.position.array ); // assumes non-indexed
+			// set colors, maybe
 
 			return this;
 
@@ -223,8 +214,6 @@
 
 	}
 
-	LineSegmentsGeometry.prototype.isLineSegmentsGeometry = true;
-
 	THREE.LineSegmentsGeometry = LineSegmentsGeometry;
 
 } )();

package/examples/js/lines/Wireframe.js

@@ -11,9 +11,10 @@
 		} ) ) {
 
 			super( geometry, material );
+			this.isWireframe = true;
 			this.type = 'Wireframe';
 
-		} // for backwards-compatability, but could be a method of THREE.LineSegmentsGeometry...
+		} // for backwards-compatibility, but could be a method of THREE.LineSegmentsGeometry...
 
 
 		computeLineDistances() {
@@ -46,8 +47,6 @@
 
 	}
 
-	Wireframe.prototype.isWireframe = true;
-
 	THREE.Wireframe = Wireframe;
 
 } )();

package/examples/js/lines/WireframeGeometry2.js

@@ -5,6 +5,7 @@
 		constructor( geometry ) {
 
 			super();
+			this.isWireframeGeometry2 = true;
 			this.type = 'WireframeGeometry2';
 			this.fromWireframeGeometry( new THREE.WireframeGeometry( geometry ) ); // set colors, maybe
 
@@ -12,8 +13,6 @@
 
 	}
 
-	WireframeGeometry2.prototype.isWireframeGeometry2 = true;
-
 	THREE.WireframeGeometry2 = WireframeGeometry2;
 
 } )();