rayzee 7.8.0 → 7.9.0

package/src/TSL/LightsSampling.js

@@ -360,7 +360,6 @@ export const sampleLightWithImportance = Fn( ( [
 	If( totalLights.greaterThan( int( 0 ) ), () => {
 
 		const totalWeight = float( 0.0 ).toVar();
-		const lightIndex = int( 0 ).toVar();
 
 		// Reservoir state: winning light's type/index/importance.
 		const selectedType = int( - 1 ).toVar(); // 0=dir, 1=area, 2=point, 3=spot
@@ -375,7 +374,7 @@ export const sampleLightWithImportance = Fn( ( [
 
 			Loop( { start: int( 0 ), end: numDirectionalLights, type: 'int', condition: '<' }, ( { i } ) => {
 
-				If( lightIndex.lessThan( int( 16 ) ), () => {
+				If( i.lessThan( int( 16 ) ), () => {
 
 					const light = DirectionalLight.wrap( getDirectionalLight( directionalLightsBuffer, i ) );
 					const importance = calculateDirectionalLightImportance( light, normal, material, bounceIndex ).toVar();
@@ -389,7 +388,6 @@ export const sampleLightWithImportance = Fn( ( [
 						selectedImportance.assign( importance );
 
 					} );
-					lightIndex.addAssign( 1 );
 
 				} );
 
@@ -401,7 +399,7 @@ export const sampleLightWithImportance = Fn( ( [
 
 			Loop( { start: int( 0 ), end: numAreaLights, type: 'int', condition: '<' }, ( { i } ) => {
 
-				If( lightIndex.lessThan( int( 16 ) ), () => {
+				If( i.lessThan( int( 16 ) ), () => {
 
 					const light = AreaLight.wrap( getAreaLight( areaLightsBuffer, i ) );
 					const importance = select( light.intensity.greaterThan( 0.0 ), estimateLightImportance( light, rayOrigin, normal, material ), float( 0.0 ) ).toVar();
@@ -415,7 +413,6 @@ export const sampleLightWithImportance = Fn( ( [
 						selectedImportance.assign( importance );
 
 					} );
-					lightIndex.addAssign( 1 );
 
 				} );
 
@@ -427,7 +424,7 @@ export const sampleLightWithImportance = Fn( ( [
 
 			Loop( { start: int( 0 ), end: numPointLights, type: 'int', condition: '<' }, ( { i } ) => {
 
-				If( lightIndex.lessThan( int( 16 ) ), () => {
+				If( i.lessThan( int( 16 ) ), () => {
 
 					const light = PointLight.wrap( getPointLight( pointLightsBuffer, i ) );
 					const importance = calculatePointLightImportance( light, rayOrigin, normal, material ).toVar();
@@ -441,7 +438,6 @@ export const sampleLightWithImportance = Fn( ( [
 						selectedImportance.assign( importance );
 
 					} );
-					lightIndex.addAssign( 1 );
 
 				} );
 
@@ -453,7 +449,7 @@ export const sampleLightWithImportance = Fn( ( [
 
 			Loop( { start: int( 0 ), end: numSpotLights, type: 'int', condition: '<' }, ( { i } ) => {
 
-				If( lightIndex.lessThan( int( 16 ) ), () => {
+				If( i.lessThan( int( 16 ) ), () => {
 
 					const light = SpotLight.wrap( getSpotLight( spotLightsBuffer, i ) );
 					const importance = calculateSpotLightImportance( light, rayOrigin, normal, material ).toVar();
@@ -467,7 +463,6 @@ export const sampleLightWithImportance = Fn( ( [
 						selectedImportance.assign( importance );
 
 					} );
-					lightIndex.addAssign( 1 );
 
 				} );
 
@@ -762,7 +757,7 @@ export const calculateMaterialPDF = Fn( ( [ viewDir, lightDir, normal, material
 } );
 
 // Total light-selection weight at a shading point, replicating the NEE reservoir's
-// importance accumulation (same per-type importance fns, same 16-light cap + order).
+// importance accumulation (same per-type importance fns, same per-type 16-light cap + order).
 // Used to reconstruct the exact NEE selection pdf for MIS on the BSDF-hit path —
 // the analogue of Cycles' light_tree_pdf re-walk. Without it, the BSDF-hit MIS
 // partner assumes uniform 1/N selection, which disagrees with the importance-
@@ -776,17 +771,15 @@ export const computeTotalLightImportance = Fn( ( [
 ] ) => {
 
 	const totalWeight = float( 0.0 ).toVar();
-	const lightIndex = int( 0 ).toVar();
 
 	If( numDirectionalLights.greaterThan( int( 0 ) ), () => {
 
 		Loop( { start: int( 0 ), end: numDirectionalLights, type: 'int', condition: '<' }, ( { i } ) => {
 
-			If( lightIndex.lessThan( int( 16 ) ), () => {
+			If( i.lessThan( int( 16 ) ), () => {
 
 				const light = DirectionalLight.wrap( getDirectionalLight( directionalLightsBuffer, i ) );
 				totalWeight.addAssign( calculateDirectionalLightImportance( light, normal, material, bounceIndex ) );
-				lightIndex.addAssign( 1 );
 
 			} );
 
@@ -798,11 +791,10 @@ export const computeTotalLightImportance = Fn( ( [
 
 		Loop( { start: int( 0 ), end: numAreaLights, type: 'int', condition: '<' }, ( { i } ) => {
 
-			If( lightIndex.lessThan( int( 16 ) ), () => {
+			If( i.lessThan( int( 16 ) ), () => {
 
 				const light = AreaLight.wrap( getAreaLight( areaLightsBuffer, i ) );
 				totalWeight.addAssign( select( light.intensity.greaterThan( 0.0 ), estimateLightImportance( light, rayOrigin, normal, material ), float( 0.0 ) ) );
-				lightIndex.addAssign( 1 );
 
 			} );
 
@@ -814,11 +806,10 @@ export const computeTotalLightImportance = Fn( ( [
 
 		Loop( { start: int( 0 ), end: numPointLights, type: 'int', condition: '<' }, ( { i } ) => {
 
-			If( lightIndex.lessThan( int( 16 ) ), () => {
+			If( i.lessThan( int( 16 ) ), () => {
 
 				const light = PointLight.wrap( getPointLight( pointLightsBuffer, i ) );
 				totalWeight.addAssign( calculatePointLightImportance( light, rayOrigin, normal, material ) );
-				lightIndex.addAssign( 1 );
 
 			} );
 
@@ -830,11 +821,10 @@ export const computeTotalLightImportance = Fn( ( [
 
 		Loop( { start: int( 0 ), end: numSpotLights, type: 'int', condition: '<' }, ( { i } ) => {
 
-			If( lightIndex.lessThan( int( 16 ) ), () => {
+			If( i.lessThan( int( 16 ) ), () => {
 
 				const light = SpotLight.wrap( getSpotLight( spotLightsBuffer, i ) );
 				totalWeight.addAssign( calculateSpotLightImportance( light, rayOrigin, normal, material ) );
-				lightIndex.addAssign( 1 );
 
 			} );
 

package/src/TSL/Random.js

@@ -187,7 +187,17 @@ const computeSTBNAtlasCoord = ( pixelCoords, sampleIndex, dimensionIndex, frame
 export const sampleSTBN2D = ( pixelCoords, sampleIndex, dimensionPairIndex, frame ) => {
 
 	const coord = computeSTBNAtlasCoord( pixelCoords, sampleIndex, dimensionPairIndex, frame );
-	return stbnVec2TextureNode.load( coord ).xy;
+	const raw = stbnVec2TextureNode.load( coord ).xy;
+
+	// The atlas has only 64 temporal slices, so frame N and N+64 read the same slice: the
+	// sample repeats and accumulation stops improving past 64 frames. Decorrelate across
+	// 64-frame cycles with a Cranley-Patterson rotation (toroidal shift) by an R2 offset
+	// keyed on the cycle index (frame >> 6). The offset is uniform per cycle, preserving
+	// spatial and within-window temporal blue noise; cycle 0's offset is 0, so frames
+	// 0-63 stay bit-identical. A toroidal shift of uniform samples stays uniform (unbiased).
+	const cycle = float( uint( frame ).shiftRight( uint( 6 ) ) );
+	const rotation = fract( vec2( R2_A1, R2_A2 ).mul( cycle ) );
+	return fract( raw.add( rotation ) );
 
 };
 

package/src/managers/EnvironmentManager.js

@@ -360,6 +360,17 @@ export class EnvironmentManager {
 	 */
 	async setEnvironmentMap( envMap ) {
 
+		// Free the outgoing env texture's GPU memory before it is orphaned. Skip: the
+		// reusable placeholder, an idempotent re-set of the same texture, and the HDRI
+		// stashed by setMode() for a later sky→hdri restore. Only when actually
+		// installing a new non-null texture (the null-env branch keeps the old ref).
+		const oldTex = this.environmentTexture;
+		if ( envMap && oldTex && oldTex !== envMap && oldTex !== this._envPlaceholder && oldTex !== this._previousHDRI ) {
+
+			oldTex.dispose?.();
+
+		}
+
 		this.scene.environment = envMap;
 		this.setEnvironmentTexture( envMap );
 

package/src/managers/RenderTargetManager.js

@@ -1,522 +0,0 @@
-/**
- * RenderTargetManager.js
- * Manages render targets, MRT textures, and efficient copying operations
- */
-
-import {
-	WebGLRenderTarget,
-	FloatType,
-	NearestFilter,
-	LinearSRGBColorSpace,
-	ShaderMaterial,
-	GLSL3
-} from 'three';
-import { FullScreenQuad } from 'three/addons/postprocessing/Pass.js';
-
-export class RenderTargetManager {
-
-	constructor( width, height, renderer ) {
-
-		this.width = width;
-		this.height = height;
-		this.renderer = renderer;
-
-		// Initialize targets to null first
-		this.currentTarget = null;
-		this.previousTarget = null;
-
-		// Copy material for efficient final output
-		this.copyMaterial = null;
-		this.copyQuad = null;
-
-		// Performance cache for MRT textures
-		this.mrtTexturesCache = { color: null, normalDepth: null, albedo: null };
-
-		// Create ping-pong MRT targets immediately
-		this.createTargets( width, height );
-
-		// Verify targets were created successfully
-		if ( ! this.currentTarget || ! this.previousTarget ) {
-
-			console.error( 'RenderTargetManager: Failed to create render targets!' );
-			// Create simple fallback targets without MRT
-			this.createFallbackTargets( width, height );
-
-		}
-
-	}
-
-	/**
-     * Create unified render targets with MRT support
-     * @param {number} width - Target width
-     * @param {number} height - Target height
-     */
-	createTargets( width, height ) {
-
-		try {
-
-			const targetOptions = {
-				minFilter: NearestFilter,
-				magFilter: NearestFilter,
-				type: FloatType,
-				colorSpace: LinearSRGBColorSpace,
-				depthBuffer: false,
-				count: 3, // MRT: Color + NormalDepth + Albedo (for OIDN)
-				samples: 0 // IMPORTANT: No multisampling to avoid blitFramebuffer issues
-			};
-
-			// Dispose existing targets if they exist
-			if ( this.currentTarget ) {
-
-				this.currentTarget.dispose();
-
-			}
-
-			if ( this.previousTarget ) {
-
-				this.previousTarget.dispose();
-
-			}
-
-			// Create new targets
-			this.currentTarget = new WebGLRenderTarget( width, height, targetOptions );
-			this.previousTarget = new WebGLRenderTarget( width, height, targetOptions );
-
-			// Verify targets have textures
-			if ( ! this.currentTarget.textures || this.currentTarget.textures.length !== 3 ) {
-
-				throw new Error( 'Current target missing MRT textures' );
-
-			}
-
-			if ( ! this.previousTarget.textures || this.previousTarget.textures.length !== 3 ) {
-
-				throw new Error( 'Previous target missing MRT textures' );
-
-			}
-
-			// Set texture names for debugging
-			this.currentTarget.textures[ 0 ].name = 'CurrentColor';
-			this.currentTarget.textures[ 1 ].name = 'CurrentNormalDepth';
-			this.currentTarget.textures[ 2 ].name = 'CurrentAlbedo';
-			this.previousTarget.textures[ 0 ].name = 'PreviousColor';
-			this.previousTarget.textures[ 1 ].name = 'PreviousNormalDepth';
-			this.previousTarget.textures[ 2 ].name = 'PreviousAlbedo';
-
-		} catch ( error ) {
-
-			console.error( 'RenderTargetManager: Error creating MRT targets:', error );
-			this.currentTarget = null;
-			this.previousTarget = null;
-
-		}
-
-	}
-
-	/**
-     * Create fallback render targets without MRT if main creation fails
-     * @param {number} width - Target width
-     * @param {number} height - Target height
-     */
-	createFallbackTargets( width, height ) {
-
-		try {
-
-			console.warn( 'RenderTargetManager: Creating fallback targets without MRT' );
-
-			const fallbackOptions = {
-				minFilter: NearestFilter,
-				magFilter: NearestFilter,
-				type: FloatType,
-				colorSpace: LinearSRGBColorSpace,
-				depthBuffer: false,
-				samples: 0
-			};
-
-			this.currentTarget = new WebGLRenderTarget( width, height, fallbackOptions );
-			this.previousTarget = new WebGLRenderTarget( width, height, fallbackOptions );
-
-			// Create dummy textures for MRT compatibility
-			this.currentTarget.textures = [ this.currentTarget.texture, this.currentTarget.texture, this.currentTarget.texture ];
-			this.previousTarget.textures = [ this.previousTarget.texture, this.previousTarget.texture, this.previousTarget.texture ];
-
-			this.currentTarget.textures[ 0 ].name = 'CurrentColor';
-			this.currentTarget.textures[ 1 ].name = 'CurrentNormalDepth';
-			this.currentTarget.textures[ 2 ].name = 'CurrentAlbedo';
-			this.previousTarget.textures[ 0 ].name = 'PreviousColor';
-			this.previousTarget.textures[ 1 ].name = 'PreviousNormalDepth';
-			this.previousTarget.textures[ 2 ].name = 'PreviousAlbedo';
-
-			console.log( 'RenderTargetManager: Fallback targets created successfully' );
-
-		} catch ( error ) {
-
-			console.error( 'RenderTargetManager: Failed to create even fallback targets:', error );
-
-		}
-
-	}
-
-	/**
-     * Get current accumulated render target
-     * @returns {WebGLRenderTarget} - Current accumulation target
-     */
-	getCurrentAccumulation() {
-
-		this.ensureTargetsReady();
-		return this.currentTarget;
-
-	}
-
-	/**
-     * Get current raw sample render target
-     * @returns {WebGLRenderTarget} - Current raw sample target
-     */
-	getCurrentRawSample() {
-
-		this.ensureTargetsReady();
-		return this.currentTarget;
-
-	}
-
-	/**
-     * Get MRT textures (color, normal/depth, and albedo)
-     * @returns {Object} - Object containing color, normalDepth, and albedo textures
-     */
-	getMRTTextures() {
-
-		if ( ! this.ensureTargetsReady() ) {
-
-			return {
-				color: null,
-				normalDepth: null,
-				albedo: null
-			};
-
-		}
-
-		// Reuse cached object to avoid allocation
-		this.mrtTexturesCache.color = this.currentTarget.textures[ 0 ];
-		this.mrtTexturesCache.normalDepth = this.currentTarget.textures[ 1 ];
-		this.mrtTexturesCache.albedo = this.currentTarget.textures[ 2 ];
-		return this.mrtTexturesCache;
-
-	}
-
-	/**
-     * Get previous frame textures
-     * @returns {Object} - Object containing previous frame textures
-     */
-	getPreviousTextures() {
-
-		if ( ! this.ensureTargetsReady() ) {
-
-			return {
-				color: null,
-				normalDepth: null,
-				albedo: null
-			};
-
-		}
-
-		return {
-			color: this.previousTarget.textures[ 0 ],
-			normalDepth: this.previousTarget.textures[ 1 ],
-			albedo: this.previousTarget.textures[ 2 ]
-		};
-
-	}
-
-	/**
-     * Swap current and previous targets
-     */
-	swapTargets() {
-
-		if ( ! this.ensureTargetsReady() ) {
-
-			return;
-
-		}
-
-		[ this.currentTarget, this.previousTarget ] = [ this.previousTarget, this.currentTarget ];
-
-	}
-
-	/**
-     * Clear both render targets
-     */
-	clearTargets() {
-
-		if ( ! this.ensureTargetsReady() ) {
-
-			return;
-
-		}
-
-		const currentRenderTarget = this.renderer.getRenderTarget();
-
-		this.renderer.setRenderTarget( this.currentTarget );
-		this.renderer.clear();
-		this.renderer.setRenderTarget( this.previousTarget );
-		this.renderer.clear();
-
-		this.renderer.setRenderTarget( currentRenderTarget );
-
-	}
-
-	/**
-     * Efficiently copy color output to destination target
-     * @param {WebGLRenderer} renderer - Three.js renderer
-     * @param {WebGLRenderTarget|null} writeBuffer - Destination target (null for screen)
-     * @param {boolean} renderToScreen - Whether to render to screen
-     */
-	efficientCopyColorOutput( renderer, writeBuffer, renderToScreen = false ) {
-
-		if ( ! this.ensureTargetsReady() ) {
-
-			return;
-
-		}
-
-		// Lazy create copy material and quad
-		if ( ! this.copyMaterial ) {
-
-			this.copyMaterial = new ShaderMaterial( {
-				glslVersion: GLSL3,
-				uniforms: {
-					tDiffuse: { value: null }
-				},
-
-				vertexShader: `
-					// in vec3 position;
-					// in vec2 uv;
-					out vec2 vUv;
-					// uniform mat4 modelViewMatrix;
-					// uniform mat4 projectionMatrix;
-
-					void main() {
-						vUv = uv;
-						gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
-					}
-				`,
-
-				fragmentShader: `
-					precision highp float;
-					uniform sampler2D tDiffuse;
-					in vec2 vUv;
-					out vec4 pc_fragColor;
-
-					void main() {
-						pc_fragColor = textureLod( tDiffuse, vUv, 0.0 );
-					}
-				`,
-
-				depthTest: false,
-				depthWrite: false,
-				transparent: false,
-			} );
-
-			this.copyQuad = new FullScreenQuad( this.copyMaterial );
-
-		}
-
-		// Set source texture (color output from our MRT)
-		this.copyMaterial.uniforms.tDiffuse.value = this.currentTarget.textures[ 0 ];
-
-		// Render to destination
-		renderer.setRenderTarget( renderToScreen ? null : writeBuffer );
-		this.copyQuad.render( renderer );
-
-	}
-
-	/**
-     * Copy specific MRT texture to destination
-     * @param {WebGLRenderer} renderer - Three.js renderer
-     * @param {number} textureIndex - Index of texture to copy (0 = color, 1 = normal/depth)
-     * @param {WebGLRenderTarget|null} writeBuffer - Destination target
-     */
-	copyMRTTexture( renderer, textureIndex, writeBuffer ) {
-
-		if ( ! this.ensureTargetsReady() ) {
-
-			return;
-
-		}
-
-		if ( ! this.copyMaterial ) {
-
-			this.efficientCopyColorOutput( renderer, null, false ); // Initialize copy material
-
-		}
-
-		this.copyMaterial.uniforms.tDiffuse.value = this.currentTarget.textures[ textureIndex ];
-		renderer.setRenderTarget( writeBuffer );
-		this.copyQuad.render( renderer );
-
-	}
-
-	/**
-     * Resize render targets
-     * @param {number} width - New width
-     * @param {number} height - New height
-     */
-	setSize( width, height ) {
-
-		this.width = width;
-		this.height = height;
-
-		// Recreate targets with new size
-		this.createTargets( width, height );
-
-		// Verify creation was successful
-		if ( ! this.isValid() ) {
-
-			console.warn( 'RenderTargetManager: Failed to resize targets, creating fallback...' );
-			this.createFallbackTargets( width, height );
-
-		}
-
-	}
-
-	/**
-     * Get target dimensions
-     * @returns {Object} - Object containing width and height
-     */
-	getSize() {
-
-		return {
-			width: this.width,
-			height: this.height
-		};
-
-	}
-
-	/**
-     * Check if targets are valid and properly sized
-     * @returns {boolean} - True if targets are valid
-     */
-	isValid() {
-
-		return this.currentTarget &&
-               this.previousTarget &&
-               this.currentTarget.textures &&
-               this.previousTarget.textures &&
-               this.currentTarget.width === this.width &&
-               this.currentTarget.height === this.height &&
-               this.previousTarget.width === this.width &&
-               this.previousTarget.height === this.height;
-
-	}
-
-	/**
-     * Ensure targets are ready before operations
-     * @returns {boolean} - True if targets are ready
-     */
-	ensureTargetsReady() {
-
-		if ( ! this.isValid() ) {
-
-			console.warn( 'RenderTargetManager: Targets not ready, attempting to recreate...' );
-			this.createTargets( this.width, this.height );
-
-			if ( ! this.isValid() ) {
-
-				this.createFallbackTargets( this.width, this.height );
-
-			}
-
-		}
-
-		return this.isValid();
-
-	}
-
-	/**
-     * Get memory usage information
-     * @returns {Object} - Memory usage statistics
-     */
-	getMemoryUsage() {
-
-		const bytesPerPixel = 16; // 4 channels * 4 bytes (Float32) per channel
-		const pixelsPerTarget = this.width * this.height;
-		const texturesPerTarget = 3; // MRT: color + normal/depth + albedo
-		const targetCount = 2; // current + previous
-
-		const totalBytes = pixelsPerTarget * bytesPerPixel * texturesPerTarget * targetCount;
-
-		return {
-			totalBytes,
-			totalMB: totalBytes / ( 1024 * 1024 ),
-			perTargetMB: ( totalBytes / targetCount ) / ( 1024 * 1024 ),
-			width: this.width,
-			height: this.height,
-			textureCount: texturesPerTarget * targetCount
-		};
-
-	}
-
-	/**
-     * Create debug info for render targets
-     * @returns {Object} - Debug information
-     */
-	getDebugInfo() {
-
-		return {
-			currentTarget: {
-				width: this.currentTarget.width,
-				height: this.currentTarget.height,
-				textureCount: this.currentTarget.textures.length,
-				textureNames: this.currentTarget.textures.map( tex => tex.name )
-			},
-			previousTarget: {
-				width: this.previousTarget.width,
-				height: this.previousTarget.height,
-				textureCount: this.previousTarget.textures.length,
-				textureNames: this.previousTarget.textures.map( tex => tex.name )
-			},
-			memoryUsage: this.getMemoryUsage()
-		};
-
-	}
-
-	/**
-     * Dispose of all resources
-     */
-	dispose() {
-
-		// Dispose render targets
-		if ( this.currentTarget ) {
-
-			this.currentTarget.dispose();
-			this.currentTarget = null;
-
-		}
-
-		if ( this.previousTarget ) {
-
-			this.previousTarget.dispose();
-			this.previousTarget = null;
-
-		}
-
-		// Dispose copy materials
-		if ( this.copyMaterial ) {
-
-			this.copyMaterial.dispose();
-			this.copyMaterial = null;
-
-		}
-
-		if ( this.copyQuad ) {
-
-			this.copyQuad.dispose();
-			this.copyQuad = null;
-
-		}
-
-		// Clear caches
-		this.mrtTexturesCache = { color: null, normalDepth: null, albedo: null };
-
-	}
-
-}