super-three 0.141.0 → 0.147.0

package/examples/js/lines/LineGeometry.js

@@ -9,13 +9,12 @@
 			this.type = 'LineGeometry';
 
 		}
-
 		setPositions( array ) {
 
 			// converts [ x1, y1, z1,  x2, y2, z2, ... ] to pairs format
+
 			const length = array.length - 3;
 			const points = new Float32Array( 2 * length );
-
 			for ( let i = 0; i < length; i += 3 ) {
 
 				points[ 2 * i ] = array[ i ];
@@ -31,13 +30,12 @@
 			return this;
 
 		}
-
 		setColors( array ) {
 
 			// converts [ r1, g1, b1,  r2, g2, b2, ... ] to pairs format
+
 			const length = array.length - 3;
 			const colors = new Float32Array( 2 * length );
-
 			for ( let i = 0; i < length; i += 3 ) {
 
 				colors[ 2 * i ] = array[ i ];
@@ -53,11 +51,11 @@
 			return this;
 
 		}
-
 		fromLine( line ) {
 
 			const geometry = line.geometry;
 			this.setPositions( geometry.attributes.position.array ); // assumes non-indexed
+
 			// set colors, maybe
 
 			return this;

package/examples/js/lines/LineMaterial.js

@@ -34,13 +34,11 @@
 		gapSize: {
 			value: 1
 		} // todo FIX - maybe change to totalSize
-
 	};
+
 	THREE.ShaderLib[ 'line' ] = {
 		uniforms: THREE.UniformsUtils.merge( [ THREE.UniformsLib.common, THREE.UniformsLib.fog, THREE.UniformsLib.line ] ),
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 		#include <common>
 		#include <color_pars_vertex>
 		#include <fog_pars_vertex>
@@ -269,9 +267,7 @@
 
 		}
 		`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 		uniform vec3 diffuse;
 		uniform float opacity;
 		uniform float linewidth;
@@ -432,7 +428,6 @@
 		}
 		`
 	};
-
 	class LineMaterial extends THREE.ShaderMaterial {
 
 		constructor( parameters ) {
@@ -443,8 +438,8 @@
 				vertexShader: THREE.ShaderLib[ 'line' ].vertexShader,
 				fragmentShader: THREE.ShaderLib[ 'line' ].fragmentShader,
 				clipping: true // required for clipping support
-
 			} );
+
 			this.isLineMaterial = true;
 			Object.defineProperties( this, {
 				color: {
@@ -501,7 +496,6 @@
 						return Boolean( 'USE_DASH' in this.defines );
 
 					},
-
 					set( value ) {
 
 						if ( Boolean( value ) !== Boolean( 'USE_DASH' in this.defines ) ) {
@@ -521,7 +515,6 @@
 						}
 
 					}
-
 				},
 				dashScale: {
 					enumerable: true,

package/examples/js/lines/LineSegments2.js

@@ -1,68 +1,48 @@
 ( function () {
 
 	const _start = new THREE.Vector3();
-
 	const _end = new THREE.Vector3();
-
 	const _start4 = new THREE.Vector4();
-
 	const _end4 = new THREE.Vector4();
-
 	const _ssOrigin = new THREE.Vector4();
-
 	const _ssOrigin3 = new THREE.Vector3();
-
 	const _mvMatrix = new THREE.Matrix4();
-
 	const _line = new THREE.Line3();
-
 	const _closestPoint = new THREE.Vector3();
-
 	const _box = new THREE.Box3();
-
 	const _sphere = new THREE.Sphere();
-
 	const _clipToWorldVector = new THREE.Vector4();
+	let _ray, _instanceStart, _instanceEnd, _lineWidth;
 
-	let _ray, _instanceStart, _instanceEnd, _lineWidth; // Returns the margin required to expand by in world space given the distance from the camera,
+	// 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, 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
 		// width does not need to be halved.
 		_clipToWorldVector.set( 0, 0, - distance, 1.0 ).applyMatrix4( camera.projectionMatrix );
-
 		_clipToWorldVector.multiplyScalar( 1.0 / _clipToWorldVector.w );
-
 		_clipToWorldVector.x = _lineWidth / resolution.width;
 		_clipToWorldVector.y = _lineWidth / resolution.height;
-
 		_clipToWorldVector.applyMatrix4( camera.projectionMatrixInverse );
-
 		_clipToWorldVector.multiplyScalar( 1.0 / _clipToWorldVector.w );
-
 		return Math.abs( Math.max( _clipToWorldVector.x, _clipToWorldVector.y ) );
 
 	}
 
 	function raycastWorldUnits( lineSegments, intersects ) {
 
+		const matrixWorld = lineSegments.matrixWorld;
 		for ( let i = 0, l = _instanceStart.count; i < l; i ++ ) {
 
 			_line.start.fromBufferAttribute( _instanceStart, i );
-
 			_line.end.fromBufferAttribute( _instanceEnd, i );
-
+			_line.applyMatrix4( matrixWorld );
 			const pointOnLine = new THREE.Vector3();
 			const point = new THREE.Vector3();
-
 			_ray.distanceSqToSegment( _line.start, _line.end, point, pointOnLine );
-
 			const isInside = point.distanceTo( pointOnLine ) < _lineWidth * 0.5;
-
 			if ( isInside ) {
 
 				intersects.push( {
@@ -91,119 +71,98 @@
 		const geometry = lineSegments.geometry;
 		const instanceStart = geometry.attributes.instanceStart;
 		const instanceEnd = geometry.attributes.instanceEnd;
-		const near = - camera.near; //
+		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.
+		_ray.at( 1, _ssOrigin );
 
-		_ray.at( 1, _ssOrigin ); // ndc space [ - 1.0, 1.0 ]
-
-
+		// ndc space [ - 1.0, 1.0 ]
 		_ssOrigin.w = 1;
-
 		_ssOrigin.applyMatrix4( camera.matrixWorldInverse );
-
 		_ssOrigin.applyMatrix4( projectionMatrix );
+		_ssOrigin.multiplyScalar( 1 / _ssOrigin.w );
 
-		_ssOrigin.multiplyScalar( 1 / _ssOrigin.w ); // screen space
-
-
+		// screen space
 		_ssOrigin.x *= resolution.x / 2;
 		_ssOrigin.y *= resolution.y / 2;
 		_ssOrigin.z = 0;
-
 		_ssOrigin3.copy( _ssOrigin );
-
 		_mvMatrix.multiplyMatrices( camera.matrixWorldInverse, matrixWorld );
-
 		for ( let i = 0, l = instanceStart.count; i < l; i ++ ) {
 
 			_start4.fromBufferAttribute( instanceStart, i );
-
 			_end4.fromBufferAttribute( instanceEnd, i );
-
 			_start4.w = 1;
-			_end4.w = 1; // camera space
+			_end4.w = 1;
 
+			// camera space
 			_start4.applyMatrix4( _mvMatrix );
+			_end4.applyMatrix4( _mvMatrix );
 
-			_end4.applyMatrix4( _mvMatrix ); // skip the segment if it's entirely behind the camera
-
-
+			// skip the segment if it's entirely behind the camera
 			const isBehindCameraNear = _start4.z > near && _end4.z > near;
-
 			if ( isBehindCameraNear ) {
 
 				continue;
 
-			} // trim the segment if it extends behind camera near
-
+			}
 
+			// 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
-
+			}
 
+			// clip space
 			_start4.applyMatrix4( projectionMatrix );
+			_end4.applyMatrix4( projectionMatrix );
 
-			_end4.applyMatrix4( projectionMatrix ); // ndc space [ - 1.0, 1.0 ]
-
-
+			// ndc space [ - 1.0, 1.0 ]
 			_start4.multiplyScalar( 1 / _start4.w );
+			_end4.multiplyScalar( 1 / _end4.w );
 
-			_end4.multiplyScalar( 1 / _end4.w ); // screen space
-
-
+			// 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
+			_end4.y *= resolution.y / 2;
 
+			// create 2d segment
 			_line.start.copy( _start4 );
-
 			_line.start.z = 0;
-
 			_line.end.copy( _end4 );
+			_line.end.z = 0;
 
-			_line.end.z = 0; // get closest point on ray to segment
-
+			// get closest point on ray to segment
 			const param = _line.closestPointToPointParameter( _ssOrigin3, true );
+			_line.at( param, _closestPoint );
 
-			_line.at( param, _closestPoint ); // check if the intersection point is within clip space
-
-
+			// 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,
@@ -231,8 +190,9 @@
 			this.isLineSegments2 = true;
 			this.type = 'LineSegments2';
 
-		} // for backwards-compatibility, but could be a method of THREE.LineSegmentsGeometry...
+		}
 
+		// for backwards-compatibility, but could be a method of THREE.LineSegmentsGeometry...
 
 		computeLineDistances() {
 
@@ -240,13 +200,10 @@
 			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 ) {
 
 				_start.fromBufferAttribute( instanceStart, i );
-
 				_end.fromBufferAttribute( instanceEnd, i );
-
 				lineDistances[ j ] = j === 0 ? 0 : lineDistances[ j - 1 ];
 				lineDistances[ j + 1 ] = lineDistances[ j ] + _start.distanceTo( _end );
 
@@ -255,18 +212,15 @@
 			const instanceDistanceBuffer = new THREE.InstancedInterleavedBuffer( lineDistances, 2, 1 ); // d0, d1
 
 			geometry.setAttribute( 'instanceDistanceStart', new THREE.InterleavedBufferAttribute( instanceDistanceBuffer, 1, 0 ) ); // d0
-
 			geometry.setAttribute( 'instanceDistanceEnd', new THREE.InterleavedBufferAttribute( instanceDistanceBuffer, 1, 1 ) ); // d1
 
 			return this;
 
 		}
-
 		raycast( raycaster, intersects ) {
 
 			const worldUnits = this.material.worldUnits;
 			const camera = raycaster.camera;
-
 			if ( camera === null && ! worldUnits ) {
 
 				console.error( 'LineSegments2: "Raycaster.camera" needs to be set in order to raycast against LineSegments2 while worldUnits is set to false.' );
@@ -280,19 +234,19 @@
 			const material = this.material;
 			_lineWidth = material.linewidth + threshold;
 			_instanceStart = geometry.attributes.instanceStart;
-			_instanceEnd = geometry.attributes.instanceEnd; // check if we intersect the sphere bounds
+			_instanceEnd = geometry.attributes.instanceEnd;
 
+			// check if we intersect the sphere bounds
 			if ( geometry.boundingSphere === null ) {
 
 				geometry.computeBoundingSphere();
 
 			}
 
-			_sphere.copy( geometry.boundingSphere ).applyMatrix4( matrixWorld ); // increase the sphere bounds by the worst case line screen space width
-
+			_sphere.copy( geometry.boundingSphere ).applyMatrix4( matrixWorld );
 
+			// increase the sphere bounds by the worst case line screen space width
 			let sphereMargin;
-
 			if ( worldUnits ) {
 
 				sphereMargin = _lineWidth * 0.5;
@@ -305,25 +259,23 @@
 			}
 
 			_sphere.radius += sphereMargin;
-
 			if ( _ray.intersectsSphere( _sphere ) === false ) {
 
 				return;
 
-			} // check if we intersect the box bounds
-
+			}
 
+			// check if we intersect the box bounds
 			if ( geometry.boundingBox === null ) {
 
 				geometry.computeBoundingBox();
 
 			}
 
-			_box.copy( geometry.boundingBox ).applyMatrix4( matrixWorld ); // increase the box bounds by the worst case line width
-
+			_box.copy( geometry.boundingBox ).applyMatrix4( matrixWorld );
 
+			// increase the box bounds by the worst case line width
 			let boxMargin;
-
 			if ( worldUnits ) {
 
 				boxMargin = _lineWidth * 0.5;
@@ -336,7 +288,6 @@
 			}
 
 			_box.expandByScalar( boxMargin );
-
 			if ( _ray.intersectsBox( _box ) === false ) {
 
 				return;

package/examples/js/lines/LineSegmentsGeometry.js

@@ -1,9 +1,7 @@
 ( function () {
 
 	const _box = new THREE.Box3();
-
 	const _vector = new THREE.Vector3();
-
 	class LineSegmentsGeometry extends THREE.InstancedBufferGeometry {
 
 		constructor() {
@@ -19,12 +17,10 @@
 			this.setAttribute( 'uv', new THREE.Float32BufferAttribute( uvs, 2 ) );
 
 		}
-
 		applyMatrix4( matrix ) {
 
 			const start = this.attributes.instanceStart;
 			const end = this.attributes.instanceEnd;
-
 			if ( start !== undefined ) {
 
 				start.applyMatrix4( matrix );
@@ -48,11 +44,9 @@
 			return this;
 
 		}
-
 		setPositions( array ) {
 
 			let lineSegments;
-
 			if ( array instanceof Float32Array ) {
 
 				lineSegments = array;
@@ -66,8 +60,8 @@
 			const instanceBuffer = new THREE.InstancedInterleavedBuffer( lineSegments, 6, 1 ); // xyz, xyz
 
 			this.setAttribute( 'instanceStart', new THREE.InterleavedBufferAttribute( instanceBuffer, 3, 0 ) ); // xyz
-
 			this.setAttribute( 'instanceEnd', new THREE.InterleavedBufferAttribute( instanceBuffer, 3, 3 ) ); // xyz
+
 			//
 
 			this.computeBoundingBox();
@@ -75,11 +69,9 @@
 			return this;
 
 		}
-
 		setColors( array ) {
 
 			let colors;
-
 			if ( array instanceof Float32Array ) {
 
 				colors = array;
@@ -93,45 +85,42 @@
 			const instanceColorBuffer = new THREE.InstancedInterleavedBuffer( colors, 6, 1 ); // rgb, rgb
 
 			this.setAttribute( 'instanceColorStart', new THREE.InterleavedBufferAttribute( instanceColorBuffer, 3, 0 ) ); // rgb
-
 			this.setAttribute( 'instanceColorEnd', new THREE.InterleavedBufferAttribute( instanceColorBuffer, 3, 3 ) ); // rgb
 
 			return this;
 
 		}
-
 		fromWireframeGeometry( geometry ) {
 
 			this.setPositions( geometry.attributes.position.array );
 			return this;
 
 		}
-
 		fromEdgesGeometry( geometry ) {
 
 			this.setPositions( geometry.attributes.position.array );
 			return this;
 
 		}
-
 		fromMesh( mesh ) {
 
-			this.fromWireframeGeometry( new THREE.WireframeGeometry( mesh.geometry ) ); // set colors, maybe
+			this.fromWireframeGeometry( new THREE.WireframeGeometry( mesh.geometry ) );
+
+			// set colors, maybe
 
 			return this;
 
 		}
-
 		fromLineSegments( lineSegments ) {
 
 			const geometry = lineSegments.geometry;
 			this.setPositions( geometry.attributes.position.array ); // assumes non-indexed
+
 			// set colors, maybe
 
 			return this;
 
 		}
-
 		computeBoundingBox() {
 
 			if ( this.boundingBox === null ) {
@@ -142,19 +131,15 @@
 
 			const start = this.attributes.instanceStart;
 			const end = this.attributes.instanceEnd;
-
 			if ( start !== undefined && end !== undefined ) {
 
 				this.boundingBox.setFromBufferAttribute( start );
-
 				_box.setFromBufferAttribute( end );
-
 				this.boundingBox.union( _box );
 
 			}
 
 		}
-
 		computeBoundingSphere() {
 
 			if ( this.boundingSphere === null ) {
@@ -171,27 +156,21 @@
 
 			const start = this.attributes.instanceStart;
 			const end = this.attributes.instanceEnd;
-
 			if ( start !== undefined && end !== undefined ) {
 
 				const center = this.boundingSphere.center;
 				this.boundingBox.getCenter( center );
 				let maxRadiusSq = 0;
-
 				for ( let i = 0, il = start.count; i < il; i ++ ) {
 
 					_vector.fromBufferAttribute( start, i );
-
 					maxRadiusSq = Math.max( maxRadiusSq, center.distanceToSquared( _vector ) );
-
 					_vector.fromBufferAttribute( end, i );
-
 					maxRadiusSq = Math.max( maxRadiusSq, center.distanceToSquared( _vector ) );
 
 				}
 
 				this.boundingSphere.radius = Math.sqrt( maxRadiusSq );
-
 				if ( isNaN( this.boundingSphere.radius ) ) {
 
 					console.error( 'THREE.LineSegmentsGeometry.computeBoundingSphere(): Computed radius is NaN. The instanced position data is likely to have NaN values.', this );
@@ -201,10 +180,10 @@
 			}
 
 		}
+		toJSON() {
 
-		toJSON() { // todo
+			// todo
 		}
-
 		applyMatrix( matrix ) {
 
 			console.warn( 'THREE.LineSegmentsGeometry: applyMatrix() has been renamed to applyMatrix4().' );

package/examples/js/lines/Wireframe.js

@@ -1,9 +1,7 @@
 ( function () {
 
 	const _start = new THREE.Vector3();
-
 	const _end = new THREE.Vector3();
-
 	class Wireframe extends THREE.Mesh {
 
 		constructor( geometry = new THREE.LineSegmentsGeometry(), material = new THREE.LineMaterial( {
@@ -14,8 +12,9 @@
 			this.isWireframe = true;
 			this.type = 'Wireframe';
 
-		} // for backwards-compatibility, but could be a method of THREE.LineSegmentsGeometry...
+		}
 
+		// for backwards-compatibility, but could be a method of THREE.LineSegmentsGeometry...
 
 		computeLineDistances() {
 
@@ -23,13 +22,10 @@
 			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 ) {
 
 				_start.fromBufferAttribute( instanceStart, i );
-
 				_end.fromBufferAttribute( instanceEnd, i );
-
 				lineDistances[ j ] = j === 0 ? 0 : lineDistances[ j - 1 ];
 				lineDistances[ j + 1 ] = lineDistances[ j ] + _start.distanceTo( _end );
 
@@ -38,7 +34,6 @@
 			const instanceDistanceBuffer = new THREE.InstancedInterleavedBuffer( lineDistances, 2, 1 ); // d0, d1
 
 			geometry.setAttribute( 'instanceDistanceStart', new THREE.InterleavedBufferAttribute( instanceDistanceBuffer, 1, 0 ) ); // d0
-
 			geometry.setAttribute( 'instanceDistanceEnd', new THREE.InterleavedBufferAttribute( instanceDistanceBuffer, 1, 1 ) ); // d1
 
 			return this;

package/examples/js/lines/WireframeGeometry2.js

@@ -7,7 +7,9 @@
 			super();
 			this.isWireframeGeometry2 = true;
 			this.type = 'WireframeGeometry2';
-			this.fromWireframeGeometry( new THREE.WireframeGeometry( geometry ) ); // set colors, maybe
+			this.fromWireframeGeometry( new THREE.WireframeGeometry( geometry ) );
+
+			// set colors, maybe
 
 		}