@meimu/mutracer 0.1.3 → 0.1.5

package/lib/renderer/glsl/shadowCatcher.frag.js

@@ -52,7 +52,7 @@ ${cameraRayGlsl}
 
 
 
-vec4 mn(inout Ray ray, out vec4 background) {
+vec4 mx(inout Ray ray, out vec4 background) {
 background = vec4(0.0);
 Path aa;
 aa.ray = ray;
@@ -65,7 +65,7 @@ aa.abort = false;
 
 ad si;
 
-cY(aa.ray, si, false);
+cZ(aa.ray, si, false);
 if (!si.hit) {
 
 
@@ -74,7 +74,7 @@ return vec4(0.0, 0.0, 0.0, 1.0);
 }
 
 J mat;
-eT(mat, si.materialIndex, si.uv, si.uv1, si.instanceIndex);
+eX(mat, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);
 if (mat.materialType != SHADOW_CATCHER) {
 
 
@@ -90,13 +90,13 @@ return vec4(1.0, bg.a, bg.a >= 0.01 ? 1.0 : 0.0, aa.alpha);
 }
 
 void main() {
-sk();
-ka(v_Texcoord * viewportSize, int(uint(sampleCount) ^ eg(uint(sequenceSeed))));
+su();
+kh(v_Texcoord * viewportSize, int(uint(sampleCount) ^ eg(uint(sequenceSeed))));
 
 if (dispersionWavelengths == 1 && wavelength > 0.0) { dz(CAMERA_WAVELENGTH); }
-Ray cam = nC();
+Ray cam = nM();
 vec4 background;
-vec4 aF = mn(cam, background);
+vec4 aF = mx(cam, background);
 
 if (!(aF.x < INF && aF.x > -EPS)) {
 aF = vec4(0, 0, 0, 1);
@@ -107,11 +107,11 @@ out_catcherBackground = background;
 
 
 
-float jl = aF.a * (background.a >= 0.01
+float jq = aF.a * (background.a >= 0.01
 ? dot(background.rgb / background.a, vec3(0.2126, 0.7152, 0.0722))
 : 1.0);
 out_catcherMoments = aF.r > 0.0
-? vec4(jl, jl * jl, 1.0, 0.0)
+? vec4(jq, jq * jq, 1.0, 0.0)
 : vec4(0.0);
 
 }`

package/lib/renderer/glsl/shadowCatcher.frag.js.map

@@ -1 +1 @@
-{"version":3,"file":"shadowCatcher.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/shadowCatcher.frag.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,sDAAsD;AACtD,kFAAkF;AAElF,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,kBAAkB,MAAM,iCAAiC,CAAC;AACjE,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,mBAAmB,MAAM,sCAAsC,CAAC;AACvE,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,eAAe,IAAI,cAAc,CAAC;IAChC,IAAI,EAAE,eAAe;IACrB,OAAO,EAAE,CAAC,eAAe,EAAE,mBAAmB,EAAE,gBAAgB,CAAC;IACjE,OAAO,EAAE;QACP,OAAO,EAAE,CAAC;KACX;IACD,QAAQ,EAAE;QACR,qBAAqB,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/C,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACtC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACpC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QAC/B,oBAAoB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;KACjD;IACD,QAAQ,EAAE,CAAC,YAAY,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;IACvE,IAAI,EAAE,IAAI,CAAA;EACV,MAAM;EACN,QAAQ;EACR,MAAM,CAAC,IAAI;;EAEX,aAAa;;EAEb,YAAY,CAAC,IAAI;EACjB,gBAAgB;;EAEhB,kBAAkB,CAAC,IAAI;EACvB,SAAS,CAAC,IAAI;EACd,MAAM,CAAC,IAAI;;EAEX,YAAY;EACZ,WAAW;EACX,mBAAmB;EACnB,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkEb;CACD,CAAC,CAAC","sourcesContent":["// Portions adapted from ray-tracing-renderer@0.10.15\n// (https://github.com/hoverinc/ray-tracing-renderer).\n// Copyright (c) 2019 HOVER, MIT license; see LICENSES/RayTracingRenderer-MIT.txt.\n\nimport cameraRayGlsl from './chunks/cameraRay.glsl.js';\nimport common from './chunks/common.glsl.js';\nimport rayTraceCore from './chunks/rayTraceCore.glsl.js';\nimport textureLinear from './chunks/textureLinear.glsl.js';\nimport materialBufferGlsl from './chunks/materialBuffer.glsl.js';\nimport intersect from './chunks/intersect.glsl.js';\nimport randGlsl from './chunks/rand.glsl.js';\nimport random from './chunks/random.glsl.js';\nimport envMap from './chunks/envMap.glsl.js';\nimport sampleShadowCatcher from './chunks/sampleShadowCatcher.glsl.js';\nimport sampleLight from './chunks/sampleLight.glsl.js';\nimport { FragmentShader, glsl, Shader } from '../shader.js';\nimport samplingGlsl from './chunks/sampling.glsl.js';\nimport uvProjectionGlsl from './chunks/uvProjection.glsl.js';\n\nexport default new FragmentShader({\n  name: 'shadowCatcher',\n  outputs: ['shadowCatcher', 'catcherBackground', 'catcherMoments'],\n  defines: {\n    BOUNCES: 2\n  },\n  uniforms: {\n    dispersionWavelengths: Shader.uniform('int', 3),\n    wavelength: Shader.uniform('float', 0),\n    viewportSize: Shader.uniform('vec2'),\n    viewProjectionInv: Shader.uniform('mat4'),\n    viewInv: Shader.uniform('mat4'),\n    cameraApertureRadius: Shader.uniform('float', 0),\n    cameraFocusDistance: Shader.uniform('float', 10)\n  },\n  includes: [rayTraceCore, materialBufferGlsl, intersect, random, envMap],\n  main: glsl`\n${common}\n${randGlsl}\n${random.main}\n\n${textureLinear}\n\n${rayTraceCore.main}\n${uvProjectionGlsl}\n\n${materialBufferGlsl.main}\n${intersect.main}\n${envMap.main}\n\n${samplingGlsl}\n${sampleLight}\n${sampleShadowCatcher}\n${cameraRayGlsl}\n\n// Path tracing integrator as described in\n// http://www.pbr-book.org/3ed-2018/Light_Transport_I_Surface_Reflection/Path_Tracing.html#\nvec4 integrator(inout Ray ray, out vec4 background) {\n  background = vec4(0.0);\n  Path path;\n  path.ray = ray;\n  path.li = vec3(0);\n  path.alpha = 1.0;\n  path.beta = vec3(1.0);\n  path.fromEye = true;\n  path.scatteringPdf = 0.0;\n  path.abort = false;\n\n  SurfaceInteraction si;\n\n  intersectScene(path.ray, si, false);\n  if (!si.hit) {\n    // Red stores catcher coverage. Keep it zero for pixels where the primary\n    // ray did not hit the catcher so denoised shadows cannot bleed onto the\n    // model silhouette during composition.\n    return vec4(0.0, 0.0, 0.0, 1.0);\n  }\n\n  OpenPbrResolvedMaterial mat;\n  getMaterial(mat, si.materialIndex, si.uv, si.uv1, si.instanceIndex);\n  if (mat.materialType != SHADOW_CATCHER) {\n    // The main path tracer already renders regular geometry. Only evaluate\n    // shadow opacity when the primary ray actually hits the catcher.\n    return vec4(0.0, 0.0, 0.0, 1.0);\n  }\n\n  vec4 bg = sampleBackgroundFromRay(ray.o, ray.d);\n  background = vec4(bg.rgb * bg.a, bg.a);\n  if (!path.abort) {\n    sampleShadowCatcher(si, 0, path);\n  }\n  return vec4(1.0, bg.a, bg.a >= 0.01 ? 1.0 : 0.0, path.alpha);\n}\n\nvoid main() {\n  initRandom();\n  rng_initialize(v_Texcoord * viewportSize, int(uint(sampleCount) ^ sampleHash(uint(sequenceSeed))));\n  // Match the beauty pass's random stream in hero-wavelength previews.\n  if (dispersionWavelengths == 1 && wavelength > 0.0) { sample1D(CAMERA_WAVELENGTH); }\n  Ray cam = primaryCameraRay();\n  vec4 background;\n  vec4 liAndAlpha = integrator(cam, background);\n\n  if (!(liAndAlpha.x < INF && liAndAlpha.x > -EPS)) {\n    liAndAlpha = vec4(0, 0, 0, 1);\n  }\n\n  out_shadowCatcher = liAndAlpha;\n  out_catcherBackground = background;\n  // The composed catcher is the background darkened by the shadow (its\n  // visibility in alpha). Over a transparent background the shadow is only\n  // its opacity.\n  float guideValue = liAndAlpha.a * (background.a >= 0.01\n    ? dot(background.rgb / background.a, vec3(0.2126, 0.7152, 0.0722))\n    : 1.0);\n  out_catcherMoments = liAndAlpha.r > 0.0\n    ? vec4(guideValue, guideValue * guideValue, 1.0, 0.0)\n    : vec4(0.0);\n\n}`\n});\n"]}
+{"version":3,"file":"shadowCatcher.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/shadowCatcher.frag.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,sDAAsD;AACtD,kFAAkF;AAElF,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,kBAAkB,MAAM,iCAAiC,CAAC;AACjE,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,mBAAmB,MAAM,sCAAsC,CAAC;AACvE,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,eAAe,IAAI,cAAc,CAAC;IAChC,IAAI,EAAE,eAAe;IACrB,OAAO,EAAE,CAAC,eAAe,EAAE,mBAAmB,EAAE,gBAAgB,CAAC;IACjE,OAAO,EAAE;QACP,OAAO,EAAE,CAAC;KACX;IACD,QAAQ,EAAE;QACR,qBAAqB,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/C,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACtC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACpC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QAC/B,oBAAoB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;KACjD;IACD,QAAQ,EAAE,CAAC,YAAY,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;IACvE,IAAI,EAAE,IAAI,CAAA;EACV,MAAM;EACN,QAAQ;EACR,MAAM,CAAC,IAAI;;EAEX,aAAa;;EAEb,YAAY,CAAC,IAAI;EACjB,gBAAgB;;EAEhB,kBAAkB,CAAC,IAAI;EACvB,SAAS,CAAC,IAAI;EACd,MAAM,CAAC,IAAI;;EAEX,YAAY;EACZ,WAAW;EACX,mBAAmB;EACnB,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkEb;CACD,CAAC,CAAC","sourcesContent":["// Portions adapted from ray-tracing-renderer@0.10.15\n// (https://github.com/hoverinc/ray-tracing-renderer).\n// Copyright (c) 2019 HOVER, MIT license; see LICENSES/RayTracingRenderer-MIT.txt.\n\nimport cameraRayGlsl from './chunks/cameraRay.glsl.js';\nimport common from './chunks/common.glsl.js';\nimport rayTraceCore from './chunks/rayTraceCore.glsl.js';\nimport textureLinear from './chunks/textureLinear.glsl.js';\nimport materialBufferGlsl from './chunks/materialBuffer.glsl.js';\nimport intersect from './chunks/intersect.glsl.js';\nimport randGlsl from './chunks/rand.glsl.js';\nimport random from './chunks/random.glsl.js';\nimport envMap from './chunks/envMap.glsl.js';\nimport sampleShadowCatcher from './chunks/sampleShadowCatcher.glsl.js';\nimport sampleLight from './chunks/sampleLight.glsl.js';\nimport { FragmentShader, glsl, Shader } from '../shader.js';\nimport samplingGlsl from './chunks/sampling.glsl.js';\nimport uvProjectionGlsl from './chunks/uvProjection.glsl.js';\n\nexport default new FragmentShader({\n  name: 'shadowCatcher',\n  outputs: ['shadowCatcher', 'catcherBackground', 'catcherMoments'],\n  defines: {\n    BOUNCES: 2\n  },\n  uniforms: {\n    dispersionWavelengths: Shader.uniform('int', 3),\n    wavelength: Shader.uniform('float', 0),\n    viewportSize: Shader.uniform('vec2'),\n    viewProjectionInv: Shader.uniform('mat4'),\n    viewInv: Shader.uniform('mat4'),\n    cameraApertureRadius: Shader.uniform('float', 0),\n    cameraFocusDistance: Shader.uniform('float', 10)\n  },\n  includes: [rayTraceCore, materialBufferGlsl, intersect, random, envMap],\n  main: glsl`\n${common}\n${randGlsl}\n${random.main}\n\n${textureLinear}\n\n${rayTraceCore.main}\n${uvProjectionGlsl}\n\n${materialBufferGlsl.main}\n${intersect.main}\n${envMap.main}\n\n${samplingGlsl}\n${sampleLight}\n${sampleShadowCatcher}\n${cameraRayGlsl}\n\n// Path tracing integrator as described in\n// http://www.pbr-book.org/3ed-2018/Light_Transport_I_Surface_Reflection/Path_Tracing.html#\nvec4 integrator(inout Ray ray, out vec4 background) {\n  background = vec4(0.0);\n  Path path;\n  path.ray = ray;\n  path.li = vec3(0);\n  path.alpha = 1.0;\n  path.beta = vec3(1.0);\n  path.fromEye = true;\n  path.scatteringPdf = 0.0;\n  path.abort = false;\n\n  SurfaceInteraction si;\n\n  intersectScene(path.ray, si, false);\n  if (!si.hit) {\n    // Red stores catcher coverage. Keep it zero for pixels where the primary\n    // ray did not hit the catcher so denoised shadows cannot bleed onto the\n    // model silhouette during composition.\n    return vec4(0.0, 0.0, 0.0, 1.0);\n  }\n\n  OpenPbrResolvedMaterial mat;\n  getMaterial(mat, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);\n  if (mat.materialType != SHADOW_CATCHER) {\n    // The main path tracer already renders regular geometry. Only evaluate\n    // shadow opacity when the primary ray actually hits the catcher.\n    return vec4(0.0, 0.0, 0.0, 1.0);\n  }\n\n  vec4 bg = sampleBackgroundFromRay(ray.o, ray.d);\n  background = vec4(bg.rgb * bg.a, bg.a);\n  if (!path.abort) {\n    sampleShadowCatcher(si, 0, path);\n  }\n  return vec4(1.0, bg.a, bg.a >= 0.01 ? 1.0 : 0.0, path.alpha);\n}\n\nvoid main() {\n  initRandom();\n  rng_initialize(v_Texcoord * viewportSize, int(uint(sampleCount) ^ sampleHash(uint(sequenceSeed))));\n  // Match the beauty pass's random stream in hero-wavelength previews.\n  if (dispersionWavelengths == 1 && wavelength > 0.0) { sample1D(CAMERA_WAVELENGTH); }\n  Ray cam = primaryCameraRay();\n  vec4 background;\n  vec4 liAndAlpha = integrator(cam, background);\n\n  if (!(liAndAlpha.x < INF && liAndAlpha.x > -EPS)) {\n    liAndAlpha = vec4(0, 0, 0, 1);\n  }\n\n  out_shadowCatcher = liAndAlpha;\n  out_catcherBackground = background;\n  // The composed catcher is the background darkened by the shadow (its\n  // visibility in alpha). Over a transparent background the shadow is only\n  // its opacity.\n  float guideValue = liAndAlpha.a * (background.a >= 0.01\n    ? dot(background.rgb / background.a, vec3(0.2126, 0.7152, 0.0722))\n    : 1.0);\n  out_catcherMoments = liAndAlpha.r > 0.0\n    ? vec4(guideValue, guideValue * guideValue, 1.0, 0.0)\n    : vec4(0.0);\n\n}`\n});\n"]}

package/lib/renderer/glsl/webglPipeline.frag.js

@@ -7,22 +7,22 @@ export const brightFragment = new FragmentShader({
         scale: Shader.uniform('float', 1)
     },
     main: glsl `
-const vec3 uJ = vec3(0.2125, 0.7154, 0.0721);
-vec4 st(vec4 a, vec4 b, vec4 c) {
+const vec3 uQ = vec3(0.2125, 0.7154, 0.0721);
+vec4 sD(vec4 a, vec4 b, vec4 c) {
 return a + b + c - min(min(a, b), c) - max(max(a, b), c);
 }
 void main() {
 vec2 d = 1.0 / vec2(colorTexRegion());
-vec4 iX = sample_colorTex(v_Texcoord);
+vec4 eA = sample_colorTex(v_Texcoord);
 vec4 s1 = sample_colorTex(v_Texcoord - vec2(d.x, 0.0));
 vec4 s2 = sample_colorTex(v_Texcoord + vec2(d.x, 0.0));
 vec4 s3 = sample_colorTex(v_Texcoord - vec2(0.0, d.y));
 vec4 s4 = sample_colorTex(v_Texcoord + vec2(0.0, d.y));
-iX = st(st(iX, s1, s2), s3, s4);
-float lum = dot(iX.rgb, uJ);
-out_color = lum > threshold && iX.a > 0.0
-? vec4(iX.rgb * scale, iX.a)
-: vec4(0.0, 0.0, 0.0, iX.a);
+eA = sD(sD(eA, s1, s2), s3, s4);
+float lum = dot(eA.rgb, uQ);
+out_color = lum > threshold && eA.a > 0.0
+? vec4(eA.rgb * scale, eA.a)
+: vec4(0.0, 0.0, 0.0, eA.a);
 }`
 });
 export const composeFragment = new FragmentShader({
@@ -48,35 +48,35 @@ export const composeFragment = new FragmentShader({
         sRGBOutput: Shader.uniform('bool', 1)
     },
     main: glsl `
-vec3 jN(vec3 color) {
+vec3 jU(vec3 color) {
 return clamp(color, 0.0, 1.0);
 }
-vec3 iK(vec3 color) {
+vec3 iP(vec3 color) {
 return clamp(color / (vec3(1.0) + color), 0.0, 1.0);
 }
-vec3 jE(vec3 color) {
+vec3 jJ(vec3 color) {
 color = max(vec3(0.0), color - 0.004);
 return pow((color * (6.2 * color + 0.5)) /
 (color * (6.2 * color + 1.7) + 0.06), vec3(2.2));
 }
-vec3 oA(vec3 value) {
-vec3 kF = value * (value + 0.0245786) - 0.000090537;
+vec3 oI(vec3 value) {
+vec3 kO = value * (value + 0.0245786) - 0.000090537;
 vec3 ap = value * (0.983729 * value + 0.4329510) + 0.238081;
-return kF / ap;
+return kO / ap;
 }
-vec3 ll(vec3 color) {
-const mat3 pn = mat3(
+vec3 lv(vec3 color) {
+const mat3 pw = mat3(
 vec3(0.59719, 0.07600, 0.02840),
 vec3(0.35458, 0.90834, 0.13383),
 vec3(0.04823, 0.01566, 0.83777)
 );
-const mat3 ov = mat3(
+const mat3 oD = mat3(
 vec3(1.60475, -0.10208, -0.00327),
 vec3(-0.53108, 1.10813, -0.07276),
 vec3(-0.07367, -0.00605, 1.07602)
 );
-color = pn * (color / 0.6);
-return clamp(ov * oA(color), 0.0, 1.0);
+color = pw * (color / 0.6);
+return clamp(oD * oI(color), 0.0, 1.0);
 }
 const mat3 LINEAR_REC2020_TO_LINEAR_SRGB = mat3(
 vec3(1.6605, -0.1246, -0.0182),
@@ -88,44 +88,44 @@ vec3(0.6274, 0.0691, 0.0164),
 vec3(0.3293, 0.9195, 0.0880),
 vec3(0.0433, 0.0113, 0.8956)
 );
-vec3 fP(vec3 value) {
-vec3 mE = value * value;
-vec3 qC = mE * mE;
-return 15.5 * qC * mE - 40.14 * qC * value
-+ 31.96 * qC - 6.868 * mE * value
-+ 0.4298 * mE + 0.1191 * value - 0.00232;
+vec3 fU(vec3 value) {
+vec3 mN = value * value;
+vec3 qK = mN * mN;
+return 15.5 * qK * mN - 40.14 * qK * value
++ 31.96 * qK - 6.868 * mN * value
++ 0.4298 * mN + 0.1191 * value - 0.00232;
 }
-vec3 lS(vec3 color) {
-const mat3 pp = mat3(
+vec3 mc(vec3 color) {
+const mat3 pH = mat3(
 vec3(0.856627153315983, 0.137318972929847, 0.11189821299995),
 vec3(0.0951212405381588, 0.761241990602591, 0.0767994186031903),
 vec3(0.0482516061458583, 0.101439036467562, 0.811302368396859)
 );
-const mat3 ow = mat3(
+const mat3 oE = mat3(
 vec3(1.1271005818144368, -0.1413297634984383, -0.14132976349843826),
 vec3(-0.11060664309660323, 1.157823702216272, -0.11060664309660294),
 vec3(-0.016493938717834573, -0.016493938717834257, 1.2519364065950405)
 );
-color = pp * (LINEAR_SRGB_TO_LINEAR_REC2020 * color);
+color = pH * (LINEAR_SRGB_TO_LINEAR_REC2020 * color);
 color = clamp((log2(max(color, 1e-10)) + 12.47393) / 16.5, 0.0, 1.0);
-color = ow * fP(color);
+color = oE * fU(color);
 color = pow(max(color, 0.0), vec3(2.2));
 return clamp(LINEAR_REC2020_TO_LINEAR_SRGB * color, 0.0, 1.0);
 }
 vec3 cl(vec3 color) {
-if (toneMappingMode == 1) return ll(color);
-if (toneMappingMode == 2) return jE(color);
-if (toneMappingMode == 3) return iK(color);
-if (toneMappingMode == 4) return jN(color);
-return lS(color);
+if (toneMappingMode == 1) return lv(color);
+if (toneMappingMode == 2) return jJ(color);
+if (toneMappingMode == 3) return iP(color);
+if (toneMappingMode == 4) return jU(color);
+return mc(color);
 }
-vec3 fX(vec3 color) {
-vec3 tb = vec3(
+vec3 gc(vec3 color) {
+vec3 tj = vec3(
 1.0 + temperature * 0.16 + tint * 0.04,
 1.0 - tint * 0.12,
 1.0 - temperature * 0.16 + tint * 0.04
 );
-color = max(color * tb, 0.0);
+color = max(color * tj, 0.0);
 color = max((color - 0.18) * contrast + 0.18, 0.0);
 float luminance = dot(color, vec3(0.2126, 0.7152, 0.0722));
 return max(mix(vec3(luminance), color, saturation), 0.0);
@@ -141,7 +141,7 @@ return;
 vec4 color = sample_colorTex(uv);
 vec4 bloom = sample_bloomTex(uv) * bloomIntensity;
 color.rgb += bloom.rgb;
-color.rgb = fX(color.rgb * exposure);
+color.rgb = gc(color.rgb * exposure);
 if (sRGBOutput) {
 float edge = smoothstep(0.2, 0.72, distance(uv, vec2(0.5)));
 color.rgb *= 1.0 - vignette * edge;
@@ -154,15 +154,15 @@ if (shadowCatcherEnabled > 0.5) {
 float coverage = clamp(shadow.r, 0.0, 1.0);
 
 
-float fO = clamp(
+float fS = clamp(
 (1.0 - shadow.a) / max(coverage, 0.000001), 0.0, 1.0
 );
-fO = max(fO - (1.0 - shadowCatcherAlpha), 0.0);
+fS = max(fS - (1.0 - shadowCatcherAlpha), 0.0);
 if (coverage > 0.0) {
 vec4 foreground = sample_foregroundTex(uv);
 vec4 background = sample_catcherBackgroundTex(uv);
-vec3 bK = fX((foreground.rgb + bloom.rgb) * exposure);
-vec3 backgroundColor = fX((background.rgb / max(background.a, 0.000001) + bloom.rgb) * exposure);
+vec3 bK = gc((foreground.rgb + bloom.rgb) * exposure);
+vec3 backgroundColor = gc((background.rgb / max(background.a, 0.000001) + bloom.rgb) * exposure);
 if (sRGBOutput) {
 float edge = smoothstep(0.2, 0.72, distance(uv, vec2(0.5)));
 bK *= 1.0 - vignette * edge;
@@ -171,15 +171,15 @@ bK = pow(max(cl(bK), 0.0), vec3(1.0 / 2.2));
 backgroundColor = pow(max(cl(backgroundColor), 0.0), vec3(1.0 / 2.2));
 }
 
-float opacity = fO;
-fO *= coverage;
-float lU = clamp(dot(bloom.rgb, vec3(0.2125, 0.7154, 0.0721)), 0.0, 1.0);
-float hr = max(foreground.a, lU * (1.0 - coverage));
-float iZ = max(background.a, lU * coverage);
-float alpha = hr + iZ * (1.0 - opacity) + fO;
-vec3 premultiplied = bK * hr
-+ backgroundColor * iZ * (1.0 - opacity)
-+ shadowCatcherColor * fO;
+float opacity = fS;
+fS *= coverage;
+float mf = clamp(dot(bloom.rgb, vec3(0.2125, 0.7154, 0.0721)), 0.0, 1.0);
+float hv = max(foreground.a, mf * (1.0 - coverage));
+float jd = max(background.a, mf * coverage);
+float alpha = hv + jd * (1.0 - opacity) + fS;
+vec3 premultiplied = bK * hv
++ backgroundColor * jd * (1.0 - opacity)
++ shadowCatcherColor * fS;
 color = vec4(premultiplied / max(alpha, 0.000001), alpha);
 }
 }

package/lib/renderer/lightsUtil.js

@@ -49,7 +49,7 @@ export function packLightsToBuffer(lights, texturesIndices, selectionPmfs = [],
             packVec3(off + 2, getLightDirection(light));
             packVec3(off + 3, [
                 Math.cos((light.outerAngle * Math.PI) / 180),
-                Math.min(1, Math.max(0, 1 - light.innerAngle / light.outerAngle)),
+                Math.cos((Math.min(light.innerAngle, light.outerAngle) * Math.PI) / 180),
                 0
             ]);
             data[(off + 3) * 4 + 3] = iesProfileTexelOffsets[i] ?? -1;
@@ -106,9 +106,11 @@ export function getSpotLightRadiance(light) {
     return light.intensity / (Math.PI * light.radius ** 2);
 }
 export function getSpotLightShapingFluxFactor(light) {
-    const cosConeAngle = Math.cos((light.outerAngle * Math.PI) / 180);
-    const softness = Math.min(1, Math.max(0, 1 - light.innerAngle / light.outerAngle));
-    return (1 - cosConeAngle) * (1 - 0.5 * softness) * 0.5;
+    // Fraction of the full sphere covered by the cone. The smoothstep falloff
+    // between the inner and outer cosines integrates to half its width.
+    const cosOuter = Math.cos((light.outerAngle * Math.PI) / 180);
+    const cosInner = Math.cos((Math.min(light.innerAngle, light.outerAngle) * Math.PI) / 180);
+    return 0.5 * (1 - 0.5 * (cosInner + cosOuter));
 }
 const warnedLights = new WeakSet();
 /** Sanitizes invalid mutable light values at the packing boundary; notifications are nonfatal. */

package/lib/renderer/lightsUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"lightsUtil.js","sourceRoot":"","sources":["../../src/renderer/lightsUtil.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SceneLight, AnalyticLight } from '../scene/Scene.js';\nimport type { Vec3 } from '../types.js';\nimport DirectionalLight from '../scene/DirectionalLight.js';\nimport SphereLight from '../scene/SphereLight.js';\nimport RectLight from '../scene/RectLight.js';\nimport SpotLight from '../scene/SpotLight.js';\n\nexport const CONSTANT_DIRECTIONAL_LIGHT = 1;\nexport const CONSTANT_SPHERE_LIGHT = 2;\nexport const CONSTANT_RECT_LIGHT = 3;\nexport const CONSTANT_SPOT_LIGHT = 4;\n\nexport function packLightsToBuffer(\n  lights: (DirectionalLight | RectLight | SphereLight | SpotLight)[],\n  texturesIndices: number[],\n  selectionPmfs: ArrayLike<number> = [],\n  selectionCdfs: ArrayLike<number> = [],\n  iesProfileTexelOffsets: ArrayLike<number> = []\n) {\n  validateSceneLights(lights);\n  const numLights = lights.length;\n  const PIXELS_PER_LIGHT = 6;\n  const data = new Float32Array(numLights * PIXELS_PER_LIGHT * 4);\n\n  function packVec3(idx: number, v: number[] | Float32Array) {\n    for (let i = 0; i < 3; i++) {\n      data[i + idx * 4] = v[i];\n    }\n  }\n\n  for (let i = 0; i < numLights; i++) {\n    const light = lights[i];\n    const color = light.color;\n    const intensity = light.intensity;\n    const off = i * PIXELS_PER_LIGHT;\n    packVec3(\n      off,\n      light.position\n    );\n    data[off * 4 + 3] = selectionPmfs[i] ?? 1 / Math.max(numLights, 1);\n    // emission\n    const emissionScale =\n      light.type === 'SpotLight' ? getSpotLightRadiance(light) : intensity;\n    packVec3(off + 1, [\n      color[0] * emissionScale,\n      color[1] * emissionScale,\n      color[2] * emissionScale\n    ]);\n    data[(off + 1) * 4 + 3] = selectionCdfs[i] ?? (i + 1) / numLights;\n    if (light.type === 'RectLight') {\n      packVec3(off + 2, getRectLightUOrV(light, 0));\n      data[(off + 2) * 4 + 3] = light.spread;\n      packVec3(off + 3, getRectLightUOrV(light, 1));\n      data[(off + 3) * 4 + 3] = texturesIndices[i] ?? -1;\n      packVec3(off + 4, [\n        light.spread,\n        getRectLightArea(light),\n        CONSTANT_RECT_LIGHT\n      ]);\n    } else if (light.type === 'SphereLight') {\n      packVec3(off + 4, [\n        light.radius,\n        getSphereLightArea(light),\n        CONSTANT_SPHERE_LIGHT\n      ]);\n    } else if (light.type === 'SpotLight') {\n      packVec3(off + 2, getLightDirection(light));\n      packVec3(off + 3, [\n        Math.cos((light.outerAngle * Math.PI) / 180),\n        Math.min(1, Math.max(0, 1 - light.innerAngle / light.outerAngle)),\n        0\n      ]);\n      data[(off + 3) * 4 + 3] = iesProfileTexelOffsets[i] ?? -1;\n      packVec3(off + 4, [\n        light.radius,\n        getSpotLightArea(light),\n        CONSTANT_SPOT_LIGHT\n      ]);\n    } else if (light.type === 'DirectionalLight') {\n      packVec3(off + 2, getLightDirection(light));\n      packVec3(off + 4, [0, 0, CONSTANT_DIRECTIONAL_LIGHT]);\n    }\n    packVec3(off + 5, getRigidLightFrame(light).x);\n  }\n\n  return data;\n}\n\nexport function getRigidLightFrame(light: AnalyticLight) {\n  const m = light.transform;\n  const normalize = (v: Vec3, fallback: Vec3): Vec3 => {\n    const length = Math.hypot(v[0], v[1], v[2]);\n    return length > 1e-12 ? [v[0]/length, v[1]/length, v[2]/length] : fallback;\n  };\n  const z = normalize([m[8],m[9],m[10]], [0,0,1]);\n  const projection = m[0]*z[0] + m[1]*z[1] + m[2]*z[2];\n  let x: Vec3 = [m[0]-projection*z[0],m[1]-projection*z[1],m[2]-projection*z[2]];\n  if (Math.hypot(...x) <= 1e-12) x = Math.abs(z[1]) < .99 ? [z[2],0,-z[0]] : [1,0,0];\n  x = normalize(x, [1,0,0]);\n  const y: Vec3 = [z[1]*x[2]-z[2]*x[1], z[2]*x[0]-z[0]*x[2], z[0]*x[1]-z[1]*x[0]];\n  return { x, y, direction: [-z[0] || 0,-z[1] || 0,-z[2] || 0] as Vec3 };\n}\nexport function getLightDirection(light: AnalyticLight) { return getRigidLightFrame(light).direction; }\nexport function getRectLightUOrV(light: RectLight, uOrV: 0 | 1) {\n  const frame = getRigidLightFrame(light), axis = uOrV ? frame.y : frame.x;\n  const size = light.size[uOrV] * (uOrV ? -1 : 1);\n  return [axis[0]*size,axis[1]*size,axis[2]*size];\n}\nexport function getRectLightPosition(light: RectLight) { return light.position; }\n\nexport function getRectLightArea(light: RectLight) {\n    return light.size[0] * light.size[1];\n}\n\nexport function getSphereLightArea(light: SphereLight) {\n    return 4 * Math.PI * light.radius ** 2;\n}\n\nexport function getSpotLightArea(light: SpotLight) {\n    return 4 * Math.PI * light.radius ** 2;\n}\n\nexport function getSpotLightRadiance(light: SpotLight) {\n    // A zero-radius spot is a point emitter. Its stored emission is luminous\n    // intensity (cd), and the shader applies inverse-square attenuation.\n    if (light.radius === 0) return light.intensity;\n    return light.intensity / (Math.PI * light.radius ** 2);\n}\n\nexport function getSpotLightShapingFluxFactor(light: SpotLight) {\n    const cosConeAngle = Math.cos((light.outerAngle * Math.PI) / 180);\n    const softness = Math.min(\n      1,\n      Math.max(0, 1 - light.innerAngle / light.outerAngle)\n    );\n    return (1 - cosConeAngle) * (1 - 0.5 * softness) * 0.5;\n}\n\nconst warnedLights = new WeakSet<SceneLight>();\n/** Sanitizes invalid mutable light values at the packing boundary; notifications are nonfatal. */\nexport function validateSceneLights(lights: readonly SceneLight[], onError?: (error: Error) => void) {\n  for (const light of lights) {\n    if (light.type === 'EnvironmentLight') continue;\n    let invalid = false;\n    const clamp = (value: number, min: number, max: number, fallback: number) => {\n      const normalized = Math.min(max,Math.max(min,Number.isFinite(value) ? value : fallback));\n      invalid ||= !Object.is(normalized,value);\n      return normalized;\n    };\n    light.intensity = clamp(light.intensity,0,Number.MAX_VALUE,1);\n    for(let i=0;i<3;i++)light.color[i] = clamp(light.color[i],0,Number.MAX_VALUE,1);\n    if (light.type !== 'AmbientLight') {\n      for(let i=0;i<16;i++) if (!Number.isFinite(light.transform[i])) {\n        light.transform[i] = i % 5 === 0 ? 1 : 0; invalid = true;\n      }\n    }\n    if (light.type === 'RectLight') {\n      for(let i=0;i<2;i++)light.size[i] = clamp(light.size[i],0,Number.MAX_VALUE,1);\n      light.spread = clamp(light.spread,0,1,1);\n    }\n    if (light.type === 'SphereLight' || light.type === 'SpotLight') light.radius = clamp(light.radius,0,Number.MAX_VALUE,light.type === 'SpotLight' ? .01 : 1);\n    if (light.type === 'SpotLight') {\n      light.outerAngle = clamp(light.outerAngle,Number.EPSILON,180,45);\n      light.innerAngle = clamp(light.innerAngle,0,light.outerAngle,30);\n    }\n    if (invalid && !warnedLights.has(light)) {\n      warnedLights.add(light);\n      const error = new Error(`Invalid ${light.type} values were clamped.`);\n      console.warn(error.message);\n      onError?.(error);\n    }\n  }\n}\n"]}
+{"version":3,"file":"lightsUtil.js","sourceRoot":"","sources":["../../src/renderer/lightsUtil.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SceneLight, AnalyticLight } from '../scene/Scene.js';\nimport type { Vec3 } from '../types.js';\nimport DirectionalLight from '../scene/DirectionalLight.js';\nimport SphereLight from '../scene/SphereLight.js';\nimport RectLight from '../scene/RectLight.js';\nimport SpotLight from '../scene/SpotLight.js';\n\nexport const CONSTANT_DIRECTIONAL_LIGHT = 1;\nexport const CONSTANT_SPHERE_LIGHT = 2;\nexport const CONSTANT_RECT_LIGHT = 3;\nexport const CONSTANT_SPOT_LIGHT = 4;\n\nexport function packLightsToBuffer(\n  lights: (DirectionalLight | RectLight | SphereLight | SpotLight)[],\n  texturesIndices: number[],\n  selectionPmfs: ArrayLike<number> = [],\n  selectionCdfs: ArrayLike<number> = [],\n  iesProfileTexelOffsets: ArrayLike<number> = []\n) {\n  validateSceneLights(lights);\n  const numLights = lights.length;\n  const PIXELS_PER_LIGHT = 6;\n  const data = new Float32Array(numLights * PIXELS_PER_LIGHT * 4);\n\n  function packVec3(idx: number, v: number[] | Float32Array) {\n    for (let i = 0; i < 3; i++) {\n      data[i + idx * 4] = v[i];\n    }\n  }\n\n  for (let i = 0; i < numLights; i++) {\n    const light = lights[i];\n    const color = light.color;\n    const intensity = light.intensity;\n    const off = i * PIXELS_PER_LIGHT;\n    packVec3(\n      off,\n      light.position\n    );\n    data[off * 4 + 3] = selectionPmfs[i] ?? 1 / Math.max(numLights, 1);\n    // emission\n    const emissionScale =\n      light.type === 'SpotLight' ? getSpotLightRadiance(light) : intensity;\n    packVec3(off + 1, [\n      color[0] * emissionScale,\n      color[1] * emissionScale,\n      color[2] * emissionScale\n    ]);\n    data[(off + 1) * 4 + 3] = selectionCdfs[i] ?? (i + 1) / numLights;\n    if (light.type === 'RectLight') {\n      packVec3(off + 2, getRectLightUOrV(light, 0));\n      data[(off + 2) * 4 + 3] = light.spread;\n      packVec3(off + 3, getRectLightUOrV(light, 1));\n      data[(off + 3) * 4 + 3] = texturesIndices[i] ?? -1;\n      packVec3(off + 4, [\n        light.spread,\n        getRectLightArea(light),\n        CONSTANT_RECT_LIGHT\n      ]);\n    } else if (light.type === 'SphereLight') {\n      packVec3(off + 4, [\n        light.radius,\n        getSphereLightArea(light),\n        CONSTANT_SPHERE_LIGHT\n      ]);\n    } else if (light.type === 'SpotLight') {\n      packVec3(off + 2, getLightDirection(light));\n      packVec3(off + 3, [\n        Math.cos((light.outerAngle * Math.PI) / 180),\n        Math.cos((Math.min(light.innerAngle, light.outerAngle) * Math.PI) / 180),\n        0\n      ]);\n      data[(off + 3) * 4 + 3] = iesProfileTexelOffsets[i] ?? -1;\n      packVec3(off + 4, [\n        light.radius,\n        getSpotLightArea(light),\n        CONSTANT_SPOT_LIGHT\n      ]);\n    } else if (light.type === 'DirectionalLight') {\n      packVec3(off + 2, getLightDirection(light));\n      packVec3(off + 4, [0, 0, CONSTANT_DIRECTIONAL_LIGHT]);\n    }\n    packVec3(off + 5, getRigidLightFrame(light).x);\n  }\n\n  return data;\n}\n\nexport function getRigidLightFrame(light: AnalyticLight) {\n  const m = light.transform;\n  const normalize = (v: Vec3, fallback: Vec3): Vec3 => {\n    const length = Math.hypot(v[0], v[1], v[2]);\n    return length > 1e-12 ? [v[0]/length, v[1]/length, v[2]/length] : fallback;\n  };\n  const z = normalize([m[8],m[9],m[10]], [0,0,1]);\n  const projection = m[0]*z[0] + m[1]*z[1] + m[2]*z[2];\n  let x: Vec3 = [m[0]-projection*z[0],m[1]-projection*z[1],m[2]-projection*z[2]];\n  if (Math.hypot(...x) <= 1e-12) x = Math.abs(z[1]) < .99 ? [z[2],0,-z[0]] : [1,0,0];\n  x = normalize(x, [1,0,0]);\n  const y: Vec3 = [z[1]*x[2]-z[2]*x[1], z[2]*x[0]-z[0]*x[2], z[0]*x[1]-z[1]*x[0]];\n  return { x, y, direction: [-z[0] || 0,-z[1] || 0,-z[2] || 0] as Vec3 };\n}\nexport function getLightDirection(light: AnalyticLight) { return getRigidLightFrame(light).direction; }\nexport function getRectLightUOrV(light: RectLight, uOrV: 0 | 1) {\n  const frame = getRigidLightFrame(light), axis = uOrV ? frame.y : frame.x;\n  const size = light.size[uOrV] * (uOrV ? -1 : 1);\n  return [axis[0]*size,axis[1]*size,axis[2]*size];\n}\nexport function getRectLightPosition(light: RectLight) { return light.position; }\n\nexport function getRectLightArea(light: RectLight) {\n    return light.size[0] * light.size[1];\n}\n\nexport function getSphereLightArea(light: SphereLight) {\n    return 4 * Math.PI * light.radius ** 2;\n}\n\nexport function getSpotLightArea(light: SpotLight) {\n    return 4 * Math.PI * light.radius ** 2;\n}\n\nexport function getSpotLightRadiance(light: SpotLight) {\n    // A zero-radius spot is a point emitter. Its stored emission is luminous\n    // intensity (cd), and the shader applies inverse-square attenuation.\n    if (light.radius === 0) return light.intensity;\n    return light.intensity / (Math.PI * light.radius ** 2);\n}\n\nexport function getSpotLightShapingFluxFactor(light: SpotLight) {\n    // Fraction of the full sphere covered by the cone. The smoothstep falloff\n    // between the inner and outer cosines integrates to half its width.\n    const cosOuter = Math.cos((light.outerAngle * Math.PI) / 180);\n    const cosInner = Math.cos((Math.min(light.innerAngle, light.outerAngle) * Math.PI) / 180);\n    return 0.5 * (1 - 0.5 * (cosInner + cosOuter));\n}\n\nconst warnedLights = new WeakSet<SceneLight>();\n/** Sanitizes invalid mutable light values at the packing boundary; notifications are nonfatal. */\nexport function validateSceneLights(lights: readonly SceneLight[], onError?: (error: Error) => void) {\n  for (const light of lights) {\n    if (light.type === 'EnvironmentLight') continue;\n    let invalid = false;\n    const clamp = (value: number, min: number, max: number, fallback: number) => {\n      const normalized = Math.min(max,Math.max(min,Number.isFinite(value) ? value : fallback));\n      invalid ||= !Object.is(normalized,value);\n      return normalized;\n    };\n    light.intensity = clamp(light.intensity,0,Number.MAX_VALUE,1);\n    for(let i=0;i<3;i++)light.color[i] = clamp(light.color[i],0,Number.MAX_VALUE,1);\n    if (light.type !== 'AmbientLight') {\n      for(let i=0;i<16;i++) if (!Number.isFinite(light.transform[i])) {\n        light.transform[i] = i % 5 === 0 ? 1 : 0; invalid = true;\n      }\n    }\n    if (light.type === 'RectLight') {\n      for(let i=0;i<2;i++)light.size[i] = clamp(light.size[i],0,Number.MAX_VALUE,1);\n      light.spread = clamp(light.spread,0,1,1);\n    }\n    if (light.type === 'SphereLight' || light.type === 'SpotLight') light.radius = clamp(light.radius,0,Number.MAX_VALUE,light.type === 'SpotLight' ? .01 : 1);\n    if (light.type === 'SpotLight') {\n      light.outerAngle = clamp(light.outerAngle,Number.EPSILON,180,45);\n      light.innerAngle = clamp(light.innerAngle,0,light.outerAngle,30);\n    }\n    if (invalid && !warnedLights.has(light)) {\n      warnedLights.add(light);\n      const error = new Error(`Invalid ${light.type} values were clamped.`);\n      console.warn(error.message);\n      onError?.(error);\n    }\n  }\n}\n"]}

package/lib/renderer/materialChanges.js

@@ -11,7 +11,7 @@ function textureKey(texture) {
     if (!textureIds.has(texture.image))
         textureIds.set(texture.image, nextTextureId++);
     return [textureIds.get(texture), textureIds.get(texture.image), texture.version, texture.uvScale.join(','),
-        texture.uvOffset.join(','), texture.uvChannel, texture.flipY].join(':');
+        texture.uvOffset.join(','), texture.uvChannel, texture.flipY, texture.wrapS, texture.wrapT, texture.colorSpace].join(':');
 }
 function key(material, keys) {
     return JSON.stringify(keys.map(k => material[k]));

package/lib/renderer/materialChanges.js.map

@@ -1 +1 @@
-{"version":3,"file":"materialChanges.js","sourceRoot":"","sources":["../../src/renderer/materialChanges.ts"],"names":[],"mappings":"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","sourcesContent":["import OpenPBRMaterial, { materialGeometryKeys, materialParamKeys, materialTextureKeys } from '../scene/OpenPBRMaterial.js';\nimport Texture from '../scene/Texture.js';\nimport { colorLuminance } from './lightSampling.js';\nimport { materialEmission } from './materialEmission.js';\n\nexport type MaterialUpdateLevel = 'params' | 'emission' | 'textures' | 'geometry';\ninterface MaterialSnapshot {\n  paramKey: string;\n  textureKey: string;\n  geometryKey: string;\n  emissive: string;\n  emissiveMap: string;\n}\nconst textureIds = new WeakMap<object, number>();\nlet nextTextureId = 1;\nfunction textureKey(texture: Texture | undefined) {\n  if (!texture) return '-';\n  if (!textureIds.has(texture)) textureIds.set(texture, nextTextureId++);\n  if (!textureIds.has(texture.image)) textureIds.set(texture.image, nextTextureId++);\n  return [textureIds.get(texture), textureIds.get(texture.image), texture.version, texture.uvScale.join(','),\n    texture.uvOffset.join(','), texture.uvChannel, texture.flipY].join(':');\n}\nfunction key(material: OpenPBRMaterial, keys: readonly (keyof OpenPBRMaterial)[]) {\n  return JSON.stringify(keys.map(k => material[k]));\n}\nfunction snapshot(material: OpenPBRMaterial): MaterialSnapshot {\n  return {\n    paramKey: key(material, materialParamKeys),\n    textureKey: materialTextureKeys.map(k => { const value = material[k]; return typeof value === 'number' ? String(value) : textureKey(value); }).join('|'),\n    // Height maps affect projective BLAS bounds.\n    geometryKey: key(material, materialGeometryKeys) + '|' + textureKey(material.displacementMap),\n    emissive: key(material, ['emissionColor', 'emissionLuminance', 'coatWeight', 'coatColor', 'unlit', 'shadowCatcher']) + '|' + textureKey(material.coatWeightMap),\n    emissiveMap: textureKey(material.emissiveMap)\n  };\n}\nexport function materialIsEmissive(material: OpenPBRMaterial) {\n  return !material.unlit && !material.shadowCatcher &&\n    colorLuminance(materialEmission(material)) > 1e-8;\n}\n\n/** Expensive field keys are computed only when receiving changed materials. */\nexport class MaterialChangeTracker {\n  private _snapshots = new WeakMap<OpenPBRMaterial, MaterialSnapshot>();\n  capture(materials: readonly OpenPBRMaterial[]) {\n    for (const material of materials) this._snapshots.set(material, snapshot(material));\n  }\n  classify(materials: readonly OpenPBRMaterial[]): { level: MaterialUpdateLevel; emission: boolean; emissiveMap: boolean } {\n    let level: MaterialUpdateLevel = 'params';\n    let emission = false;\n    let emissiveMap = false;\n    const ranks = { params: 0, emission: 1, textures: 2, geometry: 3 };\n    for (const material of materials) {\n      const previous = this._snapshots.get(material);\n      const next = snapshot(material);\n      const emissionChanged = !previous || previous.emissive !== next.emissive;\n      emission ||= emissionChanged;\n      emissiveMap ||= !previous || previous.emissiveMap !== next.emissiveMap;\n      const candidate: MaterialUpdateLevel = !previous || next.geometryKey !== previous.geometryKey\n        ? 'geometry' : next.textureKey !== previous.textureKey ? 'textures' : emissionChanged ? 'emission' : 'params';\n      if (ranks[candidate] > ranks[level]) level = candidate;\n    }\n    return { level, emission, emissiveMap };\n  }\n}\n"]}
+{"version":3,"file":"materialChanges.js","sourceRoot":"","sources":["../../src/renderer/materialChanges.ts"],"names":[],"mappings":"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","sourcesContent":["import OpenPBRMaterial, { materialGeometryKeys, materialParamKeys, materialTextureKeys } from '../scene/OpenPBRMaterial.js';\nimport Texture from '../scene/Texture.js';\nimport { colorLuminance } from './lightSampling.js';\nimport { materialEmission } from './materialEmission.js';\n\nexport type MaterialUpdateLevel = 'params' | 'emission' | 'textures' | 'geometry';\ninterface MaterialSnapshot {\n  paramKey: string;\n  textureKey: string;\n  geometryKey: string;\n  emissive: string;\n  emissiveMap: string;\n}\nconst textureIds = new WeakMap<object, number>();\nlet nextTextureId = 1;\nfunction textureKey(texture: Texture | undefined) {\n  if (!texture) return '-';\n  if (!textureIds.has(texture)) textureIds.set(texture, nextTextureId++);\n  if (!textureIds.has(texture.image)) textureIds.set(texture.image, nextTextureId++);\n  return [textureIds.get(texture), textureIds.get(texture.image), texture.version, texture.uvScale.join(','),\n    texture.uvOffset.join(','), texture.uvChannel, texture.flipY, texture.wrapS, texture.wrapT, texture.colorSpace].join(':');\n}\nfunction key(material: OpenPBRMaterial, keys: readonly (keyof OpenPBRMaterial)[]) {\n  return JSON.stringify(keys.map(k => material[k]));\n}\nfunction snapshot(material: OpenPBRMaterial): MaterialSnapshot {\n  return {\n    paramKey: key(material, materialParamKeys),\n    textureKey: materialTextureKeys.map(k => { const value = material[k]; return typeof value === 'number' ? String(value) : textureKey(value); }).join('|'),\n    // Height maps affect projective BLAS bounds.\n    geometryKey: key(material, materialGeometryKeys) + '|' + textureKey(material.displacementMap),\n    emissive: key(material, ['emissionColor', 'emissionLuminance', 'coatWeight', 'coatColor', 'unlit', 'shadowCatcher']) + '|' + textureKey(material.coatWeightMap),\n    emissiveMap: textureKey(material.emissiveMap)\n  };\n}\nexport function materialIsEmissive(material: OpenPBRMaterial) {\n  return !material.unlit && !material.shadowCatcher &&\n    colorLuminance(materialEmission(material)) > 1e-8;\n}\n\n/** Expensive field keys are computed only when receiving changed materials. */\nexport class MaterialChangeTracker {\n  private _snapshots = new WeakMap<OpenPBRMaterial, MaterialSnapshot>();\n  capture(materials: readonly OpenPBRMaterial[]) {\n    for (const material of materials) this._snapshots.set(material, snapshot(material));\n  }\n  classify(materials: readonly OpenPBRMaterial[]): { level: MaterialUpdateLevel; emission: boolean; emissiveMap: boolean } {\n    let level: MaterialUpdateLevel = 'params';\n    let emission = false;\n    let emissiveMap = false;\n    const ranks = { params: 0, emission: 1, textures: 2, geometry: 3 };\n    for (const material of materials) {\n      const previous = this._snapshots.get(material);\n      const next = snapshot(material);\n      const emissionChanged = !previous || previous.emissive !== next.emissive;\n      emission ||= emissionChanged;\n      emissiveMap ||= !previous || previous.emissiveMap !== next.emissiveMap;\n      const candidate: MaterialUpdateLevel = !previous || next.geometryKey !== previous.geometryKey\n        ? 'geometry' : next.textureKey !== previous.textureKey ? 'textures' : emissionChanged ? 'emission' : 'params';\n      if (ranks[candidate] > ranks[level]) level = candidate;\n    }\n    return { level, emission, emissiveMap };\n  }\n}\n"]}

package/lib/renderer/materialComparison.generated.js

@@ -413,7 +413,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -427,7 +428,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -441,7 +443,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -455,7 +458,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -469,7 +473,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -483,7 +488,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -497,7 +503,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -511,7 +518,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -525,7 +533,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -539,7 +548,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -553,7 +563,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -567,7 +578,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -581,7 +593,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -595,7 +608,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -609,7 +623,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -623,7 +638,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -637,7 +653,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }
@@ -651,7 +668,8 @@ export function materialTexturesChanged(material, previous) {
             else if (previous[i++] !== texture || previous[i++] !== texture.version ||
                 previous[i++] !== texture.image || previous[i++] !== texture.flipY ||
                 previous[i++] !== texture.uvScale || previous[i++] !== texture.uvOffset ||
-                previous[i++] !== texture.uvChannel)
+                previous[i++] !== texture.uvChannel || previous[i++] !== texture.wrapS || previous[i++] !== texture.wrapT ||
+                previous[i++] !== texture.colorSpace)
                 return true;
         }
     }