rayzee 11.9.0 → 11.11.0

package/dist/{sceneCachePolicy-ywbGKHD3.js → sceneCachePolicy-BHNKvrHR.js}

@@ -1,6 +1,6 @@
 import { t as e } from "./EngineEvents-CLckhYbL.js";
 import { a as t, i as n, r } from "./Logger-dDDGj9Av.js";
-import { f as i, v as a, y as o } from "./BufferLayout-Bzgccg1o.js";
+import { f as i, v as a, y as o } from "./BufferLayout-BROyMqO1.js";
 import { n as s } from "./EngineIssues-CfJiBaNj.js";
 import { n as c, r as l } from "./shared-BGBcSxBQ.js";
 import { n as u } from "./AssetConfig-DSEntE65.js";
@@ -224,6 +224,7 @@ var E = de({
 	],
 	clearcoat: 0,
 	clearcoatRoughness: 0,
+	clearcoatNormalScale: [1, 1],
 	iridescence: 0,
 	iridescenceIOR: 1.3,
 	iridescenceThicknessRange: [100, 400],
@@ -256,7 +257,8 @@ var E = de({
 		1,
 		1,
 		1
-	]
+	],
+	diffuseRoughness: 0
 });
 function de(e) {
 	for (let t of Object.values(e)) typeof t == "object" && Object.freeze(t);
@@ -774,6 +776,7 @@ function W(e) {
 		anisotropyMap: e.anisotropyMap,
 		clearcoatMap: e.clearcoatMap,
 		clearcoatRoughnessMap: e.clearcoatRoughnessMap,
+		clearcoatNormalMap: e.clearcoatNormalMap,
 		transmissionMap: e.transmissionMap,
 		sheenColorMap: e.sheenColorMap,
 		sheenRoughnessMap: e.sheenRoughnessMap,
@@ -1216,6 +1219,7 @@ var Be = class {
 			sheenColor: o("sheenColor"),
 			clearcoat: o("clearcoat"),
 			clearcoatRoughness: o("clearcoatRoughness"),
+			clearcoatNormalScale: o("clearcoatNormalScale"),
 			iridescence: o("iridescence"),
 			iridescenceIOR: o("iridescenceIOR"),
 			iridescenceThicknessRange: o("iridescenceThicknessRange"),
@@ -1230,6 +1234,7 @@ var Be = class {
 			specularColor: o("specularColor"),
 			diffuseTransmission: o("diffuseTransmission"),
 			diffuseTransmissionColor: o("diffuseTransmissionColor"),
+			diffuseRoughness: o("diffuseRoughness"),
 			normalScale: o("normalScale"),
 			bumpScale: o("bumpScale"),
 			displacementScale: o("displacementScale"),
@@ -1249,6 +1254,7 @@ var Be = class {
 			anisotropyMap: this.processTexture(i.anisotropyMap, this.anisotropyMaps),
 			clearcoatMap: this.processTexture(i.clearcoatMap, this.clearcoatMaps),
 			clearcoatRoughnessMap: this.processTexture(i.clearcoatRoughnessMap, this.clearcoatRoughnessMaps),
+			clearcoatNormalMap: this.processTexture(i.clearcoatNormalMap, this.clearcoatNormalMaps),
 			transmissionMap: this.processTexture(i.transmissionMap, this.transmissionMaps),
 			thicknessMap: this.processTexture(e.thicknessMap, []),
 			sheenColorMap: this.processTexture(i.sheenColorMap, this.sheenColorMaps),
@@ -1260,7 +1266,7 @@ var Be = class {
 			iridescenceMap: this.processTexture(i.iridescenceMap, this.iridescenceMaps),
 			iridescenceThicknessMap: this.processTexture(i.iridescenceThicknessMap, this.iridescenceThicknessMaps),
 			mapMatrix: this.getTextureMatrix(i.map),
-			normalMapMatrices: this.getTextureMatrix(i.normalMap),
+			normalMapMatrices: this.getTextureMatrix(i.normalMap ?? i.clearcoatNormalMap),
 			bumpMapMatrices: this.getTextureMatrix(i.bumpMap),
 			roughnessMapMatrices: this.getTextureMatrix(i.roughnessMap),
 			metalnessMapMatrices: this.getTextureMatrix(i.metalnessMap),
@@ -1364,7 +1370,7 @@ var Be = class {
 		if (e.children) for (let t of e.children) this._traverseMaterialsOnly(t);
 	}
 	resetArrays() {
-		this._droppedTextures = 0, this.triangles = null, this._streamedStore = !1, this.triangleData = null, this.triangleFloatChunks = null, this.triangleFloats = null, this.triangleCount = 0, this.currentTriangleIndex = 0, this.materials = [], this.materialTriangleCounts = [], this.meshes = [], this.meshTriangleRanges = [], this._geometryRanges = /* @__PURE__ */ new Map(), this.expandedTriangleCount = 0, this._allocatePlacements(0), this.maps = [], this.normalMaps = [], this.bumpMaps = [], this.metalnessMaps = [], this.emissiveMaps = [], this.roughnessMaps = [], this.displacementMaps = [], this.anisotropyMaps = [], this.transmissionMaps = [], this.clearcoatMaps = [], this.clearcoatRoughnessMaps = [], this.sheenColorMaps = [], this.sheenRoughnessMaps = [], this.iridescenceMaps = [], this.iridescenceThicknessMaps = [], this.specularIntensityMaps = [], this.specularColorMaps = [], this.diffuseTransmissionMaps = [], this.diffuseTransmissionColorMaps = [], this.directionalLights = [], this.cameras = [], this._materialUuidMap = /* @__PURE__ */ new Map(), this._textureIndexCache = /* @__PURE__ */ new WeakMap();
+		this._droppedTextures = 0, this.triangles = null, this._streamedStore = !1, this.triangleData = null, this.triangleFloatChunks = null, this.triangleFloats = null, this.triangleCount = 0, this.currentTriangleIndex = 0, this.materials = [], this.materialTriangleCounts = [], this.meshes = [], this.meshTriangleRanges = [], this._geometryRanges = /* @__PURE__ */ new Map(), this.expandedTriangleCount = 0, this._allocatePlacements(0), this.maps = [], this.normalMaps = [], this.bumpMaps = [], this.metalnessMaps = [], this.emissiveMaps = [], this.roughnessMaps = [], this.displacementMaps = [], this.anisotropyMaps = [], this.transmissionMaps = [], this.clearcoatMaps = [], this.clearcoatRoughnessMaps = [], this.clearcoatNormalMaps = [], this.sheenColorMaps = [], this.sheenRoughnessMaps = [], this.iridescenceMaps = [], this.iridescenceThicknessMaps = [], this.specularIntensityMaps = [], this.specularColorMaps = [], this.diffuseTransmissionMaps = [], this.diffuseTransmissionColorMaps = [], this.directionalLights = [], this.cameras = [], this._materialUuidMap = /* @__PURE__ */ new Map(), this._textureIndexCache = /* @__PURE__ */ new WeakMap();
 	}
 	getExtractedData() {
 		return {
@@ -1391,6 +1397,7 @@ var Be = class {
 			transmissionMaps: this.transmissionMaps,
 			clearcoatMaps: this.clearcoatMaps,
 			clearcoatRoughnessMaps: this.clearcoatRoughnessMaps,
+			clearcoatNormalMaps: this.clearcoatNormalMaps,
 			sheenColorMaps: this.sheenColorMaps,
 			sheenRoughnessMaps: this.sheenRoughnessMaps,
 			iridescenceMaps: this.iridescenceMaps,
@@ -1597,7 +1604,7 @@ var vt = class {
 			samples: this.samples.slice()
 		};
 	}
-}, yt = "11.9.0", $ = 1e4, bt = 15e5;
+}, yt = "11.11.0", $ = 1e4, bt = 15e5;
 function xt(e, t, n = $) {
 	return e >= n && t / bt < e / 3;
 }

package/package.json

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

package/src/EngineDefaults.js

@@ -111,6 +111,7 @@ export const MATERIAL_DEFAULTS = deepFreeze( {
 	specularColor: [ 1, 1, 1 ],
 	clearcoat: 0,
 	clearcoatRoughness: 0,
+	clearcoatNormalScale: [ 1, 1 ],
 	iridescence: 0,
 	iridescenceIOR: 1.3,
 	iridescenceThicknessRange: [ 100, 400 ],
@@ -133,6 +134,8 @@ export const MATERIAL_DEFAULTS = deepFreeze( {
 	// KHR_materials_diffuse_transmission: the share of the diffuse lobe passed through to the other side.
 	diffuseTransmission: 0,
 	diffuseTransmissionColor: [ 1, 1, 1 ],
+	// The diffuse lobe's roughness (OpenPBR base_diffuse_roughness): 0 is Lambert, above it EON.
+	diffuseRoughness: 0,
 } );
 
 function deepFreeze( object ) {

package/src/Processor/BufferLayout.js

@@ -141,8 +141,8 @@ export const MATERIAL_DATA_LAYOUT = {
 	ALBEDO_MAP_INDEX: 24, NORMAL_MAP_INDEX: 25, ROUGHNESS_MAP_INDEX: 26, METALNESS_MAP_INDEX: 27,
 	// Slot 7: map indices (emissive, bump) + clearcoat              [maps]
 	EMISSIVE_MAP_INDEX: 28, BUMP_MAP_INDEX: 29, CLEARCOAT: 30, CLEARCOAT_ROUGHNESS: 31,
-	// Slot 8: dispersion + visible + sheen + sheenRoughness         [extended BxDF]
-	DISPERSION: 32, VISIBLE: 33, SHEEN: 34, SHEEN_ROUGHNESS: 35,
+	// Slot 8: dispersion + diffuseRoughness + sheen + sheenRoughness [extended BxDF]
+	DISPERSION: 32, DIFFUSE_ROUGHNESS: 33, SHEEN: 34, SHEEN_ROUGHNESS: 35,
 	// Slot 9: sheenColor.rgb + diffuseTransmission                 [extended BxDF]
 	SHEEN_COLOR: 36, DIFFUSE_TRANSMISSION: 39,
 	// Slot 10: specularIntensity + specularColor.rgb                [extended BxDF]
@@ -174,9 +174,10 @@ export const MATERIAL_DATA_LAYOUT = {
 	SHEEN_ROUGHNESS_MAP_INDEX: 124, IRIDESCENCE_MAP_INDEX: 125, IRIDESCENCE_THICKNESS_MAP_INDEX: 126, SPECULAR_INTENSITY_MAP_INDEX: 127,
 	// Slot 32: extension-texture map index C (specularColor) + diffuseTransmissionColor.rgb
 	SPECULAR_COLOR_MAP_INDEX: 128, DIFFUSE_TRANSMISSION_COLOR: 129,
-	// Slot 33: extension-texture map indices D (diffuseTransmission, diffuseTransmissionColor) + 2 reserved;
-	// read only for a material with diffuse transmission
+	// Slot 33: extension-texture map indices D (diffuseTransmission, diffuseTransmissionColor) + the clear coat's normal
+	// map index and scale; read only for a material with diffuse transmission or a coat
 	DIFFUSE_TRANSMISSION_MAP_INDEX: 132, DIFFUSE_TRANSMISSION_COLOR_MAP_INDEX: 133,
+	CLEARCOAT_NORMAL_MAP_INDEX: 134, CLEARCOAT_NORMAL_SCALE: 135,
 
 	// ── Vec4 slot indices (GPU/TSL side) ─────────────────────────────
 	// Used with getDatafromStorageBuffer( buf, matIdx, int(slot), int(SLOTS_PER_MATERIAL) )
@@ -189,7 +190,7 @@ export const MATERIAL_DATA_LAYOUT = {
 		EMISSIVE_ROUGHNESS: 5, // [BxDF] emissive.rgb, roughness
 		MAP_INDICES_A: 6, // [maps] albedo, normal, roughness, metalness
 		MAP_INDICES_B: 7, // [maps] emissive, bump, clearcoat, clearcoatRoughness
-		DISPERSION_SHEEN: 8, // [extended] dispersion, visible, sheen, sheenRoughness
+		DISPERSION_SHEEN: 8, // [extended] dispersion, diffuseRoughness, sheen, sheenRoughness
 		SHEEN_COLOR: 9, // [extended] sheenColor, diffuseTransmission
 		SPECULAR: 10, // [extended] specularIntensity, specularColor
 		IRIDESCENCE: 11, // [extended] iridescence, iridescenceIOR, iridescenceThicknessRange
@@ -207,7 +208,7 @@ export const MATERIAL_DATA_LAYOUT = {
 		EXT_MAP_INDICES_A: 30, // transmission, clearcoat, clearcoatRoughness, sheenColor map indices
 		EXT_MAP_INDICES_B: 31, // sheenRoughness, iridescence, iridescenceThickness, specularIntensity map indices
 		EXT_MAP_INDICES_C: 32, // specularColor map index, diffuseTransmissionColor
-		EXT_MAP_INDICES_D: 33, // diffuseTransmission, diffuseTransmissionColor map indices + 2 reserved
+		EXT_MAP_INDICES_D: 33, // diffuseTransmission, diffuseTransmissionColor, clearcoatNormal map indices, clearcoatNormalScale
 	},
 
 };

package/src/Processor/GeometryExtractor.js

@@ -53,6 +53,7 @@ export function resolveMaterialTextures( material ) {
 		anisotropyMap: material.anisotropyMap,
 		clearcoatMap: material.clearcoatMap,
 		clearcoatRoughnessMap: material.clearcoatRoughnessMap,
+		clearcoatNormalMap: material.clearcoatNormalMap,
 		transmissionMap: material.transmissionMap,
 		sheenColorMap: material.sheenColorMap,
 		sheenRoughnessMap: material.sheenRoughnessMap,
@@ -1210,6 +1211,7 @@ export class GeometryExtractor {
 			sheenColor: pick( 'sheenColor' ),
 			clearcoat: pick( 'clearcoat' ),
 			clearcoatRoughness: pick( 'clearcoatRoughness' ),
+			clearcoatNormalScale: pick( 'clearcoatNormalScale' ),
 			iridescence: pick( 'iridescence' ),
 			iridescenceIOR: pick( 'iridescenceIOR' ),
 			iridescenceThicknessRange: pick( 'iridescenceThicknessRange' ),
@@ -1228,6 +1230,7 @@ export class GeometryExtractor {
 
 			diffuseTransmission: pick( 'diffuseTransmission' ),
 			diffuseTransmissionColor: pick( 'diffuseTransmissionColor' ),
+			diffuseRoughness: pick( 'diffuseRoughness' ),
 
 			normalScale: pick( 'normalScale' ),
 			bumpScale: pick( 'bumpScale' ),
@@ -1255,6 +1258,7 @@ export class GeometryExtractor {
 			// render effect yet (see gap-plan Phase 4.4).
 			clearcoatMap: this.processTexture( textures.clearcoatMap, this.clearcoatMaps ),
 			clearcoatRoughnessMap: this.processTexture( textures.clearcoatRoughnessMap, this.clearcoatRoughnessMaps ),
+			clearcoatNormalMap: this.processTexture( textures.clearcoatNormalMap, this.clearcoatNormalMaps ),
 			transmissionMap: this.processTexture( textures.transmissionMap, this.transmissionMaps ),
 			thicknessMap: this.processTexture( material.thicknessMap, [] ),
 			sheenColorMap: this.processTexture( textures.sheenColorMap, this.sheenColorMaps ),
@@ -1267,7 +1271,8 @@ export class GeometryExtractor {
 			iridescenceThicknessMap: this.processTexture( textures.iridescenceThicknessMap, this.iridescenceThicknessMaps ),
 
 			mapMatrix: this.getTextureMatrix( textures.map ),
-			normalMapMatrices: this.getTextureMatrix( textures.normalMap ),
+			// The coat's normal map shares the base one's transform, or brings its own when there is none.
+			normalMapMatrices: this.getTextureMatrix( textures.normalMap ?? textures.clearcoatNormalMap ),
 			bumpMapMatrices: this.getTextureMatrix( textures.bumpMap ),
 			roughnessMapMatrices: this.getTextureMatrix( textures.roughnessMap ),
 			metalnessMapMatrices: this.getTextureMatrix( textures.metalnessMap ),
@@ -1655,6 +1660,7 @@ export class GeometryExtractor {
 		this.transmissionMaps = [];
 		this.clearcoatMaps = [];
 		this.clearcoatRoughnessMaps = [];
+		this.clearcoatNormalMaps = [];
 		this.sheenColorMaps = [];
 		this.sheenRoughnessMaps = [];
 		this.iridescenceMaps = [];
@@ -1699,6 +1705,7 @@ export class GeometryExtractor {
 			transmissionMaps: this.transmissionMaps,
 			clearcoatMaps: this.clearcoatMaps,
 			clearcoatRoughnessMaps: this.clearcoatRoughnessMaps,
+			clearcoatNormalMaps: this.clearcoatNormalMaps,
 			sheenColorMaps: this.sheenColorMaps,
 			sheenRoughnessMaps: this.sheenRoughnessMaps,
 			iridescenceMaps: this.iridescenceMaps,

package/src/Processor/MaterialPacking.js

@@ -14,11 +14,6 @@ const TRANSFORMS = [
 	[ 'displacementMapMatrices', M.DISPLACEMENT_TRANSFORM ],
 ];
 
-/** Floats no field writes; the packer gives them fixed values. */
-export const MATERIAL_RESERVED_FLOATS = Object.freeze( [
-	M.VISIBLE, M.DIFFUSE_TRANSMISSION_COLOR_MAP_INDEX + 1, M.DIFFUSE_TRANSMISSION_COLOR_MAP_INDEX + 2,
-] );
-
 /**
  * Weights and roughnesses, [0, 1] in glTF and three.js. Past 1 an energy split like
  * 1 − clearcoat·E goes negative: a glTF chrome with clearcoatFactor 4 added negative light.
@@ -26,6 +21,7 @@ export const MATERIAL_RESERVED_FLOATS = Object.freeze( [
 export const UNIT_RANGE_PROPERTIES = Object.freeze( new Set( [
 	'metalness', 'roughness', 'transmission', 'opacity', 'clearcoat', 'clearcoatRoughness',
 	'sheen', 'sheenRoughness', 'specularIntensity', 'iridescence', 'subsurface', 'anisotropy', 'diffuseTransmission',
+	'diffuseRoughness',
 ] ) );
 
 export const clampUnit = ( value ) => Math.min( Math.max( value, 0 ), 1 );
@@ -112,6 +108,7 @@ export function packMaterial( data, base, mat ) {
 	u( M.CLEARCOAT_ROUGHNESS, mat.clearcoatRoughness, D.clearcoatRoughness );
 
 	s( M.DISPERSION, mat.dispersion, D.dispersion );
+	u( M.DIFFUSE_ROUGHNESS, mat.diffuseRoughness, D.diffuseRoughness );
 	u( M.SHEEN, mat.sheen, D.sheen );
 	u( M.SHEEN_ROUGHNESS, mat.sheenRoughness, D.sheenRoughness );
 
@@ -163,8 +160,8 @@ export function packMaterial( data, base, mat ) {
 	data[ base + M.DIFFUSE_TRANSMISSION_MAP_INDEX ] = mapIndex( mat.diffuseTransmissionMap );
 	data[ base + M.DIFFUSE_TRANSMISSION_COLOR_MAP_INDEX ] = mapIndex( mat.diffuseTransmissionColorMap );
 
-	data[ base + M.VISIBLE ] = 1;
-	data[ base + M.DIFFUSE_TRANSMISSION_COLOR_MAP_INDEX + 1 ] = 0;
-	data[ base + M.DIFFUSE_TRANSMISSION_COLOR_MAP_INDEX + 2 ] = 0;
+	data[ base + M.CLEARCOAT_NORMAL_MAP_INDEX ] = mapIndex( mat.clearcoatNormalMap );
+	const coatScale = mat.clearcoatNormalScale;
+	s( M.CLEARCOAT_NORMAL_SCALE, typeof coatScale === 'number' ? coatScale : coatScale?.x ?? coatScale?.[ 0 ], D.clearcoatNormalScale[ 0 ] );
 
 }

package/src/Processor/PBRT/PBRTMaterials.js

@@ -594,6 +594,8 @@ export async function buildMaterial( def, ctx ) {
 
 	const normalMap = pString( params, 'normalmap', null );
 	if ( normalMap && ctx.resolveNormalMap ) mat.normalMap = await ctx.resolveNormalMap( normalMap );
+	// pbrt shades a coat in the same normal-mapped frame as what it covers.
+	if ( mat.clearcoat > 0 && mat.normalMap ) mat.clearcoatNormalMap = mat.normalMap;
 
 	mat.roughness = Math.max( 0, Math.min( 1, mat.roughness ) );
 	return mat;

package/src/Processor/PBRT/PBRTSceneBuilder.js

@@ -111,7 +111,7 @@ const DEFAULT_CURVE_SIDES = { flat: 1, ribbon: 1, cylinder: 2 };
 const DEFAULT_CURVE_TOLERANCE = 0.05;
 
 /** Bumped whenever the same scene files build a different graph, so a stored graph is not reused. */
-export const PBRT_BUILD_REVISION = 13;
+export const PBRT_BUILD_REVISION = 14;
 
 function samePlacements( a, b ) {
 
@@ -249,7 +249,7 @@ function setMapping( texture, { su, sv, du, dv, uv = null } ) {
 }
 
 // Material maps in the order that picks a surface's one uv set: its base colour's, else the first it has.
-const UV_MAPS = [ 'map', 'roughnessMap', 'clearcoatRoughnessMap', 'normalMap' ];
+const UV_MAPS = [ 'map', 'roughnessMap', 'clearcoatRoughnessMap', 'normalMap', 'clearcoatNormalMap' ];
 const MAP_SCALARS = { roughnessMap: 'roughness', clearcoatRoughnessMap: 'clearcoatRoughness' };
 
 /** The position mapping a material's textures are read in, or null for the mesh's own uv. */
@@ -2064,7 +2064,8 @@ export class PBRTSceneBuilder {
 			`${material.clearcoat}|${material.clearcoatRoughness}|${material.clearcoatRoughnessMap?.uuid ?? '-'}|${material.opacity}|${material.side}|` +
 			`${material.normalMap ? material.normalMap.uuid : '-'}|${material.attenuationDistance}|${material.attenuationColor.toArray()}|` +
 			`${material.specularIntensity}|${material.diffuseTransmission ?? 0}|${material.diffuseTransmissionColor?.toArray() ?? '-'}|` +
-			`${material.subsurface ?? 0}|${material.subsurfaceColor?.toArray() ?? '-'}|${material.subsurfaceRadius ?? '-'}|${material.subsurfaceAnisotropy ?? 0}`;
+			`${material.subsurface ?? 0}|${material.subsurfaceColor?.toArray() ?? '-'}|${material.subsurfaceRadius ?? '-'}|${material.subsurfaceAnisotropy ?? 0}|` +
+			`${material.diffuseRoughness ?? 0}`;
 
 		const existing = this._materialBySignature.get( key );
 		if ( existing ) return existing;

package/src/Processor/SceneProcessor.js

@@ -66,7 +66,7 @@ const log = createLogger( 'scene' );
 // The per-type texture lists an extraction hands over (GeometryExtractor.getExtractedData).
 const TEXTURE_LISTS = Object.freeze( [
 	'maps', 'normalMaps', 'bumpMaps', 'roughnessMaps', 'metalnessMaps', 'emissiveMaps', 'displacementMaps',
-	'anisotropyMaps', 'transmissionMaps', 'clearcoatMaps', 'clearcoatRoughnessMaps', 'sheenColorMaps',
+	'anisotropyMaps', 'transmissionMaps', 'clearcoatMaps', 'clearcoatRoughnessMaps', 'clearcoatNormalMaps', 'sheenColorMaps',
 	'sheenRoughnessMaps', 'iridescenceMaps', 'iridescenceThicknessMaps', 'specularIntensityMaps', 'specularColorMaps',
 	'diffuseTransmissionMaps', 'diffuseTransmissionColorMaps',
 ] );
@@ -186,6 +186,7 @@ export class SceneProcessor {
 		this.transmissionMaps = [];
 		this.clearcoatMaps = [];
 		this.clearcoatRoughnessMaps = [];
+		this.clearcoatNormalMaps = [];
 		this.sheenColorMaps = [];
 		this.sheenRoughnessMaps = [];
 		this.iridescenceMaps = [];
@@ -2107,7 +2108,7 @@ export class SceneProcessor {
 		const srgbTypes = [ this.maps, this.emissiveMaps, this.sheenColorMaps, this.specularColorMaps, this.diffuseTransmissionColorMaps ];
 		const linearTypes = [
 			this.normalMaps, this.bumpMaps, this.roughnessMaps, this.metalnessMaps, this.displacementMaps,
-			this.anisotropyMaps, this.transmissionMaps, this.clearcoatMaps, this.clearcoatRoughnessMaps,
+			this.anisotropyMaps, this.transmissionMaps, this.clearcoatMaps, this.clearcoatRoughnessMaps, this.clearcoatNormalMaps,
 			this.sheenRoughnessMaps, this.iridescenceMaps, this.iridescenceThicknessMaps, this.specularIntensityMaps,
 			this.diffuseTransmissionMaps,
 		];
@@ -2194,6 +2195,7 @@ export class SceneProcessor {
 			transmission: remapType( this.transmissionMaps, linearLists, linearDedup, this._linearTexPacked, linearShapes ),
 			clearcoat: remapType( this.clearcoatMaps, linearLists, linearDedup, this._linearTexPacked, linearShapes ),
 			clearcoatRoughness: remapType( this.clearcoatRoughnessMaps, linearLists, linearDedup, this._linearTexPacked, linearShapes ),
+			clearcoatNormal: remapType( this.clearcoatNormalMaps, linearLists, linearDedup, this._linearTexPacked, linearShapes ),
 			sheenColor: remapType( this.sheenColorMaps, srgbLists, srgbDedup, this._srgbTexPacked, srgbShapes ),
 			sheenRoughness: remapType( this.sheenRoughnessMaps, linearLists, linearDedup, this._linearTexPacked, linearShapes ),
 			iridescence: remapType( this.iridescenceMaps, linearLists, linearDedup, this._linearTexPacked, linearShapes ),
@@ -2230,6 +2232,7 @@ export class SceneProcessor {
 			mat.transmissionMap = fix( mat.transmissionMap, remap.transmission );
 			mat.clearcoatMap = fix( mat.clearcoatMap, remap.clearcoat );
 			mat.clearcoatRoughnessMap = fix( mat.clearcoatRoughnessMap, remap.clearcoatRoughness );
+			mat.clearcoatNormalMap = fix( mat.clearcoatNormalMap, remap.clearcoatNormal );
 			mat.sheenColorMap = fix( mat.sheenColorMap, remap.sheenColor );
 			mat.sheenRoughnessMap = fix( mat.sheenRoughnessMap, remap.sheenRoughness );
 			mat.iridescenceMap = fix( mat.iridescenceMap, remap.iridescence );
@@ -2331,6 +2334,7 @@ export class SceneProcessor {
 		this.transmissionMaps = [];
 		this.clearcoatMaps = [];
 		this.clearcoatRoughnessMaps = [];
+		this.clearcoatNormalMaps = [];
 		this.sheenColorMaps = [];
 		this.sheenRoughnessMaps = [];
 		this.iridescenceMaps = [];

package/src/Processor/USD/USDScene.js

@@ -1910,6 +1910,14 @@ export class USDSceneReader {
 
 	}
 
+	/** A diffuse roughness input as a constant; one a texture drives is not read. */
+	mtlxDiffuseRoughness( term ) {
+
+		if ( term?.texture ) this.warnOnce( 'mtlx:diffuseroughness', 'MaterialX diffuse roughness from a texture is not read' );
+		return isNum( term?.value ) ? term.value : 0;
+
+	}
+
 	/** OpenPBR Surface 1.1, which Blender writes for its Principled BSDF. */
 	async openPbrSurface( shader ) {
 
@@ -1934,6 +1942,7 @@ export class USDSceneReader {
 		if ( Array.isArray( specularColor ) ) mat.specularColor.setRGB( specularColor[ 0 ], specularColor[ 1 ], specularColor[ 2 ] );
 		mat.ior = await num( 'specular_ior', 1.5 );
 		mat.anisotropy = await num( 'specular_roughness_anisotropy', 0 );
+		mat.diffuseRoughness = this.mtlxDiffuseRoughness( await t( 'base_diffuse_roughness' ) );
 
 		const transmission = await num( 'transmission_weight', 0 );
 		if ( transmission > 0 ) {
@@ -2037,6 +2046,8 @@ export class USDSceneReader {
 		mat.ior = await num( 'specular_IOR', 1.5 );
 		mat.anisotropy = await num( 'specular_anisotropy', 0 );
 		mat.anisotropyRotation = await num( 'specular_rotation', 0 ) * Math.PI * 2;
+		// MaterialX renders this one without energy compensation; EON returns what that loses.
+		mat.diffuseRoughness = this.mtlxDiffuseRoughness( await t( 'diffuse_roughness' ) );
 
 		const transmission = await num( 'transmission', 0 );
 		if ( transmission > 0 ) {
@@ -2220,6 +2231,9 @@ export class USDSceneReader {
 
 			mat.metalness = sum( [ 'conductor' ] ) / base;
 			mat.transmission = sum( [ 'transmission' ] ) / base;
+			const diffuse = lobes.filter( l => l.kind === 'diffuse' && l.w > 0 );
+			const diffuseWeight = sum( [ 'diffuse' ] );
+			if ( diffuseWeight > 0 ) mat.diffuseRoughness = diffuse.reduce( ( s, l ) => s + l.roughness * l.w, 0 ) / diffuseWeight;
 
 		} else {
 
@@ -2330,8 +2344,10 @@ export class USDSceneReader {
 		switch ( mtlxNode( id ) ) {
 
 			case 'oren_nayar_diffuse_bsdf':
+				lobes.push( { kind: 'diffuse', w: weight, color: await t( 'color' ), normal: await t( 'normal' ), roughness: this.mtlxDiffuseRoughness( await t( 'roughness' ) ) } );
+				return;
 			case 'burley_diffuse_bsdf':
-				lobes.push( { kind: 'diffuse', w: weight, color: await t( 'color' ), normal: await t( 'normal' ) } );
+				lobes.push( { kind: 'diffuse', w: weight, color: await t( 'color' ), normal: await t( 'normal' ), roughness: 0 } );
 				return;
 			case 'conductor_bsdf': {
 

package/src/Processor/utils.js

@@ -1,4 +1,4 @@
-import { SphereGeometry, Mesh, MeshPhysicalMaterial, Group, Object3D, Color, Vector3, ShaderMaterial, Vector2, Matrix4, GLSL3 } from 'three';
+import { SphereGeometry, Mesh, MeshPhysicalMaterial, Group, Object3D, ShaderMaterial, Vector2, Matrix4, GLSL3 } from 'three';
 import { EngineEvents } from '../EngineEvents.js';
 
 let _statusCallback = null;
@@ -171,8 +171,6 @@ export function disposeEngineOwnedResources( object ) {
 
 }
 
-
-
 /**
  Metalness (increases left to right):
    0.00  0.25  0.50  0.75  1.00
@@ -534,156 +532,3 @@ export function createLRUCache( maxSize ) {
 	};
 
 }
-
-export function getDisneyUniforms( material ) {
-
-	// Default Disney BRDF uniform values
-	const defaults = {
-		baseColor: new Color( 0xffffff ),
-		subsurface: 0.0,
-		metallic: 0.0,
-		specular: 0.5,
-		specularTint: 0.0,
-		roughness: 0.5,
-		anisotropic: 0.0,
-		sheen: 0.0,
-		sheenTint: 0.5,
-		clearcoat: 0.0,
-		clearcoatGloss: 0.0,
-		ior: 1.5,
-		transmission: 0.0,
-		opacity: 1.0,
-		emissive: new Color( 0x000000 ),
-		emissiveIntensity: 1.0
-	};
-
-	// Initialize uniforms object with default values wrapped in uniform objects
-	const uniforms = Object.entries( defaults ).reduce( ( acc, [ key, value ] ) => {
-
-		acc[ key ] = { value: value };
-		return acc;
-
-	}, {} );
-
-	// If no material is provided, return default uniforms
-	if ( ! material ) return uniforms;
-
-	// Map material properties to Disney uniforms
-	if ( material.isMeshStandardMaterial ) {
-
-		uniforms.baseColor.value = material.color;
-		uniforms.roughness.value = material.roughness;
-		uniforms.metallic.value = material.metallic;
-		uniforms.emissive.value = material.emissive;
-		uniforms.emissiveIntensity.value = material.emissiveIntensity;
-		uniforms.opacity.value = material.opacity;
-
-		// Extract maps if they exist
-		if ( material.map ) {
-
-			uniforms.baseColorMap = { value: material.map };
-
-		}
-
-		if ( material.roughnessMap ) {
-
-			uniforms.roughnessMap = { value: material.roughnessMap };
-
-		}
-
-		if ( material.metalnessMap ) {
-
-			uniforms.metallicMap = { value: material.metalnessMap };
-
-		}
-
-		if ( material.normalMap ) {
-
-			uniforms.normalMap = { value: material.normalMap };
-			uniforms.normalScale = { value: material.normalScale };
-
-		}
-
-		if ( material.emissiveMap ) {
-
-			uniforms.emissiveMap = { value: material.emissiveMap };
-
-		}
-
-	} else if ( material.isMeshPhysicalMaterial ) {
-
-		// Include all MeshStandardMaterial properties
-		uniforms.baseColor.value = material.color;
-		uniforms.roughness.value = material.roughness;
-		uniforms.metallic.value = material.metallic;
-		uniforms.emissive.value = material.emissive;
-		uniforms.emissiveIntensity.value = material.emissiveIntensity;
-		uniforms.opacity.value = material.opacity;
-
-		// Add physical material specific properties
-		uniforms.clearcoat.value = material.clearcoat;
-		uniforms.clearcoatGloss.value = 1 - material.clearcoatRoughness;
-		uniforms.ior.value = material.ior;
-		uniforms.transmission.value = material.transmission;
-
-		// Extract maps
-		if ( material.clearcoatMap ) {
-
-			uniforms.clearcoatMap = { value: material.clearcoatMap };
-
-		}
-
-		if ( material.clearcoatRoughnessMap ) {
-
-			uniforms.clearcoatGlossMap = { value: material.clearcoatRoughnessMap };
-
-		}
-
-		if ( material.clearcoatNormalMap ) {
-
-			uniforms.clearcoatNormalMap = { value: material.clearcoatNormalMap };
-
-		}
-
-		if ( material.transmissionMap ) {
-
-			uniforms.transmissionMap = { value: material.transmissionMap };
-
-		}
-
-	} else if ( material.isMeshBasicMaterial ||
-             material.isMeshLambertMaterial ||
-             material.isMeshPhongMaterial ) {
-
-		// Basic conversion for simpler materials
-		uniforms.baseColor.value = material.color;
-		uniforms.opacity.value = material.opacity;
-		uniforms.emissive.value = material.emissive || new Color( 0x000000 );
-
-		// Estimate roughness and metallic from shininess if available
-		if ( 'shininess' in material ) {
-
-			uniforms.roughness.value = 1 - Math.min( 1, material.shininess / 100 );
-			uniforms.specular.value = material.specular ?
-				( material.specular.r + material.specular.g + material.specular.b ) / 3 :
-				0.5;
-
-		}
-
-		// Extract maps
-		if ( material.map ) {
-
-			uniforms.baseColorMap = { value: material.map };
-
-		}
-
-	}
-
-	// Add common Three.js uniform values needed for shading
-	uniforms.cameraPosition = { value: new Vector3() };
-	uniforms.time = { value: 0 };
-
-	return uniforms;
-
-}
-

package/src/Stages/PathTracer.js

@@ -428,6 +428,7 @@ export class PathTracer extends PathTracerStage {
 			const needed = this._layersToCompile();
 			if ( MATERIAL_LAYERS.some( ( layer ) => needed[ layer ] && ! this._compiledLayers?.[ layer ] ) ) this._outputsChanged = true;
 			if ( ! this._compiledTransmissionMaps && this.materialData.hasTransmissionMaps() ) this._outputsChanged = true;
+			if ( ! this._compiledClearcoatNormals && this._clearcoatNormalsNeeded() ) this._outputsChanged = true;
 
 		}
 
@@ -1460,6 +1461,13 @@ export class PathTracer extends PathTracerStage {
 
 	}
 
+	/** Whether a coat can lean apart from its base: never for an integrator of its own (its vertices keep one normal). */
+	_clearcoatNormalsNeeded() {
+
+		return ! this._integrator && this.materialData.hasClearcoatNormals();
+
+	}
+
 	/** The material layers the scene uses. */
 	_layersToCompile() {
 
@@ -1877,6 +1885,7 @@ export class PathTracer extends PathTracerStage {
 			materialLayers: this._compiledLayers = this._layersToCompile(),
 			lightRadius: this._compiledLightRadius = this._lightRadiusNeeded(),
 			transmissionMaps: this._compiledTransmissionMaps = this.materialData.hasTransmissionMaps(),
+			clearcoatNormals: this._compiledClearcoatNormals = this._clearcoatNormalsNeeded(),
 		};
 		const own = ( call ) => withSceneResources( call, resources );
 		const freshEnvTex = _env.environmentTexture ? texture( _env.environmentTexture ) : texNodes.envTex;

package/src/Storage/SceneGraphCodec.js

@@ -171,6 +171,7 @@ function encodeMaterial( material, meta ) {
 	if ( material.ior !== undefined ) json.exactIor = material.ior;
 	// Engine properties three.js does not know, so toJSON drops them.
 	if ( material.diffuseTransmission !== undefined ) json.diffuseTransmission = material.diffuseTransmission;
+	if ( material.diffuseRoughness !== undefined ) json.diffuseRoughness = material.diffuseRoughness;
 	for ( const key of ENGINE_TEXTURES ) if ( material[ key ]?.isTexture ) ( json.engineTextures ??= {} )[ key ] = material[ key ].uuid;
 	return json;
 
@@ -460,6 +461,7 @@ export async function decodeSceneGraph( manifest, data, { loadTexture } ) {
 
 		if ( json.exactIor !== undefined ) material.ior = json.exactIor;
 		if ( json.diffuseTransmission !== undefined ) material.diffuseTransmission = json.diffuseTransmission;
+		if ( json.diffuseRoughness !== undefined ) material.diffuseRoughness = json.diffuseRoughness;
 		for ( const [ key, uuid ] of Object.entries( json.engineTextures ?? {} ) ) if ( textures[ uuid ] ) material[ key ] = textures[ uuid ];
 		materials[ json.uuid ] = material;
 

package/src/TSL/Clearcoat.js

@@ -15,7 +15,7 @@ import { struct } from './patches.js';
 import { AnisoFrame, DotProducts,
 	BRDFWeights,
 } from './Struct.js';
-import { MIN_CLEARCOAT_ROUGHNESS, computeDotProductsAniso, anisoTangentFrame, constructTBN } from './Common.js';
+import { MIN_CLEARCOAT_ROUGHNESS, computeDotProductsAniso, anisoTangentFrame, constructTBN, coatNormal } from './Common.js';
 import { computeAnisoAlphas, calculateBRDFWeightsFromMaterial, calculateBSDFSamplingPDF, diffuseTransmissionPdf } from './MaterialProperties.js';
 import { ImportanceSampleCosine, sampleGGXVNDF, sampleGGXVNDFAniso } from './MaterialSampling.js';
 import { evaluateMaterialResponseFromDots, evaluateDiffuseTransmission } from './MaterialEvaluation.js';
@@ -34,7 +34,7 @@ export const ClearcoatResult = struct( {
 export const sampleClearcoat = Fn( ( [
 	ray, hitInfo, material, randomSample, rngState,
 	pixelCoord, resolution, frame, dimBase,
-] ) => {
+], builder ) => {
 
 	const N = hitInfo.normal;
 	const V = ray.direction.negate();
@@ -62,7 +62,7 @@ export const sampleClearcoat = Fn( ( [
 	If( rand.lessThan( clearcoatWeight ), () => {
 
 		// Sample clearcoat layer (VNDF — see the base-specular note below)
-		const ccTBN = constructTBN( { N } );
+		const ccTBN = constructTBN( { N: coatNormal( N, material, builder ) } );
 		H.assign( ccTBN.mul( sampleGGXVNDF( { V: ccTBN.transpose().mul( V ), roughness: clearcoatRoughness, Xi: randomSample } ) ) );
 		L.assign( reflect( V.negate(), H ) );
 
@@ -108,7 +108,7 @@ export const sampleClearcoat = Fn( ( [
 
 	// Evaluate complete BRDF
 	// The same BRDF every other site evaluates — see the clearcoat note in MaterialEvaluation.
-	const brdf = transmitted.select( evaluateDiffuseTransmission( material, max( dot( N, V ), 0.001 ) ), evaluateMaterialResponseFromDots( material, dots ) );
+	const brdf = transmitted.select( evaluateDiffuseTransmission( material, N, V ), evaluateMaterialResponseFromDots( material, dots ) );
 
 	// Return brdf, L direction, and pdf packed together
 	// Caller needs L and pdf - return as struct-like output