@meimu/mutracer 0.1.2 → 0.1.4

package/lib/renderer/glsl/chunks/sobol.glsl.js

@@ -26,10 +26,10 @@ const uint BOUNCE_STRIDE = 64u;
 
 uvec2 bc;
 uint bd;
-uint cE = 0u;
+uint cF = 0u;
 uint em = 0u;
-uint eg(uint ki) {
-uint x = ki;
+uint eg(uint kt) {
+uint x = kt;
 x ^= x >> 16u; x *= 0x7feb352du;
 x ^= x >> 15u; x *= 0x846ca68bu;
 return x ^ (x >> 16u);
@@ -37,28 +37,28 @@ return x ^ (x >> 16u);
 uint aq(uint a, uint b) {
 return eg(a ^ eg(b + 0x9e3779b9u));
 }
-uint iA(uint ki, uint ie) {
-uint x = ki + ie;
+uint iE(uint kt, uint ij) {
+uint x = kt + ij;
 x ^= x * 0x6c50b47cu; x ^= x * 0xb82f1e52u;
 x ^= x * 0xc7afe638u; x ^= x * 0x8d22f6e6u;
 return x;
 }
-uint sv(uint x, uint ie) {
-return reverseBits(iA(reverseBits(x), ie));
+uint sK(uint x, uint ij) {
+return reverseBits(iE(reverseBits(x), ij));
 }
 
-uint qX(uint ki) {
-uint r = reverseBits(ki);
+uint rl(uint kt) {
+uint r = reverseBits(kt);
 ${sobolD1Steps.map(([shift, mask]) => `r ^= (r << ${shift}u) & 0x${mask.toString(16)}u;`).join("\n  ")}
 return r;
 }
-vec2 vD(uint index, uint ie) {
-uint i = sv(index, aq(ie, 0u));
-uint x = reverseBits(iA(i, aq(ie, 1u)));
-uint y = sv(qX(i), aq(ie, 2u));
+vec2 vP(uint index, uint ij) {
+uint i = sK(index, aq(ij, 0u));
+uint x = reverseBits(iE(i, aq(ij, 1u)));
+uint y = sK(rl(i), aq(ij, 2u));
 return vec2(float(x >> 8u), float(y >> 8u)) * (1.0 / 16777216.0);
 }
-uint tj(uvec2 p) {
+uint tB(uvec2 p) {
 uvec2 v = p & uvec2(255u);
 v = (v | (v << uvec2(4u))) & uvec2(0x0f0fu);
 v = (v | (v << uvec2(2u))) & uvec2(0x3333u);
@@ -66,104 +66,104 @@ v = (v | (v << uvec2(1u))) & uvec2(0x5555u);
 return v.x | (v.y << 1u);
 }
 ${zSobolPackedPermutations.map((v, i) => `const uint Z_PERM_${i} = ${v}u;`).join("\n")}
-uint kk(uint tm) {
-uint group = tm >> 2u;
+uint kw(uint tE) {
+uint group = tE >> 2u;
 uint word = Z_PERM_5;
 ${[0, 1, 2, 3, 4].map(i => `word = group == ${i}u ? Z_PERM_${i} : word;`).join("\n  ")}
-return (word >> ((tm & 3u) * 8u)) & 255u;
+return (word >> ((tE & 3u) * 8u)) & 255u;
 }
-uint pK(uint kB, uint dim, uint logSPP) {
+uint pW(uint kN, uint dim, uint logSPP) {
 uint odd = logSPP & 1u;
-uint ua = 8u + ((logSPP + 1u) >> 1u);
+uint um = 8u + ((logSPP + 1u) >> 1u);
 uint result = 0u;
-for (int digit = int(ua) - 1; digit >= int(odd); digit--) {
+for (int digit = int(um) - 1; digit >= int(odd); digit--) {
 uint shift = 2u*uint(digit) - odd;
 
-uint sd = 0u;
-if (shift < 30u) { sd = kB >> (shift + 2u); }
-uint tm = (eg(sd ^ (0x55555555u * dim)) >> 24u) % 24u;
-uint d = (kB >> shift) & 3u;
-result |= ((kk(tm) >> (2u*d)) & 3u) << shift;
+uint st = 0u;
+if (shift < 30u) { st = kN >> (shift + 2u); }
+uint tE = (eg(st ^ (0x55555555u * dim)) >> 24u) % 24u;
+uint d = (kN >> shift) & 3u;
+result |= ((kw(tE) >> (2u*d)) & 3u) << shift;
 }
 if (odd != 0u) {
-result |= (kB & 1u) ^ (eg((kB >> 1u) ^ (0x55555555u * dim)) & 1u);
+result |= (kN & 1u) ^ (eg((kN >> 1u) ^ (0x55555555u * dim)) & 1u);
 }
 return result;
 }
 
 
 
-uint cv(uint slot) {
-return CAMERA_BEVEL_BASE + uint(BEVEL_SAMPLES) + cE * BOUNCE_STRIDE + slot;
+uint cw(uint slot) {
+return CAMERA_BEVEL_BASE + uint(BEVEL_SAMPLES) + cF * BOUNCE_STRIDE + slot;
 }
 
-uvec4 hh;
-uint hi;
-bool fv = false;
-bool df = false;
-uint dE;
-uint gp;
-vec2 eN;
+uvec4 hl;
+uint hm;
+bool fB = false;
+bool dg = false;
+uint dF;
+uint gu;
+vec2 eQ;
 void dw(uint dim) {
 
-uint jU = bc.x + bc.y * uint(round(1.0 / pixelSize.x));
-uvec4 key = uvec4(dim, bd, jU, uint(sequenceSeed));
-if (fv && all(equal(hh, key)) && hi == uint(zSobolLogSPP)) { return; }
-hh = key; hi = uint(zSobolLogSPP);
-fv = true; df = false;
-uint ie = aq(aq(jU, dim), uint(sequenceSeed));
+uint kd = bc.x + bc.y * uint(round(1.0 / pixelSize.x));
+uvec4 key = uvec4(dim, bd, kd, uint(sequenceSeed));
+if (fB && all(equal(hl, key)) && hm == uint(zSobolLogSPP)) { return; }
+hl = key; hm = uint(zSobolLogSPP);
+fB = true; dg = false;
+uint ij = aq(aq(kd, dim), uint(sequenceSeed));
 uint index = bd;
 if (samplingPattern == 1) {
 uint logSPP = uint(zSobolLogSPP);
 if (index == 0u) { logSPP = 0u; }
 else { index -= 1u; }
 
-uint iV = index >> logSPP;
+uint jb = index >> logSPP;
 uint mask = (1u << logSPP) - 1u;
-uint kB = (tj(bc) << logSPP) | (index & mask);
-index = pK(kB, dim, logSPP);
+uint kN = (tB(bc) << logSPP) | (index & mask);
+index = pW(kN, dim, logSPP);
 uvec2 tile = bc >> uvec2(8u);
-ie = aq(aq(dim, uint(sequenceSeed)), aq(tile.x, tile.y));
+ij = aq(aq(dim, uint(sequenceSeed)), aq(tile.x, tile.y));
 
-if (bd != 0u) { iV += 1u; }
-ie = aq(ie, iV);
+if (bd != 0u) { jb += 1u; }
+ij = aq(ij, jb);
 }
-dE = sv(index, aq(ie, 0u));
-gp = ie;
-uint x = reverseBits(iA(dE, aq(ie, 1u)));
-eN.x = float(x >> 8u) * (1.0 / 16777216.0);
+dF = sK(index, aq(ij, 0u));
+gu = ij;
+uint x = reverseBits(iE(dF, aq(ij, 1u)));
+eQ.x = float(x >> 8u) * (1.0 / 16777216.0);
 }
-vec2 kG(uint dim) {
+vec2 kS(uint dim) {
 dw(dim);
-if (!df) {
-uint y = sv(qX(dE), aq(gp, 2u));
-eN.y = float(y >> 8u) * (1.0 / 16777216.0);
-df = true;
+if (!dg) {
+uint y = sK(rl(dF), aq(gu, 2u));
+eQ.y = float(y >> 8u) * (1.0 / 16777216.0);
+dg = true;
 }
-return EPS + (1.0 - 2.0*EPS) * eN;
+return EPS + (1.0 - 2.0*EPS) * eQ;
 }
 float dz(uint dim) {
 if (samplingPattern == 2) { return EPS + (1.0 - 2.0*EPS)*rand(); }
 dw(dim);
-return EPS + (1.0 - 2.0*EPS) * eN.x;
+return EPS + (1.0 - 2.0*EPS) * eQ.x;
 }
-vec2 fk(uint dim) {
+vec2 fo(uint dim) {
 if (samplingPattern == 2) {
 float x = dz(dim); float y = dz(dim);
 return vec2(x,y);
 }
-return kG(dim);
+return kS(dim);
 }
 
 float eo(uint slot) {
-uint dim = aq(aq(cE, slot), em) | 0x80000000u;
+uint dim = aq(aq(cF, slot), em) | 0x80000000u;
 em += 1u;
 if (samplingPattern == 2) { return EPS + (1.0 - 2.0*EPS)*rand(); }
 
-uint jU = bc.x + bc.y * uint(round(1.0 / pixelSize.x));
-uint ie = aq(aq(jU, dim), uint(sequenceSeed));
-uint i = sv(bd, aq(ie, 0u));
-uint x = reverseBits(iA(i, aq(ie, 1u)));
+uint kd = bc.x + bc.y * uint(round(1.0 / pixelSize.x));
+uint ij = aq(aq(kd, dim), uint(sequenceSeed));
+uint i = sK(bd, aq(ij, 0u));
+uint x = reverseBits(iE(i, aq(ij, 1u)));
 return EPS + (1.0 - 2.0*EPS) * (float(x >> 8u) * (1.0 / 16777216.0));
 }
 `;

package/lib/renderer/glsl/chunks/textureLinear.glsl.js

@@ -9,16 +9,16 @@ vec4 textureLinear(sampler2D map, vec2 uv) {
 return texture(map, uv);
 #else
 vec2 size = vec2(textureSize(map, 0));
-vec2 pO = 1.0 / size;
+vec2 qa = 1.0 / size;
 
 uv = uv * size - 0.5;
 vec2 f = fract(uv);
 uv = floor(uv) + 0.5;
 
-vec4 s1 = texture(map, (uv + vec2(0, 0)) * pO);
-vec4 s2 = texture(map, (uv + vec2(1, 0)) * pO);
-vec4 s3 = texture(map, (uv + vec2(0, 1)) * pO);
-vec4 s4 = texture(map, (uv + vec2(1, 1)) * pO);
+vec4 s1 = texture(map, (uv + vec2(0, 0)) * qa);
+vec4 s2 = texture(map, (uv + vec2(1, 0)) * qa);
+vec4 s3 = texture(map, (uv + vec2(0, 1)) * qa);
+vec4 s4 = texture(map, (uv + vec2(1, 1)) * qa);
 
 return mix(mix(s1, s2, f.x), mix(s3, s4, f.x), f.y);
 #endif

package/lib/renderer/glsl/chunks/uvProjection.glsl.js

@@ -8,12 +8,12 @@ float phi = acos(n.y) / PI;
 return vec2(theta, 1.0 - phi);
 }
 
-vec2 iL(vec3 pos, vec3 normal, vec2 uvScale) {
-vec3 dm = abs(normal);
+vec2 iR(vec3 pos, vec3 normal, vec2 uvScale) {
+vec3 dn = abs(normal);
 vec2 uv = vec2(0.0);
-if (dm.x > dm.y && dm.x > dm.z) {
+if (dn.x > dn.y && dn.x > dn.z) {
 uv = pos.yz;
-} else if (dm.y > dm.x && dm.y > dm.z) {
+} else if (dn.y > dn.x && dn.y > dn.z) {
 uv = pos.xz;
 } else {
 uv = pos.xy;
@@ -53,18 +53,18 @@ return fract(uv * uvScale);
 
 
 
-vec2 hA(vec3 pos, vec3 normal) {
+vec2 hD(vec3 pos, vec3 normal) {
 float theta = atan(pos.z, pos.x) / (2.0 * PI) + 0.5;
 return vec2(theta, pos.y);
 }
 
-vec2 gz(int fh, vec3 pos, vec3 normal, vec2 uvScale) {
-if (fh == ${uvProjectionConstants.triplanar + ''}) {
-return iL(pos, normal, uvScale);
-} else if (fh == ${uvProjectionConstants.spherical + ''}) {
+vec2 gH(int fk, vec3 pos, vec3 normal, vec2 uvScale) {
+if (fk == ${uvProjectionConstants.triplanar + ''}) {
+return iR(pos, normal, uvScale);
+} else if (fk == ${uvProjectionConstants.spherical + ''}) {
 return sphericalProjection(pos) * uvScale;
-} else if (fh == ${uvProjectionConstants.cylindrical + ''}) {
-return hA(pos, normal) * uvScale;
+} else if (fk == ${uvProjectionConstants.cylindrical + ''}) {
+return hD(pos, normal) * uvScale;
 }
 return vec2(0.0);
 }

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

@@ -33,18 +33,18 @@ if (any(lessThan(uv, vec2(0.0))) || any(greaterThan(uv, vec2(1.0)))) return;
 vec4 origin = viewProjectionInv * vec4(uv * 2.0 - 1.0, -1.0, 1.0);
 vec4 target = viewProjectionInv * vec4(uv * 2.0 - 1.0, 1.0, 1.0);
 Ray ray;
-iw(ray, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));
+iC(ray, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));
 vec3 eye = viewInv[3].xyz;
-vec3 nV = -normalize(viewInv[2].xyz);
+vec3 ol = -normalize(viewInv[2].xyz);
 ad si;
 si.triangleIndex = -1;
 for (int layer = 0; layer < 32; layer++) {
-cY(ray, si, false);
+cZ(ray, si, false);
 if (!si.hit) return;
 J material;
-eT(material, si.materialIndex, si.uv, si.uv1, si.instanceIndex);
+eX(material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);
 if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {
-out_depth.r = max(dot(si.position - eye, nV), 0.0);
+out_depth.r = max(dot(si.position - eye, ol), 0.0);
 return;
 }
 ray.o = si.position + ray.d * (EPS * 0.02);

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

@@ -1 +1 @@
-{"version":3,"file":"depthQuery.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/depthQuery.frag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,IAAI,MAAM,+BAA+B,CAAC;AACjD,OAAO,SAAS,MAAM,iCAAiC,CAAC;AACxD,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAEzC,eAAe,IAAI,cAAc,CAAC;IAChC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC;IACtC,OAAO,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE;IACnC,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC;IAC9C,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KAChC;IACD,IAAI,EAAE,UAAU,CAAC;EACjB,MAAM;EACN,IAAI;EACJ,MAAM,CAAC,IAAI;EACX,IAAI,CAAC,IAAI;EACT,YAAY;EACZ,SAAS,CAAC,IAAI;EACd,SAAS,CAAC,IAAI;;;yCAG2B,iBAAiB,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAwB/D;CACA,CAAC,CAAC","sourcesContent":["import { FragmentShader, Shader } from '../shader.js';\nimport { DEPTH_SAMPLE_GRID } from '../depthQuery.js';\nimport common from './chunks/common.glsl.js';\nimport core from './chunks/rayTraceCore.glsl.js';\nimport materials from './chunks/materialBuffer.glsl.js';\nimport intersect from './chunks/intersect.glsl.js';\nimport uvProjection from './chunks/uvProjection.glsl.js';\nimport random from './chunks/random.glsl.js';\nimport rand from './chunks/rand.glsl.js';\n\nexport default new FragmentShader({\n  name: 'depthQuery', outputs: ['depth'],\n  defines: { DEPTH_QUERY_MODE: true },\n  includes: [core, materials, intersect, random],\n  uniforms: {\n    depthArea: Shader.uniform('vec4'),\n    viewProjectionInv: Shader.uniform('mat4'),\n    viewInv: Shader.uniform('mat4')\n  },\n  main: /* glsl */ `\n${common}\n${rand}\n${random.main}\n${core.main}\n${uvProjection}\n${materials.main}\n${intersect.main}\n\nvoid main() {\n  vec2 offset = floor(gl_FragCoord.xy) / ${DEPTH_SAMPLE_GRID - 1}.0 * 2.0 - 1.0;\n  vec2 uv = depthArea.xy + depthArea.zw * offset * vec2(1.0, -1.0);\n  out_depth = vec4(0.0);\n  if (any(lessThan(uv, vec2(0.0))) || any(greaterThan(uv, vec2(1.0)))) return;\n  vec4 origin = viewProjectionInv * vec4(uv * 2.0 - 1.0, -1.0, 1.0);\n  vec4 target = viewProjectionInv * vec4(uv * 2.0 - 1.0, 1.0, 1.0);\n  Ray ray;\n  initRay(ray, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));\n  vec3 eye = viewInv[3].xyz;\n  vec3 forward = -normalize(viewInv[2].xyz);\n  SurfaceInteraction si;\n  si.triangleIndex = -1;\n  for (int layer = 0; layer < 32; layer++) {\n    intersectScene(ray, si, false);\n    if (!si.hit) return;\n    OpenPbrResolvedMaterial material;\n    getMaterial(material, si.materialIndex, si.uv, si.uv1, si.instanceIndex);\n    if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {\n      out_depth.r = max(dot(si.position - eye, forward), 0.0);\n      return;\n    }\n    ray.o = si.position + ray.d * (EPS * 0.02);\n  }\n}\n`\n});\n"]}
+{"version":3,"file":"depthQuery.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/depthQuery.frag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,IAAI,MAAM,+BAA+B,CAAC;AACjD,OAAO,SAAS,MAAM,iCAAiC,CAAC;AACxD,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAEzC,eAAe,IAAI,cAAc,CAAC;IAChC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC;IACtC,OAAO,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE;IACnC,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC;IAC9C,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KAChC;IACD,IAAI,EAAE,UAAU,CAAC;EACjB,MAAM;EACN,IAAI;EACJ,MAAM,CAAC,IAAI;EACX,IAAI,CAAC,IAAI;EACT,YAAY;EACZ,SAAS,CAAC,IAAI;EACd,SAAS,CAAC,IAAI;;;yCAG2B,iBAAiB,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAwB/D;CACA,CAAC,CAAC","sourcesContent":["import { FragmentShader, Shader } from '../shader.js';\nimport { DEPTH_SAMPLE_GRID } from '../depthQuery.js';\nimport common from './chunks/common.glsl.js';\nimport core from './chunks/rayTraceCore.glsl.js';\nimport materials from './chunks/materialBuffer.glsl.js';\nimport intersect from './chunks/intersect.glsl.js';\nimport uvProjection from './chunks/uvProjection.glsl.js';\nimport random from './chunks/random.glsl.js';\nimport rand from './chunks/rand.glsl.js';\n\nexport default new FragmentShader({\n  name: 'depthQuery', outputs: ['depth'],\n  defines: { DEPTH_QUERY_MODE: true },\n  includes: [core, materials, intersect, random],\n  uniforms: {\n    depthArea: Shader.uniform('vec4'),\n    viewProjectionInv: Shader.uniform('mat4'),\n    viewInv: Shader.uniform('mat4')\n  },\n  main: /* glsl */ `\n${common}\n${rand}\n${random.main}\n${core.main}\n${uvProjection}\n${materials.main}\n${intersect.main}\n\nvoid main() {\n  vec2 offset = floor(gl_FragCoord.xy) / ${DEPTH_SAMPLE_GRID - 1}.0 * 2.0 - 1.0;\n  vec2 uv = depthArea.xy + depthArea.zw * offset * vec2(1.0, -1.0);\n  out_depth = vec4(0.0);\n  if (any(lessThan(uv, vec2(0.0))) || any(greaterThan(uv, vec2(1.0)))) return;\n  vec4 origin = viewProjectionInv * vec4(uv * 2.0 - 1.0, -1.0, 1.0);\n  vec4 target = viewProjectionInv * vec4(uv * 2.0 - 1.0, 1.0, 1.0);\n  Ray ray;\n  initRay(ray, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));\n  vec3 eye = viewInv[3].xyz;\n  vec3 forward = -normalize(viewInv[2].xyz);\n  SurfaceInteraction si;\n  si.triangleIndex = -1;\n  for (int layer = 0; layer < 32; layer++) {\n    intersectScene(ray, si, false);\n    if (!si.hit) return;\n    OpenPbrResolvedMaterial material;\n    getMaterial(material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);\n    if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {\n      out_depth.r = max(dot(si.position - eye, forward), 0.0);\n      return;\n    }\n    ray.o = si.position + ray.d * (EPS * 0.02);\n  }\n}\n`\n});\n"]}

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

@@ -16,22 +16,22 @@ const normalizeRayTraceOutput = new FragmentShader({
     main: glsl `
 void main() {
 vec2 uv = lightScale * v_Texcoord;
-vec4 rI = sample_albedoTex(uv);
-float hit = rI.a;
-vec4 rM = sample_normalTex(uv);
+vec4 rV = sample_albedoTex(uv);
+float hit = rV.a;
+vec4 rZ = sample_normalTex(uv);
 
 
 
-float sc = max(rM.a, 1.0);
-vec3 albedo = rI.rgb / sc;
-vec3 normal = rM.rgb / sc;
+float sr = max(rZ.a, 1.0);
+vec3 albedo = rV.rgb / sr;
+vec3 normal = rZ.rgb / sr;
 vec4 shadowCatcher= sample_shadowCatcherTex(uv) / sampleCount;
-vec4 sk = sample_colorTex(uv);
+vec4 sB = sample_colorTex(uv);
 
 
 
 
-vec4 light = vec4(sk.rgb / (hit > 0.0 ? hit : sampleCount), sk.a / sampleCount);
+vec4 light = vec4(sB.rgb / (hit > 0.0 ? hit : sampleCount), sB.a / sampleCount);