rayzee 11.9.0 → 11.11.0

package/dist/{ArchiveImporter-BJxszU_k.js → ArchiveImporter-D5XOC3tN.js}

@@ -1,9 +1,9 @@
-import { n as e } from "./BidirectionalIntegrator-DWg66vAd.js";
-import { A as t, T as n, at as r, n as i, r as a, v as o, x as s } from "./sceneCachePolicy-ywbGKHD3.js";
+import { n as e } from "./BidirectionalIntegrator-DqG0BEIz.js";
+import { A as t, T as n, at as r, n as i, r as a, v as o, x as s } from "./sceneCachePolicy-BHNKvrHR.js";
 import { n as c, r as l, t as u } from "./EngineIssues-CfJiBaNj.js";
 import { r as d } from "./shared-BGBcSxBQ.js";
 import { i as f, n as p, o as m, r as h } from "./identity-C1cLD1C0.js";
-import { a as g, s as _, t as v } from "./SceneMetadata-C17UfOEp.js";
+import { a as g, s as _, t as v } from "./SceneMetadata-Bb3iwWhh.js";
 import { n as y, t as b } from "./ZipReader-gDSWr0I5.js";
 import { AnimationClip as x, BooleanKeyframeTrack as S, BoxGeometry as C, BufferAttribute as w, BufferGeometry as T, CapsuleGeometry as ee, ClampToEdgeWrapping as E, Color as D, ConeGeometry as te, CylinderGeometry as ne, DataTexture as O, DirectionalLight as re, DoubleSide as k, EquirectangularReflectionMapping as ie, Euler as ae, Float32BufferAttribute as A, FloatType as oe, FrontSide as se, Group as ce, InstancedBufferAttribute as le, InstancedMesh as ue, LinearFilter as de, LoadingManager as fe, MaterialLoader as pe, Matrix4 as j, Mesh as me, MeshPhysicalMaterial as M, MirroredRepeatWrapping as he, NoColorSpace as ge, NumberKeyframeTrack as _e, Object3D as ve, OrthographicCamera as ye, PerspectiveCamera as be, PlaneGeometry as xe, PointLight as Se, Quaternion as Ce, QuaternionKeyframeTrack as we, RGBAFormat as Te, RectAreaLight as Ee, RepeatWrapping as De, SRGBColorSpace as N, SphereGeometry as Oe, SpotLight as ke, Texture as Ae, Uint32BufferAttribute as P, Vector3 as F, VectorKeyframeTrack as je } from "three";
 import { HDRLoader as Me } from "three/addons/loaders/HDRLoader.js";
@@ -529,7 +529,7 @@ function Mt(e, t) {
 		r.g,
 		r.b
 	]);
-	e.ior !== void 0 && (n.exactIor = e.ior), e.diffuseTransmission !== void 0 && (n.diffuseTransmission = e.diffuseTransmission);
+	e.ior !== void 0 && (n.exactIor = e.ior), e.diffuseTransmission !== void 0 && (n.diffuseTransmission = e.diffuseTransmission), e.diffuseRoughness !== void 0 && (n.diffuseRoughness = e.diffuseRoughness);
 	for (let t of ht) e[t]?.isTexture && ((n.engineTextures ??= {})[t] = e[t].uuid);
 	return n;
 }
@@ -659,7 +659,7 @@ async function Vt(e, t, { loadTexture: n }) {
 	for (let t of e.materials) {
 		let e = s.parse(t);
 		for (let [n, r] of Object.entries(t.exactColors ?? {})) n === "diffuseTransmissionColor" && (e[n] = new D()), e[n]?.setRGB(r[0], r[1], r[2]);
-		t.exactIor !== void 0 && (e.ior = t.exactIor), t.diffuseTransmission !== void 0 && (e.diffuseTransmission = t.diffuseTransmission);
+		t.exactIor !== void 0 && (e.ior = t.exactIor), t.diffuseTransmission !== void 0 && (e.diffuseTransmission = t.diffuseTransmission), t.diffuseRoughness !== void 0 && (e.diffuseRoughness = t.diffuseRoughness);
 		for (let [n, r] of Object.entries(t.engineTextures ?? {})) o[r] && (e[n] = o[r]);
 		c[t.uuid] = e;
 	}
@@ -2463,7 +2463,7 @@ async function $n(e, t) {
 			break;
 	}
 	let s = K(r, "normalmap", null);
-	return s && t.resolveNormalMap && (i.normalMap = await t.resolveNormalMap(s)), i.roughness = Math.max(0, Math.min(1, i.roughness)), i;
+	return s && t.resolveNormalMap && (i.normalMap = await t.resolveNormalMap(s)), i.clearcoat > 0 && i.normalMap && (i.clearcoatNormalMap = i.normalMap), i.roughness = Math.max(0, Math.min(1, i.roughness)), i;
 }
 //#endregion
 //#region src/Processor/PBRT/PBRTTextureBake.js
@@ -3264,7 +3264,8 @@ var pi = [
 	"map",
 	"roughnessMap",
 	"clearcoatRoughnessMap",
-	"normalMap"
+	"normalMap",
+	"clearcoatNormalMap"
 ], mi = {
 	roughnessMap: "roughness",
 	clearcoatRoughnessMap: "clearcoatRoughness"
@@ -4059,7 +4060,7 @@ var Ii = class {
 		return u.attenuationDistance = 1 / l, u.attenuationColor.setRGB(...c.map((e) => Math.exp(-e / l))), this._dedupeMaterial(u);
 	}
 	_dedupeMaterial(e) {
-		let t = e.color, n = e.emissive, r = `${t.r},${t.g},${t.b}|${n.r},${n.g},${n.b}|${e.emissiveIntensity}|${e.map ? e.map.uuid : "-"}|${e.roughness}|${e.roughnessMap?.uuid ?? "-"}|${e.metalness}|${e.transmission}|${e.ior}|${e.thickness}|${e.clearcoat}|${e.clearcoatRoughness}|${e.clearcoatRoughnessMap?.uuid ?? "-"}|${e.opacity}|${e.side}|${e.normalMap ? e.normalMap.uuid : "-"}|${e.attenuationDistance}|${e.attenuationColor.toArray()}|${e.specularIntensity}|${e.diffuseTransmission ?? 0}|${e.diffuseTransmissionColor?.toArray() ?? "-"}|${e.subsurface ?? 0}|${e.subsurfaceColor?.toArray() ?? "-"}|${e.subsurfaceRadius ?? "-"}|${e.subsurfaceAnisotropy ?? 0}`;
+		let t = e.color, n = e.emissive, r = `${t.r},${t.g},${t.b}|${n.r},${n.g},${n.b}|${e.emissiveIntensity}|${e.map ? e.map.uuid : "-"}|${e.roughness}|${e.roughnessMap?.uuid ?? "-"}|${e.metalness}|${e.transmission}|${e.ior}|${e.thickness}|${e.clearcoat}|${e.clearcoatRoughness}|${e.clearcoatRoughnessMap?.uuid ?? "-"}|${e.opacity}|${e.side}|${e.normalMap ? e.normalMap.uuid : "-"}|${e.attenuationDistance}|${e.attenuationColor.toArray()}|${e.specularIntensity}|${e.diffuseTransmission ?? 0}|${e.diffuseTransmissionColor?.toArray() ?? "-"}|${e.subsurface ?? 0}|${e.subsurfaceColor?.toArray() ?? "-"}|${e.subsurfaceRadius ?? "-"}|${e.subsurfaceAnisotropy ?? 0}|${e.diffuseRoughness ?? 0}`;
 		return this._materialBySignature.get(r) || (this._materialBySignature.set(r, e), e);
 	}
 	_poweredMaterial(e, t, n) {
@@ -7610,6 +7611,9 @@ var as = class {
 			uvSet: "st"
 		};
 	}
+	mtlxDiffuseRoughness(e) {
+		return e?.texture && this.warnOnce("mtlx:diffuseroughness", "MaterialX diffuse roughness from a texture is not read"), Z(e?.value) ? e.value : 0;
+	}
 	async openPbrSurface(e) {
 		let t = (t) => this.term(e, t), n = async (e, n) => {
 			let r = (await t(e))?.value;
@@ -7617,7 +7621,7 @@ var as = class {
 		}, r = new M({ side: k }), i = this.mtlxSurfaceOf(r);
 		r.color.setRGB(.8, .8, .8), await this.mtlxWeighted(r, "color", await t("base_color"), await n("base_weight", 1), i, "map"), r.metalness = 0, await this.applyScalar(r, "metalness", await t("base_metalness"), i, "metalnessMap", "b"), r.roughness = .3, await this.applyScalar(r, "roughness", await t("specular_roughness"), i, "roughnessMap", "g"), r.specularIntensity = Math.min(1, await n("specular_weight", 1));
 		let a = (await t("specular_color"))?.value;
-		Array.isArray(a) && r.specularColor.setRGB(a[0], a[1], a[2]), r.ior = await n("specular_ior", 1.5), r.anisotropy = await n("specular_roughness_anisotropy", 0);
+		Array.isArray(a) && r.specularColor.setRGB(a[0], a[1], a[2]), r.ior = await n("specular_ior", 1.5), r.anisotropy = await n("specular_roughness_anisotropy", 0), r.diffuseRoughness = this.mtlxDiffuseRoughness(await t("base_diffuse_roughness"));
 		let o = await n("transmission_weight", 0);
 		if (o > 0) {
 			r.transmission = o;
@@ -7660,7 +7664,7 @@ var as = class {
 		}, r = new M({ side: k }), i = this.mtlxSurfaceOf(r);
 		r.color.setRGB(.8, .8, .8), await this.mtlxWeighted(r, "color", await t("base_color"), await n("base", 1), i, "map"), r.metalness = 0, await this.applyScalar(r, "metalness", await t("metalness"), i, "metalnessMap", "b"), r.roughness = .2, await this.applyScalar(r, "roughness", await t("specular_roughness"), i, "roughnessMap", "g"), r.specularIntensity = Math.min(1, await n("specular", 1));
 		let a = (await t("specular_color"))?.value;
-		Array.isArray(a) && r.specularColor.setRGB(a[0], a[1], a[2]), r.ior = await n("specular_IOR", 1.5), r.anisotropy = await n("specular_anisotropy", 0), r.anisotropyRotation = await n("specular_rotation", 0) * Math.PI * 2;
+		Array.isArray(a) && r.specularColor.setRGB(a[0], a[1], a[2]), r.ior = await n("specular_IOR", 1.5), r.anisotropy = await n("specular_anisotropy", 0), r.anisotropyRotation = await n("specular_rotation", 0) * Math.PI * 2, r.diffuseRoughness = this.mtlxDiffuseRoughness(await t("diffuse_roughness"));
 		let o = await n("transmission", 0);
 		if (o > 0) {
 			r.transmission = o;
@@ -7747,6 +7751,8 @@ var as = class {
 				for (let n = 0; n < 3; n++) s[n] += (Z(e) ? e : e[n]) * t.w / o;
 			}
 			n && n.w / o >= .5 ? (await this.applyColor(r, "color", n.color, i, "map"), e.some((e) => e !== n && e.w > 0) && this.warnOnce("mtlx:lobecolor", "MaterialX lobes of different colours over a texture are read as the texture")) : r.color.setRGB(s[0], s[1], s[2]), r.metalness = a(["conductor"]) / o, r.transmission = a(["transmission"]) / o;
+			let c = t.filter((e) => e.kind === "diffuse" && e.w > 0), l = a(["diffuse"]);
+			l > 0 && (r.diffuseRoughness = c.reduce((e, t) => e + t.roughness * t.w, 0) / l);
 		} else r.color.setRGB(0, 0, 0);
 		let s = t.filter((e) => [
 			"conductor",
@@ -7806,12 +7812,21 @@ var as = class {
 		}, u = n * await l("weight", 1);
 		switch (X(o)) {
 			case "oren_nayar_diffuse_bsdf":
+				r.push({
+					kind: "diffuse",
+					w: u,
+					color: await c("color"),
+					normal: await c("normal"),
+					roughness: this.mtlxDiffuseRoughness(await c("roughness"))
+				});
+				return;
 			case "burley_diffuse_bsdf":
 				r.push({
 					kind: "diffuse",
 					w: u,
 					color: await c("color"),
-					normal: await c("normal")
+					normal: await c("normal"),
+					roughness: 0
 				});
 				return;
 			case "conductor_bsdf": {
@@ -8462,7 +8477,7 @@ var fs = /* @__PURE__ */ e({
 			curveSides: i.curveSides,
 			curveTolerance: i.curveTolerance,
 			instanceIncludes: i.instanceIncludes
-		}, m = o?.archiveId ? this.loader._keyed(`pbrt:2.13:${a}`, `${o.archiveId}|${n ?? ""}|${[...o.elements ?? []].sort().join(",")}|${JSON.stringify(p)}`) : null, h = m ? await this._loadStoredGraph(m, o, {
+		}, m = o?.archiveId ? this.loader._keyed(`pbrt:2.14:${a}`, `${o.archiveId}|${n ?? ""}|${[...o.elements ?? []].sort().join(",")}|${JSON.stringify(p)}`) : null, h = m ? await this._loadStoredGraph(m, o, {
 			imageFromBytes: u,
 			envFromBytes: d
 		}) : null, g = h ?? await ga({