super-three 0.168.0 → 0.169.0

package/src/nodes/lighting/LightsNode.js

@@ -1,4 +1,4 @@
-import Node, { registerNode } from '../core/Node.js';
+import Node from '../core/Node.js';
 import { nodeObject, nodeProxy, vec3 } from '../tsl/TSLBase.js';
 
 const sortLights = ( lights ) => {
@@ -23,8 +23,16 @@ const getLightNodeById = ( id, lightNodes ) => {
 
 };
 
+const _lightsNodeRef = /*@__PURE__*/ new WeakMap();
+
 class LightsNode extends Node {
 
+	static get type() {
+
+		return 'LightsNode';
+
+	}
+
 	constructor( lights = [] ) {
 
 		super( 'vec3' );
@@ -106,14 +114,27 @@ class LightsNode extends Node {
 
 					const lightNodeClass = nodeLibrary.getLightNodeClass( light.constructor );
 
-					if ( lightNodeClass === undefined ) {
+					if ( lightNodeClass === null ) {
 
 						console.warn( `LightsNode.setupNodeLights: Light node not found for ${ light.constructor.name }` );
 						continue;
 
 					}
 
-					lightNodes.push( nodeObject( new lightNodeClass( light ) ) );
+					let lightNode = null;
+
+					if ( ! _lightsNodeRef.has( light ) ) {
+
+						lightNode = new lightNodeClass( light );
+						_lightsNodeRef.set( light, lightNode );
+
+					} else {
+
+						lightNode = _lightsNodeRef.get( light );
+
+					}
+
+					lightNodes.push( lightNode );
 
 				}
 
@@ -226,6 +247,4 @@ class LightsNode extends Node {
 
 export default LightsNode;
 
-LightsNode.type = /*@__PURE__*/ registerNode( 'Lights', LightsNode );
-
 export const lights = /*@__PURE__*/ nodeProxy( LightsNode );

package/src/nodes/lighting/PointLightNode.js

@@ -1,18 +1,24 @@
-import { registerNode } from '../core/Node.js';
 import AnalyticLightNode from './AnalyticLightNode.js';
 import { getDistanceAttenuation } from './LightUtils.js';
 import { uniform } from '../core/UniformNode.js';
-import { objectViewPosition } from '../accessors/Object3DNode.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 );
 
 	}
 
@@ -33,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();
@@ -59,5 +65,3 @@ class PointLightNode extends AnalyticLightNode {
 }
 
 export default PointLightNode;
-
-PointLightNode.type = /*@__PURE__*/ registerNode( 'PointLight', PointLightNode );

package/src/nodes/lighting/RectAreaLightNode.js

@@ -1,8 +1,8 @@
-import { registerNode } from '../core/Node.js';
 import AnalyticLightNode from './AnalyticLightNode.js';
 import { texture } from '../accessors/TextureNode.js';
 import { uniform } from '../core/UniformNode.js';
-import { objectViewPosition } from '../accessors/Object3DNode.js';
+import { lightViewPosition } from '../accessors/Lights.js';
+import { renderGroup } from '../core/UniformGroupNode.js';
 
 import { Matrix4 } from '../../math/Matrix4.js';
 import { Vector3 } from '../../math/Vector3.js';
@@ -14,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 );
 
 	}
 
@@ -65,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( {
@@ -89,5 +95,3 @@ class RectAreaLightNode extends AnalyticLightNode {
 }
 
 export default RectAreaLightNode;
-
-RectAreaLightNode.type = /*@__PURE__*/ registerNode( 'RectAreaLight', RectAreaLightNode );

package/src/nodes/lighting/SpotLightNode.js

@@ -1,23 +1,28 @@
-import { registerNode } from '../core/Node.js';
 import AnalyticLightNode from './AnalyticLightNode.js';
-import { lightTargetDirection } from './LightNode.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/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 );
 
 	}
 
@@ -51,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 ) );
@@ -80,5 +85,3 @@ class SpotLightNode extends AnalyticLightNode {
 }
 
 export default SpotLightNode;
-
-SpotLightNode.type = /*@__PURE__*/ registerNode( 'SpotLight', SpotLightNode );

package/src/nodes/math/ConditionalNode.js

@@ -1,9 +1,15 @@
-import Node, { registerNode } from '../core/Node.js';
+import Node from '../core/Node.js';
 import { property } from '../core/PropertyNode.js';
 import { addMethodChaining, nodeProxy } from '../tsl/TSLCore.js';
 
 class ConditionalNode extends Node {
 
+	static get type() {
+
+		return 'ConditionalNode';
+
+	}
+
 	constructor( condNode, ifNode, elseNode = null ) {
 
 		super();
@@ -37,10 +43,23 @@ class ConditionalNode extends Node {
 
 	setup( builder ) {
 
+		const condNode = this.condNode.cache();
+		const ifNode = this.ifNode.cache();
+		const elseNode = this.elseNode ? this.elseNode.cache() : null;
+
+		//
+
+		const currentNodeBlock = builder.context.nodeBlock;
+
+		builder.getDataFromNode( ifNode ).parentNodeBlock = currentNodeBlock;
+		if ( elseNode !== null ) builder.getDataFromNode( elseNode ).parentNodeBlock = currentNodeBlock;
+
+		//
+
 		const properties = builder.getNodeProperties( this );
-		properties.condNode = this.condNode.cache();
-		properties.ifNode = this.ifNode.cache();
-		properties.elseNode = this.elseNode ? this.elseNode.cache() : null;
+		properties.condNode = condNode;
+		properties.ifNode = ifNode.context( { nodeBlock: ifNode } );
+		properties.elseNode = elseNode ? elseNode.context( { nodeBlock: elseNode } ) : null;
 
 	}
 
@@ -121,8 +140,6 @@ class ConditionalNode extends Node {
 
 export default ConditionalNode;
 
-ConditionalNode.type = /*@__PURE__*/ registerNode( 'Conditional', ConditionalNode );
-
 export const select = /*@__PURE__*/ nodeProxy( ConditionalNode );
 
 addMethodChaining( 'select', select );

package/src/nodes/math/MathNode.js

@@ -1,10 +1,15 @@
-import { registerNode } from '../core/Node.js';
 import TempNode from '../core/TempNode.js';
 import { sub, mul, div } from './OperatorNode.js';
 import { addMethodChaining, nodeObject, nodeProxy, float, vec2, vec3, vec4, Fn } from '../tsl/TSLCore.js';
 
 class MathNode extends TempNode {
 
+	static get type() {
+
+		return 'MathNode';
+
+	}
+
 	constructor( method, aNode, bNode = null, cNode = null ) {
 
 		super();
@@ -264,8 +269,6 @@ MathNode.FACEFORWARD = 'faceforward';
 
 export default MathNode;
 
-MathNode.type = /*@__PURE__*/ registerNode( 'Math', MathNode );
-
 export const EPSILON = /*@__PURE__*/ float( 1e-6 );
 export const INFINITY = /*@__PURE__*/ float( 1e6 );
 export const PI = /*@__PURE__*/ float( Math.PI );

package/src/nodes/math/OperatorNode.js

@@ -1,9 +1,14 @@
-import { registerNode } from '../core/Node.js';
 import TempNode from '../core/TempNode.js';
 import { addMethodChaining, nodeProxy } from '../tsl/TSLCore.js';
 
 class OperatorNode extends TempNode {
 
+	static get type() {
+
+		return 'OperatorNode';
+
+	}
+
 	constructor( op, aNode, bNode, ...params ) {
 
 		super();
@@ -259,8 +264,6 @@ class OperatorNode extends TempNode {
 
 export default OperatorNode;
 
-OperatorNode.type = /*@__PURE__*/ registerNode( 'Operator', OperatorNode );
-
 export const add = /*@__PURE__*/ nodeProxy( OperatorNode, '+' );
 export const sub = /*@__PURE__*/ nodeProxy( OperatorNode, '-' );
 export const mul = /*@__PURE__*/ nodeProxy( OperatorNode, '*' );

package/src/nodes/pmrem/PMREMNode.js

@@ -1,4 +1,3 @@
-import { registerNode } from '../core/Node.js';
 import TempNode from '../core/TempNode.js';
 import { texture } from '../accessors/TextureNode.js';
 import { textureCubeUV } from './PMREMUtils.js';
@@ -74,6 +73,12 @@ function _getPMREMFromTexture( texture ) {
 
 class PMREMNode extends TempNode {
 
+	static get type() {
+
+		return 'PMREMNode';
+
+	}
+
 	constructor( value, uvNode = null, levelNode = null ) {
 
 		super( 'vec3' );
@@ -206,8 +211,6 @@ class PMREMNode extends TempNode {
 
 export default PMREMNode;
 
-PMREMNode.type = /*@__PURE__*/ registerNode( 'PMREM', PMREMNode );
-
 function isCubeMapReady( image ) {
 
 	if ( image === null || image === undefined ) return false;

package/src/nodes/utils/ArrayElementNode.js

@@ -1,6 +1,12 @@
-import Node, { registerNode } from '../core/Node.js';
+import Node from '../core/Node.js';
 
-class ArrayElementNode extends Node { // @TODO: If extending from TempNode it breaks webgpu_compute
+class ArrayElementNode extends Node {
+
+	static get type() {
+
+		return 'ArrayElementNode';
+
+	} // @TODO: If extending from TempNode it breaks webgpu_compute
 
 	constructor( node, indexNode ) {
 
@@ -31,5 +37,3 @@ class ArrayElementNode extends Node { // @TODO: If extending from TempNode it br
 }
 
 export default ArrayElementNode;
-
-ArrayElementNode.type = /*@__PURE__*/ registerNode( 'ArrayElement', ArrayElementNode );

package/src/nodes/utils/ConvertNode.js

@@ -1,7 +1,13 @@
-import Node, { registerNode } from '../core/Node.js';
+import Node from '../core/Node.js';
 
 class ConvertNode extends Node {
 
+	static get type() {
+
+		return 'ConvertNode';
+
+	}
+
 	constructor( node, convertTo ) {
 
 		super();
@@ -61,5 +67,3 @@ class ConvertNode extends Node {
 }
 
 export default ConvertNode;
-
-ConvertNode.type = /*@__PURE__*/ registerNode( 'Convert', ConvertNode );

package/src/nodes/utils/CubeMapNode.js

@@ -1,4 +1,3 @@
-import { registerNode } from '../core/Node.js';
 import TempNode from '../core/TempNode.js';
 import { NodeUpdateType } from '../core/constants.js';
 import { nodeProxy } from '../tsl/TSLBase.js';
@@ -11,6 +10,12 @@ const _cache = new WeakMap();
 
 class CubeMapNode extends TempNode {
 
+	static get type() {
+
+		return 'CubeMapNode';
+
+	}
+
 	constructor( envNode ) {
 
 		super( 'vec3' );
@@ -112,8 +117,6 @@ class CubeMapNode extends TempNode {
 
 export default CubeMapNode;
 
-CubeMapNode.type = /*@__PURE__*/ registerNode( 'CubeMap', CubeMapNode );
-
 function isEquirectangularMapReady( image ) {
 
 	if ( image === null || image === undefined ) return false;

package/src/nodes/utils/EquirectUVNode.js

@@ -1,10 +1,15 @@
-import { registerNode } from '../core/Node.js';
 import TempNode from '../core/TempNode.js';
 import { positionWorldDirection } from '../accessors/Position.js';
 import { nodeProxy, vec2 } from '../tsl/TSLBase.js';
 
 class EquirectUVNode extends TempNode {
 
+	static get type() {
+
+		return 'EquirectUVNode';
+
+	}
+
 	constructor( dirNode = positionWorldDirection ) {
 
 		super( 'vec2' );
@@ -28,6 +33,4 @@ class EquirectUVNode extends TempNode {
 
 export default EquirectUVNode;
 
-EquirectUVNode.type = /*@__PURE__*/ registerNode( 'EquirectUV', EquirectUVNode );
-
 export const equirectUV = /*@__PURE__*/ nodeProxy( EquirectUVNode );

package/src/nodes/utils/FlipNode.js

@@ -1,9 +1,14 @@
-import { registerNode } from '../core/Node.js';
 import TempNode from '../core/TempNode.js';
 import { vectorComponents } from '../core/constants.js';
 
 class FlipNode extends TempNode {
 
+	static get type() {
+
+		return 'FlipNode';
+
+	}
+
 	constructor( sourceNode, components ) {
 
 		super();
@@ -29,7 +34,7 @@ class FlipNode extends TempNode {
 		const sourceCache = builder.getVarFromNode( this );
 		const sourceProperty = builder.getPropertyName( sourceCache );
 
-		builder.addLineFlowCode( sourceProperty + ' = ' + sourceSnippet );
+		builder.addLineFlowCode( sourceProperty + ' = ' + sourceSnippet, this );
 
 		const length = builder.getTypeLength( sourceType );
 		const snippetValues = [];
@@ -61,5 +66,3 @@ class FlipNode extends TempNode {
 }
 
 export default FlipNode;
-
-FlipNode.type = /*@__PURE__*/ registerNode( 'Flip', FlipNode );

package/src/nodes/utils/FunctionOverloadingNode.js

@@ -1,8 +1,14 @@
-import Node, { registerNode } from '../core/Node.js';
+import Node from '../core/Node.js';
 import { nodeProxy } from '../tsl/TSLBase.js';
 
 class FunctionOverloadingNode extends Node {
 
+	static get type() {
+
+		return 'FunctionOverloadingNode';
+
+	}
+
 	constructor( functionNodes = [], ...parametersNodes ) {
 
 		super();
@@ -90,8 +96,6 @@ class FunctionOverloadingNode extends Node {
 
 export default FunctionOverloadingNode;
 
-FunctionOverloadingNode.type = /*@__PURE__*/ registerNode( 'FunctionOverloading', FunctionOverloadingNode );
-
 const overloadingBaseFn = /*@__PURE__*/ nodeProxy( FunctionOverloadingNode );
 
 export const overloadingFn = ( functionNodes ) => ( ...params ) => overloadingBaseFn( functionNodes, ...params );

package/src/nodes/utils/JoinNode.js

@@ -1,8 +1,13 @@
-import { registerNode } from '../core/Node.js';
 import TempNode from '../core/TempNode.js';
 
 class JoinNode extends TempNode {
 
+	static get type() {
+
+		return 'JoinNode';
+
+	}
+
 	constructor( nodes = [], nodeType = null ) {
 
 		super( nodeType );
@@ -57,5 +62,3 @@ class JoinNode extends TempNode {
 }
 
 export default JoinNode;
-
-JoinNode.type = /*@__PURE__*/ registerNode( 'Join', JoinNode );

package/src/nodes/utils/LoopNode.js

@@ -1,9 +1,15 @@
-import Node, { registerNode } from '../core/Node.js';
+import Node from '../core/Node.js';
 import { expression } from '../code/ExpressionNode.js';
 import { nodeObject, nodeArray } from '../tsl/TSLBase.js';
 
 class LoopNode extends Node {
 
+	static get type() {
+
+		return 'LoopNode';
+
+	}
+
 	constructor( params = [] ) {
 
 		super();
@@ -191,8 +197,6 @@ class LoopNode extends Node {
 
 export default LoopNode;
 
-LoopNode.type = /*@__PURE__*/ registerNode( 'Loop', LoopNode );
-
 export const Loop = ( ...params ) => nodeObject( new LoopNode( nodeArray( params, 'int' ) ) ).append();
 export const Continue = () => expression( 'continue' ).append();
 export const Break = () => expression( 'break' ).append();

package/src/nodes/utils/MatcapUVNode.js

@@ -1,4 +1,3 @@
-import { registerNode } from '../core/Node.js';
 import TempNode from '../core/TempNode.js';
 import { transformedNormalView } from '../accessors/Normal.js';
 import { positionViewDirection } from '../accessors/Position.js';
@@ -6,6 +5,12 @@ import { nodeImmutable, vec2, vec3 } from '../tsl/TSLBase.js';
 
 class MatcapUVNode extends TempNode {
 
+	static get type() {
+
+		return 'MatcapUVNode';
+
+	}
+
 	constructor() {
 
 		super( 'vec2' );
@@ -25,6 +30,4 @@ class MatcapUVNode extends TempNode {
 
 export default MatcapUVNode;
 
-MatcapUVNode.type = /*@__PURE__*/ registerNode( 'MatcapUV', MatcapUVNode );
-
 export const matcapUV = /*@__PURE__*/ nodeImmutable( MatcapUVNode );

package/src/nodes/utils/MaxMipLevelNode.js

@@ -1,10 +1,15 @@
-import { registerNode } from '../core/Node.js';
 import UniformNode from '../core/UniformNode.js';
 import { NodeUpdateType } from '../core/constants.js';
 import { nodeProxy } from '../tsl/TSLBase.js';
 
 class MaxMipLevelNode extends UniformNode {
 
+	static get type() {
+
+		return 'MaxMipLevelNode';
+
+	}
+
 	constructor( textureNode ) {
 
 		super( 0 );
@@ -47,6 +52,4 @@ class MaxMipLevelNode extends UniformNode {
 
 export default MaxMipLevelNode;
 
-MaxMipLevelNode.type = /*@__PURE__*/ registerNode( 'MaxMipLevel', MaxMipLevelNode );
-
 export const maxMipLevel = /*@__PURE__*/ nodeProxy( MaxMipLevelNode );

package/src/nodes/utils/OscNode.js

@@ -1,9 +1,15 @@
-import Node, { registerNode } from '../core/Node.js';
+import Node from '../core/Node.js';
 import { timerLocal } from './TimerNode.js';
 import { nodeObject, nodeProxy } from '../tsl/TSLBase.js';
 
 class OscNode extends Node {
 
+	static get type() {
+
+		return 'OscNode';
+
+	}
+
 	constructor( method = OscNode.SINE, timeNode = timerLocal() ) {
 
 		super();
@@ -73,8 +79,6 @@ OscNode.SAWTOOTH = 'sawtooth';
 
 export default OscNode;
 
-OscNode.type = /*@__PURE__*/ registerNode( 'Osc', OscNode );
-
 export const oscSine = /*@__PURE__*/ nodeProxy( OscNode, OscNode.SINE );
 export const oscSquare = /*@__PURE__*/ nodeProxy( OscNode, OscNode.SQUARE );
 export const oscTriangle = /*@__PURE__*/ nodeProxy( OscNode, OscNode.TRIANGLE );

package/src/nodes/utils/RTTNode.js

@@ -1,4 +1,3 @@
-import { registerNode } from '../core/Node.js';
 import { nodeObject } from '../tsl/TSLCore.js';
 import TextureNode from '../accessors/TextureNode.js';
 import { NodeUpdateType } from '../core/constants.js';
@@ -14,6 +13,12 @@ const _size = /*@__PURE__*/ new Vector2();
 
 class RTTNode extends TextureNode {
 
+	static get type() {
+
+		return 'RTTNode';
+
+	}
+
 	constructor( node, width = null, height = null, options = { type: HalfFloatType } ) {
 
 		const renderTarget = new RenderTarget( width, height, options );
@@ -124,7 +129,5 @@ class RTTNode extends TextureNode {
 
 export default RTTNode;
 
-RTTNode.type = /*@__PURE__*/ registerNode( 'RTT', RTTNode );
-
 export const rtt = ( node, ...params ) => nodeObject( new RTTNode( nodeObject( node ), ...params ) );
 export const convertToTexture = ( node, ...params ) => node.isTextureNode ? node : rtt( node, ...params );

package/src/nodes/utils/ReflectorNode.js

@@ -1,8 +1,7 @@
-import { registerNode } from '../core/Node.js';
 import TextureNode from '../accessors/TextureNode.js';
 import { nodeObject } from '../tsl/TSLBase.js';
 import { NodeUpdateType } from '../core/constants.js';
-import { viewportUV } from '../display/ViewportNode.js';
+import { screenUV } from '../display/ScreenNode.js';
 
 import { HalfFloatType, LinearMipMapLinearFilter } from '../../constants.js';
 import { Plane } from '../../math/Plane.js';
@@ -28,12 +27,18 @@ const _q = new Vector4();
 const _size = new Vector2();
 
 const _defaultRT = new RenderTarget();
-const _defaultUV = viewportUV.flipX();
+const _defaultUV = screenUV.flipX();
 
 let _inReflector = false;
 
 class ReflectorNode extends TextureNode {
 
+	static get type() {
+
+		return 'ReflectorNode';
+
+	}
+
 	constructor( parameters = {} ) {
 
 		super( _defaultRT.texture, _defaultUV );
@@ -236,5 +241,3 @@ class ReflectorNode extends TextureNode {
 export const reflector = ( parameters ) => nodeObject( new ReflectorNode( parameters ) );
 
 export default ReflectorNode;
-
-ReflectorNode.type = /*@__PURE__*/ registerNode( 'Reflector', ReflectorNode );