@meimu/mutracer 0.1.4 → 0.1.5

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

@@ -12,12 +12,12 @@ int triangleIndex = primitiveOffset + k;
 ${skipTriangleCode}
 vec4 r3 = dp(triangleIndex);
 ivec3 index = floatBitsToInt(r3.xyz) + vertexOffset;
-fA tri = fA(
+fB tri = fB(
 kG(positionBuffer, index.x, vertexColumns).xyz,
 kG(positionBuffer, index.y, vertexColumns).xyz,
 kG(positionBuffer, index.z, vertexColumns).xyz
 );
-eC hit = fL(o, d, tri, ey, gP, tMax);
+eC hit = fM(o, d, tri, ey, gQ, tMax);
 
 if (hit.t > 0.0) {
 tMax = hit.t;
@@ -52,7 +52,7 @@ vec3 hB;
 vec3 aB;
 ivec3 hw;
 
-fA lC;
+fB lB;
 
 
 top = 0;
@@ -81,18 +81,18 @@ o = (w2l * vec4(ray.o, 1.0)).xyz;
 d = (w2l * vec4(ray.d, 0.0)).xyz;
 }
 ey = maxDimension(abs(d));
-gP = mv(d, ey);
+gQ = mu(d, ey);
 sO = cf;
 }
 
 int bo = cf < 0 ? 0 : blasOffset;
-uint fJ = cf < 0 ? 0u : floatBitsToUint(bv(cf * ${INSTANCE_VEC4_STRIDE}).x);
-int gR = int(fJ >> 30u);
-int eW = int(fJ & 0x3fffffffu);
+uint fK = cf < 0 ? 0u : floatBitsToUint(bv(cf * ${INSTANCE_VEC4_STRIDE}).x);
+int gS = int(fK >> 30u);
+int eW = int(fK & 0x3fffffffu);
 int bh = 0;
 int primitiveOffset = 0;
 
-if (gR == 3) {
+if (gS == 3) {
 uint hW = uint(node.x);
 if ((hW & 0x80000000u) != 0u) {
 bh = int((hW >> 23u) & 0xffu);
@@ -101,10 +101,10 @@ primitiveOffset = bo + eW + int(hW & 0x007fffffu);
 else {
 int i = node.x + bo;
 vec4 jA = dp(i);
-vec4 fF = dp(i + 1);
-vec4 mV = dp(i + 2);
-vec4 mW = dp(i + 3);
-vec4 mX = dp(i + 4);
+vec4 fG = dp(i + 1);
+vec4 mU = dp(i + 2);
+vec4 mV = dp(i + 3);
+vec4 mW = dp(i + 4);
 uint header = floatBitsToUint(jA.w);
 int rG = int(header << 24u) >> 24;
 int rH = int((header >> 8u) << 24u) >> 24;
@@ -114,54 +114,54 @@ uintBitsToFloat(uint(rG + 127) << 23u),
 uintBitsToFloat(uint(rH + 127) << 23u),
 uintBitsToFloat(uint(rI + 127) << 23u)
 );
-uint childBase = floatBitsToUint(fF.x);
-uint oQ = floatBitsToUint(fF.y);
+uint childBase = floatBitsToUint(fG.x);
+uint oP = floatBitsToUint(fG.y);
 uint internalMask = header >> 24u;
 uint ut = (d.x < 0.0 ? 4u : 0u) |
 (d.y < 0.0 ? 2u : 0u) |
 (d.z < 0.0 ? 1u : 0u);
-uint gI[12] = uint[12](
+uint gJ[12] = uint[12](
+floatBitsToUint(mU.x), floatBitsToUint(mU.y),
+floatBitsToUint(mU.z), floatBitsToUint(mU.w),
 floatBitsToUint(mV.x), floatBitsToUint(mV.y),
 floatBitsToUint(mV.z), floatBitsToUint(mV.w),
 floatBitsToUint(mW.x), floatBitsToUint(mW.y),
-floatBitsToUint(mW.z), floatBitsToUint(mW.w),
-floatBitsToUint(mX.x), floatBitsToUint(mX.y),
-floatBitsToUint(mX.z), floatBitsToUint(mX.w)
+floatBitsToUint(mW.z), floatBitsToUint(mW.w)
 );
 
 for (int order = 7; order >= 0; order--) {
 uint slot = uint(order) ^ ut;
 uint sE = slot >= 4u
-? floatBitsToUint(fF.w)
-: floatBitsToUint(fF.z);
+? floatBitsToUint(fG.w)
+: floatBitsToUint(fG.z);
 uint meta = (sE >> ((slot & 3u) * 8u)) & 0xffu;
 if (meta == 0u) continue;
-uint lY = (slot & 3u) * 8u;
+uint lX = (slot & 3u) * 8u;
 uint kV = slot >> 2u;
 vec3 tH = vec3(
-float((gI[kV] >> lY) & 0xffu),
-float((gI[2u + kV] >> lY) & 0xffu),
-float((gI[4u + kV] >> lY) & 0xffu)
+float((gJ[kV] >> lX) & 0xffu),
+float((gJ[2u + kV] >> lX) & 0xffu),
+float((gJ[4u + kV] >> lX) & 0xffu)
 );
 vec3 tG = vec3(
-float((gI[6u + kV] >> lY) & 0xffu),
-float((gI[8u + kV] >> lY) & 0xffu),
-float((gI[10u + kV] >> lY) & 0xffu)
+float((gJ[6u + kV] >> lX) & 0xffu),
+float((gJ[8u + kV] >> lX) & 0xffu),
+float((gJ[10u + kV] >> lX) & 0xffu)
 );
 vec3 uW = jA.xyz + tH * hJ;
 vec3 uV = jA.xyz + tG * hJ;
 if (cM(o, d, uW, uV, tMax) <= 0.0) continue;
 uint jC = meta & 0x1fu;
 if (jC >= 24u) {
-uint ns = internalMask & ((1u << slot) - 1u);
-uint sX = childBase + qT(ns);
+uint nr = internalMask & ((1u << slot) - 1u);
+uint sX = childBase + qT(nr);
 stack[++top] = ivec2(
 eW + int(sX * 5u), cf
 );
 }
 else {
 uint triangleCount = qT(meta >> 5u);
-uint rS = oQ + jC;
+uint rS = oP + jC;
 uint vh = 0x80000000u |
 (triangleCount << 23u) |
 (rS & 0x007fffffu);
@@ -170,7 +170,7 @@ stack[++top] = ivec2(int(vh), cf);
 }
 }
 }
-else if (gR == 2) {
+else if (gS == 2) {
 int i = node.x + bo;
 vec4 uY = dp(i);
 vec4 uZ = dp(i + 1);
@@ -195,7 +195,7 @@ if (d0 > 0.0) stack[++top] = ivec2(left, cf);
 }
 }
 }
-else if (gR == 1) {
+else if (gS == 1) {
 uint hW = uint(node.x);
 if ((hW & 0x80000000u) != 0u) {
 bh = int((hW >> 23u) & 0xffu);
@@ -209,7 +209,7 @@ vec4 rp = dp(i + 2);
 vec4 rq = dp(i + 3);
 vec3 nodeMin = ui.xyz;
 vec3 ec = vec3(ui.w, ro.x, ro.y);
-uint mh[4] = uint[4](
+uint mg[4] = uint[4](
 floatBitsToUint(ro.z), floatBitsToUint(ro.w),
 floatBitsToUint(rp.x), floatBitsToUint(rp.y)
 );
@@ -219,18 +219,18 @@ vec4 rB = fc(floatBitsToUint(rq.x));
 vec4 rt = fc(floatBitsToUint(rq.y));
 vec4 ru = fc(floatBitsToUint(rq.z));
 vec4 rv = fc(floatBitsToUint(rq.w));
-vec3 gC = fb(d);
-vec3 bJ = eZ(gC, o);
-vec4 tx0 = (nodeMin.x + rw * ec.x - o.x) * gC.x;
-vec4 tx1 = (nodeMin.x + rt * ec.x - o.x) * gC.x;
-vec4 ty0 = (nodeMin.y + rA * ec.y - o.y) * gC.y;
-vec4 ty1 = (nodeMin.y + ru * ec.y - o.y) * gC.y;
-vec4 tz0 = (nodeMin.z + rB * ec.z - o.z) * gC.z;
-vec4 tz1 = (nodeMin.z + rv * ec.z - o.z) * gC.z;
-vec4 mL = max(max((min(tx0, tx1) - vec4(bJ.x)), (min(ty0, ty1) - vec4(bJ.y))), (min(tz0, tz1) - vec4(bJ.z)));
+vec3 gE = fb(d);
+vec3 bJ = eZ(gE, o);
+vec4 tx0 = (nodeMin.x + rw * ec.x - o.x) * gE.x;
+vec4 tx1 = (nodeMin.x + rt * ec.x - o.x) * gE.x;
+vec4 ty0 = (nodeMin.y + rA * ec.y - o.y) * gE.y;
+vec4 ty1 = (nodeMin.y + ru * ec.y - o.y) * gE.y;
+vec4 tz0 = (nodeMin.z + rB * ec.z - o.z) * gE.z;
+vec4 tz1 = (nodeMin.z + rv * ec.z - o.z) * gE.z;
+vec4 mK = max(max((min(tx0, tx1) - vec4(bJ.x)), (min(ty0, ty1) - vec4(bJ.y))), (min(tz0, tz1) - vec4(bJ.z)));
 vec4 rU = min(min((max(tx0, tx1) + vec4(bJ.x)), (max(ty0, ty1) + vec4(bJ.y))), (max(tz0, tz1) + vec4(bJ.z)));
-vec4 distance = mix(rU, mL, greaterThan(mL, vec4(0.0)));
-distance = mix(distance, vec4(-1.0), greaterThan(mL, min(rU, vec4(tMax))));
+vec4 distance = mix(rU, mK, greaterThan(mK, vec4(0.0)));
+distance = mix(distance, vec4(-1.0), greaterThan(mK, min(rU, vec4(tMax))));
 float fd[4] = float[4](distance.x, distance.y, distance.z, distance.w);
 
 
@@ -238,15 +238,15 @@ for (int order = 0; order < 4; order++) {
 float dX = -1.0;
 int el = -1;
 for (int child = 0; child < 4; child++) {
-if (mh[child] != 0u && fd[child] > dX) {
+if (mg[child] != 0u && fd[child] > dX) {
 dX = fd[child];
 el = child;
 }
 }
 if (el >= 0 && dX > 0.0) {
-uint nD = mh[el];
-int jI = int(nD);
-if ((nD & 0x80000000u) == 0u) {
+uint nC = mg[el];
+int jI = int(nC);
+if ((nC & 0x80000000u) == 0u) {
 jI += eW;
 }
 stack[++top] = ivec2(jI, cf);
@@ -321,7 +321,7 @@ export default createShaderMixin({
     },
     main: glsl `
 
-struct fA {
+struct fB {
 vec3 p0;
 vec3 p1;
 vec3 p2;
@@ -347,7 +347,7 @@ return t2;
 return INF;
 }
 
-float ni(vec3 pos, vec3 u, vec3 v, vec3 n, Ray r) {
+float nh(vec3 pos, vec3 u, vec3 v, vec3 n, Ray r) {
 float dt = dot(r.d, n);
 float t = (dot(n, pos) - dot(n, r.o)) / dt;
 
@@ -366,7 +366,7 @@ return t;
 return INF;
 }
 
-float mz(Ray r, Light light, out LightSampleRec lightSample) {
+float my(Ray r, Light light, out LightSampleRec lightSample) {
 
 
 
@@ -383,7 +383,7 @@ vec3 normal = normalize(cross(u, v));
 if (dot(normal, r.d) > 0.) 
 return INF;
 
-d = ni(pos, u, v, normal, r);
+d = nh(pos, u, v, normal, r);
 if (d < 0.) {
 d = INF;
 }
@@ -452,8 +452,8 @@ lightSample.isDelta = false;
 }
 if (d != INF) {
 vec3 ve = r.o + d * r.d;
-float mC = bL(light, normalize(r.o - ve));
-if (mC <= 0.0) return INF;
+float mB = bL(light, normalize(r.o - ve));
+if (mB <= 0.0) return INF;
 float aj = distance(r.o, light.position);
 float cosThetaMax = aj <= light.radius
 ? -1.0
@@ -463,7 +463,7 @@ lightSample.pdf = aj <= light.radius
 ? INV4PI
 : 1.0 / max(TWOPI * (1.0 - cosThetaMax), 1e-8);
 }
-lightSample.emission = light.emission * mC * (light.radius <= 0.0
+lightSample.emission = light.emission * mB * (light.radius <= 0.0
 ? 1.0 / max(d * d, 1e-8)
 : 1.0);
 }
@@ -507,42 +507,42 @@ w21 = w21 / hk + w20;
 w22 = w22 / hk + w21;
 
 float rand = eo(0u);
-float nj;
+float ni;
 if (rand < w00) {
-nj = m00.x;
+ni = m00.x;
 } else if (rand < w01) {
-nj = m01.x;
+ni = m01.x;
 } else if (rand < w02) {
-nj = m02.x;
+ni = m02.x;
 } else if (rand < w10) {
-nj = m10.x;
+ni = m10.x;
 } else if (rand < w11) {
-nj = m11.x;
+ni = m11.x;
 } else if (rand < w12) {
-nj = m12.x;
+ni = m12.x;
 } else if (rand < w20) {
-nj = m20.x;
+ni = m20.x;
 } else if (rand < w21) {
-nj = m21.x;
+ni = m21.x;
 } else {
-nj = m22.x;
+ni = m22.x;
 }
-return int(nj);
+return int(ni);
 }
 
 
 vec4 bv(int i);
 
 
-mat2x3 eE(vec3 normal, vec3 dp1, vec3 dp2, vec2 od, vec2 oe, vec4 aT) {
-float determinant = od.x * oe.y - od.y * oe.x;
+mat2x3 eE(vec3 normal, vec3 dp1, vec3 dp2, vec2 oc, vec2 od, vec4 aT) {
+float determinant = oc.x * od.y - oc.y * od.x;
 vec3 t = aT.xyz;
 vec3 b = vec3(0.0);
 
 float qC = abs(aT.w) > 1.5 ? 0.0 : aT.w;
 if (abs(determinant) > 1e-12) {
-vec3 dt = (dp1 * oe.y - dp2 * od.y) / determinant;
-vec3 db = (dp2 * od.x - dp1 * oe.x) / determinant;
+vec3 dt = (dp1 * od.y - dp2 * oc.y) / determinant;
+vec3 db = (dp2 * oc.x - dp1 * od.x) / determinant;
 if (dot(t, t) < 1e-8) { t = dt; }
 if (qC == 0.0) { qC = (dot(cross(normal, dt), db) < 0.0 ? -1.0 : 1.0); }
 }
@@ -558,12 +558,12 @@ else { t = normalize(t); b = normalize(cross(normal, t)); }
 return mat2x3(t, b * (qC < 0.0 ? -1.0 : 1.0));
 }
 
-void ht(inout ad si, fA tri, vec3 barycentric, ivec3 index) {
+void ht(inout ad si, fB tri, vec3 barycentric, ivec3 index) {
 si.hit = true;
 si.position = barycentric.x * tri.p0 + barycentric.y * tri.p1 + barycentric.z * tri.p2;
-ivec2 i0 = gQ(index.x, vertexColumns);
-ivec2 i1 = gQ(index.y, vertexColumns);
-ivec2 i2 = gQ(index.z, vertexColumns);
+ivec2 i0 = gR(index.x, vertexColumns);
+ivec2 i1 = gR(index.y, vertexColumns);
+ivec2 i2 = gR(index.z, vertexColumns);
 si.vertexColor = vec3(1.0);
 #ifdef USE_VERTEX_COLOR
 si.vertexColor = barycentric.x * texelFetch(colorBuffer, i0, 0).rgb
@@ -630,29 +630,31 @@ vec2 cX = barycentric.x * secondaryUv0
 + barycentric.y * secondaryUv1
 + barycentric.z * secondaryUv2;
 
-vec4 lM = fetchMatData(si.materialIndex * MAT_DATA_SIZE + MAT_ROW_UV);
-int uvProjection = int(lM.r);
+vec4 lL = fetchMatData(si.materialIndex * MAT_DATA_SIZE + MAT_ROW_UV);
+int uvProjection = int(lL.r);
 if (uvProjection > 0) {
-uv = gH(uvProjection, si.position, normal, lM.zw);
+uv = gI(uvProjection, si.position, normal, lL.zw);
 cX = uv;
 } else {
-uv *= lM.zw;
-cX *= lM.zw;
+uv *= lL.zw;
+cX *= lL.zw;
 }
 #else
 vec2 uv = vec2(0.0);
 vec2 cX = vec2(0.0);
 #endif
 
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 si.coatNormal = normal;
-float lw = fetchMatData(si.materialIndex * MAT_DATA_SIZE + MAT_ROW_LAYER_MAPS).z;
+#ifdef NUM_COAT_NORMAL_MAPS
+float oU = fetchMatData(si.materialIndex * MAT_DATA_SIZE + MAT_ROW_LAYER_MAPS).z;
+#endif
 #endif
 vec4 directionMaterial = fetchMatData(si.materialIndex * MAT_DATA_SIZE + MAT_ROW_DIRECTION_NORMAL);
 float tm = fetchMatData(si.materialIndex * MAT_DATA_SIZE + MAT_ROW_FILM_TEXTURE).x;
 if (directionMaterial.x >= 0.0 || directionMaterial.y != 0.0 || tm != 0.0
-#ifdef NUM_COAT_NORMAL_MAPS
-|| lw >= 0.0
+#ifdef USE_COAT_NORMAL_FRAMES
+|| fetchMatData(si.materialIndex * MAT_DATA_SIZE + MAT_ROW_COAT).w > 0.0
 #endif
 ) {
 vec3 dp1 = tri.p0 - tri.p2;
@@ -666,31 +668,31 @@ aT = barycentric.x * texelFetch(tangentBuffer, i0, 0)
 mat2x3 eS = eE(normal, dp1, dp2, uv0-uv2, uv1-uv2, aT);
 si.geometryTangent = eS[0];
 si.geometryBitangent = eS[1];
-mat2x3 fY = eS;
+mat2x3 fZ = eS;
 #ifdef NUM_ANISOTROPY_MAPS
 if (directionMaterial.x >= 0.0 && mapUvChannel[int(directionMaterial.x)] > 0.5) {
 vec2 a = texelFetch(uv1Buffer, i0, 0).xy;
 vec2 b = texelFetch(uv1Buffer, i1, 0).xy;
 vec2 c = texelFetch(uv1Buffer, i2, 0).xy;
-fY = eE(normal, dp1, dp2, a-c, b-c, (aT.w == 0.0 ? vec4(0.0) : aT));
+fZ = eE(normal, dp1, dp2, a-c, b-c, (aT.w == 0.0 ? vec4(0.0) : aT));
 }
 #endif
-si.directionTangent = fY[0];
-si.directionBitangent = fY[1];
-#ifdef NUM_COAT_NORMAL_MAPS
-if (lw >= 0.0) {
-int kC = int(lw);
-mat2x3 mi = eS;
+si.directionTangent = fZ[0];
+si.directionBitangent = fZ[1];
+#if defined(USE_COAT_NORMAL_FRAMES) && defined(NUM_COAT_NORMAL_MAPS)
+if (oU >= 0.0) {
+int kC = int(oU);
+mat2x3 mh = eS;
 if (mapUvChannel[kC] > 0.5) {
 vec2 a = texelFetch(uv1Buffer, i0, 0).xy;
 vec2 b = texelFetch(uv1Buffer, i1, 0).xy;
 vec2 c = texelFetch(uv1Buffer, i2, 0).xy;
-mi = eE(normal, dp1, dp2, a-c, b-c,
+mh = eE(normal, dp1, dp2, a-c, b-c,
 aT.w == 0.0 ? vec4(0.0) : aT);
 }
 vec3 decoded = sampleMap(kC, getMapUvSet(kC, uv, cX)).rgb * 2.0 - 1.0;
-vec3 mapped = mi[0] * decoded.x * directionMaterial.z
-+ mi[1] * decoded.y * directionMaterial.w + normal * decoded.z;
+vec3 mapped = mh[0] * decoded.x * directionMaterial.z
++ mh[1] * decoded.y * directionMaterial.w + normal * decoded.z;
 if (dot(mapped, mapped) > 1e-12) { si.coatNormal = normalize(mapped); }
 }
 #endif
@@ -708,10 +710,10 @@ si.tangent = normalize(barycentric.x * t0 + barycentric.y * t1 + barycentric.z *
 #if defined(NUM_NORMAL_MAPS)
 vec3 dp1 = tri.p0 - tri.p2;
 vec3 dp2 = tri.p1 - tri.p2;
-vec2 od = uv0 - uv2;
-vec2 oe = uv1 - uv2;
-si.normal = om(
-si.materialIndex, uv, normal, dp1, dp2, od, oe
+vec2 oc = uv0 - uv2;
+vec2 od = uv1 - uv2;
+si.normal = ol(
+si.materialIndex, uv, normal, dp1, dp2, oc, od
 );
 #else
 si.normal = normal;
@@ -740,19 +742,19 @@ value = (value + (value >> 4u)) & 0x0f0f0f0fu;
 return (value * 0x01010101u) >> 24u;
 }
 
-vec4 fc(uint lV) {
+vec4 fc(uint lU) {
 return vec4(
-float(lV & 0xffu),
-float((lV >> 8u) & 0xffu),
-float((lV >> 16u) & 0xffu),
-float(lV >> 24u)
+float(lU & 0xffu),
+float((lU >> 8u) & 0xffu),
+float((lU >> 16u) & 0xffu),
+float(lU >> 24u)
 ) / 255.0;
 }
 
 
 
 
-eC fL(vec3 o, vec3 d, fA tri, int ey, vec3 gP, float tMax) {
+eC fM(vec3 o, vec3 d, fB tri, int ey, vec3 gQ, float tMax) {
 eC ti;
 
 
@@ -772,9 +774,9 @@ p2t = p2t.zxy;
 }
 
 
-p0t.xy += gP.xy * p0t.z;
-p1t.xy += gP.xy * p1t.z;
-p2t.xy += gP.xy * p2t.z;
+p0t.xy += gQ.xy * p0t.z;
+p1t.xy += gQ.xy * p1t.z;
+p2t.xy += gQ.xy * p2t.z;
 
 
 vec3 e = vec3(
@@ -799,9 +801,9 @@ float det = e.x + e.y + e.z;
 if (det == 0.0) return ti;
 #endif
 
-p0t.z *= gP.z;
-p1t.z *= gP.z;
-p2t.z *= gP.z;
+p0t.z *= gQ.z;
+p1t.z *= gQ.z;
+p2t.z *= gQ.z;
 float rn = (e.x * p0t.z + e.y * p1t.z + e.z * p2t.z);
 
 
@@ -831,9 +833,9 @@ return 1.0 / d;
 #endif
 }
 
-vec3 eZ(vec3 gC, vec3 o) {
+vec3 eZ(vec3 gE, vec3 o) {
 #ifdef DEPTH_QUERY_MODE
-return abs(gC) * max(vec3(1.0), abs(o)) * 1e-6;
+return abs(gE) * max(vec3(1.0), abs(o)) * 1e-6;
 #else
 return vec3(0.0);
 #endif
@@ -843,18 +845,18 @@ return vec3(0.0);
 
 float cM(vec3 o, vec3 d, vec3 vK, vec3 vJ, float tMax) {
 #ifdef DEPTH_QUERY_MODE
-vec3 gC = fb(d);
-vec3 uR = (vK - o) * gC;
-vec3 uS = (vJ - o) * gC;
-vec3 bJ = eZ(gC, o);
+vec3 gE = fb(d);
+vec3 uR = (vK - o) * gE;
+vec3 uS = (vJ - o) * gE;
+vec3 bJ = eZ(gE, o);
 #else
 vec3 uR = (vK - o) / d;
 vec3 uS = (vJ - o) / d;
 vec3 bJ = vec3(0.0);
 #endif
-vec3 mL = min(uR, uS) - bJ;
+vec3 mK = min(uR, uS) - bJ;
 vec3 rU = max(uR, uS) + bJ;
-float t0 = max(mL.x, max(mL.y, mL.z));
+float t0 = max(mK.x, max(mK.y, mK.z));
 float t1 = min(rU.x, min(rU.y, rU.z));
 
 return (t0 > t1 || t0 > tMax) ? -1.0 : (t0 > 0.0 ? t0 : t1);
@@ -864,7 +866,7 @@ int maxDimension(vec3 v) {
 return v.x > v.y ? (v.x > v.z ? 0 : 2) : (v.y > v.z ? 1 : 2);
 }
 
-vec3 mv(vec3 d, int ey) {
+vec3 mu(vec3 d, int ey) {
 
 
 if (ey == 0) {
@@ -885,12 +887,12 @@ return;
 }
 
 int ey = maxDimension(abs(ray.d));
-vec3 gP = mv(ray.d, ey);
+vec3 gQ = mu(ray.d, ey);
 int ao;
 
 ${getBVHTraverseCode(glsl `
 si.triangleIndex = triangleIndex;
-lC = tri;
+lB = tri;
 hB = faceNormal;
 aB = hit.barycentric;
 hw = index;
@@ -902,7 +904,7 @@ if (rb) {
 si.instanceIndex = ao;
 si.materialIndex = int(ae(floatBitsToInt(bv(ao * ${INSTANCE_VEC4_STRIDE}).z)).x);
 
-ht(si, lC, aB, hw);
+ht(si, lB, aB, hw);
 mat4 l2w = mat4(
 bv(ao * ${INSTANCE_VEC4_STRIDE} + 5),
 bv(ao * ${INSTANCE_VEC4_STRIDE} + 6),
@@ -919,7 +921,7 @@ mat3 aD = transpose(mat3(w2l));
 si.faceNormal = normalize(aD * hB);
 si.vertexNormal = normalize(aD * si.vertexNormal);
 si.normal = normalize(aD * si.normal);
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 si.coatNormal = normalize(aD * si.coatNormal);
 #endif
 #ifdef USE_TANGENT
@@ -946,12 +948,12 @@ return;
 
 bool doubleSided = true;
 int ey = maxDimension(abs(ray.d));
-vec3 gP = mv(ray.d, ey);
+vec3 gQ = mu(ray.d, ey);
 int ao;
 
 ${getBVHTraverseCode(glsl `
 si.triangleIndex = triangleIndex;
-lC = tri;
+lB = tri;
 hB = faceNormal;
 aB = hit.barycentric;
 hw = index;
@@ -966,7 +968,7 @@ continue;
 if (rb) {
 si.instanceIndex = ao;
 si.materialIndex = int(ae(floatBitsToInt(bv(ao * ${INSTANCE_VEC4_STRIDE}).z)).x);
-ht(si, lC, aB, hw);
+ht(si, lB, aB, hw);
 mat4 l2w = mat4(
 bv(ao * ${INSTANCE_VEC4_STRIDE} + 5),
 bv(ao * ${INSTANCE_VEC4_STRIDE} + 6),
@@ -983,7 +985,7 @@ mat3 aD = transpose(mat3(w2l));
 si.faceNormal = normalize(aD * hB);
 si.vertexNormal = normalize(aD * si.vertexNormal);
 si.normal = normalize(aD * si.normal);
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 si.coatNormal = normalize(aD * si.coatNormal);
 #endif
 #ifdef USE_TANGENT
@@ -1008,7 +1010,7 @@ return false;
 
 bool doubleSided = true;
 int ey = maxDimension(abs(ray.d));
-vec3 gP = mv(ray.d, ey);
+vec3 gQ = mu(ray.d, ey);
 
 ${getBVHTraverseCode(glsl `
 
@@ -1020,9 +1022,9 @@ vec3 position = barycentric.x * tri.p0 + barycentric.y * tri.p1 + barycentric.z
 if (jt) {
 #ifdef HAS_ALPHA
 int materialIndex = int(ae(floatBitsToInt(bv(cf * ${INSTANCE_VEC4_STRIDE}).z)).x);
-ivec2 i0 = gQ(index.x, vertexColumns);
-ivec2 i1 = gQ(index.y, vertexColumns);
-ivec2 i2 = gQ(index.z, vertexColumns);
+ivec2 i0 = gR(index.x, vertexColumns);
+ivec2 i1 = gR(index.y, vertexColumns);
+ivec2 i2 = gR(index.z, vertexColumns);
 ivec4 m0 = ivec4(texelFetch(materialIndexBuffer, i0, 0));
 ivec4 m1 = ivec4(texelFetch(materialIndexBuffer, i1, 0));
 ivec4 m2 = ivec4(texelFetch(materialIndexBuffer, i2, 0));
@@ -1042,12 +1044,12 @@ vec2 uv0 = texelFetch(uvBuffer, i0, 0).xy;
 vec2 uv1 = texelFetch(uvBuffer, i1, 0).xy;
 vec2 uv2 = texelFetch(uvBuffer, i2, 0).xy;
 vec2 uv = barycentric.x * uv0 + barycentric.y * uv1 + barycentric.z * uv2;
-vec4 lM = fetchMatData(ii + MAT_ROW_UV);
-int uvProjection = int(lM.r);
+vec4 lL = fetchMatData(ii + MAT_ROW_UV);
+int uvProjection = int(lL.r);
 if (uvProjection > 0) {
-uv = gH(uvProjection, position, hB, lM.zw);
+uv = gI(uvProjection, position, hB, lL.zw);
 } else {
-uv *= lM.zw;
+uv *= lL.zw;
 }
 
 alpha *= sampleMap(diffuseMapIndex, uv).a;
@@ -1061,12 +1063,12 @@ vec2 uv0 = texelFetch(uvBuffer, i0, 0).xy;
 vec2 uv1 = texelFetch(uvBuffer, i1, 0).xy;
 vec2 uv2 = texelFetch(uvBuffer, i2, 0).xy;
 vec2 uv = barycentric.x * uv0 + barycentric.y * uv1 + barycentric.z * uv2;
-vec4 lM = fetchMatData(ii + MAT_ROW_UV);
-int uvProjection = int(lM.r);
+vec4 lL = fetchMatData(ii + MAT_ROW_UV);
+int uvProjection = int(lL.r);
 if (uvProjection > 0) {
-uv = gH(uvProjection, position, hB, lM.zw);
+uv = gI(uvProjection, position, hB, lL.zw);
 } else {
-uv *= lM.zw;
+uv *= lL.zw;
 }
 alpha *= sampleMap(alphaMapIndex, uv).g;
 }