super-three 0.165.0 → 0.168.0

package/{examples/jsm → src}/renderers/common/UniformsGroup.js

@@ -9,6 +9,8 @@ class UniformsGroup extends UniformBuffer {
 
 		this.isUniformsGroup = true;
 
+		this._values = null;
+
 		// the order of uniforms in this array must match the order of uniforms in the shader
 
 		this.uniforms = [];
@@ -37,6 +39,18 @@ class UniformsGroup extends UniformBuffer {
 
 	}
 
+	get values() {
+
+		if ( this._values === null ) {
+
+			this._values = Array.from( this.buffer );
+
+		}
+
+		return this._values;
+
+	}
+
 	get buffer() {
 
 		let buffer = this._buffer;
@@ -116,7 +130,7 @@ class UniformsGroup extends UniformBuffer {
 
 	updateByType( uniform ) {
 
-		if ( uniform.isFloatUniform ) return this.updateNumber( uniform );
+		if ( uniform.isNumberUniform ) return this.updateNumber( uniform );
 		if ( uniform.isVector2Uniform ) return this.updateVector2( uniform );
 		if ( uniform.isVector3Uniform ) return this.updateVector3( uniform );
 		if ( uniform.isVector4Uniform ) return this.updateVector4( uniform );
@@ -132,13 +146,15 @@ class UniformsGroup extends UniformBuffer {
 
 		let updated = false;
 
-		const a = this.buffer;
+		const a = this.values;
 		const v = uniform.getValue();
 		const offset = uniform.offset;
 
 		if ( a[ offset ] !== v ) {
 
-			a[ offset ] = v;
+			const b = this.buffer;
+
+			b[ offset ] = a[ offset ] = v;
 			updated = true;
 
 		}
@@ -151,14 +167,16 @@ class UniformsGroup extends UniformBuffer {
 
 		let updated = false;
 
-		const a = this.buffer;
+		const a = this.values;
 		const v = uniform.getValue();
 		const offset = uniform.offset;
 
 		if ( a[ offset + 0 ] !== v.x || a[ offset + 1 ] !== v.y ) {
 
-			a[ offset + 0 ] = v.x;
-			a[ offset + 1 ] = v.y;
+			const b = this.buffer;
+
+			b[ offset + 0 ] = a[ offset + 0 ] = v.x;
+			b[ offset + 1 ] = a[ offset + 1 ] = v.y;
 
 			updated = true;
 
@@ -172,15 +190,17 @@ class UniformsGroup extends UniformBuffer {
 
 		let updated = false;
 
-		const a = this.buffer;
+		const a = this.values;
 		const v = uniform.getValue();
 		const offset = uniform.offset;
 
 		if ( a[ offset + 0 ] !== v.x || a[ offset + 1 ] !== v.y || a[ offset + 2 ] !== v.z ) {
 
-			a[ offset + 0 ] = v.x;
-			a[ offset + 1 ] = v.y;
-			a[ offset + 2 ] = v.z;
+			const b = this.buffer;
+
+			b[ offset + 0 ] = a[ offset + 0 ] = v.x;
+			b[ offset + 1 ] = a[ offset + 1 ] = v.y;
+			b[ offset + 2 ] = a[ offset + 2 ] = v.z;
 
 			updated = true;
 
@@ -194,16 +214,18 @@ class UniformsGroup extends UniformBuffer {
 
 		let updated = false;
 
-		const a = this.buffer;
+		const a = this.values;
 		const v = uniform.getValue();
 		const offset = uniform.offset;
 
 		if ( a[ offset + 0 ] !== v.x || a[ offset + 1 ] !== v.y || a[ offset + 2 ] !== v.z || a[ offset + 4 ] !== v.w ) {
 
-			a[ offset + 0 ] = v.x;
-			a[ offset + 1 ] = v.y;
-			a[ offset + 2 ] = v.z;
-			a[ offset + 3 ] = v.w;
+			const b = this.buffer;
+
+			b[ offset + 0 ] = a[ offset + 0 ] = v.x;
+			b[ offset + 1 ] = a[ offset + 1 ] = v.y;
+			b[ offset + 2 ] = a[ offset + 2 ] = v.z;
+			b[ offset + 3 ] = a[ offset + 3 ] = v.w;
 
 			updated = true;
 
@@ -217,15 +239,17 @@ class UniformsGroup extends UniformBuffer {
 
 		let updated = false;
 
-		const a = this.buffer;
+		const a = this.values;
 		const c = uniform.getValue();
 		const offset = uniform.offset;
 
 		if ( a[ offset + 0 ] !== c.r || a[ offset + 1 ] !== c.g || a[ offset + 2 ] !== c.b ) {
 
-			a[ offset + 0 ] = c.r;
-			a[ offset + 1 ] = c.g;
-			a[ offset + 2 ] = c.b;
+			const b = this.buffer;
+
+			b[ offset + 0 ] = a[ offset + 0 ] = c.r;
+			b[ offset + 1 ] = a[ offset + 1 ] = c.g;
+			b[ offset + 2 ] = a[ offset + 2 ] = c.b;
 
 			updated = true;
 
@@ -239,7 +263,7 @@ class UniformsGroup extends UniformBuffer {
 
 		let updated = false;
 
-		const a = this.buffer;
+		const a = this.values;
 		const e = uniform.getValue().elements;
 		const offset = uniform.offset;
 
@@ -247,15 +271,17 @@ class UniformsGroup extends UniformBuffer {
 			a[ offset + 4 ] !== e[ 3 ] || a[ offset + 5 ] !== e[ 4 ] || a[ offset + 6 ] !== e[ 5 ] ||
 			a[ offset + 8 ] !== e[ 6 ] || a[ offset + 9 ] !== e[ 7 ] || a[ offset + 10 ] !== e[ 8 ] ) {
 
-			a[ offset + 0 ] = e[ 0 ];
-			a[ offset + 1 ] = e[ 1 ];
-			a[ offset + 2 ] = e[ 2 ];
-			a[ offset + 4 ] = e[ 3 ];
-			a[ offset + 5 ] = e[ 4 ];
-			a[ offset + 6 ] = e[ 5 ];
-			a[ offset + 8 ] = e[ 6 ];
-			a[ offset + 9 ] = e[ 7 ];
-			a[ offset + 10 ] = e[ 8 ];
+			const b = this.buffer;
+
+			b[ offset + 0 ] = a[ offset + 0 ] = e[ 0 ];
+			b[ offset + 1 ] = a[ offset + 1 ] = e[ 1 ];
+			b[ offset + 2 ] = a[ offset + 2 ] = e[ 2 ];
+			b[ offset + 4 ] = a[ offset + 4 ] = e[ 3 ];
+			b[ offset + 5 ] = a[ offset + 5 ] = e[ 4 ];
+			b[ offset + 6 ] = a[ offset + 6 ] = e[ 5 ];
+			b[ offset + 8 ] = a[ offset + 8 ] = e[ 6 ];
+			b[ offset + 9 ] = a[ offset + 9 ] = e[ 7 ];
+			b[ offset + 10 ] = a[ offset + 10 ] = e[ 8 ];
 
 			updated = true;
 
@@ -269,13 +295,15 @@ class UniformsGroup extends UniformBuffer {
 
 		let updated = false;
 
-		const a = this.buffer;
+		const a = this.values;
 		const e = uniform.getValue().elements;
 		const offset = uniform.offset;
 
 		if ( arraysEqual( a, e, offset ) === false ) {
 
-			a.set( e, offset );
+			const b = this.buffer;
+			b.set( e, offset );
+			setArray( a, e, offset );
 			updated = true;
 
 		}
@@ -286,6 +314,16 @@ class UniformsGroup extends UniformBuffer {
 
 }
 
+function setArray( a, b, offset ) {
+
+	for ( let i = 0, l = b.length; i < l; i ++ ) {
+
+		a[ offset + i ] = b[ i ];
+
+	}
+
+}
+
 function arraysEqual( a, b, offset ) {
 
 	for ( let i = 0, l = b.length; i < l; i ++ ) {

package/{examples/jsm → src}/renderers/common/extras/PMREMGenerator.js

@@ -1,21 +1,25 @@
-import NodeMaterial from '../../../nodes/materials/NodeMaterial.js';
+import NodeMaterial from '../../../materials/nodes/NodeMaterial.js';
 import { getDirection, blur } from '../../../nodes/pmrem/PMREMUtils.js';
 import { equirectUV } from '../../../nodes/utils/EquirectUVNode.js';
 import { uniform } from '../../../nodes/core/UniformNode.js';
-import { uniforms } from '../../../nodes/accessors/UniformsNode.js';
+import { uniformArray } from '../../../nodes/accessors/UniformArrayNode.js';
 import { texture } from '../../../nodes/accessors/TextureNode.js';
 import { cubeTexture } from '../../../nodes/accessors/CubeTextureNode.js';
-import { float, vec3 } from '../../../nodes/shadernode/ShaderNode.js';
-import { uv } from '../../../nodes/accessors/UVNode.js';
+import { float, vec3 } from '../../../nodes/tsl/TSLBase.js';
+import { uv } from '../../../nodes/accessors/UV.js';
 import { attribute } from '../../../nodes/core/AttributeNode.js';
+
+import { OrthographicCamera } from '../../../cameras/OrthographicCamera.js';
+import { Color } from '../../../math/Color.js';
+import { Vector3 } from '../../../math/Vector3.js';
+import { BufferGeometry } from '../../../core/BufferGeometry.js';
+import { BufferAttribute } from '../../../core/BufferAttribute.js';
+import { RenderTarget } from '../../../core/RenderTarget.js';
+import { Mesh } from '../../../objects/Mesh.js';
+import { PerspectiveCamera } from '../../../cameras/PerspectiveCamera.js';
+import { MeshBasicMaterial } from '../../../materials/MeshBasicMaterial.js';
+import { BoxGeometry } from '../../../geometries/BoxGeometry.js';
 import {
-	OrthographicCamera,
-	Color,
-	Vector3,
-	BufferGeometry,
-	BufferAttribute,
-	RenderTarget,
-	Mesh,
 	CubeReflectionMapping,
 	CubeRefractionMapping,
 	CubeUVReflectionMapping,
@@ -24,11 +28,8 @@ import {
 	RGBAFormat,
 	HalfFloatType,
 	BackSide,
-	LinearSRGBColorSpace,
-	PerspectiveCamera,
-	MeshBasicMaterial,
-	BoxGeometry
-} from 'three';
+	LinearSRGBColorSpace
+} from '../../../constants.js';
 
 const LOD_MIN = 4;
 
@@ -697,19 +698,18 @@ function _createRenderTarget( width, height, params ) {
 
 function _setViewport( target, x, y, width, height ) {
 
-	const viewY = target.height - height - y;
-
-	target.viewport.set( x, viewY, width, height );
-	target.scissor.set( x, viewY, width, height );
+	target.viewport.set( x, y, width, height );
+	target.scissor.set( x, y, width, height );
 
 }
 
-function _getMaterial() {
+function _getMaterial( type ) {
 
 	const material = new NodeMaterial();
 	material.depthTest = false;
 	material.depthWrite = false;
 	material.blending = NoBlending;
+	material.name = `PMREM_${ type }`;
 
 	return material;
 
@@ -717,7 +717,7 @@ function _getMaterial() {
 
 function _getBlurShader( lodMax, width, height ) {
 
-	const weights = uniforms( new Array( MAX_SAMPLES ).fill( 0 ) );
+	const weights = uniformArray( new Array( MAX_SAMPLES ).fill( 0 ) );
 	const poleAxis = uniform( new Vector3( 0, 1, 0 ) );
 	const dTheta = uniform( 0 );
 	const n = float( MAX_SAMPLES );
@@ -744,7 +744,7 @@ function _getBlurShader( lodMax, width, height ) {
 		CUBEUV_MAX_MIP
 	};
 
-	const material = _getMaterial();
+	const material = _getMaterial( 'blur' );
 	material.uniforms = materialUniforms; // TODO: Move to outside of the material
 	material.fragmentNode = blur( { ...materialUniforms, latitudinal: latitudinal.equal( 1 ) } );
 
@@ -754,7 +754,7 @@ function _getBlurShader( lodMax, width, height ) {
 
 function _getCubemapMaterial( envTexture ) {
 
-	const material = _getMaterial();
+	const material = _getMaterial( 'cubemap' );
 	material.fragmentNode = cubeTexture( envTexture, outputDirection );
 
 	return material;
@@ -763,7 +763,7 @@ function _getCubemapMaterial( envTexture ) {
 
 function _getEquirectMaterial( envTexture ) {
 
-	const material = _getMaterial();
+	const material = _getMaterial( 'equirect' );
 	material.fragmentNode = texture( envTexture, equirectUV( outputDirection ), 0 );
 
 	return material;

package/src/renderers/common/nodes/NodeBuilderState.js

@@ -0,0 +1,58 @@
+import BindGroup from '../BindGroup.js';
+
+class NodeBuilderState {
+
+	constructor( vertexShader, fragmentShader, computeShader, nodeAttributes, bindings, updateNodes, updateBeforeNodes, updateAfterNodes, instanceBindGroups = true, transforms = [] ) {
+
+		this.vertexShader = vertexShader;
+		this.fragmentShader = fragmentShader;
+		this.computeShader = computeShader;
+		this.transforms = transforms;
+
+		this.nodeAttributes = nodeAttributes;
+		this.bindings = bindings;
+
+		this.updateNodes = updateNodes;
+		this.updateBeforeNodes = updateBeforeNodes;
+		this.updateAfterNodes = updateAfterNodes;
+
+		this.instanceBindGroups = instanceBindGroups;
+
+		this.usedTimes = 0;
+
+	}
+
+	createBindings() {
+
+		const bindings = [];
+
+		for ( const instanceGroup of this.bindings ) {
+
+			const shared = this.instanceBindGroups && instanceGroup.bindings[ 0 ].groupNode.shared;
+
+			if ( shared !== true ) {
+
+				const bindingsGroup = new BindGroup( instanceGroup.name, [], instanceGroup.index, instanceGroup );
+				bindings.push( bindingsGroup );
+
+				for ( const instanceBinding of instanceGroup.bindings ) {
+
+					bindingsGroup.bindings.push( instanceBinding.clone() );
+
+				}
+
+			} else {
+
+				bindings.push( instanceGroup );
+
+			}
+
+		}
+
+		return bindings;
+
+	}
+
+}
+
+export default NodeBuilderState;

package/src/renderers/common/nodes/NodeLibrary.js

@@ -0,0 +1,118 @@
+class NodeLibrary {
+
+	constructor() {
+
+		this.lightNodes = new WeakMap();
+		this.materialNodes = new Map();
+		this.toneMappingNodes = new Map();
+		this.colorSpaceNodes = new Map();
+
+	}
+
+	fromMaterial( material ) {
+
+		if ( material.isNodeMaterial ) return material;
+
+		let nodeMaterial = null;
+
+		const nodeMaterialClass = this.getMaterialNodeClass( material.type );
+
+		if ( nodeMaterialClass !== null ) {
+
+			nodeMaterial = new nodeMaterialClass();
+
+			for ( const key in material ) {
+
+				nodeMaterial[ key ] = material[ key ];
+
+			}
+
+		}
+
+		return nodeMaterial;
+
+	}
+
+	addColorSpace( colorSpaceNode, colorSpace ) {
+
+		this.addType( colorSpaceNode, colorSpace, this.colorSpaceNodes );
+
+	}
+
+	getColorSpaceFunction( colorSpace ) {
+
+		return this.colorSpaceNodes.get( colorSpace ) || null;
+
+	}
+
+	addToneMapping( toneMappingNode, toneMapping ) {
+
+		this.addType( toneMappingNode, toneMapping, this.toneMappingNodes );
+
+	}
+
+	getToneMappingFunction( toneMapping ) {
+
+		return this.toneMappingNodes.get( toneMapping ) || null;
+
+	}
+
+	getMaterialNodeClass( materialType ) {
+
+		return this.materialNodes.get( materialType ) || null;
+
+	}
+
+	addMaterial( materialNodeClass, materialClass ) {
+
+		this.addType( materialNodeClass, materialClass.name, this.materialNodes );
+
+	}
+
+	getLightNodeClass( light ) {
+
+		return this.lightNodes.get( light ) || null;
+
+	}
+
+	addLight( lightNodeClass, lightClass ) {
+
+		this.addClass( lightNodeClass, lightClass, this.lightNodes );
+
+	}
+
+	addType( nodeClass, type, library ) {
+
+		if ( library.has( type ) ) {
+
+			console.warn( `Redefinition of node ${ type }` );
+			return;
+
+		}
+
+		if ( typeof nodeClass !== 'function' ) throw new Error( `Node class ${ nodeClass.name } is not a class.` );
+		if ( typeof type === 'function' || typeof type === 'object' ) throw new Error( `Base class ${ type } is not a class.` );
+
+		library.set( type, nodeClass );
+
+	}
+
+	addClass( nodeClass, baseClass, library ) {
+
+		if ( library.has( baseClass ) ) {
+
+			console.warn( `Redefinition of node ${ baseClass.name }` );
+			return;
+
+		}
+
+		if ( typeof nodeClass !== 'function' ) throw new Error( `Node class ${ nodeClass.name } is not a class.` );
+		if ( typeof baseClass !== 'function' ) throw new Error( `Base class ${ baseClass.name } is not a class.` );
+
+		library.set( baseClass, nodeClass );
+
+	}
+
+}
+
+export default NodeLibrary;

package/{examples/jsm → src}/renderers/common/nodes/NodeSampledTexture.js

@@ -2,19 +2,20 @@ import { SampledTexture } from '../SampledTexture.js';
 
 class NodeSampledTexture extends SampledTexture {
 
-	constructor( name, textureNode, access = null ) {
+	constructor( name, textureNode, groupNode, access = null ) {
 
 		super( name, textureNode ? textureNode.value : null );
 
 		this.textureNode = textureNode;
+		this.groupNode = groupNode;
 
 		this.access = access;
 
 	}
 
-	get needsBindingsUpdate() {
+	needsBindingsUpdate( generation ) {
 
-		return this.textureNode.value !== this.texture || super.needsBindingsUpdate;
+		return this.textureNode.value !== this.texture || super.needsBindingsUpdate( generation );
 
 	}
 
@@ -38,9 +39,9 @@ class NodeSampledTexture extends SampledTexture {
 
 class NodeSampledCubeTexture extends NodeSampledTexture {
 
-	constructor( name, textureNode, access ) {
+	constructor( name, textureNode, groupNode, access ) {
 
-		super( name, textureNode, access );
+		super( name, textureNode, groupNode, access );
 
 		this.isSampledCubeTexture = true;
 
@@ -50,9 +51,9 @@ class NodeSampledCubeTexture extends NodeSampledTexture {
 
 class NodeSampledTexture3D extends NodeSampledTexture {
 
-	constructor( name, textureNode, access ) {
+	constructor( name, textureNode, groupNode, access ) {
 
-		super( name, textureNode, access );
+		super( name, textureNode, groupNode, access );
 
 		this.isSampledTexture3D = true;
 

package/{examples/jsm → src}/renderers/common/nodes/NodeSampler.js

@@ -2,11 +2,12 @@ import Sampler from '../Sampler.js';
 
 class NodeSampler extends Sampler {
 
-	constructor( name, textureNode ) {
+	constructor( name, textureNode, groupNode ) {
 
 		super( name, textureNode ? textureNode.value : null );
 
 		this.textureNode = textureNode;
+		this.groupNode = groupNode;
 
 	}
 

package/{examples/jsm → src}/renderers/common/nodes/NodeStorageBuffer.js

@@ -1,14 +1,18 @@
 import StorageBuffer from '../StorageBuffer.js';
+import { GPUBufferBindingType } from '../../webgpu/utils/WebGPUConstants.js';
 
 let _id = 0;
 
 class NodeStorageBuffer extends StorageBuffer {
 
-	constructor( nodeUniform ) {
+	constructor( nodeUniform, groupNode ) {
 
 		super( 'StorageBuffer_' + _id ++, nodeUniform ? nodeUniform.value : null );
 
 		this.nodeUniform = nodeUniform;
+		this.access = nodeUniform ? nodeUniform.access : GPUBufferBindingType.Storage;
+		this.groupNode = groupNode;
+
 
 	}
 

package/{examples/jsm → src}/renderers/common/nodes/NodeUniform.js

@@ -1,9 +1,9 @@
 import {
-	FloatUniform, Vector2Uniform, Vector3Uniform, Vector4Uniform,
+	NumberUniform, Vector2Uniform, Vector3Uniform, Vector4Uniform,
 	ColorUniform, Matrix3Uniform, Matrix4Uniform
 } from '../Uniform.js';
 
-class FloatNodeUniform extends FloatUniform {
+class NumberNodeUniform extends NumberUniform {
 
 	constructor( nodeUniform ) {
 
@@ -130,6 +130,6 @@ class Matrix4NodeUniform extends Matrix4Uniform {
 }
 
 export {
-	FloatNodeUniform, Vector2NodeUniform, Vector3NodeUniform, Vector4NodeUniform,
+	NumberNodeUniform, Vector2NodeUniform, Vector3NodeUniform, Vector4NodeUniform,
 	ColorNodeUniform, Matrix3NodeUniform, Matrix4NodeUniform
 };

package/{examples/jsm → src}/renderers/common/nodes/NodeUniformBuffer.js

@@ -4,11 +4,12 @@ let _id = 0;
 
 class NodeUniformBuffer extends UniformBuffer {
 
-	constructor( nodeUniform ) {
+	constructor( nodeUniform, groupNode ) {
 
 		super( 'UniformBuffer_' + _id ++, nodeUniform ? nodeUniform.value : null );
 
 		this.nodeUniform = nodeUniform;
+		this.groupNode = groupNode;
 
 	}
 

package/{examples/jsm → src}/renderers/common/nodes/NodeUniformsGroup.js

@@ -1,6 +1,6 @@
 import UniformsGroup from '../UniformsGroup.js';
 
-let id = 0;
+let _id = 0;
 
 class NodeUniformsGroup extends UniformsGroup {
 
@@ -8,19 +8,13 @@ class NodeUniformsGroup extends UniformsGroup {
 
 		super( name );
 
-		this.id = id ++;
+		this.id = _id ++;
 		this.groupNode = groupNode;
 
 		this.isNodeUniformsGroup = true;
 
 	}
 
-	get shared() {
-
-		return this.groupNode.shared;
-
-	}
-
 	getNodes() {
 
 		const nodes = [];