rayzee 5.4.0 → 5.4.1

package/src/managers/EnvironmentManager.js

@@ -43,11 +43,11 @@ export class EnvironmentManager {
 		this.environmentTexture = this._envPlaceholder;
 		this.envTexSize = new Vector2();
 
-		// CDF storage buffers
-		this.envMarginalStorageAttr = null;
-		this.envMarginalStorageNode = null;
-		this.envConditionalStorageAttr = null;
-		this.envConditionalStorageNode = null;
+		// CDF storage buffer (marginal + conditional packed into one buffer).
+		// Layout: [ marginal (envResolution.y floats) | conditional (envResolution.x * envResolution.y floats) ]
+		// Conditional offset is the marginal length, which equals envResolution.y at runtime.
+		this.envCDFStorageAttr = null;
+		this.envCDFStorageNode = null;
 		this._initCDFStorageBuffers();
 
 		// Environment rotation
@@ -177,74 +177,52 @@ export class EnvironmentManager {
 
 	}
 
-	// ===== CDF STORAGE BUFFERS =====
+	// ===== CDF STORAGE BUFFER =====
 
 	/**
-	 * Initialize CDF storage buffers with placeholder data.
-	 * Must be called before shader compilation so the nodes exist in the graph.
+	 * Initialize the packed CDF storage buffer with placeholder data.
+	 * Must be called before shader compilation so the node exists in the graph.
+	 *
+	 * Layout: [ marginal (size = envResolution.y) | conditional (size = envResolution.x * envResolution.y) ]
+	 * Placeholder shape is a 1x2 env map: marginal=[0,1], conditional=[0,0,1,1].
 	 * @private
 	 */
 	_initCDFStorageBuffers() {
 
-		// Marginal: 1 float per entry, default placeholder
-		const marginalPlaceholder = new Float32Array( [ 0, 1 ] );
-		this.envMarginalStorageAttr = new StorageInstancedBufferAttribute( marginalPlaceholder, 1 );
-		this.envMarginalStorageNode = storage( this.envMarginalStorageAttr, 'float', 2 ).toReadOnly();
-
-		// Conditional: 1 float per entry, default placeholder
-		const conditionalPlaceholder = new Float32Array( [ 0, 0, 1, 1 ] );
-		this.envConditionalStorageAttr = new StorageInstancedBufferAttribute( conditionalPlaceholder, 1 );
-		this.envConditionalStorageNode = storage( this.envConditionalStorageAttr, 'float', 4 ).toReadOnly();
-
-	}
-
-	/**
-	 * Update marginal CDF storage buffer from Float32Array.
-	 */
-	setEnvMarginalData( floatData ) {
-
-		if ( ! floatData ) return;
-
-		this.envMarginalStorageAttr = new StorageInstancedBufferAttribute( floatData, 1 );
-		this.envMarginalStorageNode.value = this.envMarginalStorageAttr;
-		this.envMarginalStorageNode.bufferCount = floatData.length;
-
-	}
-
-	/**
-	 * Update conditional CDF storage buffer from Float32Array.
-	 */
-	setEnvConditionalData( floatData ) {
-
-		if ( ! floatData ) return;
-
-		this.envConditionalStorageAttr = new StorageInstancedBufferAttribute( floatData, 1 );
-		this.envConditionalStorageNode.value = this.envConditionalStorageAttr;
-		this.envConditionalStorageNode.bufferCount = floatData.length;
+		const placeholder = new Float32Array( [ 0, 1, 0, 0, 1, 1 ] );
+		this.envCDFStorageAttr = new StorageInstancedBufferAttribute( placeholder, 1 );
+		this.envCDFStorageNode = storage( this.envCDFStorageAttr, 'float', placeholder.length ).toReadOnly();
 
 	}
 
 	/**
-	 * Update both CDF storage buffers from equirectHdrInfo.
+	 * Update the packed CDF storage buffer from equirectHdrInfo.
+	 * Concatenates marginal + conditional into one buffer.
 	 * @private
 	 */
 	_updateCDFStorageBuffers() {
 
-		this.setEnvMarginalData( this.equirectHdrInfo.marginalData );
-		this.setEnvConditionalData( this.equirectHdrInfo.conditionalData );
+		const marginal = this.equirectHdrInfo.marginalData;
+		const conditional = this.equirectHdrInfo.conditionalData;
+		if ( ! marginal || ! conditional ) return;
+
+		const combined = new Float32Array( marginal.length + conditional.length );
+		combined.set( marginal, 0 );
+		combined.set( conditional, marginal.length );
+
+		this.envCDFStorageAttr = new StorageInstancedBufferAttribute( combined, 1 );
+		this.envCDFStorageNode.value = this.envCDFStorageAttr;
+		this.envCDFStorageNode.bufferCount = combined.length;
 
 	}
 
 	/**
-	 * Get CDF storage nodes for shader graph.
-	 * @returns {{ marginalNode: StorageNode, conditionalNode: StorageNode }}
+	 * Get the packed CDF storage node for shader graph.
+	 * @returns {{ cdfNode: StorageNode }}
 	 */
 	getCDFStorageNodes() {
 
-		return {
-			marginalNode: this.envMarginalStorageNode,
-			conditionalNode: this.envConditionalStorageNode,
-		};
+		return { cdfNode: this.envCDFStorageNode };
 
 	}
 
@@ -559,10 +537,8 @@ export class EnvironmentManager {
 
 		this.proceduralSkyRenderer = null;
 		this.simpleSkyRenderer = null;
-		this.envMarginalStorageAttr = null;
-		this.envMarginalStorageNode = null;
-		this.envConditionalStorageAttr = null;
-		this.envConditionalStorageNode = null;
+		this.envCDFStorageAttr = null;
+		this.envCDFStorageNode = null;
 		this._envPlaceholder?.dispose();
 		this._envPlaceholder = null;
 		this.environmentTexture = null;

package/src/managers/UniformManager.js

@@ -237,6 +237,9 @@ export class UniformManager {
 		u( 'emissiveTriangleCount', 0, 'int' );
 		u( 'emissiveTotalPower', 0.0, 'float' );
 		u( 'lightBVHNodeCount', 0, 'int' );
+		// Offset (in vec4 elements) within the packed light buffer where emissive
+		// triangle data starts. Equals lightBVHNodeCount * LBVH_STRIDE; computed on upload.
+		u( 'emissiveVec4Offset', 0, 'int' );
 
 		// Render mode
 		u( 'renderMode', DEFAULT_STATE.renderMode, 'int' );

package/src/TSL/structProxy.js

@@ -1,87 +0,0 @@
-/**
- * Proxy-enhanced struct factory for TSL.
- *
- * TSL structs require `.get('fieldName')` for member access, but GLSL-style
- * dot notation (`.fieldName`) is more natural and matches the ported code.
- *
- * This utility wraps TSL's `struct()` so that:
- * - Direct construction: `MyStruct({...}).toVar('x')` → `.fieldName` works automatically
- * - Fn return values: `MyStruct.wrap(someFn(...))` → `.fieldName` works automatically
- *
- * Internally, property access for known struct member names is redirected to `.get('name')`.
- * Swizzle properties (x, y, z, w, etc.), Node methods (.add, .assign, etc.), and other
- * standard properties pass through to the underlying node unmodified.
- */
-
-import { struct as _struct } from 'three/tsl';
-
-/**
- * Creates a Proxy around a TSL node that redirects struct member access to `.get('name')`.
- * Also intercepts `.toVar()` to ensure the resulting VarNode is also proxy-wrapped.
- */
-function createStructProxy( node, memberSet ) {
-
-	return new Proxy( node, {
-
-		get( target, prop, receiver ) {
-
-			// Intercept known struct member names
-			if ( typeof prop === 'string' && memberSet.has( prop ) ) {
-
-				return target.get( prop );
-
-			}
-
-			const val = Reflect.get( target, prop, receiver );
-
-			// Intercept .toVar() to proxy-wrap the result
-			if ( prop === 'toVar' && typeof val === 'function' ) {
-
-				return ( ...args ) => createStructProxy( val.apply( target, args ), memberSet );
-
-			}
-
-			return val;
-
-		}
-
-	} );
-
-}
-
-/**
- * Drop-in replacement for TSL's `struct()` that returns a proxy-enhanced factory.
- *
- * The returned factory:
- * - Creates struct nodes where `.toVar()` results support dot-notation field access
- * - Has `.wrap(node)` method to proxy-wrap Fn return values for field access
- * - Has `.layout` and `.isStruct` matching the original TSL struct API
- *
- * @param {Object} members - Struct member layout (e.g., { didHit: 'bool', dst: 'float' })
- * @param {string|null} name - Optional struct name
- * @returns {Function} Enhanced struct factory
- */
-export function struct( members, name = null ) {
-
-	const factory = _struct( members, name );
-	const memberSet = new Set( Object.keys( members ) );
-
-	const wrappedFactory = ( ...args ) => {
-
-		const node = factory( ...args );
-		return createStructProxy( node, memberSet );
-
-	};
-
-	wrappedFactory.layout = factory.layout;
-	wrappedFactory.isStruct = true;
-
-	/**
-	 * Wrap an existing node (e.g., Fn return value) with struct field access proxy.
-	 * Usage: `const hit = HitInfo.wrap(traverseBVH(...).toVar('hit'));`
-	 */
-	wrappedFactory.wrap = ( node ) => createStructProxy( node, memberSet );
-
-	return wrappedFactory;
-
-}

package/src/TSL/wgslGlobalVarsPatch.js

@@ -1,60 +0,0 @@
-/**
- * Monkey-patch to disable WGSL global-variable promotion for compute shaders.
- *
- * Three.js r184 introduced `WGSLNodeBuilder.allowGlobalVariables = true` which
- * emits `.toVar()` declarations at WGSL module scope as `var<private> name : T`
- * instead of function-local `var name : T` inside `fn main()` (as r183 did).
- *
- * For shaders with hundreds of `.toVar()` calls inside loops (e.g. our BVH
- * traversal + BRDF path tracer), `var<private>` increases GPU register pressure
- * because the Dawn/Chromium WGSL compiler cannot aggressively register-allocate
- * variables with a stable per-invocation memory address. We measured a ~8% fps
- * regression (120 → 110) on the path tracer after upgrading r183 → r184 that
- * traced entirely to GPU execution, not CPU.
- *
- * This patch wraps `WebGPUBackend.createNodeBuilder` so every newly constructed
- * node builder reports `allowGlobalVariables = false`, restoring r183's
- * function-scoped `var` emission inside `fn main()`. No behavior change —
- * WGSL spec guarantees `var<private>` and function-local `var` are semantically
- * equivalent for per-invocation storage; only the compiler's register-allocation
- * latitude differs.
- *
- * Relevant upstream lines:
- *  - `node_modules/three/src/renderers/webgpu/nodes/WGSLNodeBuilder.js:247`
- *    (`this.allowGlobalVariables = true`)
- *  - `...WGSLNodeBuilder.js:2458` (module-scope vars block)
- *  - `...WGSLNodeBuilder.js:2467` (function-body vars block)
- *
- * Revisit if upstream adds an official opt-out or fixes register pressure.
- * Import this module once at app startup (side-effect only).
- */
-
-import { WebGPUBackend } from 'three/webgpu';
-
-const _origCreateNodeBuilder = WebGPUBackend.prototype.createNodeBuilder;
-
-// WGSLNodeBuilder's `allowGlobalVariables` switch is ONLY consumed by the
-// compute-shader template (see `_getWGSLComputeCode`). The vertex/fragment
-// templates always emit `shaderData.vars` at module scope and therefore
-// REQUIRE `allowGlobalVariables=true` (emitting function-local `var` at
-// module scope is invalid WGSL and crashes pipeline creation with
-// "Invalid ShaderModule"). We install a per-instance accessor that returns
-// `false` only when the builder is for a compute node (material === null)
-// and `true` otherwise, so render pipelines keep r184 behavior untouched.
-WebGPUBackend.prototype.createNodeBuilder = function ( object, renderer ) {
-
-	const builder = _origCreateNodeBuilder.call( this, object, renderer );
-
-	Object.defineProperty( builder, 'allowGlobalVariables', {
-		get() {
-
-			return this.material !== null;
-
-		},
-		set() { /* ignore — the value is derived from material presence */ },
-		configurable: true,
-	} );
-
-	return builder;
-
-};