super-three 0.137.0 → 0.141.0

package/examples/jsm/animation/CCDIKSolver.js

@@ -186,19 +186,13 @@ class CCDIKSolver {
 
 				if ( rotationMin !== undefined ) {
 
-					link.rotation.setFromVector3(
-						link.rotation
-							.toVector3( _vector )
-							.max( rotationMin ) );
+					link.rotation.setFromVector3( _vector.setFromEuler( link.rotation ).max( rotationMin ) );
 
 				}
 
 				if ( rotationMax !== undefined ) {
 
-					link.rotation.setFromVector3(
-						link.rotation
-							.toVector3( _vector )
-							.min( rotationMax ) );
+					link.rotation.setFromVector3( _vector.setFromEuler( link.rotation ).min( rotationMax ) );
 
 				}
 
@@ -461,4 +455,4 @@ class CCDIKHelper extends Object3D {
 
 }
 
-export { CCDIKSolver };
+export { CCDIKSolver, CCDIKHelper };

package/examples/jsm/animation/MMDPhysics.js

@@ -211,7 +211,7 @@ class MMDPhysics {
 
 		let parent = mesh.parent;
 
-		if ( parent !== null ) parent = null;
+		if ( parent !== null ) mesh.parent = null;
 
 		const currentPosition = manager.allocThreeVector3();
 		const currentQuaternion = manager.allocThreeQuaternion();

package/examples/jsm/capabilities/WebGPU.js

@@ -1,3 +1,9 @@
+if ( window.GPUShaderStage === undefined ) {
+
+	window.GPUShaderStage = { VERTEX: 1, FRAGMENT: 2, COMPUTE: 4 };
+
+}
+
 class WebGPU {
 
 	static isAvailable() {

package/examples/jsm/controls/ArcballControls.js

@@ -1040,7 +1040,9 @@ class ArcballControls extends EventDispatcher {
 
 							}
 
-							this.applyTransformMatrix( this.scale( size, this._gizmos.position ) );
+							this._v3_1.setFromMatrixPosition(this._gizmoMatrixState);
+
+							this.applyTransformMatrix( this.scale( size, this._v3_1 ) );
 
 						}
 

package/examples/jsm/controls/PointerLockControls.js

@@ -34,6 +34,8 @@ class PointerLockControls extends EventDispatcher {
 		this.minPolarAngle = 0; // radians
 		this.maxPolarAngle = Math.PI; // radians
 
+		this.pointerSpeed = 1.0;
+
 		const scope = this;
 
 		function onMouseMove( event ) {
@@ -45,8 +47,8 @@ class PointerLockControls extends EventDispatcher {
 
 			_euler.setFromQuaternion( camera.quaternion );
 
-			_euler.y -= movementX * 0.002;
-			_euler.x -= movementY * 0.002;
+			_euler.y -= movementX * 0.002 * scope.pointerSpeed;
+			_euler.x -= movementY * 0.002 * scope.pointerSpeed;
 
 			_euler.x = Math.max( _PI_2 - scope.maxPolarAngle, Math.min( _PI_2 - scope.minPolarAngle, _euler.x ) );
 

package/examples/jsm/controls/TrackballControls.js

@@ -541,9 +541,6 @@ class TrackballControls extends EventDispatcher {
 						_state = STATE.PAN;
 						break;
 
-					default:
-						_state = STATE.NONE;
-
 				}
 
 			}
@@ -706,7 +703,7 @@ class TrackballControls extends EventDispatcher {
 
 				case 2:
 					_state = STATE.TOUCH_ZOOM_PAN;
-					_moveCurr.copy( getMouseOnCircle( event.pageX - _movePrev.pageX, event.pageY - _movePrev.pageY ) );
+					_moveCurr.copy( getMouseOnCircle( event.pageX - _movePrev.x, event.pageY - _movePrev.y ) );
 					_movePrev.copy( _moveCurr );
 					break;
 

package/examples/jsm/controls/TransformControls.js

@@ -49,6 +49,8 @@ class TransformControls extends Object3D {
 
 		}
 
+		this.isTransformControls = true;
+
 		this.visible = false;
 		this.domElement = domElement;
 		this.domElement.style.touchAction = 'none'; // disable touch scroll
@@ -641,8 +643,6 @@ class TransformControls extends Object3D {
 
 }
 
-TransformControls.prototype.isTransformControls = true;
-
 // mouse / touch event handlers
 
 function getPointer( event ) {
@@ -766,6 +766,8 @@ class TransformControlsGizmo extends Object3D {
 
 		super();
 
+		this.isTransformControlsGizmo = true;
+
 		this.type = 'TransformControlsGizmo';
 
 		// shared materials
@@ -1456,8 +1458,6 @@ class TransformControlsGizmo extends Object3D {
 
 }
 
-TransformControlsGizmo.prototype.isTransformControlsGizmo = true;
-
 //
 
 class TransformControlsPlane extends Mesh {
@@ -1469,6 +1469,8 @@ class TransformControlsPlane extends Mesh {
 			new MeshBasicMaterial( { visible: false, wireframe: true, side: DoubleSide, transparent: true, opacity: 0.1, toneMapped: false } )
 		);
 
+		this.isTransformControlsPlane = true;
+
 		this.type = 'TransformControlsPlane';
 
 	}
@@ -1551,6 +1553,4 @@ class TransformControlsPlane extends Mesh {
 
 }
 
-TransformControlsPlane.prototype.isTransformControlsPlane = true;
-
 export { TransformControls, TransformControlsGizmo, TransformControlsPlane };

package/examples/jsm/controls/experimental/CameraControls.js

@@ -157,7 +157,7 @@ var CameraControls = function ( object, domElement ) {
 
 					vec.set( 0, 1, 0 ).applyQuaternion( scope.object.quaternion );
 
-					var factor = ( scope.enableDamping ) ? scope.dampingFactor : 1;
+					const factor = ( scope.enableDamping ) ? scope.dampingFactor : 1;
 
 					q.setFromAxisAngle( vec, sphericalDelta.theta * factor );
 
@@ -172,7 +172,7 @@ var CameraControls = function ( object, domElement ) {
 
 					vec.set( 1, 0, 0 ).applyQuaternion( scope.object.quaternion );
 
-					var factor = ( scope.enableDamping ) ? scope.dampingFactor : 1;
+					const factor = ( scope.enableDamping ) ? scope.dampingFactor : 1;
 
 					q.setFromAxisAngle( vec, sphericalDelta.phi * factor );
 

package/examples/jsm/csm/CSMFrustum.js

@@ -133,7 +133,7 @@ class CSMFrustum {
 
 	toSpace( cameraMatrix, target ) {
 
-		for ( var i = 0; i < 4; i ++ ) {
+		for ( let i = 0; i < 4; i ++ ) {
 
 			target.vertices.near[ i ]
 				.copy( this.vertices.near[ i ] )

package/examples/jsm/csm/CSMShader.js

@@ -90,19 +90,19 @@ IncidentLight directLight;
 		directionalLight = directionalLights[ i ];
 		getDirectionalLightInfo( directionalLight, geometry, directLight );
 
-		// NOTE: Depth gets larger away from the camera.
-		// cascade.x is closer, cascade.y is further
-		cascade = CSM_cascades[ i ];
-		cascadeCenter = ( cascade.x + cascade.y ) / 2.0;
-		closestEdge = linearDepth < cascadeCenter ? cascade.x : cascade.y;
-		margin = 0.25 * pow( closestEdge, 2.0 );
-		csmx = cascade.x - margin / 2.0;
-		csmy = cascade.y + margin / 2.0;
-		if( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS && linearDepth >= csmx && ( linearDepth < csmy || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 ) ) {
-
-			float dist = min( linearDepth - csmx, csmy - linearDepth );
-			float ratio = clamp( dist / margin, 0.0, 1.0 );
-			if( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS ) {
+	  	#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS )
+			// NOTE: Depth gets larger away from the camera.
+			// cascade.x is closer, cascade.y is further
+			cascade = CSM_cascades[ i ];
+			cascadeCenter = ( cascade.x + cascade.y ) / 2.0;
+			closestEdge = linearDepth < cascadeCenter ? cascade.x : cascade.y;
+			margin = 0.25 * pow( closestEdge, 2.0 );
+			csmx = cascade.x - margin / 2.0;
+			csmy = cascade.y + margin / 2.0;
+			if( linearDepth >= csmx && ( linearDepth < csmy || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 ) ) {
+
+				float dist = min( linearDepth - csmx, csmy - linearDepth );
+				float ratio = clamp( dist / margin, 0.0, 1.0 );
 
 				vec3 prevColor = directLight.color;
 				directionalLightShadow = directionalLightShadows[ i ];
@@ -111,42 +111,58 @@ IncidentLight directLight;
 				bool shouldFadeLastCascade = UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 && linearDepth > cascadeCenter;
 				directLight.color = mix( prevColor, directLight.color, shouldFadeLastCascade ? ratio : 1.0 );
 
-			}
-
-			ReflectedLight prevLight = reflectedLight;
-			RE_Direct( directLight, geometry, material, reflectedLight );
+				ReflectedLight prevLight = reflectedLight;
+				RE_Direct( directLight, geometry, material, reflectedLight );
 
-			bool shouldBlend = UNROLLED_LOOP_INDEX != CSM_CASCADES - 1 || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 && linearDepth < cascadeCenter;
-			float blendRatio = shouldBlend ? ratio : 1.0;
+				bool shouldBlend = UNROLLED_LOOP_INDEX != CSM_CASCADES - 1 || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 && linearDepth < cascadeCenter;
+				float blendRatio = shouldBlend ? ratio : 1.0;
 
-			reflectedLight.directDiffuse = mix( prevLight.directDiffuse, reflectedLight.directDiffuse, blendRatio );
-			reflectedLight.directSpecular = mix( prevLight.directSpecular, reflectedLight.directSpecular, blendRatio );
-			reflectedLight.indirectDiffuse = mix( prevLight.indirectDiffuse, reflectedLight.indirectDiffuse, blendRatio );
-			reflectedLight.indirectSpecular = mix( prevLight.indirectSpecular, reflectedLight.indirectSpecular, blendRatio );
+				reflectedLight.directDiffuse = mix( prevLight.directDiffuse, reflectedLight.directDiffuse, blendRatio );
+				reflectedLight.directSpecular = mix( prevLight.directSpecular, reflectedLight.directSpecular, blendRatio );
+				reflectedLight.indirectDiffuse = mix( prevLight.indirectDiffuse, reflectedLight.indirectDiffuse, blendRatio );
+				reflectedLight.indirectSpecular = mix( prevLight.indirectSpecular, reflectedLight.indirectSpecular, blendRatio );
 
-		}
+			}
+	  	#endif
 
 	}
 	#pragma unroll_loop_end
 	#else
 
-	#pragma unroll_loop_start
-	for ( int i = 0; i < NUM_DIR_LIGHTS; i ++ ) {
+		#pragma unroll_loop_start
+		for ( int i = 0; i < NUM_DIR_LIGHTS; i ++ ) {
 
-		directionalLight = directionalLights[ i ];
-		getDirectionalLightInfo( directionalLight, geometry, directLight );
+			directionalLight = directionalLights[ i ];
+			getDirectionalLightInfo( directionalLight, geometry, directLight );
 
-		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS )
+			#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS )
 
-		directionalLightShadow = directionalLightShadows[ i ];
-		if(linearDepth >= CSM_cascades[UNROLLED_LOOP_INDEX].x && linearDepth < CSM_cascades[UNROLLED_LOOP_INDEX].y) directLight.color *= all( bvec2( directLight.visible, receiveShadow ) ) ? getShadow( directionalShadowMap[ i ], directionalLightShadow.shadowMapSize, directionalLightShadow.shadowBias, directionalLightShadow.shadowRadius, vDirectionalShadowCoord[ i ] ) : 1.0;
+			directionalLightShadow = directionalLightShadows[ i ];
+			if(linearDepth >= CSM_cascades[UNROLLED_LOOP_INDEX].x && linearDepth < CSM_cascades[UNROLLED_LOOP_INDEX].y) directLight.color *= all( bvec2( directLight.visible, receiveShadow ) ) ? getShadow( directionalShadowMap[ i ], directionalLightShadow.shadowMapSize, directionalLightShadow.shadowBias, directionalLightShadow.shadowRadius, vDirectionalShadowCoord[ i ] ) : 1.0;
 
-		#endif
+			if(linearDepth >= CSM_cascades[UNROLLED_LOOP_INDEX].x && (linearDepth < CSM_cascades[UNROLLED_LOOP_INDEX].y || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1)) RE_Direct( directLight, geometry, material, reflectedLight );
 
-		if(linearDepth >= CSM_cascades[UNROLLED_LOOP_INDEX].x && (linearDepth < CSM_cascades[UNROLLED_LOOP_INDEX].y || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1)) RE_Direct( directLight, geometry, material, reflectedLight );
+			#endif
 
-	}
-	#pragma unroll_loop_end
+		}
+		#pragma unroll_loop_end
+
+	#endif
+
+	#if ( NUM_DIR_LIGHTS > NUM_DIR_LIGHT_SHADOWS)
+		// compute the lights not casting shadows (if any)
+
+		#pragma unroll_loop_start
+		for ( int i = NUM_DIR_LIGHT_SHADOWS; i < NUM_DIR_LIGHTS; i ++ ) {
+
+			directionalLight = directionalLights[ i ];
+
+			getDirectionalLightInfo( directionalLight, geometry, directLight );
+
+			RE_Direct( directLight, geometry, material, reflectedLight );
+
+		}
+		#pragma unroll_loop_end
 
 	#endif
 

package/examples/jsm/curves/CurveExtras.js

@@ -404,21 +404,19 @@ class DecoratedTorusKnot5c extends Curve {
 
 }
 
-const Curves = {
-	GrannyKnot: GrannyKnot,
-	HeartCurve: HeartCurve,
-	VivianiCurve: VivianiCurve,
-	KnotCurve: KnotCurve,
-	HelixCurve: HelixCurve,
-	TrefoilKnot: TrefoilKnot,
-	TorusKnot: TorusKnot,
-	CinquefoilKnot: CinquefoilKnot,
-	TrefoilPolynomialKnot: TrefoilPolynomialKnot,
-	FigureEightPolynomialKnot: FigureEightPolynomialKnot,
-	DecoratedTorusKnot4a: DecoratedTorusKnot4a,
-	DecoratedTorusKnot4b: DecoratedTorusKnot4b,
-	DecoratedTorusKnot5a: DecoratedTorusKnot5a,
-	DecoratedTorusKnot5c: DecoratedTorusKnot5c
+export {
+	GrannyKnot,
+	HeartCurve,
+	VivianiCurve,
+	KnotCurve,
+	HelixCurve,
+	TrefoilKnot,
+	TorusKnot,
+	CinquefoilKnot,
+	TrefoilPolynomialKnot,
+	FigureEightPolynomialKnot,
+	DecoratedTorusKnot4a,
+	DecoratedTorusKnot4b,
+	DecoratedTorusKnot5a,
+	DecoratedTorusKnot5c
 };
-
-export { Curves };

package/examples/jsm/effects/AnaglyphEffect.js

@@ -154,10 +154,10 @@ class AnaglyphEffect {
 
 		this.dispose = function () {
 
-			if ( _renderTargetL ) _renderTargetL.dispose();
-			if ( _renderTargetR ) _renderTargetR.dispose();
-			if ( _mesh ) _mesh.geometry.dispose();
-			if ( _material ) _material.dispose();
+			_renderTargetL.dispose();
+			_renderTargetR.dispose();
+			_mesh.geometry.dispose();
+			_mesh.material.dispose();
 
 		};
 

package/examples/jsm/effects/AsciiEffect.js

@@ -14,14 +14,13 @@ class AsciiEffect {
 
 		// Some ASCII settings
 
-		const bResolution = ! options[ 'resolution' ] ? 0.15 : options[ 'resolution' ]; // Higher for more details
-		const iScale = ! options[ 'scale' ] ? 1 : options[ 'scale' ];
-		const bColor = ! options[ 'color' ] ? false : options[ 'color' ]; // nice but slows down rendering!
-		const bAlpha = ! options[ 'alpha' ] ? false : options[ 'alpha' ]; // Transparency
-		const bBlock = ! options[ 'block' ] ? false : options[ 'block' ]; // blocked characters. like good O dos
-		const bInvert = ! options[ 'invert' ] ? false : options[ 'invert' ]; // black is white, white is black
-
-		const strResolution = 'low';
+		const fResolution = options[ 'resolution' ] || 0.15; // Higher for more details
+		const iScale = options[ 'scale' ] || 1;
+		const bColor = options[ 'color' ] || false; // nice but slows down rendering!
+		const bAlpha = options[ 'alpha' ] || false; // Transparency
+		const bBlock = options[ 'block' ] || false; // blocked characters. like good O dos
+		const bInvert = options[ 'invert' ] || false; // black is white, white is black
+		const strResolution = options[ 'strResolution' ] || 'low';
 
 		let width, height;
 
@@ -49,7 +48,7 @@ class AsciiEffect {
 		this.render = function ( scene, camera ) {
 
 			renderer.render( scene, camera );
-			asciifyImage( renderer, oAscii );
+			asciifyImage( oAscii );
 
 		};
 
@@ -122,18 +121,6 @@ class AsciiEffect {
 
 		if ( charSet ) aCharList = charSet;
 
-		let fResolution = 0.5;
-
-		switch ( strResolution ) {
-
-			case 'low' : 	fResolution = 0.25; break;
-			case 'medium' : fResolution = 0.5; break;
-			case 'high' : 	fResolution = 1; break;
-
-		}
-
-		if ( bResolution ) fResolution = bResolution;
-
 		// Setup dom
 
 		const fFontSize = ( 2 / fResolution ) * iScale;
@@ -191,7 +178,7 @@ class AsciiEffect {
 
 		// convert img element to ascii
 
-		function asciifyImage( canvasRenderer, oAscii ) {
+		function asciifyImage( oAscii ) {
 
 			oCtx.clearRect( 0, 0, iWidth, iHeight );
 			oCtx.drawImage( oCanvasImg, 0, 0, iWidth, iHeight );

package/examples/jsm/exporters/ColladaExporter.js

@@ -144,10 +144,30 @@ class ColladaExporter {
 
 		// gets the attribute array. Generate a new array if the attribute is interleaved
 		const getFuncs = [ 'getX', 'getY', 'getZ', 'getW' ];
+		const tempColor = new Color();
 
-		function attrBufferToArray( attr ) {
+		function attrBufferToArray( attr, isColor = false ) {
 
-			if ( attr.isInterleavedBufferAttribute ) {
+			if ( isColor ) {
+
+				// convert the colors to srgb before export
+				// colors are always written as floats
+				const arr = new Float32Array( attr.count * 3 );
+				for ( let i = 0, l = attr.count; i < l; i ++ ) {
+
+					tempColor
+						.fromBufferAttribute( attr, i )
+						.convertLinearToSRGB();
+
+					arr[ 3 * i + 0 ] = tempColor.r;
+					arr[ 3 * i + 1 ] = tempColor.g;
+					arr[ 3 * i + 2 ] = tempColor.b;
+
+				}
+
+				return arr;
+
+			} else if ( attr.isInterleavedBufferAttribute ) {
 
 				// use the typed array constructor to save on memory
 				const arr = new attr.array.constructor( attr.count * attr.itemSize );
@@ -183,9 +203,9 @@ class ColladaExporter {
 		}
 
 		// Returns the string for a geometry's attribute
-		function getAttribute( attr, name, params, type ) {
+		function getAttribute( attr, name, params, type, isColor = false ) {
 
-			const array = attrBufferToArray( attr );
+			const array = attrBufferToArray( attr, isColor );
 			const res =
 					`<source id="${ name }">` +
 
@@ -296,8 +316,9 @@ class ColladaExporter {
 				// serialize colors
 				if ( 'color' in bufferGeometry.attributes ) {
 
+					// colors are always written as floats
 					const colName = `${ meshid }-color`;
-					gnode += getAttribute( bufferGeometry.attributes.color, colName, [ 'X', 'Y', 'Z' ], 'uint8' );
+					gnode += getAttribute( bufferGeometry.attributes.color, colName, [ 'R', 'G', 'B' ], 'float', true );
 					triangleInputs += `<input semantic="COLOR" source="#${ colName }" offset="0" />`;
 
 				}
@@ -419,6 +440,10 @@ class ColladaExporter {
 				const shininess = m.shininess || 0;
 				const reflectivity = m.reflectivity || 0;
 
+				emissive.convertLinearToSRGB();
+				specular.convertLinearToSRGB();
+				diffuse.convertLinearToSRGB();
+
 				// Do not export and alpha map for the reasons mentioned in issue (#13792)
 				// in three.js alpha maps are black and white, but collada expects the alpha
 				// channel to specify the transparency
@@ -608,7 +633,7 @@ class ColladaExporter {
 					`<instance_geometry url="#${ meshid }">` +
 
 					(
-						matids != null ?
+						matids.length > 0 ?
 							'<bind_material><technique_common>' +
 							matids.map( ( id, i ) =>