super-three 0.170.0 → 0.171.0

package/src/math/ColorManagement.js

@@ -1,182 +1,190 @@
 import { SRGBColorSpace, LinearSRGBColorSpace, SRGBTransfer, LinearTransfer, NoColorSpace } from '../constants.js';
 import { Matrix3 } from './Matrix3.js';
 
-export const ColorManagement = {
-
-	enabled: true,
-
-	workingColorSpace: LinearSRGBColorSpace,
-
-	/**
-	 * Implementations of supported color spaces.
-	 *
-	 * Required:
-	 *	- primaries: chromaticity coordinates [ rx ry gx gy bx by ]
-	 *	- whitePoint: reference white [ x y ]
-	 *	- transfer: transfer function (pre-defined)
-	 *	- toXYZ: Matrix3 RGB to XYZ transform
-	 *	- fromXYZ: Matrix3 XYZ to RGB transform
-	 *	- luminanceCoefficients: RGB luminance coefficients
-	 *
-	 * Optional:
-	 *  - outputColorSpaceConfig: { drawingBufferColorSpace: ColorSpace }
-	 *  - workingColorSpaceConfig: { unpackColorSpace: ColorSpace }
-	 *
-	 * Reference:
-	 * - https://www.russellcottrell.com/photo/matrixCalculator.htm
-	 */
-	spaces: {},
+const LINEAR_REC709_TO_XYZ = /*@__PURE__*/ new Matrix3().set(
+	0.4123908, 0.3575843, 0.1804808,
+	0.2126390, 0.7151687, 0.0721923,
+	0.0193308, 0.1191948, 0.9505322
+);
 
-	convert: function ( color, sourceColorSpace, targetColorSpace ) {
+const XYZ_TO_LINEAR_REC709 = /*@__PURE__*/ new Matrix3().set(
+	3.2409699, - 1.5373832, - 0.4986108,
+	- 0.9692436, 1.8759675, 0.0415551,
+	0.0556301, - 0.2039770, 1.0569715
+);
 
-		if ( this.enabled === false || sourceColorSpace === targetColorSpace || ! sourceColorSpace || ! targetColorSpace ) {
+function createColorManagement() {
 
-			return color;
+	const ColorManagement = {
 
-		}
+		enabled: true,
 
-		if ( this.spaces[ sourceColorSpace ].transfer === SRGBTransfer ) {
+		workingColorSpace: LinearSRGBColorSpace,
 
-			color.r = SRGBToLinear( color.r );
-			color.g = SRGBToLinear( color.g );
-			color.b = SRGBToLinear( color.b );
+		/**
+		 * Implementations of supported color spaces.
+		 *
+		 * Required:
+		 *	- primaries: chromaticity coordinates [ rx ry gx gy bx by ]
+		 *	- whitePoint: reference white [ x y ]
+		 *	- transfer: transfer function (pre-defined)
+		 *	- toXYZ: Matrix3 RGB to XYZ transform
+		 *	- fromXYZ: Matrix3 XYZ to RGB transform
+		 *	- luminanceCoefficients: RGB luminance coefficients
+		 *
+		 * Optional:
+		 *  - outputColorSpaceConfig: { drawingBufferColorSpace: ColorSpace }
+		 *  - workingColorSpaceConfig: { unpackColorSpace: ColorSpace }
+		 *
+		 * Reference:
+		 * - https://www.russellcottrell.com/photo/matrixCalculator.htm
+		 */
+		spaces: {},
 
-		}
+		convert: function ( color, sourceColorSpace, targetColorSpace ) {
 
-		if ( this.spaces[ sourceColorSpace ].primaries !== this.spaces[ targetColorSpace ].primaries ) {
+			if ( this.enabled === false || sourceColorSpace === targetColorSpace || ! sourceColorSpace || ! targetColorSpace ) {
 
-			color.applyMatrix3( this.spaces[ sourceColorSpace ].toXYZ );
-			color.applyMatrix3( this.spaces[ targetColorSpace ].fromXYZ );
+				return color;
 
-		}
+			}
 
-		if ( this.spaces[ targetColorSpace ].transfer === SRGBTransfer ) {
+			if ( this.spaces[ sourceColorSpace ].transfer === SRGBTransfer ) {
 
-			color.r = LinearToSRGB( color.r );
-			color.g = LinearToSRGB( color.g );
-			color.b = LinearToSRGB( color.b );
+				color.r = SRGBToLinear( color.r );
+				color.g = SRGBToLinear( color.g );
+				color.b = SRGBToLinear( color.b );
 
-		}
+			}
 
-		return color;
+			if ( this.spaces[ sourceColorSpace ].primaries !== this.spaces[ targetColorSpace ].primaries ) {
 
-	},
+				color.applyMatrix3( this.spaces[ sourceColorSpace ].toXYZ );
+				color.applyMatrix3( this.spaces[ targetColorSpace ].fromXYZ );
 
-	fromWorkingColorSpace: function ( color, targetColorSpace ) {
+			}
 
-		return this.convert( color, this.workingColorSpace, targetColorSpace );
+			if ( this.spaces[ targetColorSpace ].transfer === SRGBTransfer ) {
 
-	},
+				color.r = LinearToSRGB( color.r );
+				color.g = LinearToSRGB( color.g );
+				color.b = LinearToSRGB( color.b );
 
-	toWorkingColorSpace: function ( color, sourceColorSpace ) {
+			}
 
-		return this.convert( color, sourceColorSpace, this.workingColorSpace );
+			return color;
 
-	},
+		},
 
-	getPrimaries: function ( colorSpace ) {
+		fromWorkingColorSpace: function ( color, targetColorSpace ) {
 
-		return this.spaces[ colorSpace ].primaries;
+			return this.convert( color, this.workingColorSpace, targetColorSpace );
 
-	},
+		},
 
-	getTransfer: function ( colorSpace ) {
+		toWorkingColorSpace: function ( color, sourceColorSpace ) {
 
-		if ( colorSpace === NoColorSpace ) return LinearTransfer;
+			return this.convert( color, sourceColorSpace, this.workingColorSpace );
 
-		return this.spaces[ colorSpace ].transfer;
+		},
 
-	},
+		getPrimaries: function ( colorSpace ) {
 
-	getLuminanceCoefficients: function ( target, colorSpace = this.workingColorSpace ) {
+			return this.spaces[ colorSpace ].primaries;
 
-		return target.fromArray( this.spaces[ colorSpace ].luminanceCoefficients );
+		},
 
-	},
+		getTransfer: function ( colorSpace ) {
 
-	define: function ( colorSpaces ) {
+			if ( colorSpace === NoColorSpace ) return LinearTransfer;
 
-		Object.assign( this.spaces, colorSpaces );
+			return this.spaces[ colorSpace ].transfer;
 
-	},
+		},
 
-	// Internal APIs
+		getLuminanceCoefficients: function ( target, colorSpace = this.workingColorSpace ) {
 
-	_getMatrix: function ( targetMatrix, sourceColorSpace, targetColorSpace ) {
+			return target.fromArray( this.spaces[ colorSpace ].luminanceCoefficients );
 
-		return targetMatrix
-			.copy( this.spaces[ sourceColorSpace ].toXYZ )
-			.multiply( this.spaces[ targetColorSpace ].fromXYZ );
+		},
 
-	},
+		define: function ( colorSpaces ) {
 
-	_getDrawingBufferColorSpace: function ( colorSpace ) {
+			Object.assign( this.spaces, colorSpaces );
 
-		return this.spaces[ colorSpace ].outputColorSpaceConfig.drawingBufferColorSpace;
+		},
 
-	},
+		// Internal APIs
 
-	_getUnpackColorSpace: function ( colorSpace = this.workingColorSpace ) {
+		_getMatrix: function ( targetMatrix, sourceColorSpace, targetColorSpace ) {
 
-		return this.spaces[ colorSpace ].workingColorSpaceConfig.unpackColorSpace;
+			return targetMatrix
+				.copy( this.spaces[ sourceColorSpace ].toXYZ )
+				.multiply( this.spaces[ targetColorSpace ].fromXYZ );
 
-	}
+		},
 
-};
+		_getDrawingBufferColorSpace: function ( colorSpace ) {
 
-export function SRGBToLinear( c ) {
+			return this.spaces[ colorSpace ].outputColorSpaceConfig.drawingBufferColorSpace;
 
-	return ( c < 0.04045 ) ? c * 0.0773993808 : Math.pow( c * 0.9478672986 + 0.0521327014, 2.4 );
+		},
 
-}
+		_getUnpackColorSpace: function ( colorSpace = this.workingColorSpace ) {
 
-export function LinearToSRGB( c ) {
+			return this.spaces[ colorSpace ].workingColorSpaceConfig.unpackColorSpace;
 
-	return ( c < 0.0031308 ) ? c * 12.92 : 1.055 * ( Math.pow( c, 0.41666 ) ) - 0.055;
+		}
+
+	};
+
+	/******************************************************************************
+	 * sRGB definitions
+	 */
+
+	const REC709_PRIMARIES = [ 0.640, 0.330, 0.300, 0.600, 0.150, 0.060 ];
+	const REC709_LUMINANCE_COEFFICIENTS = [ 0.2126, 0.7152, 0.0722 ];
+	const D65 = [ 0.3127, 0.3290 ];
+
+	ColorManagement.define( {
+
+		[ LinearSRGBColorSpace ]: {
+			primaries: REC709_PRIMARIES,
+			whitePoint: D65,
+			transfer: LinearTransfer,
+			toXYZ: LINEAR_REC709_TO_XYZ,
+			fromXYZ: XYZ_TO_LINEAR_REC709,
+			luminanceCoefficients: REC709_LUMINANCE_COEFFICIENTS,
+			workingColorSpaceConfig: { unpackColorSpace: SRGBColorSpace },
+			outputColorSpaceConfig: { drawingBufferColorSpace: SRGBColorSpace }
+		},
+
+		[ SRGBColorSpace ]: {
+			primaries: REC709_PRIMARIES,
+			whitePoint: D65,
+			transfer: SRGBTransfer,
+			toXYZ: LINEAR_REC709_TO_XYZ,
+			fromXYZ: XYZ_TO_LINEAR_REC709,
+			luminanceCoefficients: REC709_LUMINANCE_COEFFICIENTS,
+			outputColorSpaceConfig: { drawingBufferColorSpace: SRGBColorSpace }
+		},
+
+	} );
+
+	return ColorManagement;
 
 }
 
-/******************************************************************************
- * sRGB definitions
- */
+export const ColorManagement = /*@__PURE__*/ createColorManagement();
 
-const REC709_PRIMARIES = [ 0.640, 0.330, 0.300, 0.600, 0.150, 0.060 ];
-const REC709_LUMINANCE_COEFFICIENTS = [ 0.2126, 0.7152, 0.0722 ];
-const D65 = [ 0.3127, 0.3290 ];
+export function SRGBToLinear( c ) {
 
-const LINEAR_REC709_TO_XYZ = /*@__PURE__*/ new Matrix3().set(
-	0.4123908, 0.3575843, 0.1804808,
-	0.2126390, 0.7151687, 0.0721923,
-	0.0193308, 0.1191948, 0.9505322
-);
+	return ( c < 0.04045 ) ? c * 0.0773993808 : Math.pow( c * 0.9478672986 + 0.0521327014, 2.4 );
 
-const XYZ_TO_LINEAR_REC709 = /*@__PURE__*/ new Matrix3().set(
-	3.2409699, - 1.5373832, - 0.4986108,
-	- 0.9692436, 1.8759675, 0.0415551,
-	0.0556301, - 0.2039770, 1.0569715
-);
+}
 
-ColorManagement.define( {
-
-	[ LinearSRGBColorSpace ]: {
-		primaries: REC709_PRIMARIES,
-		whitePoint: D65,
-		transfer: LinearTransfer,
-		toXYZ: LINEAR_REC709_TO_XYZ,
-		fromXYZ: XYZ_TO_LINEAR_REC709,
-		luminanceCoefficients: REC709_LUMINANCE_COEFFICIENTS,
-		workingColorSpaceConfig: { unpackColorSpace: SRGBColorSpace },
-		outputColorSpaceConfig: { drawingBufferColorSpace: SRGBColorSpace }
-	},
-
-	[ SRGBColorSpace ]: {
-		primaries: REC709_PRIMARIES,
-		whitePoint: D65,
-		transfer: SRGBTransfer,
-		toXYZ: LINEAR_REC709_TO_XYZ,
-		fromXYZ: XYZ_TO_LINEAR_REC709,
-		luminanceCoefficients: REC709_LUMINANCE_COEFFICIENTS,
-		outputColorSpaceConfig: { drawingBufferColorSpace: SRGBColorSpace }
-	},
-
-} );
+export function LinearToSRGB( c ) {
+
+	return ( c < 0.0031308 ) ? c * 12.92 : 1.055 * ( Math.pow( c, 0.41666 ) ) - 0.055;
+
+}

package/src/math/Line3.js

@@ -1,5 +1,5 @@
 import { Vector3 } from './Vector3.js';
-import * as MathUtils from './MathUtils.js';
+import { clamp } from './MathUtils.js';
 
 const _startP = /*@__PURE__*/ new Vector3();
 const _startEnd = /*@__PURE__*/ new Vector3();
@@ -73,7 +73,7 @@ class Line3 {
 
 		if ( clampToLine ) {
 
-			t = MathUtils.clamp( t, 0, 1 );
+			t = clamp( t, 0, 1 );
 
 		}
 

package/src/math/Quaternion.js

@@ -1,4 +1,4 @@
-import * as MathUtils from './MathUtils.js';
+import { clamp } from './MathUtils.js';
 
 class Quaternion {
 
@@ -394,7 +394,7 @@ class Quaternion {
 
 	angleTo( q ) {
 
-		return 2 * Math.acos( Math.abs( MathUtils.clamp( this.dot( q ), - 1, 1 ) ) );
+		return 2 * Math.acos( Math.abs( clamp( this.dot( q ), - 1, 1 ) ) );
 
 	}
 

package/src/math/Spherical.js

@@ -1,4 +1,4 @@
-import * as MathUtils from './MathUtils.js';
+import { clamp } from './MathUtils.js';
 
 /**
  * Ref: https://en.wikipedia.org/wiki/Spherical_coordinate_system
@@ -42,7 +42,7 @@ class Spherical {
 	makeSafe() {
 
 		const EPS = 0.000001;
-		this.phi = Math.max( EPS, Math.min( Math.PI - EPS, this.phi ) );
+		this.phi = clamp( this.phi, EPS, Math.PI - EPS );
 
 		return this;
 
@@ -66,7 +66,7 @@ class Spherical {
 		} else {
 
 			this.theta = Math.atan2( x, z );
-			this.phi = Math.acos( MathUtils.clamp( y / this.radius, - 1, 1 ) );
+			this.phi = Math.acos( clamp( y / this.radius, - 1, 1 ) );
 
 		}
 

package/src/math/Vector2.js

@@ -1,4 +1,4 @@
-import * as MathUtils from './MathUtils.js';
+import { clamp } from './MathUtils.js';
 
 class Vector2 {
 
@@ -240,8 +240,8 @@ class Vector2 {
 
 		// assumes min < max, componentwise
 
-		this.x = Math.max( min.x, Math.min( max.x, this.x ) );
-		this.y = Math.max( min.y, Math.min( max.y, this.y ) );
+		this.x = clamp( this.x, min.x, max.x );
+		this.y = clamp( this.y, min.y, max.y );
 
 		return this;
 
@@ -249,8 +249,8 @@ class Vector2 {
 
 	clampScalar( minVal, maxVal ) {
 
-		this.x = Math.max( minVal, Math.min( maxVal, this.x ) );
-		this.y = Math.max( minVal, Math.min( maxVal, this.y ) );
+		this.x = clamp( this.x, minVal, maxVal );
+		this.y = clamp( this.y, minVal, maxVal );
 
 		return this;
 
@@ -260,7 +260,7 @@ class Vector2 {
 
 		const length = this.length();
 
-		return this.divideScalar( length || 1 ).multiplyScalar( Math.max( min, Math.min( max, length ) ) );
+		return this.divideScalar( length || 1 ).multiplyScalar( clamp( length, min, max ) );
 
 	}
 
@@ -365,7 +365,7 @@ class Vector2 {
 
 		// clamp, to handle numerical problems
 
-		return Math.acos( MathUtils.clamp( theta, - 1, 1 ) );
+		return Math.acos( clamp( theta, - 1, 1 ) );
 
 	}
 

package/src/math/Vector3.js

@@ -1,4 +1,4 @@
-import * as MathUtils from './MathUtils.js';
+import { clamp } from './MathUtils.js';
 import { Quaternion } from './Quaternion.js';
 
 class Vector3 {
@@ -338,9 +338,9 @@ class Vector3 {
 
 		// assumes min < max, componentwise
 
-		this.x = Math.max( min.x, Math.min( max.x, this.x ) );
-		this.y = Math.max( min.y, Math.min( max.y, this.y ) );
-		this.z = Math.max( min.z, Math.min( max.z, this.z ) );
+		this.x = clamp( this.x, min.x, max.x );
+		this.y = clamp( this.y, min.y, max.y );
+		this.z = clamp( this.z, min.z, max.z );
 
 		return this;
 
@@ -348,9 +348,9 @@ class Vector3 {
 
 	clampScalar( minVal, maxVal ) {
 
-		this.x = Math.max( minVal, Math.min( maxVal, this.x ) );
-		this.y = Math.max( minVal, Math.min( maxVal, this.y ) );
-		this.z = Math.max( minVal, Math.min( maxVal, this.z ) );
+		this.x = clamp( this.x, minVal, maxVal );
+		this.y = clamp( this.y, minVal, maxVal );
+		this.z = clamp( this.z, minVal, maxVal );
 
 		return this;
 
@@ -360,7 +360,7 @@ class Vector3 {
 
 		const length = this.length();
 
-		return this.divideScalar( length || 1 ).multiplyScalar( Math.max( min, Math.min( max, length ) ) );
+		return this.divideScalar( length || 1 ).multiplyScalar( clamp( length, min, max ) );
 
 	}
 
@@ -530,7 +530,7 @@ class Vector3 {
 
 		// clamp, to handle numerical problems
 
-		return Math.acos( MathUtils.clamp( theta, - 1, 1 ) );
+		return Math.acos( clamp( theta, - 1, 1 ) );
 
 	}
 

package/src/math/Vector4.js

@@ -1,3 +1,5 @@
+import { clamp } from './MathUtils.js';
+
 class Vector4 {
 
 	constructor( x = 0, y = 0, z = 0, w = 1 ) {
@@ -463,10 +465,10 @@ class Vector4 {
 
 		// assumes min < max, componentwise
 
-		this.x = Math.max( min.x, Math.min( max.x, this.x ) );
-		this.y = Math.max( min.y, Math.min( max.y, this.y ) );
-		this.z = Math.max( min.z, Math.min( max.z, this.z ) );
-		this.w = Math.max( min.w, Math.min( max.w, this.w ) );
+		this.x = clamp( this.x, min.x, max.x );
+		this.y = clamp( this.y, min.y, max.y );
+		this.z = clamp( this.z, min.z, max.z );
+		this.w = clamp( this.w, min.w, max.w );
 
 		return this;
 
@@ -474,10 +476,10 @@ class Vector4 {
 
 	clampScalar( minVal, maxVal ) {
 
-		this.x = Math.max( minVal, Math.min( maxVal, this.x ) );
-		this.y = Math.max( minVal, Math.min( maxVal, this.y ) );
-		this.z = Math.max( minVal, Math.min( maxVal, this.z ) );
-		this.w = Math.max( minVal, Math.min( maxVal, this.w ) );
+		this.x = clamp( this.x, minVal, maxVal );
+		this.y = clamp( this.y, minVal, maxVal );
+		this.z = clamp( this.z, minVal, maxVal );
+		this.w = clamp( this.w, minVal, maxVal );
 
 		return this;
 
@@ -487,7 +489,7 @@ class Vector4 {
 
 		const length = this.length();
 
-		return this.divideScalar( length || 1 ).multiplyScalar( Math.max( min, Math.min( max, length ) ) );
+		return this.divideScalar( length || 1 ).multiplyScalar( clamp( length, min, max ) );
 
 	}
 

package/src/nodes/Nodes.js

@@ -60,6 +60,7 @@ export { default as BufferNode } from './accessors/BufferNode.js';
 export { default as VertexColorNode } from './accessors/VertexColorNode.js';
 export { default as CubeTextureNode } from './accessors/CubeTextureNode.js';
 export { default as InstanceNode } from './accessors/InstanceNode.js';
+export { default as InstancedMeshNode } from './accessors/InstancedMeshNode.js';
 export { default as BatchNode } from './accessors/BatchNode.js';
 export { default as MaterialNode } from './accessors/MaterialNode.js';
 export { default as MaterialReferenceNode } from './accessors/MaterialReferenceNode.js';

package/src/nodes/TSL.js

@@ -47,6 +47,7 @@ export * from './tsl/TSLBase.js';
 
 // accessors
 export * from './accessors/AccessorsUtils.js';
+export * from './accessors/Arrays.js';
 export * from './accessors/UniformArrayNode.js';
 export * from './accessors/Bitangent.js';
 export * from './accessors/BufferAttributeNode.js';
@@ -55,6 +56,7 @@ export * from './accessors/Camera.js';
 export * from './accessors/VertexColorNode.js';
 export * from './accessors/CubeTextureNode.js';
 export * from './accessors/InstanceNode.js';
+export * from './accessors/InstancedMeshNode.js';
 export * from './accessors/BatchNode.js';
 export * from './accessors/MaterialNode.js';
 export * from './accessors/MaterialProperties.js';
@@ -83,7 +85,7 @@ export * from './accessors/UserDataNode.js';
 export * from './accessors/VelocityNode.js';
 
 // display
-export * from './display/BlendMode.js';
+export * from './display/BlendModes.js';
 export * from './display/BumpMapNode.js';
 export * from './display/ColorAdjustment.js';
 export * from './display/ColorSpaceNode.js';

package/src/nodes/accessors/Arrays.js

@@ -0,0 +1,27 @@
+import StorageInstancedBufferAttribute from '../../renderers/common/StorageInstancedBufferAttribute.js';
+import StorageBufferAttribute from '../../renderers/common/StorageBufferAttribute.js';
+import { storage } from './StorageBufferNode.js';
+import { getLengthFromType } from '../core/NodeUtils.js';
+
+export const attributeArray = ( count, type = 'float' ) => {
+
+	const itemSize = getLengthFromType( type );
+
+	const buffer = new StorageBufferAttribute( count, itemSize );
+	const node = storage( buffer, type, count );
+
+	return node;
+
+};
+
+
+export const instancedArray = ( count, type = 'float' ) => {
+
+	const itemSize = getLengthFromType( type );
+
+	const buffer = new StorageInstancedBufferAttribute( count, itemSize );
+	const node = storage( buffer, type, count );
+
+	return node;
+
+};

package/src/nodes/accessors/BuiltinNode.js

@@ -0,0 +1,26 @@
+import Node from '../core/Node.js';
+import { nodeProxy } from '../tsl/TSLBase.js';
+
+class BuiltinNode extends Node {
+
+	constructor( name ) {
+
+		super( 'float' );
+
+		this.name = name;
+
+		this.isBuiltinNode = true;
+
+	}
+
+	generate( /* builder */ ) {
+
+		return this.name;
+
+	}
+
+}
+
+export default BuiltinNode;
+
+export const builtin = nodeProxy( BuiltinNode );