super-three 0.141.0 → 0.147.0

package/examples/js/csm/CSM.js

@@ -1,13 +1,9 @@
 ( function () {
 
 	const _cameraToLightMatrix = new THREE.Matrix4();
-
 	const _lightSpaceFrustum = new THREE.CSMFrustum();
-
 	const _center = new THREE.Vector3();
-
 	const _bbox = new THREE.Box3();
-
 	const _uniformArray = [];
 	const _logArray = [];
 	class CSM {
@@ -39,7 +35,6 @@
 			this.injectInclude();
 
 		}
-
 		createLights() {
 
 			for ( let i = 0; i < this.cascades; i ++ ) {
@@ -58,7 +53,6 @@
 			}
 
 		}
-
 		initCascades() {
 
 			const camera = this.camera;
@@ -67,24 +61,22 @@
 			this.mainFrustum.split( this.breaks, this.frustums );
 
 		}
-
 		updateShadowBounds() {
 
 			const frustums = this.frustums;
-
 			for ( let i = 0; i < frustums.length; i ++ ) {
 
 				const light = this.lights[ i ];
 				const shadowCam = light.shadow.camera;
-				const frustum = this.frustums[ i ]; // Get the two points that represent that furthest points on the frustum assuming
+				const frustum = this.frustums[ i ];
+
+				// Get the two points that represent that furthest points on the frustum assuming
 				// that's either the diagonal across the far plane or the diagonal across the whole
 				// frustum itself.
-
 				const nearVerts = frustum.vertices.near;
 				const farVerts = frustum.vertices.far;
 				const point1 = farVerts[ 0 ];
 				let point2;
-
 				if ( point1.distanceTo( farVerts[ 2 ] ) > point1.distanceTo( nearVerts[ 2 ] ) ) {
 
 					point2 = farVerts[ 2 ];
@@ -96,7 +88,6 @@
 				}
 
 				let squaredBBWidth = point1.distanceTo( point2 );
-
 				if ( this.fade ) {
 
 					// expand the shadow extents by the fade margin if fade is enabled.
@@ -117,27 +108,22 @@
 			}
 
 		}
-
 		getBreaks() {
 
 			const camera = this.camera;
 			const far = Math.min( camera.far, this.maxFar );
 			this.breaks.length = 0;
-
 			switch ( this.mode ) {
 
 				case 'uniform':
 					uniformSplit( this.cascades, camera.near, far, this.breaks );
 					break;
-
 				case 'logarithmic':
 					logarithmicSplit( this.cascades, camera.near, far, this.breaks );
 					break;
-
 				case 'practical':
 					practicalSplit( this.cascades, camera.near, far, 0.5, this.breaks );
 					break;
-
 				case 'custom':
 					if ( this.customSplitsCallback === undefined ) console.error( 'CSM: Custom split scheme callback not defined.' );
 					this.customSplitsCallback( this.cascades, camera.near, far, this.breaks );
@@ -175,7 +161,6 @@
 				_logArray.length = 0;
 				logarithmicSplit( amount, near, far, _logArray );
 				uniformSplit( amount, near, far, _uniformArray );
-
 				for ( let i = 1; i < amount; i ++ ) {
 
 					target.push( THREE.MathUtils.lerp( _uniformArray[ i - 1 ], _logArray[ i - 1 ], lambda ) );
@@ -187,12 +172,10 @@
 			}
 
 		}
-
 		update() {
 
 			const camera = this.camera;
 			const frustums = this.frustums;
-
 			for ( let i = 0; i < frustums.length; i ++ ) {
 
 				const light = this.lights[ i ];
@@ -200,31 +183,23 @@
 				const texelWidth = ( shadowCam.right - shadowCam.left ) / this.shadowMapSize;
 				const texelHeight = ( shadowCam.top - shadowCam.bottom ) / this.shadowMapSize;
 				light.shadow.camera.updateMatrixWorld( true );
-
 				_cameraToLightMatrix.multiplyMatrices( light.shadow.camera.matrixWorldInverse, camera.matrixWorld );
-
 				frustums[ i ].toSpace( _cameraToLightMatrix, _lightSpaceFrustum );
 				const nearVerts = _lightSpaceFrustum.vertices.near;
 				const farVerts = _lightSpaceFrustum.vertices.far;
-
 				_bbox.makeEmpty();
-
 				for ( let j = 0; j < 4; j ++ ) {
 
 					_bbox.expandByPoint( nearVerts[ j ] );
-
 					_bbox.expandByPoint( farVerts[ j ] );
 
 				}
 
 				_bbox.getCenter( _center );
-
 				_center.z = _bbox.max.z + this.lightMargin;
 				_center.x = Math.floor( _center.x / texelWidth ) * texelWidth;
 				_center.y = Math.floor( _center.y / texelHeight ) * texelHeight;
-
 				_center.applyMatrix4( light.shadow.camera.matrixWorld );
-
 				light.position.copy( _center );
 				light.target.position.copy( _center );
 				light.target.position.x += this.lightDirection.x;
@@ -234,20 +209,17 @@
 			}
 
 		}
-
 		injectInclude() {
 
 			THREE.ShaderChunk.lights_fragment_begin = THREE.CSMShader.lights_fragment_begin;
 			THREE.ShaderChunk.lights_pars_begin = THREE.CSMShader.lights_pars_begin;
 
 		}
-
 		setupMaterial( material ) {
 
 			material.defines = material.defines || {};
 			material.defines.USE_CSM = 1;
 			material.defines.CSM_CASCADES = this.cascades;
-
 			if ( this.fade ) {
 
 				material.defines.CSM_FADE = '';
@@ -257,7 +229,6 @@
 			const breaksVec2 = [];
 			const scope = this;
 			const shaders = this.shaders;
-
 			material.onBeforeCompile = function ( shader ) {
 
 				const far = Math.min( scope.camera.far, scope.maxFar );
@@ -278,7 +249,6 @@
 			shaders.set( material, null );
 
 		}
-
 		updateUniforms() {
 
 			const far = Math.min( this.camera.far, this.maxFar );
@@ -309,7 +279,6 @@
 			}, this );
 
 		}
-
 		getExtendedBreaks( target ) {
 
 			while ( target.length < this.breaks.length ) {
@@ -319,7 +288,6 @@
 			}
 
 			target.length = this.breaks.length;
-
 			for ( let i = 0; i < this.cascades; i ++ ) {
 
 				const amount = this.breaks[ i ];
@@ -330,7 +298,6 @@
 			}
 
 		}
-
 		updateFrustums() {
 
 			this.getBreaks();
@@ -339,17 +306,16 @@
 			this.updateUniforms();
 
 		}
-
 		remove() {
 
 			for ( let i = 0; i < this.lights.length; i ++ ) {
 
+				this.parent.remove( this.lights[ i ].target );
 				this.parent.remove( this.lights[ i ] );
 
 			}
 
 		}
-
 		dispose() {
 
 			const shaders = this.shaders;
@@ -359,7 +325,6 @@
 				delete material.defines.USE_CSM;
 				delete material.defines.CSM_CASCADES;
 				delete material.defines.CSM_FADE;
-
 				if ( shader !== null ) {
 
 					delete shader.uniforms.CSM_cascades;

package/examples/js/csm/CSMFrustum.js

@@ -1,7 +1,6 @@
 ( function () {
 
 	const inverseProjectionMatrix = new THREE.Matrix4();
-
 	class CSMFrustum {
 
 		constructor( data ) {
@@ -11,7 +10,6 @@
 				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 );
@@ -19,11 +17,12 @@
 			}
 
 		}
-
 		setFromProjectionMatrix( projectionMatrix, maxFar ) {
 
 			const isOrthographic = projectionMatrix.elements[ 2 * 4 + 3 ] === 0;
-			inverseProjectionMatrix.copy( projectionMatrix ).invert(); // 3 --- 0  vertices.near/far order
+			inverseProjectionMatrix.copy( projectionMatrix ).invert();
+
+			// 3 --- 0  vertices.near/far order
 			// |     |
 			// 2 --- 1
 			// clip space spans from [-1, 1]
@@ -45,7 +44,6 @@
 
 				v.applyMatrix4( inverseProjectionMatrix );
 				const absZ = Math.abs( v.z );
-
 				if ( isOrthographic ) {
 
 					v.z *= Math.min( maxFar / absZ, 1.0 );
@@ -60,7 +58,6 @@
 			return this.vertices;
 
 		}
-
 		split( breaks, target ) {
 
 			while ( breaks.length > target.length ) {
@@ -70,11 +67,9 @@
 			}
 
 			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 ++ ) {
@@ -114,7 +109,6 @@
 			}
 
 		}
-
 		toSpace( cameraMatrix, target ) {
 
 			for ( let i = 0; i < 4; i ++ ) {

package/examples/js/csm/CSMHelper.js

@@ -22,7 +22,6 @@
 			this.shadowLines = [];
 
 		}
-
 		updateVisibility() {
 
 			const displayFrustum = this.displayFrustum;
@@ -32,7 +31,6 @@
 			const cascadeLines = this.cascadeLines;
 			const cascadePlanes = this.cascadePlanes;
 			const shadowLines = this.shadowLines;
-
 			for ( let i = 0, l = cascadeLines.length; i < l; i ++ ) {
 
 				const cascadeLine = cascadeLines[ i ];
@@ -47,7 +45,6 @@
 			frustumLines.visible = displayFrustum;
 
 		}
-
 		update() {
 
 			const csm = this.csm;
@@ -65,7 +62,6 @@
 			this.quaternion.copy( camera.quaternion );
 			this.scale.copy( camera.scale );
 			this.updateMatrixWorld( true );
-
 			while ( cascadeLines.length > cascades ) {
 
 				this.remove( cascadeLines.pop() );
@@ -137,6 +133,30 @@
 			frustumLinePositions.needsUpdate = true;
 
 		}
+		dispose() {
+
+			const frustumLines = this.frustumLines;
+			const cascadeLines = this.cascadeLines;
+			const cascadePlanes = this.cascadePlanes;
+			const shadowLines = this.shadowLines;
+			frustumLines.geometry.dispose();
+			frustumLines.material.dispose();
+			const cascades = this.csm.cascades;
+			for ( let i = 0; i < cascades; i ++ ) {
+
+				const cascadeLine = cascadeLines[ i ];
+				const cascadePlane = cascadePlanes[ i ];
+				const shadowLineGroup = shadowLines[ i ];
+				const shadowLine = shadowLineGroup.children[ 0 ];
+				cascadeLine.dispose(); // THREE.Box3Helper
+
+				cascadePlane.geometry.dispose();
+				cascadePlane.material.dispose();
+				shadowLine.dispose(); // THREE.Box3Helper
+
+			}
+
+		}
 
 	}
 

package/examples/js/csm/CSMShader.js

@@ -1,9 +1,7 @@
 ( function () {
 
 	const CSMShader = {
-		lights_fragment_begin:
-  /* glsl */
-  `
+		lights_fragment_begin: /* glsl */`
 GeometricContext geometry;
 
 geometry.position = - vViewPosition;
@@ -241,9 +239,7 @@ IncidentLight directLight;
 
 #endif
 `,
-		lights_pars_begin:
-  /* glsl */
-  `
+		lights_pars_begin: /* glsl */`
 #if defined( USE_CSM ) && defined( CSM_CASCADES )
 uniform vec2 CSM_cascades[CSM_CASCADES];
 uniform float cameraNear;

package/examples/js/curves/CurveExtras.js

@@ -9,6 +9,7 @@
  * http://www.mi.sanu.ac.rs/vismath/taylorapril2011/Taylor.pdf
  * https://prideout.net/blog/old/blog/index.html@p=44.html
  */
+
 	// GrannyKnot
 
 	class GrannyKnot extends THREE.Curve {
@@ -24,8 +25,9 @@
 
 		}
 
-	} // HeartCurve
+	}
 
+	// HeartCurve
 
 	class HeartCurve extends THREE.Curve {
 
@@ -35,7 +37,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -47,8 +48,9 @@
 
 		}
 
-	} // Viviani's THREE.Curve
+	}
 
+	// Viviani's THREE.Curve
 
 	class VivianiCurve extends THREE.Curve {
 
@@ -58,12 +60,10 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
 			t = t * 4 * Math.PI; // normalized to 0..1
-
 			const a = this.scale / 2;
 			const x = a * ( 1 + Math.cos( t ) );
 			const y = a * Math.sin( t );
@@ -72,8 +72,9 @@
 
 		}
 
-	} // KnotCurve
+	}
 
+	// KnotCurve
 
 	class KnotCurve extends THREE.Curve {
 
@@ -90,8 +91,9 @@
 
 		}
 
-	} // HelixCurve
+	}
 
+	// HelixCurve
 
 	class HelixCurve extends THREE.Curve {
 
@@ -99,7 +101,6 @@
 
 			const point = optionalTarget;
 			const a = 30; // radius
-
 			const b = 150; // height
 
 			const t2 = 2 * Math.PI * t * b / 30;
@@ -110,8 +111,9 @@
 
 		}
 
-	} // TrefoilKnot
+	}
 
+	// TrefoilKnot
 
 	class TrefoilKnot extends THREE.Curve {
 
@@ -121,7 +123,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -133,8 +134,9 @@
 
 		}
 
-	} // TorusKnot
+	}
 
+	// TorusKnot
 
 	class TorusKnot extends THREE.Curve {
 
@@ -144,7 +146,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -158,8 +159,9 @@
 
 		}
 
-	} // CinquefoilKnot
+	}
 
+	// CinquefoilKnot
 
 	class CinquefoilKnot extends THREE.Curve {
 
@@ -169,7 +171,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -183,8 +184,9 @@
 
 		}
 
-	} // TrefoilPolynomialKnot
+	}
 
+	// TrefoilPolynomialKnot
 
 	class TrefoilPolynomialKnot extends THREE.Curve {
 
@@ -194,7 +196,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -207,14 +208,14 @@
 		}
 
 	}
-
 	function scaleTo( x, y, t ) {
 
 		const r = y - x;
 		return t * r + x;
 
-	} // FigureEightPolynomialKnot
+	}
 
+	// FigureEightPolynomialKnot
 
 	class FigureEightPolynomialKnot extends THREE.Curve {
 
@@ -224,7 +225,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -236,8 +236,9 @@
 
 		}
 
-	} // DecoratedTorusKnot4a
+	}
 
+	// DecoratedTorusKnot4a
 
 	class DecoratedTorusKnot4a extends THREE.Curve {
 
@@ -247,7 +248,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -259,8 +259,9 @@
 
 		}
 
-	} // DecoratedTorusKnot4b
+	}
 
+	// DecoratedTorusKnot4b
 
 	class DecoratedTorusKnot4b extends THREE.Curve {
 
@@ -270,7 +271,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -282,8 +282,9 @@
 
 		}
 
-	} // DecoratedTorusKnot5a
+	}
 
+	// DecoratedTorusKnot5a
 
 	class DecoratedTorusKnot5a extends THREE.Curve {
 
@@ -293,7 +294,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
@@ -305,8 +305,9 @@
 
 		}
 
-	} // DecoratedTorusKnot5c
+	}
 
+	// DecoratedTorusKnot5c
 
 	class DecoratedTorusKnot5c extends THREE.Curve {
 
@@ -316,7 +317,6 @@
 			this.scale = scale;
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;

package/examples/js/curves/NURBSCurve.js

@@ -11,24 +11,15 @@
 
 	class NURBSCurve extends THREE.Curve {
 
-		constructor( degree, knots
-			/* array of reals */
-			, controlPoints
-			/* array of Vector(2|3|4) */
-			, startKnot
-			/* index in knots */
-			, endKnot
-			/* index in knots */
-		) {
+		constructor( degree, knots /* array of reals */, controlPoints /* array of Vector(2|3|4) */, startKnot /* index in knots */, endKnot /* index in knots */ ) {
 
 			super();
 			this.degree = degree;
 			this.knots = knots;
-			this.controlPoints = []; // Used by periodic NURBS to remove hidden spans
-
+			this.controlPoints = [];
+			// Used by periodic NURBS to remove hidden spans
 			this.startKnot = startKnot || 0;
 			this.endKnot = endKnot || this.knots.length - 1;
-
 			for ( let i = 0; i < controlPoints.length; ++ i ) {
 
 				// ensure THREE.Vector4 for control points
@@ -38,15 +29,13 @@
 			}
 
 		}
-
 		getPoint( t, optionalTarget = new THREE.Vector3() ) {
 
 			const point = optionalTarget;
 			const u = this.knots[ this.startKnot ] + t * ( this.knots[ this.endKnot ] - this.knots[ this.startKnot ] ); // linear mapping t->u
-			// following results in (wx, wy, wz, w) homogeneous point
 
+			// following results in (wx, wy, wz, w) homogeneous point
 			const hpoint = THREE.NURBSUtils.calcBSplinePoint( this.degree, this.knots, this.controlPoints, u );
-
 			if ( hpoint.w !== 1.0 ) {
 
 				// project to 3D space: (wx, wy, wz, w) -> (x, y, z, 1)
@@ -57,7 +46,6 @@
 			return point.set( hpoint.x, hpoint.y, hpoint.z );
 
 		}
-
 		getTangent( t, optionalTarget = new THREE.Vector3() ) {
 
 			const tangent = optionalTarget;

package/examples/js/curves/NURBSSurface.js

@@ -8,11 +8,7 @@
 
 	class NURBSSurface {
 
-		constructor( degree1, degree2, knots1, knots2
-			/* arrays of reals */
-			, controlPoints
-			/* array^2 of Vector(2|3|4) */
-		) {
+		constructor( degree1, degree2, knots1, knots2 /* arrays of reals */, controlPoints /* array^2 of Vector(2|3|4) */ ) {
 
 			this.degree1 = degree1;
 			this.degree2 = degree2;
@@ -20,12 +16,12 @@
 			this.knots2 = knots2;
 			this.controlPoints = [];
 			const len1 = knots1.length - degree1 - 1;
-			const len2 = knots2.length - degree2 - 1; // ensure THREE.Vector4 for control points
+			const len2 = knots2.length - degree2 - 1;
 
+			// ensure THREE.Vector4 for control points
 			for ( let i = 0; i < len1; ++ i ) {
 
 				this.controlPoints[ i ] = [];
-
 				for ( let j = 0; j < len2; ++ j ) {
 
 					const point = controlPoints[ i ][ j ];
@@ -36,11 +32,9 @@
 			}
 
 		}
-
 		getPoint( t1, t2, target ) {
 
 			const u = this.knots1[ 0 ] + t1 * ( this.knots1[ this.knots1.length - 1 ] - this.knots1[ 0 ] ); // linear mapping t1->u
-
 			const v = this.knots2[ 0 ] + t2 * ( this.knots2[ this.knots2.length - 1 ] - this.knots2[ 0 ] ); // linear mapping t2->u
 
 			THREE.NURBSUtils.calcSurfacePoint( this.degree1, this.degree2, this.knots1, this.knots2, this.controlPoints, u, v, target );