super-three 0.167.0 → 0.169.0

package/src/nodes/lighting/IESSpotLightNode.js

@@ -1,13 +1,15 @@
 import SpotLightNode from './SpotLightNode.js';
-import { addLightNode } from './LightsNode.js';
 import { texture } from '../accessors/TextureNode.js';
-import { vec2 } from '../shadernode/ShaderNode.js';
-import { addNodeClass } from '../core/Node.js';
-
-import IESSpotLight from '../../lights/webgpu/IESSpotLight.js';
+import { vec2 } from '../tsl/TSLBase.js';
 
 class IESSpotLightNode extends SpotLightNode {
 
+	static get type() {
+
+		return 'IESSpotLightNode';
+
+	}
+
 	getSpotAttenuation( angleCosine ) {
 
 		const iesMap = this.light.iesMap;
@@ -33,7 +35,3 @@ class IESSpotLightNode extends SpotLightNode {
 }
 
 export default IESSpotLightNode;
-
-addNodeClass( 'IESSpotLightNode', IESSpotLightNode );
-
-addLightNode( IESSpotLight, IESSpotLightNode );

package/src/nodes/lighting/IrradianceNode.js

@@ -1,8 +1,13 @@
 import LightingNode from './LightingNode.js';
-import { addNodeClass } from '../core/Node.js';
 
 class IrradianceNode extends LightingNode {
 
+	static get type() {
+
+		return 'IrradianceNode';
+
+	}
+
 	constructor( node ) {
 
 		super();
@@ -20,5 +25,3 @@ class IrradianceNode extends LightingNode {
 }
 
 export default IrradianceNode;
-
-addNodeClass( 'IrradianceNode', IrradianceNode );

package/src/nodes/lighting/LightProbeNode.js

@@ -0,0 +1,53 @@
+import AnalyticLightNode from './AnalyticLightNode.js';
+import { normalWorld } from '../accessors/Normal.js';
+import { uniformArray } from '../accessors/UniformArrayNode.js';
+import { Vector3 } from '../../math/Vector3.js';
+import getShIrradianceAt from '../functions/material/getShIrradianceAt.js';
+
+class LightProbeNode extends AnalyticLightNode {
+
+	static get type() {
+
+		return 'LightProbeNode';
+
+	}
+
+	constructor( light = null ) {
+
+		super( light );
+
+		const array = [];
+
+		for ( let i = 0; i < 9; i ++ ) array.push( new Vector3() );
+
+		this.lightProbe = uniformArray( array );
+
+	}
+
+	update( frame ) {
+
+		const { light } = this;
+
+		super.update( frame );
+
+		//
+
+		for ( let i = 0; i < 9; i ++ ) {
+
+			this.lightProbe.array[ i ].copy( light.sh.coefficients[ i ] ).multiplyScalar( light.intensity );
+
+		}
+
+	}
+
+	setup( builder ) {
+
+		const irradiance = getShIrradianceAt( normalWorld, this.lightProbe );
+
+		builder.context.irradiance.addAssign( irradiance );
+
+	}
+
+}
+
+export default LightProbeNode;

package/src/nodes/lighting/LightUtils.js

@@ -1,6 +1,6 @@
-import { tslFn } from '../shadernode/ShaderNode.js';
+import { Fn } from '../tsl/TSLBase.js';
 
-export const getDistanceAttenuation = tslFn( ( inputs ) => {
+export const getDistanceAttenuation = /*@__PURE__*/ Fn( ( inputs ) => {
 
 	const { lightDistance, cutoffDistance, decayExponent } = inputs;
 
@@ -9,7 +9,7 @@ export const getDistanceAttenuation = tslFn( ( inputs ) => {
 	// https://seblagarde.files.wordpress.com/2015/07/course_notes_moving_frostbite_to_pbr_v32.pdf
 	const distanceFalloff = lightDistance.pow( decayExponent ).max( 0.01 ).reciprocal();
 
-	return cutoffDistance.greaterThan( 0 ).cond(
+	return cutoffDistance.greaterThan( 0 ).select(
 		distanceFalloff.mul( lightDistance.div( cutoffDistance ).pow4().oneMinus().clamp().pow2() ),
 		distanceFalloff
 	);

package/src/nodes/lighting/LightingContextNode.js

@@ -1,9 +1,14 @@
 import ContextNode from '../core/ContextNode.js';
-import { addNodeClass } from '../core/Node.js';
-import { addNodeElement, nodeProxy, float, vec3 } from '../shadernode/ShaderNode.js';
+import { nodeProxy, float, vec3 } from '../tsl/TSLBase.js';
 
 class LightingContextNode extends ContextNode {
 
+	static get type() {
+
+		return 'LightingContextNode';
+
+	}
+
 	constructor( node, lightingModel = null, backdropNode = null, backdropAlphaNode = null ) {
 
 		super( node );
@@ -12,7 +17,7 @@ class LightingContextNode extends ContextNode {
 		this.backdropNode = backdropNode;
 		this.backdropAlphaNode = backdropAlphaNode;
 
-		this._context = null;
+		this._value = null;
 
 	}
 
@@ -20,10 +25,10 @@ class LightingContextNode extends ContextNode {
 
 		const { backdropNode, backdropAlphaNode } = this;
 
-		const directDiffuse = vec3().temp( 'directDiffuse' ),
-			directSpecular = vec3().temp( 'directSpecular' ),
-			indirectDiffuse = vec3().temp( 'indirectDiffuse' ),
-			indirectSpecular = vec3().temp( 'indirectSpecular' );
+		const directDiffuse = vec3().toVar( 'directDiffuse' ),
+			directSpecular = vec3().toVar( 'directSpecular' ),
+			indirectDiffuse = vec3().toVar( 'indirectDiffuse' ),
+			indirectSpecular = vec3().toVar( 'indirectSpecular' );
 
 		const reflectedLight = {
 			directDiffuse,
@@ -33,10 +38,10 @@ class LightingContextNode extends ContextNode {
 		};
 
 		const context = {
-			radiance: vec3().temp( 'radiance' ),
-			irradiance: vec3().temp( 'irradiance' ),
-			iblIrradiance: vec3().temp( 'iblIrradiance' ),
-			ambientOcclusion: float( 1 ).temp( 'ambientOcclusion' ),
+			radiance: vec3().toVar( 'radiance' ),
+			irradiance: vec3().toVar( 'irradiance' ),
+			iblIrradiance: vec3().toVar( 'iblIrradiance' ),
+			ambientOcclusion: float( 1 ).toVar( 'ambientOcclusion' ),
 			reflectedLight,
 			backdrop: backdropNode,
 			backdropAlpha: backdropAlphaNode
@@ -48,8 +53,8 @@ class LightingContextNode extends ContextNode {
 
 	setup( builder ) {
 
-		this.context = this._context || ( this._context = this.getContext() );
-		this.context.lightingModel = this.lightingModel || builder.context.lightingModel;
+		this.value = this._value || ( this._value = this.getContext() );
+		this.value.lightingModel = this.lightingModel || builder.context.lightingModel;
 
 		return super.setup( builder );
 
@@ -59,8 +64,4 @@ class LightingContextNode extends ContextNode {
 
 export default LightingContextNode;
 
-export const lightingContext = nodeProxy( LightingContextNode );
-
-addNodeElement( 'lightingContext', lightingContext );
-
-addNodeClass( 'LightingContextNode', LightingContextNode );
+export const lightingContext = /*@__PURE__*/ nodeProxy( LightingContextNode );

package/src/nodes/lighting/LightingNode.js

@@ -1,7 +1,13 @@
-import Node, { addNodeClass } from '../core/Node.js';
+import Node from '../core/Node.js';
 
 class LightingNode extends Node {
 
+	static get type() {
+
+		return 'LightingNode';
+
+	}
+
 	constructor() {
 
 		super( 'vec3' );
@@ -19,5 +25,3 @@ class LightingNode extends Node {
 }
 
 export default LightingNode;
-
-addNodeClass( 'LightingNode', LightingNode );

package/src/nodes/lighting/LightsNode.js

@@ -1,8 +1,5 @@
 import Node from '../core/Node.js';
-import AnalyticLightNode from './AnalyticLightNode.js';
-import { nodeObject, nodeProxy, vec3 } from '../shadernode/ShaderNode.js';
-
-const LightNodes = new WeakMap();
+import { nodeObject, nodeProxy, vec3 } from '../tsl/TSLBase.js';
 
 const sortLights = ( lights ) => {
 
@@ -10,46 +7,69 @@ const sortLights = ( lights ) => {
 
 };
 
-class LightsNode extends Node {
+const getLightNodeById = ( id, lightNodes ) => {
 
-	constructor( lightNodes = [] ) {
+	for ( const lightNode of lightNodes ) {
 
-		super( 'vec3' );
+		if ( lightNode.isAnalyticLightNode && lightNode.light.id === id ) {
+
+			return lightNode;
+
+		}
+
+	}
+
+	return null;
+
+};
 
-		this.totalDiffuseNode = vec3().temp( 'totalDiffuse' );
-		this.totalSpecularNode = vec3().temp( 'totalSpecular' );
+const _lightsNodeRef = /*@__PURE__*/ new WeakMap();
 
-		this.outgoingLightNode = vec3().temp( 'outgoingLight' );
+class LightsNode extends Node {
 
-		this.lightNodes = lightNodes;
+	static get type() {
 
-		this._hash = null;
+		return 'LightsNode';
 
 	}
 
-	get hasLight() {
+	constructor( lights = [] ) {
+
+		super( 'vec3' );
+
+		this.totalDiffuseNode = vec3().toVar( 'totalDiffuse' );
+		this.totalSpecularNode = vec3().toVar( 'totalSpecular' );
+
+		this.outgoingLightNode = vec3().toVar( 'outgoingLight' );
+
+		this._lights = lights;
 
-		return this.lightNodes.length > 0;
+		this._lightNodes = null;
+		this._lightNodesHash = null;
+
+		this.global = true;
 
 	}
 
-	getHash() {
+	getHash( builder ) {
+
+		if ( this._lightNodesHash === null ) {
 
-		if ( this._hash === null ) {
+			if ( this._lightNodes === null ) this.setupLightsNode( builder );
 
 			const hash = [];
 
-			for ( const lightNode of this.lightNodes ) {
+			for ( const lightNode of this._lightNodes ) {
 
 				hash.push( lightNode.getHash() );
 
 			}
 
-			this._hash = 'lights-' + hash.join( ',' );
+			this._lightNodesHash = 'lights-' + hash.join( ',' );
 
 		}
 
-		return this._hash;
+		return this._lightNodesHash;
 
 	}
 
@@ -65,8 +85,71 @@ class LightsNode extends Node {
 
 	}
 
+	setupLightsNode( builder ) {
+
+		const lightNodes = [];
+
+		const previousLightNodes = this._lightNodes;
+
+		const lights = sortLights( this._lights );
+		const nodeLibrary = builder.renderer.nodes.library;
+
+		for ( const light of lights ) {
+
+			if ( light.isNode ) {
+
+				lightNodes.push( nodeObject( light ) );
+
+			} else {
+
+				let lightNode = null;
+
+				if ( previousLightNodes !== null ) {
+
+					lightNode = getLightNodeById( light.id, previousLightNodes ); // resuse existing light node
+
+				}
+
+				if ( lightNode === null ) {
+
+					const lightNodeClass = nodeLibrary.getLightNodeClass( light.constructor );
+
+					if ( lightNodeClass === null ) {
+
+						console.warn( `LightsNode.setupNodeLights: Light node not found for ${ light.constructor.name }` );
+						continue;
+
+					}
+
+					let lightNode = null;
+
+					if ( ! _lightsNodeRef.has( light ) ) {
+
+						lightNode = new lightNodeClass( light );
+						_lightsNodeRef.set( light, lightNode );
+
+					} else {
+
+						lightNode = _lightsNodeRef.get( light );
+
+					}
+
+					lightNodes.push( lightNode );
+
+				}
+
+			}
+
+		}
+
+		this._lightNodes = lightNodes;
+
+	}
+
 	setup( builder ) {
 
+		if ( this._lightNodes === null ) this.setupLightsNode( builder );
+
 		const context = builder.context;
 		const lightingModel = context.lightingModel;
 
@@ -74,7 +157,7 @@ class LightsNode extends Node {
 
 		if ( lightingModel ) {
 
-			const { lightNodes, totalDiffuseNode, totalSpecularNode } = this;
+			const { _lightNodes, totalDiffuseNode, totalSpecularNode } = this;
 
 			context.outgoingLight = outgoingLightNode;
 
@@ -91,7 +174,7 @@ class LightsNode extends Node {
 
 			// lights
 
-			for ( const lightNode of lightNodes ) {
+			for ( const lightNode of _lightNodes ) {
 
 				lightNode.build( builder );
 
@@ -143,49 +226,20 @@ class LightsNode extends Node {
 
 	}
 
-	_getLightNodeById( id ) {
-
-		for ( const lightNode of this.lightNodes ) {
-
-			if ( lightNode.isAnalyticLightNode && lightNode.light.id === id ) {
+	setLights( lights ) {
 
-				return lightNode;
+		this._lights = lights;
 
-			}
-
-		}
+		this._lightNodes = null;
+		this._lightNodesHash = null;
 
-		return null;
+		return this;
 
 	}
 
-	fromLights( lights = [] ) {
-
-		const lightNodes = [];
+	getLights() {
 
-		lights = sortLights( lights );
-
-		for ( const light of lights ) {
-
-			let lightNode = this._getLightNodeById( light.id );
-
-			if ( lightNode === null ) {
-
-				const lightClass = light.constructor;
-				const lightNodeClass = LightNodes.has( lightClass ) ? LightNodes.get( lightClass ) : AnalyticLightNode;
-
-				lightNode = nodeObject( new lightNodeClass( light ) );
-
-			}
-
-			lightNodes.push( lightNode );
-
-		}
-
-		this.lightNodes = lightNodes;
-		this._hash = null;
-
-		return this;
+		return this._lights;
 
 	}
 
@@ -193,21 +247,4 @@ class LightsNode extends Node {
 
 export default LightsNode;
 
-export const lights = ( lights ) => nodeObject( new LightsNode().fromLights( lights ) );
-export const lightsNode = nodeProxy( LightsNode );
-
-export function addLightNode( lightClass, lightNodeClass ) {
-
-	if ( LightNodes.has( lightClass ) ) {
-
-		console.warn( `Redefinition of light node ${ lightNodeClass.type }` );
-		return;
-
-	}
-
-	if ( typeof lightClass !== 'function' ) throw new Error( `Light ${ lightClass.name } is not a class` );
-	if ( typeof lightNodeClass !== 'function' || ! lightNodeClass.type ) throw new Error( `Light node ${ lightNodeClass.type } is not a class` );
-
-	LightNodes.set( lightClass, lightNodeClass );
-
-}
+export const lights = /*@__PURE__*/ nodeProxy( LightsNode );

package/src/nodes/lighting/PointLightNode.js

@@ -1,21 +1,24 @@
 import AnalyticLightNode from './AnalyticLightNode.js';
-import { addLightNode } from './LightsNode.js';
 import { getDistanceAttenuation } from './LightUtils.js';
 import { uniform } from '../core/UniformNode.js';
-import { objectViewPosition } from '../accessors/Object3DNode.js';
-import { positionView } from '../accessors/PositionNode.js';
-import { addNodeClass } from '../core/Node.js';
-
-import { PointLight } from '../../lights/PointLight.js';
+import { lightViewPosition } from '../accessors/Lights.js';
+import { positionView } from '../accessors/Position.js';
+import { renderGroup } from '../TSL.js';
 
 class PointLightNode extends AnalyticLightNode {
 
+	static get type() {
+
+		return 'PointLightNode';
+
+	}
+
 	constructor( light = null ) {
 
 		super( light );
 
-		this.cutoffDistanceNode = uniform( 0 );
-		this.decayExponentNode = uniform( 0 );
+		this.cutoffDistanceNode = uniform( 0 ).setGroup( renderGroup );
+		this.decayExponentNode = uniform( 0 ).setGroup( renderGroup );
 
 	}
 
@@ -36,7 +39,7 @@ class PointLightNode extends AnalyticLightNode {
 
 		const lightingModel = builder.context.lightingModel;
 
-		const lVector = objectViewPosition( light ).sub( positionView ); // @TODO: Add it into LightNode
+		const lVector = lightViewPosition( light ).sub( positionView ); // @TODO: Add it into LightNode
 
 		const lightDirection = lVector.normalize();
 		const lightDistance = lVector.length();
@@ -62,7 +65,3 @@ class PointLightNode extends AnalyticLightNode {
 }
 
 export default PointLightNode;
-
-addNodeClass( 'PointLightNode', PointLightNode );
-
-addLightNode( PointLight, PointLightNode );

package/src/nodes/lighting/RectAreaLightNode.js

@@ -1,11 +1,9 @@
 import AnalyticLightNode from './AnalyticLightNode.js';
-import { addLightNode } from './LightsNode.js';
 import { texture } from '../accessors/TextureNode.js';
 import { uniform } from '../core/UniformNode.js';
-import { objectViewPosition } from '../accessors/Object3DNode.js';
-import { addNodeClass } from '../core/Node.js';
+import { lightViewPosition } from '../accessors/Lights.js';
+import { renderGroup } from '../core/UniformGroupNode.js';
 
-import { RectAreaLight } from '../../lights/RectAreaLight.js';
 import { Matrix4 } from '../../math/Matrix4.js';
 import { Vector3 } from '../../math/Vector3.js';
 
@@ -16,12 +14,18 @@ let ltcLib = null;
 
 class RectAreaLightNode extends AnalyticLightNode {
 
+	static get type() {
+
+		return 'RectAreaLightNode';
+
+	}
+
 	constructor( light = null ) {
 
 		super( light );
 
-		this.halfHeight = uniform( new Vector3() );
-		this.halfWidth = uniform( new Vector3() );
+		this.halfHeight = uniform( new Vector3() ).setGroup( renderGroup );
+		this.halfWidth = uniform( new Vector3() ).setGroup( renderGroup );
 
 	}
 
@@ -67,7 +71,7 @@ class RectAreaLightNode extends AnalyticLightNode {
 		const { colorNode, light } = this;
 		const lightingModel = builder.context.lightingModel;
 
-		const lightPosition = objectViewPosition( light );
+		const lightPosition = lightViewPosition( light );
 		const reflectedLight = builder.context.reflectedLight;
 
 		lightingModel.directRectArea( {
@@ -91,7 +95,3 @@ class RectAreaLightNode extends AnalyticLightNode {
 }
 
 export default RectAreaLightNode;
-
-addNodeClass( 'RectAreaLightNode', RectAreaLightNode );
-
-addLightNode( RectAreaLight, RectAreaLightNode );

package/src/nodes/lighting/SpotLightNode.js

@@ -1,26 +1,28 @@
 import AnalyticLightNode from './AnalyticLightNode.js';
-import { lightTargetDirection } from './LightNode.js';
-import { addLightNode } from './LightsNode.js';
 import { getDistanceAttenuation } from './LightUtils.js';
 import { uniform } from '../core/UniformNode.js';
 import { smoothstep } from '../math/MathNode.js';
-import { objectViewPosition } from '../accessors/Object3DNode.js';
-import { positionView } from '../accessors/PositionNode.js';
-import { addNodeClass } from '../core/Node.js';
-
-import { SpotLight } from '../../lights/SpotLight.js';
+import { positionView } from '../accessors/Position.js';
+import { renderGroup } from '../core/UniformGroupNode.js';
+import { lightViewPosition, lightTargetDirection } from '../accessors/Lights.js';
 
 class SpotLightNode extends AnalyticLightNode {
 
+	static get type() {
+
+		return 'SpotLightNode';
+
+	}
+
 	constructor( light = null ) {
 
 		super( light );
 
-		this.coneCosNode = uniform( 0 );
-		this.penumbraCosNode = uniform( 0 );
+		this.coneCosNode = uniform( 0 ).setGroup( renderGroup );
+		this.penumbraCosNode = uniform( 0 ).setGroup( renderGroup );
 
-		this.cutoffDistanceNode = uniform( 0 );
-		this.decayExponentNode = uniform( 0 );
+		this.cutoffDistanceNode = uniform( 0 ).setGroup( renderGroup );
+		this.decayExponentNode = uniform( 0 ).setGroup( renderGroup );
 
 	}
 
@@ -54,7 +56,7 @@ class SpotLightNode extends AnalyticLightNode {
 
 		const { colorNode, cutoffDistanceNode, decayExponentNode, light } = this;
 
-		const lVector = objectViewPosition( light ).sub( positionView ); // @TODO: Add it into LightNode
+		const lVector = lightViewPosition( light ).sub( positionView ); // @TODO: Add it into LightNode
 
 		const lightDirection = lVector.normalize();
 		const angleCos = lightDirection.dot( lightTargetDirection( light ) );
@@ -83,7 +85,3 @@ class SpotLightNode extends AnalyticLightNode {
 }
 
 export default SpotLightNode;
-
-addNodeClass( 'SpotLightNode', SpotLightNode );
-
-addLightNode( SpotLight, SpotLightNode );

package/src/nodes/materialx/MaterialXNodes.js

@@ -7,8 +7,8 @@ import {
 import { mx_hsvtorgb, mx_rgbtohsv } from './lib/mx_hsv.js';
 import { mx_srgb_texture_to_lin_rec709 } from './lib/mx_transform_color.js';
 import { mix, smoothstep } from '../math/MathNode.js';
-import { uv } from '../accessors/UVNode.js';
-import { float, vec2, vec4, int } from '../shadernode/ShaderNode.js';
+import { uv } from '../accessors/UV.js';
+import { float, vec2, vec4, int } from '../tsl/TSLBase.js';
 
 export const mx_aastep = ( threshold, value ) => {