rayzee 6.4.0 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rayzee",
-  "version": "6.4.0",
+  "version": "7.0.0",
   "type": "module",
   "description": "Real-time WebGPU path tracing engine built on Three.js",
   "main": "dist/rayzee.umd.js",

package/src/EngineDefaults.js

@@ -58,6 +58,10 @@ export const ENGINE_DEFAULTS = {
 	afScreenPoint: { x: 0.5, y: 0.5 },
 	afSmoothingFactor: 0.15,
 
+	// Multi-sample pool: S=samplesPerPixel rays/pixel/frame, FinalWrite averages them; interactive-only (renderMode 0, ≤ cap), else S=1.
+	// Pixel cap (768²) bounds pool memory; covers the 512² default, excludes ≥768².
+	wavefrontMultiSampleMaxPixels: 589824,
+
 	enablePathTracer: true,
 	enableAccumulation: true,
 	pauseRendering: false,
@@ -65,18 +69,14 @@ export const ENGINE_DEFAULTS = {
 	bounces: 3,
 	samplesPerPixel: 1,
 	transmissiveBounces: 5,
+	maxSubsurfaceSteps: 8, // interactive default: low cap (bounded random-walk SSS)
 	samplingTechnique: 3,
 	enableEmissiveTriangleSampling: false,
 	emissiveBoost: 1.0,
 
-	adaptiveSampling: false,
-	adaptiveSamplingMin: 1,
-	adaptiveSamplingMax: 8,
-	adaptiveSamplingVarianceThreshold: 0.1,
 	temporalVarianceWeight: 0.6,
 	enableEarlyTermination: true,
 	earlyTerminationThreshold: 0.002,
-	showAdaptiveSamplingHelper: false,
 	performanceModeAdaptive: 'medium',
 
 	fireflyThreshold: 3.0,
@@ -84,8 +84,7 @@ export const ENGINE_DEFAULTS = {
 	renderTimeLimit: 30,
 	renderMode: 0,
 	enableAlphaShadows: false,
-	tiles: 3,
-	tilesHelper: false,
+	tilesHelper: true, // show OIDN denoise / AI upscale tile progress overlay
 	showLightHelper: false,
 
 	directionalLightIntensity: 0,
@@ -151,6 +150,12 @@ export const ENGINE_DEFAULTS = {
 // only round-trip exactly when both sides agree.
 export const ALBEDO_EPS = 0.01;
 
+// Per-resolution compute StorageTextures are pre-allocated at this size and never
+// resized (works around three.js r184 StorageTexture-resize bugs — see TSL/patches
+// history). Render resolution must not exceed this on either axis; the engine warns
+// and ignores larger requests.
+export const MAX_STORAGE_TEXTURE_SIZE = 2048;
+
 export const ASVGF_QUALITY_PRESETS = {
 	// phiColor / phiDepth are RELATIVE tolerances (fractions). Bigger = more
 	// permissive. gradientStrength = 0 keeps the adaptive-α boost off; the
@@ -356,8 +361,8 @@ export const TRIANGLE_DATA_LAYOUT = {
 // Shared between CPU writers (TextureCreator, MaterialDataManager) and GPU readers (Common.js getMaterial).
 export const MATERIAL_DATA_LAYOUT = {
 
-	SLOTS_PER_MATERIAL: 27, // vec4 slots per material
-	FLOATS_PER_MATERIAL: 108, // total floats per material (27 × 4)
+	SLOTS_PER_MATERIAL: 30, // vec4 slots per material
+	FLOATS_PER_MATERIAL: 120, // total floats per material (30 × 4)
 
 	// ── Flat float offsets (CPU side) ────────────────────────────────
 	// Used as: data[ materialIndex * FLOATS_PER_MATERIAL + offset ]
@@ -399,6 +404,14 @@ export const MATERIAL_DATA_LAYOUT = {
 	BUMP_TRANSFORM: 92,
 	DISPLACEMENT_TRANSFORM: 100,
 
+	// ── Subsurface scattering (3 slots appended after transforms) ────
+	// Slot 27: subsurfaceColor.rgb (scatter albedo) + subsurface weight
+	SUBSURFACE_COLOR: 108, SUBSURFACE: 111,
+	// Slot 28: subsurfaceRadius.rgb (mean free path) + radius scale
+	SUBSURFACE_RADIUS: 112, SUBSURFACE_RADIUS_SCALE: 115,
+	// Slot 29: anisotropy g (floats 117-119 reserved for future SSS)
+	SUBSURFACE_ANISOTROPY: 116,
+
 	// ── Vec4 slot indices (GPU/TSL side) ─────────────────────────────
 	// Used with getDatafromStorageBuffer( buf, matIdx, int(slot), int(SLOTS_PER_MATERIAL) )
 	SLOT: {
@@ -422,6 +435,9 @@ export const MATERIAL_DATA_LAYOUT = {
 		EMISSIVE_TRANSFORM_A: 21, EMISSIVE_TRANSFORM_B: 22,
 		BUMP_TRANSFORM_A: 23, BUMP_TRANSFORM_B: 24,
 		DISPLACEMENT_TRANSFORM_A: 25, DISPLACEMENT_TRANSFORM_B: 26,
+		SUBSURFACE_A: 27, // subsurfaceColor.rgb, subsurface weight
+		SUBSURFACE_B: 28, // subsurfaceRadius.rgb, subsurfaceRadiusScale
+		SUBSURFACE_C: 29, // subsurfaceAnisotropy, reserved
 	},
 
 };
@@ -434,7 +450,7 @@ export const BVH_LEAF_MARKERS = {
 
 // Texture processing constants
 export const TEXTURE_CONSTANTS = {
-	PIXELS_PER_MATERIAL: 27,
+	PIXELS_PER_MATERIAL: 30,
 	RGBA_COMPONENTS: 4,
 	VEC4_PER_TRIANGLE: 8,
 	VEC4_PER_BVH_NODE: 4,
@@ -454,8 +470,8 @@ export const DEFAULT_TEXTURE_MATRIX = [ 0, 0, 1, 1, 0, 0, 0, 1 ];
 // 'interactive' — low-sample, bounded bounces, no offline denoising, controls enabled.
 // 'production'  — high-sample, deep bounces, OIDN enabled, controls disabled.
 export const PRODUCTION_RENDER_CONFIG = {
-	maxSamples: 30, bounces: 20, transmissiveBounces: 8, samplesPerPixel: 1,
-	renderMode: 1, enableAlphaShadows: true, tiles: 3, tilesHelper: true,
+	maxSamples: 30, bounces: 20, transmissiveBounces: 8, maxSubsurfaceSteps: 64, samplesPerPixel: 1,
+	renderMode: 1, enableAlphaShadows: true,
 	enableOIDN: true, oidnQuality: 'balance',
 	interactionModeEnabled: false,
 };
@@ -464,7 +480,7 @@ export const INTERACTIVE_RENDER_CONFIG = {
 	maxSamples: ENGINE_DEFAULTS.maxSamples, bounces: ENGINE_DEFAULTS.bounces,
 	samplesPerPixel: ENGINE_DEFAULTS.samplesPerPixel, renderMode: ENGINE_DEFAULTS.renderMode, enableAlphaShadows: ENGINE_DEFAULTS.enableAlphaShadows,
 	transmissiveBounces: ENGINE_DEFAULTS.transmissiveBounces,
-	tiles: ENGINE_DEFAULTS.tiles, tilesHelper: ENGINE_DEFAULTS.tilesHelper,
+	maxSubsurfaceSteps: ENGINE_DEFAULTS.maxSubsurfaceSteps,
 	enableOIDN: false, oidnQuality: 'fast',
 	interactionModeEnabled: true,
 };

package/src/PathTracerApp.js

@@ -11,14 +11,13 @@ import { MotionVector } from './Stages/MotionVector.js';
 import { ASVGF } from './Stages/ASVGF.js';
 import { Variance } from './Stages/Variance.js';
 import { BilateralFilter } from './Stages/BilateralFilter.js';
-import { AdaptiveSampling } from './Stages/AdaptiveSampling.js';
 import { EdgeFilter } from './Stages/EdgeFilter.js';
 import { AutoExposure } from './Stages/AutoExposure.js';
 import { SSRC } from './Stages/SSRC.js';
 import { Compositor } from './Stages/Compositor.js';
 import { RenderPipeline } from './Pipeline/RenderPipeline.js';
 import { CompletionTracker } from './Pipeline/CompletionTracker.js';
-import { ENGINE_DEFAULTS as DEFAULT_STATE, PRODUCTION_RENDER_CONFIG, INTERACTIVE_RENDER_CONFIG } from './EngineDefaults.js';
+import { ENGINE_DEFAULTS as DEFAULT_STATE, PRODUCTION_RENDER_CONFIG, INTERACTIVE_RENDER_CONFIG, MAX_STORAGE_TEXTURE_SIZE } from './EngineDefaults.js';
 import { updateStats, updateLoading, resetLoading, setStatusCallback, getDisplaySamples, disposeObjectFromMemory } from './Processor/utils.js';
 import { BuildTimer } from './Processor/BuildTimer.js';
 import { InteractionManager } from './managers/InteractionManager.js';
@@ -310,7 +309,14 @@ export class PathTracerApp extends EventDispatcher {
 
 			}
 
-			updateStats( { timeElapsed: this.completion.timeElapsed, samples: getDisplaySamples( this.stages.pathTracer ) } );
+			this._ensureVRAMWiring();
+			const mem = this.stages.pathTracer?.vramTracker?.measure();
+			updateStats( {
+				timeElapsed: this.completion.timeElapsed,
+				samples: getDisplaySamples( this.stages.pathTracer ),
+				memoryUsed: mem?.current ?? 0,
+				memoryPeak: mem?.peak ?? 0,
+			} );
 
 			// Check time limit
 			if ( this.completion.isTimeLimitReached( this.settings.get( 'renderLimitMode' ), this.settings.get( 'renderTimeLimit' ) ) ) {
@@ -740,12 +746,9 @@ export class PathTracerApp extends EventDispatcher {
 		this.stages.pathTracer.setupMaterial();
 		timer.end( 'Material setup (TSL compile)' );
 
-		// Front-load GPU pipeline creation so the first animate frame is snappy:
-		//  - compute: Three.js has no async compute compile — one dispatch at
-		//    build time moves the stall to this loading moment.
-		//  - raster fallback: compileAsync yields to main thread (r184+).
+		// Front-load raster pipeline creation (compileAsync yields to main thread, r184+) so the first
+		// animate frame is snappy. Wavefront compute kernels compile lazily on their first dispatch.
 		timer.start( 'Pipeline precompile' );
-		this.stages.pathTracer.shaderBuilder.forceCompile( this.renderer );
 		try {
 
 			await this.renderer.compileAsync( this.meshScene, this.cameraManager.camera );
@@ -845,11 +848,31 @@ export class PathTracerApp extends EventDispatcher {
 	// Resize
 	// ═══════════════════════════════════════════════════════════════
 
+	/**
+	 * Guard against render resolutions the compute pipeline can't support.
+	 * Per-resolution StorageTextures are pre-allocated at MAX_STORAGE_TEXTURE_SIZE
+	 * and never resized, so a larger request would overflow them. Warn and skip.
+	 * @returns {boolean} true if the size is renderable
+	 */
+	_isRenderSizeSupported( width, height ) {
+
+		if ( width > MAX_STORAGE_TEXTURE_SIZE || height > MAX_STORAGE_TEXTURE_SIZE ) {
+
+			console.warn( `[Rayzee] Render resolution ${width}×${height} exceeds the ${MAX_STORAGE_TEXTURE_SIZE}px limit (compute storage textures are pre-allocated at ${MAX_STORAGE_TEXTURE_SIZE}px). Ignoring resize — use a resolution ≤ ${MAX_STORAGE_TEXTURE_SIZE}.` );
+			return false;
+
+		}
+
+		return true;
+
+	}
+
 	onResize() {
 
 		const width = this.canvas.clientWidth;
 		const height = this.canvas.clientHeight;
 		if ( width === 0 || height === 0 ) return;
+		if ( ! this._isRenderSizeSupported( width, height ) ) return;
 
 		this.renderer.setPixelRatio( 1.0 );
 		this.renderer.setSize( width, height, false );
@@ -878,6 +901,8 @@ export class PathTracerApp extends EventDispatcher {
 
 	_applyRenderResize( renderWidth, renderHeight ) {
 
+		if ( ! this._isRenderSizeSupported( renderWidth, renderHeight ) ) return;
+
 		this.pipeline?.setSize( renderWidth, renderHeight );
 		this.denoisingManager?.setRenderSize( renderWidth, renderHeight );
 		this.needsReset = true;
@@ -889,6 +914,7 @@ export class PathTracerApp extends EventDispatcher {
 	setCanvasSize( width, height ) {
 
 		if ( width === 0 || height === 0 ) return;
+		if ( ! this._isRenderSizeSupported( width, height ) ) return;
 
 		this.renderer.setPixelRatio( 1.0 );
 		this.renderer.setSize( width, height, false );
@@ -922,19 +948,11 @@ export class PathTracerApp extends EventDispatcher {
 			maxBounces: config.bounces,
 			samplesPerPixel: config.samplesPerPixel,
 			transmissiveBounces: config.transmissiveBounces,
+			maxSubsurfaceSteps: config.maxSubsurfaceSteps,
 		}, { silent: true } );
 
 		this.stages.pathTracer?.setUniform( 'renderMode', parseInt( config.renderMode ) );
 		this.stages.pathTracer?.setUniform( 'enableAlphaShadows', config.enableAlphaShadows ?? false );
-		this.stages.pathTracer?.tileManager?.setTileCount( config.tiles );
-
-		const tileHelper = this.overlayManager?.getHelper( 'tiles' );
-		if ( tileHelper ) {
-
-			tileHelper.enabled = config.tilesHelper;
-			if ( ! config.tilesHelper ) tileHelper.hide();
-
-		}
 
 		this.stages.pathTracer?.updateCompletionThreshold?.();
 
@@ -957,6 +975,20 @@ export class PathTracerApp extends EventDispatcher {
 
 		this.needsReset = false;
 		this.pauseRendering = false;
+
+		// Entering a final render starts a fresh peak window (Blender per-render semantics).
+		if ( isProduction ) {
+
+			const tracker = this.stages.pathTracer?.vramTracker;
+			if ( tracker ) {
+
+				tracker.measure();
+				tracker.resetPeak();
+
+			}
+
+		}
+
 		this.reset();
 
 	}
@@ -1066,6 +1098,69 @@ export class PathTracerApp extends EventDispatcher {
 
 	}
 
+	/** The path tracer's VRAM tracker, or null before stages are built. */
+	get vram() {
+
+		return this.stages.pathTracer?.vramTracker ?? null;
+
+	}
+
+	/**
+	 * On-demand current/peak GPU memory snapshot.
+	 * @returns {{ current: number, peak: number, byCategory: Object }} bytes
+	 */
+	getMemoryInfo() {
+
+		return this.stages.pathTracer?.vramTracker?.measure() ?? { current: 0, peak: 0, byCategory: {} };
+
+	}
+
+	// Idempotent: registers the cross-stage texture provider and re-measures on
+	// allocation events (scene/env load, resize) so peak is caught even while idle.
+	_ensureVRAMWiring() {
+
+		if ( this._vramWired ) return;
+		const tracker = this.stages.pathTracer?.vramTracker;
+		if ( ! tracker ) return; // stages not ready yet
+
+		tracker.register( 'stages', () => this._collectStageTextures() );
+
+		const remeasure = () => tracker.measure();
+		this._addTrackedListener( this, 'SceneRebuild', remeasure );
+		this._addTrackedListener( this, 'EnvironmentLoaded', remeasure );
+		this._addTrackedListener( this, 'resolution_changed', remeasure );
+
+		this._vramWired = true;
+
+	}
+
+	// Direct StorageTexture/RenderTarget properties of every non-pathTracer stage
+	// (denoiser/G-buffer/filter targets). The pathTracer's own buffers/textures are
+	// registered explicitly; measure() dedupes by identity so overlaps don't double-count.
+	_collectStageTextures() {
+
+		const out = [];
+		const stages = this.stages || {};
+		const pt = stages.pathTracer;
+
+		for ( const key in stages ) {
+
+			const stage = stages[ key ];
+			if ( ! stage || stage === pt || typeof stage !== 'object' ) continue;
+
+			for ( const prop in stage ) {
+
+				const v = stage[ prop ];
+				if ( v && ( v.isTexture || v.isRenderTarget ) ) out.push( v );
+
+			}
+
+		}
+
+		return out;
+
+	}
+
 	// ═══════════════════════════════════════════════════════════════
 	// Materials (absorbed from MaterialsAPI)
 	// ═══════════════════════════════════════════════════════════════
@@ -1206,6 +1301,7 @@ export class PathTracerApp extends EventDispatcher {
 				maxBufferSize: adapterLimits.maxBufferSize,
 				maxStorageBufferBindingSize: adapterLimits.maxStorageBufferBindingSize,
 				maxColorAttachmentBytesPerSample: 128,
+				maxStorageBuffersPerShaderStage: Math.min( adapterLimits.maxStorageBuffersPerShaderStage, 10 ),
 			}
 		} );
 
@@ -1264,7 +1360,6 @@ export class PathTracerApp extends EventDispatcher {
 		this.pipeline.addStage( this.stages.asvgf );
 		this.pipeline.addStage( this.stages.variance );
 		this.pipeline.addStage( this.stages.bilateralFilter );
-		this.pipeline.addStage( this.stages.adaptiveSampling );
 		this.pipeline.addStage( this.stages.edgeFilter );
 		this.pipeline.addStage( this.stages.autoExposure );
 		this.pipeline.addStage( this.stages.compositor );
@@ -1468,9 +1563,6 @@ export class PathTracerApp extends EventDispatcher {
 
 	_createStages() {
 
-		const adaptiveSamplingMax = this.settings.get( 'adaptiveSamplingMax' );
-		const useAdaptiveSampling = this.settings.get( 'useAdaptiveSampling' );
-
 		this.stages.pathTracer = new PathTracer( this.renderer, this.scene, this.cameraManager.camera );
 		this.stages.normalDepth = new NormalDepth( this.renderer, {
 			pathTracer: this.stages.pathTracer
@@ -1482,10 +1574,6 @@ export class PathTracerApp extends EventDispatcher {
 		this.stages.asvgf = new ASVGF( this.renderer, { enabled: false } );
 		this.stages.variance = new Variance( this.renderer, { enabled: false } );
 		this.stages.bilateralFilter = new BilateralFilter( this.renderer, { enabled: false } );
-		this.stages.adaptiveSampling = new AdaptiveSampling( this.renderer, {
-			adaptiveSamplingMax,
-			enabled: useAdaptiveSampling,
-		} );
 		this.stages.edgeFilter = new EdgeFilter( this.renderer, { enabled: false } );
 		this.stages.autoExposure = new AutoExposure( this.renderer, { enabled: DEFAULT_STATE.autoExposure ?? false } );
 
@@ -1504,10 +1592,11 @@ export class PathTracerApp extends EventDispatcher {
 			camera: this.cameraManager.camera,
 			stages: {
 				pathTracer: this.stages.pathTracer,
+				normalDepth: this.stages.normalDepth,
+				motionVector: this.stages.motionVector,
 				asvgf: this.stages.asvgf,
 				variance: this.stages.variance,
 				bilateralFilter: this.stages.bilateralFilter,
-				adaptiveSampling: this.stages.adaptiveSampling,
 				edgeFilter: this.stages.edgeFilter,
 				ssrc: this.stages.ssrc,
 				autoExposure: this.stages.autoExposure,
@@ -1522,6 +1611,10 @@ export class PathTracerApp extends EventDispatcher {
 		this.denoisingManager.setupDenoiser();
 		this.denoisingManager.setupUpscaler();
 
+		// Seed G-buffer gating: NormalDepth/MotionVector start enabled (stage default)
+		// but are only needed by real-time denoisers — idle them until one is active.
+		this.denoisingManager._syncGBufferStages();
+
 		// Set initial render resolution
 		const initW = this.canvas.clientWidth || 1;
 		const initH = this.canvas.clientHeight || 1;

package/src/Pipeline/PipelineContext.js

@@ -42,7 +42,7 @@ export class PipelineContext {
 			accumulatedFrames: 0,
 
 			// Render modes
-			renderMode: 0, // 0 = progressive, 1 = tiled
+			renderMode: 0, // 0 = interactive, 1 = production (full-frame in both)
 			interactionMode: false,
 			isComplete: false,
 
@@ -65,7 +65,6 @@ export class PipelineContext {
 
 			// Feature flags
 			enableASVGF: false,
-			enableAdaptiveSampling: false,
 			enableEdgeFiltering: false,
 			// Can be extended by stages as needed
 		};

package/src/Pipeline/RenderPipeline.js

@@ -22,7 +22,7 @@ import { EventDispatcher } from './EventDispatcher.js';
  * // Add stages in execution order
  * pipeline.addStage(new PathTracer(...));
  * pipeline.addStage(new ASVGF(...));
- * pipeline.addStage(new AdaptiveSampling(...));
+ * pipeline.addStage(new EdgeFilter(...));
  *
  * // Render all stages
  * pipeline.render(writeBuffer);

package/src/Pipeline/RenderStage.js

@@ -28,7 +28,7 @@ export const StageExecutionMode = {
 
 	/**
 	 * CONDITIONAL - Stage decides execution via shouldExecute() method
-	 * Use for: Stages with complex execution logic (AdaptiveSampling)
+	 * Use for: Stages with complex execution logic
 	 */
 	CONDITIONAL: 'conditional'
 };

package/src/Processor/CameraOptimizer.js

@@ -25,7 +25,6 @@ export class CameraOptimizer {
 		this.interactionQualitySettings = {
 			maxBounceCount: 1,
 			numRaysPerPixel: 1,
-			useAdaptiveSampling: false,
 			useEnvMapIS: false,
 			// pixelRatio: 0.25,
 			enableAccumulation: false,
@@ -306,7 +305,6 @@ export class CameraOptimizer {
 			'ultra-low': {
 				maxBounceCount: 1,
 				numRaysPerPixel: 1,
-				useAdaptiveSampling: false,
 				useEnvMapIS: false,
 				pixelRatio: 0.125,
 				enableAccumulation: false
@@ -314,7 +312,6 @@ export class CameraOptimizer {
 			'low': {
 				maxBounceCount: 1,
 				numRaysPerPixel: 1,
-				useAdaptiveSampling: false,
 				useEnvMapIS: false,
 				pixelRatio: 0.25,
 				enableAccumulation: false
@@ -322,7 +319,6 @@ export class CameraOptimizer {
 			'medium': {
 				maxBounceCount: 2,
 				numRaysPerPixel: 1,
-				useAdaptiveSampling: false,
 				useEnvMapIS: true,
 				pixelRatio: 0.5,
 				enableAccumulation: false
@@ -330,7 +326,6 @@ export class CameraOptimizer {
 			'high': {
 				maxBounceCount: 3,
 				numRaysPerPixel: 1,
-				useAdaptiveSampling: true,
 				useEnvMapIS: true,
 				pixelRatio: 0.75,
 				enableAccumulation: true

package/src/Processor/GeometryExtractor.js

@@ -160,6 +160,7 @@ export class GeometryExtractor {
 			if ( newMaterial.iridescence > 0 ) this.sceneFeatures.hasIridescence = true;
 			if ( newMaterial.sheen > 0 ) this.sceneFeatures.hasSheen = true;
 			if ( newMaterial.transparent || newMaterial.opacity < 1.0 || newMaterial.alphaTest > 0 ) this.sceneFeatures.hasTransparency = true;
+			if ( newMaterial.subsurface > 0 ) this.sceneFeatures.hasSubsurface = true;
 
 			// Detect multi-lobe materials (require multi-lobe MIS for optimal sampling)
 			const featureCount = [
@@ -259,7 +260,13 @@ export class GeometryExtractor {
 			normalScale: { x: 1, y: 1 },
 			bumpScale: 1.0,
 			displacementScale: 1.0,
-			alphaTest: 0.0
+			alphaTest: 0.0,
+			// Subsurface scattering (no native MeshPhysicalMaterial equivalent)
+			subsurface: 0.0,
+			subsurfaceColor: new Color( 0xffffff ),
+			subsurfaceRadius: [ 1.0, 0.2, 0.1 ], // skin-like: red travels furthest
+			subsurfaceRadiusScale: 1.0,
+			subsurfaceAnisotropy: 0.0
 		};
 
 	}
@@ -390,6 +397,13 @@ export class GeometryExtractor {
 			iridescenceIOR: material.iridescenceIOR ?? defaults.iridescenceIOR,
 			iridescenceThicknessRange: material.iridescenceThicknessRange ?? defaults.iridescenceThicknessRange,
 
+			// Subsurface scattering (custom props; MeshPhysicalMaterial has none)
+			subsurface: material.subsurface ?? defaults.subsurface,
+			subsurfaceColor: material.subsurfaceColor ?? defaults.subsurfaceColor,
+			subsurfaceRadius: material.subsurfaceRadius ?? defaults.subsurfaceRadius,
+			subsurfaceRadiusScale: material.subsurfaceRadiusScale ?? defaults.subsurfaceRadiusScale,
+			subsurfaceAnisotropy: material.subsurfaceAnisotropy ?? defaults.subsurfaceAnisotropy,
+
 			// Specular properties (for compatibility)
 			specularIntensity: legacyMapping.specularIntensity ?? material.specularIntensity ?? defaults.specularIntensity,
 			specularColor: legacyMapping.specularColor ?? material.specularColor ?? defaults.specularColor,
@@ -522,6 +536,10 @@ export class GeometryExtractor {
 	// triangle extraction that stores directly in texture format
 	extractTrianglesInBatch( positions, normals, uvs, indices, triangleCount, materialIndex, meshIndex ) {
 
+		// Track per-material triangle count for sort-bin remap (item 41)
+		while ( this.materialTriangleCounts.length <= materialIndex ) this.materialTriangleCounts.push( 0 );
+		this.materialTriangleCounts[ materialIndex ] += triangleCount;
+
 		// Pre-allocate objects for positions, normals, and UVs
 		const posA = this._getVec3( 0 );
 		const posB = this._getVec3( 1 );
@@ -765,6 +783,7 @@ export class GeometryExtractor {
 
 		// Reset other arrays
 		this.materials = [];
+		this.materialTriangleCounts = []; // Per-material triangle count (for sort-bin remap, item 41)
 		this.meshes = [];
 		this.meshTriangleRanges = []; // Per-mesh { start, count } for TLAS/BLAS
 		this.maps = [];
@@ -789,6 +808,7 @@ export class GeometryExtractor {
 			hasIridescence: false,
 			hasSheen: false,
 			hasTransparency: false,
+			hasSubsurface: false,
 			hasMultiLobeMaterials: false, // Materials with 2+ BRDF lobes
 			hasMRTOutputs: true // Always enabled for ASVGF/adaptive sampling support
 		};
@@ -801,6 +821,7 @@ export class GeometryExtractor {
 			triangleData: this.getTriangleData(), // Texture-ready Float32Array format
 			triangleCount: this.getTriangleCount(),
 			materials: this.materials,
+			materialTriangleCounts: this.materialTriangleCounts,
 			meshes: this.meshes,
 			meshTriangleRanges: this.meshTriangleRanges, // Per-mesh { start, count } for TLAS/BLAS
 			maps: this.maps,