super-three 0.165.0 → 0.167.0

package/{examples/jsm → src}/nodes/lighting/EnvironmentNode.js

@@ -11,7 +11,7 @@ import { reference } from '../accessors/ReferenceNode.js';
 import { transformedBentNormalView } from '../accessors/AccessorsUtils.js';
 import { pmremTexture } from '../pmrem/PMREMNode.js';
 
-const envNodeCache = new WeakMap();
+const _envNodeCache = new WeakMap();
 
 class EnvironmentNode extends LightingNode {
 
@@ -29,13 +29,13 @@ class EnvironmentNode extends LightingNode {
 
 		if ( envNode.isTextureNode ) {
 
-			let cacheEnvNode = envNodeCache.get( envNode.value );
+			let cacheEnvNode = _envNodeCache.get( envNode.value );
 
 			if ( cacheEnvNode === undefined ) {
 
 				cacheEnvNode = pmremTexture( envNode.value );
 
-				envNodeCache.set( envNode.value, cacheEnvNode );
+				_envNodeCache.set( envNode.value, cacheEnvNode );
 
 			}
 
@@ -57,12 +57,13 @@ class EnvironmentNode extends LightingNode {
 		const irradiance = context( envNode, createIrradianceContext( transformedNormalWorld ) ).mul( Math.PI ).mul( intensity );
 
 		const isolateRadiance = cache( radiance );
+		const isolateIrradiance = cache( irradiance );
 
 		//
 
 		builder.context.radiance.addAssign( isolateRadiance );
 
-		builder.context.iblIrradiance.addAssign( irradiance );
+		builder.context.iblIrradiance.addAssign( isolateIrradiance );
 
 		//
 

package/{examples/jsm → src}/nodes/lighting/HemisphereLightNode.js

@@ -6,7 +6,8 @@ import { normalView } from '../accessors/NormalNode.js';
 import { objectPosition } from '../accessors/Object3DNode.js';
 import { addNodeClass } from '../core/Node.js';
 
-import { Color, HemisphereLight } from 'three';
+import { Color } from '../../math/Color.js';
+import { HemisphereLight } from '../../lights/HemisphereLight.js';
 
 class HemisphereLightNode extends AnalyticLightNode {
 

package/{examples/jsm → src}/nodes/lighting/IESSpotLightNode.js

@@ -4,7 +4,7 @@ import { texture } from '../accessors/TextureNode.js';
 import { vec2 } from '../shadernode/ShaderNode.js';
 import { addNodeClass } from '../core/Node.js';
 
-import IESSpotLight from '../../lights/IESSpotLight.js';
+import IESSpotLight from '../../lights/webgpu/IESSpotLight.js';
 
 class IESSpotLightNode extends SpotLightNode {
 

package/{examples/jsm → src}/nodes/lighting/LightingNode.js

@@ -6,6 +6,8 @@ class LightingNode extends Node {
 
 		super( 'vec3' );
 
+		this.isLightingNode = true;
+
 	}
 
 	generate( /*builder*/ ) {

package/{examples/jsm → src}/nodes/lighting/LightsNode.js

@@ -99,9 +99,7 @@ class LightsNode extends Node {
 
 			//
 
-			lightingModel.indirectDiffuse( context, stack, builder );
-			lightingModel.indirectSpecular( context, stack, builder );
-			lightingModel.ambientOcclusion( context, stack, builder );
+			lightingModel.indirect( context, stack, builder );
 
 			//
 

package/{examples/jsm → src}/nodes/lighting/PointLightNode.js

@@ -6,7 +6,7 @@ import { objectViewPosition } from '../accessors/Object3DNode.js';
 import { positionView } from '../accessors/PositionNode.js';
 import { addNodeClass } from '../core/Node.js';
 
-import { PointLight } from 'three';
+import { PointLight } from '../../lights/PointLight.js';
 
 class PointLightNode extends AnalyticLightNode {
 
@@ -54,8 +54,7 @@ class PointLightNode extends AnalyticLightNode {
 		lightingModel.direct( {
 			lightDirection,
 			lightColor,
-			reflectedLight,
-			shadowMask: this.shadowMaskNode
+			reflectedLight
 		}, builder.stack, builder );
 
 	}

package/src/nodes/lighting/RectAreaLightNode.js

@@ -0,0 +1,97 @@
+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 { RectAreaLight } from '../../lights/RectAreaLight.js';
+import { Matrix4 } from '../../math/Matrix4.js';
+import { Vector3 } from '../../math/Vector3.js';
+
+const _matrix41 = /*@__PURE__*/ new Matrix4();
+const _matrix42 = /*@__PURE__*/ new Matrix4();
+
+let ltcLib = null;
+
+class RectAreaLightNode extends AnalyticLightNode {
+
+	constructor( light = null ) {
+
+		super( light );
+
+		this.halfHeight = uniform( new Vector3() );
+		this.halfWidth = uniform( new Vector3() );
+
+	}
+
+	update( frame ) {
+
+		super.update( frame );
+
+		const { light } = this;
+
+		const viewMatrix = frame.camera.matrixWorldInverse;
+
+		_matrix42.identity();
+		_matrix41.copy( light.matrixWorld );
+		_matrix41.premultiply( viewMatrix );
+		_matrix42.extractRotation( _matrix41 );
+
+		this.halfWidth.value.set( light.width * 0.5, 0.0, 0.0 );
+		this.halfHeight.value.set( 0.0, light.height * 0.5, 0.0 );
+
+		this.halfWidth.value.applyMatrix4( _matrix42 );
+		this.halfHeight.value.applyMatrix4( _matrix42 );
+
+	}
+
+	setup( builder ) {
+
+		super.setup( builder );
+
+		let ltc_1, ltc_2;
+
+		if ( builder.isAvailable( 'float32Filterable' ) ) {
+
+			ltc_1 = texture( ltcLib.LTC_FLOAT_1 );
+			ltc_2 = texture( ltcLib.LTC_FLOAT_2 );
+
+		} else {
+
+			ltc_1 = texture( ltcLib.LTC_HALF_1 );
+			ltc_2 = texture( ltcLib.LTC_HALF_2 );
+
+		}
+
+		const { colorNode, light } = this;
+		const lightingModel = builder.context.lightingModel;
+
+		const lightPosition = objectViewPosition( light );
+		const reflectedLight = builder.context.reflectedLight;
+
+		lightingModel.directRectArea( {
+			lightColor: colorNode,
+			lightPosition,
+			halfWidth: this.halfWidth,
+			halfHeight: this.halfHeight,
+			reflectedLight,
+			ltc_1,
+			ltc_2
+		}, builder.stack, builder );
+
+	}
+
+	static setLTC( ltc ) {
+
+		ltcLib = ltc;
+
+	}
+
+}
+
+export default RectAreaLightNode;
+
+addNodeClass( 'RectAreaLightNode', RectAreaLightNode );
+
+addLightNode( RectAreaLight, RectAreaLightNode );

package/{examples/jsm → src}/nodes/lighting/SpotLightNode.js

@@ -8,7 +8,7 @@ import { objectViewPosition } from '../accessors/Object3DNode.js';
 import { positionView } from '../accessors/PositionNode.js';
 import { addNodeClass } from '../core/Node.js';
 
-import { SpotLight } from 'three';
+import { SpotLight } from '../../lights/SpotLight.js';
 
 class SpotLightNode extends AnalyticLightNode {
 
@@ -75,8 +75,7 @@ class SpotLightNode extends AnalyticLightNode {
 		lightingModel.direct( {
 			lightDirection,
 			lightColor,
-			reflectedLight,
-			shadowMask: this.shadowMaskNode
+			reflectedLight
 		}, builder.stack, builder );
 
 	}

package/{examples/jsm → src}/nodes/loaders/NodeLoader.js

@@ -1,6 +1,8 @@
 import { createNodeFromType } from '../core/Node.js';
 import { nodeObject } from '../shadernode/ShaderNode.js';
-import { FileLoader, Loader } from 'three';
+
+import { Loader } from '../../loaders/Loader.js';
+import { FileLoader } from '../../loaders/FileLoader.js';
 
 class NodeLoader extends Loader {
 

package/{examples/jsm → src}/nodes/loaders/NodeMaterialLoader.js

@@ -1,6 +1,7 @@
-import { MaterialLoader } from 'three';
 import { createNodeMaterialFromType } from '../materials/Materials.js';
 
+import { MaterialLoader } from '../../loaders/MaterialLoader.js';
+
 const superFromTypeFunction = MaterialLoader.createMaterialFromType;
 
 MaterialLoader.createMaterialFromType = function ( type ) {

package/{examples/jsm → src}/nodes/loaders/NodeObjectLoader.js

@@ -1,6 +1,7 @@
 import NodeLoader from './NodeLoader.js';
 import NodeMaterialLoader from './NodeMaterialLoader.js';
-import { ObjectLoader } from 'three';
+
+import { ObjectLoader } from '../../loaders/ObjectLoader.js';
 
 class NodeObjectLoader extends ObjectLoader {
 

package/{examples/jsm → src}/nodes/materials/InstancedPointsNodeMaterial.js

@@ -11,9 +11,9 @@ import { tslFn, vec2, vec4 } from '../shadernode/ShaderNode.js';
 import { uv } from '../accessors/UVNode.js';
 import { viewport } from '../display/ViewportNode.js';
 
-import { PointsMaterial } from 'three';
+import { PointsMaterial } from '../../materials/PointsMaterial.js';
 
-const defaultValues = new PointsMaterial();
+const _defaultValues = /*@__PURE__*/ new PointsMaterial();
 
 class InstancedPointsNodeMaterial extends NodeMaterial {
 
@@ -33,7 +33,7 @@ class InstancedPointsNodeMaterial extends NodeMaterial {
 
 		this.pointColorNode = null;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setupShaders();
 

package/{examples/jsm → src}/nodes/materials/Line2NodeMaterial.js

@@ -13,9 +13,9 @@ import { uv } from '../accessors/UVNode.js';
 import { viewport } from '../display/ViewportNode.js';
 import { dashSize, gapSize } from '../core/PropertyNode.js';
 
-import { LineDashedMaterial } from 'three';
+import { LineDashedMaterial } from '../../materials/LineDashedMaterial.js';
 
-const defaultValues = new LineDashedMaterial();
+const _defaultValues = /*@__PURE__*/ new LineDashedMaterial();
 
 class Line2NodeMaterial extends NodeMaterial {
 
@@ -26,7 +26,7 @@ class Line2NodeMaterial extends NodeMaterial {
 		this.normals = false;
 		this.lights = false;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.useAlphaToCoverage = true;
 		this.useColor = params.vertexColors;

package/{examples/jsm → src}/nodes/materials/LineBasicNodeMaterial.js

@@ -1,8 +1,8 @@
 import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
 
-import { LineBasicMaterial } from 'three';
+import { LineBasicMaterial } from '../../materials/LineBasicMaterial.js';
 
-const defaultValues = new LineBasicMaterial();
+const _defaultValues = /*@__PURE__*/ new LineBasicMaterial();
 
 class LineBasicNodeMaterial extends NodeMaterial {
 
@@ -15,7 +15,7 @@ class LineBasicNodeMaterial extends NodeMaterial {
 		this.lights = false;
 		this.normals = false;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 

package/{examples/jsm → src}/nodes/materials/LineDashedNodeMaterial.js

@@ -4,9 +4,10 @@ import { varying } from '../core/VaryingNode.js';
 import { materialLineDashSize, materialLineGapSize, materialLineScale } from '../accessors/MaterialNode.js';
 import { dashSize, gapSize } from '../core/PropertyNode.js';
 import { float } from '../shadernode/ShaderNode.js';
-import { LineDashedMaterial } from 'three';
 
-const defaultValues = new LineDashedMaterial();
+import { LineDashedMaterial } from '../../materials/LineDashedMaterial.js';
+
+const _defaultValues = /*@__PURE__*/ new LineDashedMaterial();
 
 class LineDashedNodeMaterial extends NodeMaterial {
 
@@ -19,7 +20,7 @@ class LineDashedNodeMaterial extends NodeMaterial {
 		this.lights = false;
 		this.normals = false;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.offsetNode = null;
 		this.dashScaleNode = null;

package/src/nodes/materials/MeshBasicNodeMaterial.js

@@ -0,0 +1,73 @@
+import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
+import { materialLightMap } from '../accessors/MaterialNode.js';
+import { MeshBasicMaterial } from '../../materials/MeshBasicMaterial.js';
+import BasicEnvironmentNode from '../lighting/BasicEnvironmentNode.js';
+import BasicLightMapNode from '../lighting/BasicLightMapNode.js';
+import BasicLightingModel from '../functions/BasicLightingModel.js';
+import { transformedNormalView, normalView } from '../accessors/NormalNode.js';
+import { diffuseColor } from '../core/PropertyNode.js';
+
+const _defaultValues = /*@__PURE__*/ new MeshBasicMaterial();
+
+class MeshBasicNodeMaterial extends NodeMaterial {
+
+	constructor( parameters ) {
+
+		super();
+
+		this.isMeshBasicNodeMaterial = true;
+
+		this.lights = true;
+		//this.normals = false; @TODO: normals usage by context
+
+		this.setDefaultValues( _defaultValues );
+
+		this.setValues( parameters );
+
+	}
+
+	setupNormal() {
+
+		transformedNormalView.assign( normalView ); // see #28839
+
+	}
+
+	setupEnvironment( builder ) {
+
+		const envNode = super.setupEnvironment( builder );
+
+		return envNode ? new BasicEnvironmentNode( envNode ) : null;
+
+	}
+
+	setupLightMap( builder ) {
+
+		let node = null;
+
+		if ( builder.material.lightMap ) {
+
+			node = new BasicLightMapNode( materialLightMap );
+
+		}
+
+		return node;
+
+	}
+
+	setupOutgoingLight() {
+
+		return diffuseColor.rgb;
+
+	}
+
+	setupLightingModel() {
+
+		return new BasicLightingModel();
+
+	}
+
+}
+
+export default MeshBasicNodeMaterial;
+
+addNodeMaterial( 'MeshBasicNodeMaterial', MeshBasicNodeMaterial );

package/{examples/jsm → src}/nodes/materials/MeshLambertNodeMaterial.js

@@ -1,9 +1,10 @@
 import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
+import BasicEnvironmentNode from '../lighting/BasicEnvironmentNode.js';
 import PhongLightingModel from '../functions/PhongLightingModel.js';
 
-import { MeshLambertMaterial } from 'three';
+import { MeshLambertMaterial } from '../../materials/MeshLambertMaterial.js';
 
-const defaultValues = new MeshLambertMaterial();
+const _defaultValues = /*@__PURE__*/ new MeshLambertMaterial();
 
 class MeshLambertNodeMaterial extends NodeMaterial {
 
@@ -15,12 +16,20 @@ class MeshLambertNodeMaterial extends NodeMaterial {
 
 		this.lights = true;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 
 	}
 
+	setupEnvironment( builder ) {
+
+		const envNode = super.setupEnvironment( builder );
+
+		return envNode ? new BasicEnvironmentNode( envNode ) : null;
+
+	}
+
 	setupLightingModel( /*builder*/ ) {
 
 		return new PhongLightingModel( false ); // ( specular ) -> force lambert

package/{examples/jsm → src}/nodes/materials/MeshMatcapNodeMaterial.js

@@ -2,11 +2,12 @@ import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
 import { materialReference } from '../accessors/MaterialReferenceNode.js';
 import { diffuseColor } from '../core/PropertyNode.js';
 import { vec3 } from '../shadernode/ShaderNode.js';
-import { MeshMatcapMaterial } from 'three';
 import { mix } from '../math/MathNode.js';
 import { matcapUV } from '../utils/MatcapUVNode.js';
 
-const defaultValues = new MeshMatcapMaterial();
+import { MeshMatcapMaterial } from '../../materials/MeshMatcapMaterial.js';
+
+const _defaultValues = /*@__PURE__*/ new MeshMatcapMaterial();
 
 class MeshMatcapNodeMaterial extends NodeMaterial {
 
@@ -14,11 +15,11 @@ class MeshMatcapNodeMaterial extends NodeMaterial {
 
 		super();
 
-		this.isMeshMatcapNodeMaterial = true;
-
 		this.lights = false;
 
-		this.setDefaultValues( defaultValues );
+		this.isMeshMatcapNodeMaterial = true;
+
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 

package/{examples/jsm → src}/nodes/materials/MeshNormalNodeMaterial.js

@@ -5,9 +5,9 @@ import { materialOpacity } from '../accessors/MaterialNode.js';
 import { transformedNormalView } from '../accessors/NormalNode.js';
 import { float, vec4 } from '../shadernode/ShaderNode.js';
 
-import { MeshNormalMaterial } from 'three';
+import { MeshNormalMaterial } from '../../materials/MeshNormalMaterial.js';
 
-const defaultValues = new MeshNormalMaterial();
+const _defaultValues = /*@__PURE__*/ new MeshNormalMaterial();
 
 class MeshNormalNodeMaterial extends NodeMaterial {
 
@@ -15,9 +15,11 @@ class MeshNormalNodeMaterial extends NodeMaterial {
 
 		super();
 
+		this.lights = false;
+
 		this.isMeshNormalNodeMaterial = true;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 

package/{examples/jsm → src}/nodes/materials/MeshPhongNodeMaterial.js

@@ -2,11 +2,12 @@ import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
 import { shininess, specularColor } from '../core/PropertyNode.js';
 import { materialShininess, materialSpecular } from '../accessors/MaterialNode.js';
 import { float } from '../shadernode/ShaderNode.js';
+import BasicEnvironmentNode from '../lighting/BasicEnvironmentNode.js';
 import PhongLightingModel from '../functions/PhongLightingModel.js';
 
-import { MeshPhongMaterial } from 'three';
+import { MeshPhongMaterial } from '../../materials/MeshPhongMaterial.js';
 
-const defaultValues = new MeshPhongMaterial();
+const _defaultValues = /*@__PURE__*/ new MeshPhongMaterial();
 
 class MeshPhongNodeMaterial extends NodeMaterial {
 
@@ -21,12 +22,19 @@ class MeshPhongNodeMaterial extends NodeMaterial {
 		this.shininessNode = null;
 		this.specularNode = null;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 
 	}
 
+	setupEnvironment( builder ) {
+
+		const envNode = super.setupEnvironment( builder );
+
+		return envNode ? new BasicEnvironmentNode( envNode ) : null;
+
+	}
 	setupLightingModel( /*builder*/ ) {
 
 		return new PhongLightingModel();

package/{examples/jsm → src}/nodes/materials/MeshPhysicalNodeMaterial.js

@@ -8,9 +8,10 @@ import { TBNViewMatrix } from '../accessors/AccessorsUtils.js';
 import PhysicalLightingModel from '../functions/PhysicalLightingModel.js';
 import MeshStandardNodeMaterial from './MeshStandardNodeMaterial.js';
 import { mix, pow2, min } from '../math/MathNode.js';
-import { MeshPhysicalMaterial } from 'three';
 
-const defaultValues = new MeshPhysicalMaterial();
+import { MeshPhysicalMaterial } from '../../materials/MeshPhysicalMaterial.js';
+
+const _defaultValues = /*@__PURE__*/ new MeshPhysicalMaterial();
 
 class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
 
@@ -43,7 +44,7 @@ class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
 
 		this.anisotropyNode = null;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 
@@ -157,7 +158,7 @@ class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
 
 			} ).else( () => {
 
-				anisotropyV.divAssign( anisotropy );
+				anisotropyV.divAssign( vec2( anisotropy ) );
 				anisotropy.assign( anisotropy.saturate() );
 
 			} );

package/{examples/jsm → src}/nodes/materials/MeshStandardNodeMaterial.js

@@ -4,11 +4,12 @@ import { mix } from '../math/MathNode.js';
 import { materialRoughness, materialMetalness } from '../accessors/MaterialNode.js';
 import getRoughness from '../functions/material/getRoughness.js';
 import PhysicalLightingModel from '../functions/PhysicalLightingModel.js';
+import EnvironmentNode from '../lighting/EnvironmentNode.js';
 import { float, vec3, vec4 } from '../shadernode/ShaderNode.js';
 
-import { MeshStandardMaterial } from 'three';
+import { MeshStandardMaterial } from '../../materials/MeshStandardMaterial.js';
 
-const defaultValues = new MeshStandardMaterial();
+const _defaultValues = /*@__PURE__*/ new MeshStandardMaterial();
 
 class MeshStandardNodeMaterial extends NodeMaterial {
 
@@ -18,17 +19,27 @@ class MeshStandardNodeMaterial extends NodeMaterial {
 
 		this.isMeshStandardNodeMaterial = true;
 
+		this.lights = true;
+
 		this.emissiveNode = null;
 
 		this.metalnessNode = null;
 		this.roughnessNode = null;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 
 	}
 
+	setupEnvironment( builder ) {
+
+		const envNode = super.setupEnvironment( builder );
+
+		return envNode ? new EnvironmentNode( envNode ) : null;
+
+	}
+
 	setupLightingModel( /*builder*/ ) {
 
 		return new PhysicalLightingModel();

package/{examples/jsm → src}/nodes/materials/MeshToonNodeMaterial.js

@@ -1,9 +1,9 @@
 import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
 import ToonLightingModel from '../functions/ToonLightingModel.js';
 
-import { MeshToonMaterial } from 'three';
+import { MeshToonMaterial } from '../../materials/MeshToonMaterial.js';
 
-const defaultValues = new MeshToonMaterial();
+const _defaultValues = /*@__PURE__*/ new MeshToonMaterial();
 
 class MeshToonNodeMaterial extends NodeMaterial {
 
@@ -15,7 +15,7 @@ class MeshToonNodeMaterial extends NodeMaterial {
 
 		this.lights = true;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );