rayzee 6.4.0 → 7.0.0

package/src/managers/EnvironmentManager.js

@@ -7,10 +7,8 @@
  * is mutated to preserve TSL shader graph references after compilation.
  */
 
-import { StorageInstancedBufferAttribute } from 'three/webgpu';
-import { storage } from 'three/tsl';
 import {
-	RGBAFormat, FloatType, Vector2, Vector3, Color, Matrix4, DataTexture,
+	RGBAFormat, RedFormat, FloatType, Vector2, Vector3, Color, Matrix4, DataTexture,
 } from 'three';
 import { EquirectHDRInfo } from '../Processor/EquirectHDRInfo.js';
 import { ProceduralSky } from '../Processor/ProceduralSky.js';
@@ -43,12 +41,10 @@ export class EnvironmentManager {
 		this.environmentTexture = this._envPlaceholder;
 		this.envTexSize = new Vector2();
 
-		// 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();
+		// Importance-sampling CDF as an R32F texture (frees a Shade storage-buffer binding — the limit is 10).
+		// Layout: (envResolution.x + 1) × envResolution.y; conditional in columns [0,W), marginal in column W.
+		this.envCDFTexture = null;
+		this._initCDFTexture();
 
 		// Environment rotation
 		this.environmentRotationMatrix = new Matrix4();
@@ -183,46 +179,42 @@ export class EnvironmentManager {
 	 * 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].
+	 * 1×1 R32F placeholder until a real env CDF is built (env IS is off meanwhile).
 	 * @private
 	 */
-	_initCDFStorageBuffers() {
+	_initCDFTexture() {
 
-		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();
+		this.envCDFTexture = new DataTexture( new Float32Array( [ 0 ] ), 1, 1, RedFormat, FloatType );
+		this.envCDFTexture.needsUpdate = true;
 
 	}
 
 	/**
-	 * Update the packed CDF storage buffer from equirectHdrInfo.
-	 * Concatenates marginal + conditional into one buffer.
+	 * Rebuild the CDF texture from equirectHdrInfo. Packs the 2D conditional + 1D marginal into one
+	 * R32F texture of (W+1)×H: conditional[cy*W+cx] at texel (cx, cy); marginal[cy] at texel (W, cy).
 	 * @private
 	 */
-	_updateCDFStorageBuffers() {
+	_updateCDFTexture() {
 
 		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 );
+		const W = this.equirectHdrInfo.width;
+		const H = this.equirectHdrInfo.height;
+		const texW = W + 1;
+		const data = new Float32Array( texW * H );
+		for ( let cy = 0; cy < H; cy ++ ) {
 
-		this.envCDFStorageAttr = new StorageInstancedBufferAttribute( combined, 1 );
-		this.envCDFStorageNode.value = this.envCDFStorageAttr;
-		this.envCDFStorageNode.bufferCount = combined.length;
+			const dstRow = cy * texW;
+			data.set( conditional.subarray( cy * W, cy * W + W ), dstRow ); // conditional → columns [0,W)
+			data[ dstRow + W ] = marginal[ cy ]; // marginal → column W
 
-	}
-
-	/**
-	 * Get the packed CDF storage node for shader graph.
-	 * @returns {{ cdfNode: StorageNode }}
-	 */
-	getCDFStorageNodes() {
+		}
 
-		return { cdfNode: this.envCDFStorageNode };
+		this.envCDFTexture?.dispose?.();
+		this.envCDFTexture = new DataTexture( data, texW, H, RedFormat, FloatType );
+		this.envCDFTexture.needsUpdate = true;
 
 	}
 
@@ -278,7 +270,7 @@ export class EnvironmentManager {
 
 		if ( ! this.scene.environment ) {
 
-			this._updateCDFStorageBuffers();
+			this._updateCDFTexture();
 			this.uniforms.set( 'envTotalSum', 0.0 );
 			this.uniforms.set( 'envCompensationDelta', 0.0 );
 			this.uniforms.set( 'useEnvMapIS', 0 );
@@ -293,7 +285,7 @@ export class EnvironmentManager {
 
 			if ( ! textureForCDF.image ) {
 
-				this._updateCDFStorageBuffers();
+				this._updateCDFTexture();
 				this.uniforms.set( 'envTotalSum', 0.0 );
 				this.uniforms.set( 'envCompensationDelta', 0.0 );
 				this.uniforms.set( 'useEnvMapIS', 0 );
@@ -313,7 +305,7 @@ export class EnvironmentManager {
 
 			this.cdfBuildTime = performance.now() - startTime;
 
-			this._updateCDFStorageBuffers();
+			this._updateCDFTexture();
 			this.uniforms.set( 'envTotalSum', this.equirectHdrInfo.totalSum );
 			this.uniforms.set( 'envCompensationDelta', this.equirectHdrInfo.compensationDelta );
 			this.uniforms.set( 'useEnvMapIS', 1 );
@@ -377,7 +369,7 @@ export class EnvironmentManager {
 
 		} else {
 
-			this._updateCDFStorageBuffers();
+			this._updateCDFTexture();
 			this.uniforms.set( 'envTotalSum', 0.0 );
 			this.uniforms.set( 'envCompensationDelta', 0.0 );
 			this.uniforms.set( 'useEnvMapIS', 0 );
@@ -543,9 +535,8 @@ export class EnvironmentManager {
 		this.proceduralSkyRenderer = null;
 		this.simpleSkyRenderer = null;
 
-		this.envCDFStorageAttr?.dispose?.();
-		this.envCDFStorageAttr = null;
-		this.envCDFStorageNode = null;
+		this.envCDFTexture?.dispose?.();
+		this.envCDFTexture = null;
 
 		// Dispose the HDRI environment texture unless it's the shared placeholder
 		// (the placeholder is handled separately just below).

package/src/managers/MaterialDataManager.js

@@ -307,6 +307,41 @@ export class MaterialDataManager {
 				break;
 			case 'bumpScale': data[ stride + M.BUMP_SCALE ] = value; break;
 			case 'displacementScale': data[ stride + M.DISPLACEMENT_SCALE ] = value; break;
+			case 'subsurface': data[ stride + M.SUBSURFACE ] = value; break;
+			case 'subsurfaceRadiusScale': data[ stride + M.SUBSURFACE_RADIUS_SCALE ] = value; break;
+			case 'subsurfaceAnisotropy': data[ stride + M.SUBSURFACE_ANISOTROPY ] = value; break;
+			case 'subsurfaceColor':
+				if ( value.r !== undefined ) {
+
+					data[ stride + M.SUBSURFACE_COLOR ] = value.r;
+					data[ stride + M.SUBSURFACE_COLOR + 1 ] = value.g;
+					data[ stride + M.SUBSURFACE_COLOR + 2 ] = value.b;
+
+				} else if ( Array.isArray( value ) ) {
+
+					data[ stride + M.SUBSURFACE_COLOR ] = value[ 0 ];
+					data[ stride + M.SUBSURFACE_COLOR + 1 ] = value[ 1 ];
+					data[ stride + M.SUBSURFACE_COLOR + 2 ] = value[ 2 ];
+
+				}
+
+				break;
+			case 'subsurfaceRadius':
+				if ( Array.isArray( value ) ) {
+
+					data[ stride + M.SUBSURFACE_RADIUS ] = value[ 0 ];
+					data[ stride + M.SUBSURFACE_RADIUS + 1 ] = value[ 1 ];
+					data[ stride + M.SUBSURFACE_RADIUS + 2 ] = value[ 2 ];
+
+				} else if ( value.x !== undefined ) {
+
+					data[ stride + M.SUBSURFACE_RADIUS ] = value.x;
+					data[ stride + M.SUBSURFACE_RADIUS + 1 ] = value.y;
+					data[ stride + M.SUBSURFACE_RADIUS + 2 ] = value.z;
+
+				}
+
+				break;
 			default:
 				console.warn( `Unknown material property: ${property}` );
 				return;
@@ -322,7 +357,7 @@ export class MaterialDataManager {
 
 		}
 
-		const featureProperties = [ 'transmission', 'clearcoat', 'sheen', 'iridescence', 'dispersion', 'transparent', 'opacity', 'alphaTest' ];
+		const featureProperties = [ 'transmission', 'clearcoat', 'sheen', 'iridescence', 'dispersion', 'transparent', 'opacity', 'alphaTest', 'subsurface' ];
 		if ( featureProperties.includes( property ) ) {
 
 			const featuresChanged = this.rescanMaterialFeatures();
@@ -446,6 +481,27 @@ export class MaterialDataManager {
 		data[ stride + M.DISPLACEMENT_SCALE ] = materialData.displacementScale ?? 1;
 		data[ stride + M.DISPLACEMENT_MAP_INDEX ] = materialData.displacementMap ?? - 1;
 
+		// Subsurface scattering
+		data[ stride + M.SUBSURFACE ] = materialData.subsurface ?? 0;
+		if ( materialData.subsurfaceColor ) {
+
+			data[ stride + M.SUBSURFACE_COLOR ] = materialData.subsurfaceColor.r ?? materialData.subsurfaceColor[ 0 ] ?? 1;
+			data[ stride + M.SUBSURFACE_COLOR + 1 ] = materialData.subsurfaceColor.g ?? materialData.subsurfaceColor[ 1 ] ?? 1;
+			data[ stride + M.SUBSURFACE_COLOR + 2 ] = materialData.subsurfaceColor.b ?? materialData.subsurfaceColor[ 2 ] ?? 1;
+
+		}
+
+		if ( materialData.subsurfaceRadius ) {
+
+			data[ stride + M.SUBSURFACE_RADIUS ] = materialData.subsurfaceRadius[ 0 ] ?? 1;
+			data[ stride + M.SUBSURFACE_RADIUS + 1 ] = materialData.subsurfaceRadius[ 1 ] ?? 0.2;
+			data[ stride + M.SUBSURFACE_RADIUS + 2 ] = materialData.subsurfaceRadius[ 2 ] ?? 0.1;
+
+		}
+
+		data[ stride + M.SUBSURFACE_RADIUS_SCALE ] = materialData.subsurfaceRadiusScale ?? 1;
+		data[ stride + M.SUBSURFACE_ANISOTROPY ] = materialData.subsurfaceAnisotropy ?? 0;
+
 		// Texture transformation matrices (9 floats each, identity if missing)
 		const identity = [ 1, 0, 0, 0, 1, 0, 0, 0, 1 ];
 		const transformEntries = [
@@ -574,6 +630,7 @@ export class MaterialDataManager {
 			hasIridescence: false,
 			hasSheen: false,
 			hasTransparency: false,
+			hasSubsurface: false,
 			hasMultiLobeMaterials: false,
 			hasMRTOutputs: true
 		};
@@ -590,6 +647,7 @@ export class MaterialDataManager {
 			const opacity = data[ stride + M.OPACITY ];
 			const transparent = data[ stride + M.TRANSPARENT ];
 			const alphaTest = data[ stride + M.ALPHA_TEST ];
+			const subsurface = data[ stride + M.SUBSURFACE ];
 
 			if ( clearcoat > 0 ) newFeatures.hasClearcoat = true;
 			if ( transmission > 0 ) newFeatures.hasTransmission = true;
@@ -597,6 +655,7 @@ export class MaterialDataManager {
 			if ( iridescence > 0 ) newFeatures.hasIridescence = true;
 			if ( sheen > 0 ) newFeatures.hasSheen = true;
 			if ( transparent > 0 || opacity < 1.0 || alphaTest > 0 ) newFeatures.hasTransparency = true;
+			if ( subsurface > 0 ) newFeatures.hasSubsurface = true;
 
 			const featureCount = [
 				clearcoat > 0,

package/src/managers/OverlayManager.js

@@ -1,6 +1,5 @@
 import { TileHelper } from './helpers/TileHelper.js';
 import { OutlineHelper } from './helpers/OutlineHelper.js';
-import { EngineEvents } from '../EngineEvents.js';
 
 /**
  * OverlayManager — Unified overlay system for visual helpers.
@@ -9,7 +8,7 @@ import { EngineEvents } from '../EngineEvents.js';
  *   1. **HelperScene** — A Three.js Scene rendered on top of the WebGPU backbuffer
  *      (light gizmos, bounding boxes, outlines). Renders at display resolution.
  *   2. **HUDCanvas** — A 2D `<canvas>` element overlaid via CSS for screen-space
- *      elements (tile progress, AF points, debug labels). Completely separate
+ *      elements (AF points, debug labels). Completely separate
  *      from the WebGPU canvas, so it is never captured in saved images.
  *
  * Helpers are registered by name and implement a simple interface:
@@ -17,8 +16,8 @@ import { EngineEvents } from '../EngineEvents.js';
  *
  * @example
  *   const overlay = new OverlayManager( renderer, camera );
- *   overlay.register( 'tiles', new TileHelper() );
- *   overlay.show( 'tiles' );
+ *   overlay.register( 'outline', new OutlineHelper() );
+ *   overlay.show( 'outline' );
  *   // in animate():
  *   overlay.render();
  */
@@ -84,7 +83,7 @@ export class OverlayManager {
 	// ═══════════════════════════════════════════════════════════════
 
 	/**
-	 * Creates and wires the default overlay helpers (tile progress, outline).
+	 * Creates and wires the default overlay helpers (denoise/upscale progress, outline).
 	 * Call once during app init after pipeline and managers are ready.
 	 *
 	 * @param {Object} config
@@ -92,7 +91,7 @@ export class OverlayManager {
 	 * @param {import('three').Scene} config.meshScene
 	 * @param {import('../Pipeline/RenderPipeline.js').RenderPipeline} config.pipeline
 	 * @param {import('./DenoisingManager.js').DenoisingManager} config.denoisingManager
-	 * @param {import('three').EventDispatcher} config.app - App instance for resize/render-complete events
+	 * @param {import('three').EventDispatcher} config.app - App instance for resize events
 	 * @param {number} config.renderWidth
 	 * @param {number} config.renderHeight
 	 */
@@ -100,7 +99,7 @@ export class OverlayManager {
 
 		this.setHelperScene( helperScene );
 
-		// ── Tile helper (shared across path tracer, OIDN, upscaler) ──
+		// ── Tile helper — shows OIDN denoise + AI upscale progress ──
 		const tileHelper = new TileHelper();
 		this.register( 'tiles', tileHelper );
 
@@ -112,22 +111,8 @@ export class OverlayManager {
 
 		} );
 
-		// Path tracer tile events
-		pipeline.eventBus.on( 'tile:changed', ( e ) => {
-
-			if ( e.renderMode === 1 && e.tileBounds ) {
-
-				tileHelper.setActiveTile( e.tileBounds );
-				tileHelper.show();
-
-			}
-
-		} );
-
 		pipeline.eventBus.on( 'pipeline:reset', () => tileHelper.hide() );
-		app.addEventListener( EngineEvents.RENDER_COMPLETE, () => tileHelper.hide() );
 
-		// OIDN/upscaler tile events
 		this._wireDenoiserTileEvents( tileHelper, denoisingManager );
 
 		// ── Outline helper ──
@@ -137,7 +122,7 @@ export class OverlayManager {
 	}
 
 	/**
-	 * Wires denoiser/upscaler tile progress events to the tile helper.
+	 * Wires denoiser/upscaler tile-progress events to the tile helper.
 	 * These fire while the animation loop is stopped, so we trigger manual HUD redraws.
 	 */
 	_wireDenoiserTileEvents( tileHelper, denoisingManager ) {

package/src/managers/UniformManager.js

@@ -164,6 +164,7 @@ export class UniformManager {
 		u( 'samplesPerPixel', DEFAULT_STATE.samplesPerPixel, 'int' );
 		u( 'maxSamples', DEFAULT_STATE.maxSamples, 'int' );
 		u( 'transmissiveBounces', DEFAULT_STATE.transmissiveBounces, 'int' );
+		u( 'maxSubsurfaceSteps', DEFAULT_STATE.maxSubsurfaceSteps, 'int' );
 		u( 'visMode', DEFAULT_STATE.debugMode, 'int' );
 		u( 'debugVisScale', DEFAULT_STATE.debugVisScale, 'float' );
 
@@ -230,9 +231,6 @@ export class UniformManager {
 		this._uniforms.set( 'samplingTechnique', samplingTechniqueUniform );
 		samplingTechniqueUniform.value = DEFAULT_STATE.samplingTechnique;
 
-		ub( 'useAdaptiveSampling', DEFAULT_STATE.adaptiveSampling );
-		u( 'adaptiveSamplingMin', DEFAULT_STATE.adaptiveSamplingMin ?? 1, 'int' );
-		u( 'adaptiveSamplingMax', DEFAULT_STATE.adaptiveSamplingMax, 'int' );
 		u( 'fireflyThreshold', DEFAULT_STATE.fireflyThreshold, 'float' );
 
 		// Emissive

package/src/managers/helpers/TileHelper.js

@@ -1,8 +1,8 @@
 /**
  * TileHelper — 2D canvas overlay showing the active tile border.
  *
- * Universal: works for path tracer tiled rendering, OIDN denoiser,
- * and AI upscaler. Callers provide pixel-space tile bounds via
+ * Shows progress of the OIDN denoiser and AI upscaler (both process the
+ * image in tiles). Callers provide pixel-space tile bounds via
  * `setActiveTile()` and control visibility via `show()` / `hide()`.
  *
  * Layer: 'hud' (rendered by OverlayManager's 2D canvas pass).