@meimu/mutracer 0.1.4 → 0.1.5

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

@@ -37,7 +37,7 @@ J material;
 bj basis;
 bj coatBasis;
 bool directionFrames;
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 vec3 coatViewLocal;
 #endif
 vec3 viewLocal;
@@ -104,7 +104,7 @@ float F(int sl, int row) {
 return texelFetch(openPbrEnergyLut, ivec2(sl, row), 0).r;
 }
 
-float gd(
+float ge(
 float dJ,
 float bR,
 float hR
@@ -141,7 +141,7 @@ kE
 );
 }
 
-float gF(float dJ, float bR) {
+float gG(float dJ, float bR) {
 float bA = clamp(dJ, 0.0, 31.0);
 float aH = clamp(bR, 0.0, 31.0);
 int dQ = int(floor(bA));
@@ -285,7 +285,7 @@ float ior,
 float alpha,
 float au
 ) {
-float value = gd(
+float value = ge(
 aC(ior),
 sqrt(alpha) * 31.0,
 au * 31.0
@@ -294,7 +294,7 @@ return aX(value, ior);
 }
 
 float cr(float ior, float alpha) {
-float value = gF(
+float value = gG(
 aC(ior),
 sqrt(alpha) * 31.0
 );
@@ -356,7 +356,7 @@ return (ak * L - av * S)
 / (av * S + ak * L);
 }
 
-float hc(
+float hd(
 float av,
 float ak,
 float L,
@@ -366,7 +366,7 @@ return 2.0 * av * L
 / (av * L + ak * S);
 }
 
-float hb(
+float hc(
 float av,
 float ak,
 float L,
@@ -389,9 +389,9 @@ return vec2(
 }
 
 vec2 hX(vec2 value) {
-float nK = length(value);
-float sP = sqrt(max(0.0, 0.5 * (nK + value.x)));
-float ff = sqrt(max(0.0, 0.5 * (nK - value.x)));
+float nJ = length(value);
+float sP = sqrt(max(0.0, 0.5 * (nJ + value.x)));
+float ff = sqrt(max(0.0, 0.5 * (nJ - value.x)));
 return vec2(sP, value.y >= 0.0 ? ff : -ff);
 }
 
@@ -401,9 +401,9 @@ float av,
 vec2 ak,
 bool qG
 ) {
-float os = sqrt(max(0.0, 1.0 - L * L));
+float oq = sqrt(max(0.0, 1.0 - L * L));
 vec2 sA = aZ(vec2(av, 0.0), ak);
-vec2 hA = sA * os;
+vec2 hA = sA * oq;
 vec2 S = hX(
 vec2(1.0, 0.0) - aU(hA, hA)
 );
@@ -411,7 +411,7 @@ if (aU(ak, S).y < 0.0) {
 S = -S;
 }
 
-vec2 fK = vec2(av * L, 0.0);
+vec2 fL = vec2(av * L, 0.0);
 vec2 eB = aU(ak, S);
 if (qG) {
 vec2 ci = ak * L;
@@ -422,23 +422,23 @@ ci + ce
 );
 }
 return aZ(
-fK - eB,
-fK + eB
+fL - eB,
+fL + eB
 );
 }
 
 float eq(
 float iH,
-float gM,
-float oH,
-float mN,
+float gN,
+float oG,
+float mM,
 vec2 kf,
 float phase
 ) {
-vec2 nr = vec2(cos(phase), sin(phase));
-vec2 ia = aU(kf, nr);
-vec2 kO = ia * (gM * mN);
-vec2 ap = vec2(1.0, 0.0) - ia * oH;
+vec2 nq = vec2(cos(phase), sin(phase));
+vec2 ia = aU(kf, nq);
+vec2 kO = ia * (gN * mM);
+vec2 ap = vec2(1.0, 0.0) - ia * oG;
 vec2 hz = vec2(iH, 0.0)
 + aZ(kO, ap);
 return dot(hz, hz);
@@ -465,13 +465,13 @@ aM, ck, L, cU
 float la = jZ(
 aM, ck, L, cU
 );
-float jj = hc(
+float jj = hd(
 aM, ck, L, cU
 );
-float ji = hb(
+float ji = hc(
 aM, ck, L, cU
 );
-float gq = ck * cU
+float gr = ck * cU
 / max(aM * L, 1e-9);
 vec2 tb = bX(
 cU, ck, eu, false
@@ -484,7 +484,7 @@ float tJ = eq(
 lb,
 jj,
 -lb,
-jj * gq,
+jj * gr,
 tb,
 phase
 );
@@ -492,7 +492,7 @@ float tI = eq(
 la,
 ji,
 -la,
-ji * gq,
+ji * gr,
 ta,
 phase
 );
@@ -525,19 +525,19 @@ vec3 dU(float au, vec3 f0, vec3 tint) {
 vec3 rk = mix(f0, vec3(1.0), aE(au));
 if (all(equal(tint, vec3(1.0)))) { return rk; }
 float dk = 1.0 / 7.0;
-float ml = 1.0 - dk;
-vec3 fI = mix(f0, vec3(1.0), aE(dk));
+float mk = 1.0 - dk;
+vec3 fJ = mix(f0, vec3(1.0), aE(dk));
 float di = 1.0 - au;
 float qt = au * aE(au) * di
-/ (dk * pow(ml, 6.0));
-return clamp(rk - qt * (fI - tint * fI), vec3(0.0), vec3(1.0));
+/ (dk * pow(mk, 6.0));
+return clamp(rk - qt * (fJ - tint * fJ), vec3(0.0), vec3(1.0));
 }
 
 vec2 cQ(float f0, float tp) {
 float dN = clamp(f0, 0.0, 0.99);
-float gL = sqrt(dN);
+float gM = sqrt(dN);
 float qF = (1.0 - dN) / (1.0 + dN);
-float qD = (1.0 + gL) / max(1.0 - gL, 1e-9);
+float qD = (1.0 + gM) / max(1.0 - gM, 1e-9);
 float ior = mix(qD, qF, clamp(tp, 0.0, 1.0));
 float jO = (
 (ior + 1.0) * (ior + 1.0) * dN
@@ -639,7 +639,7 @@ J material,
 vec3 color,
 vec3 viewLocal,
 vec3 lightLocal,
-float ft,
+float fu,
 out float pdf
 ) {
 pdf = 0.0;
@@ -648,47 +648,47 @@ return vec3(0.0);
 }
 
 float roughness = material.diffuseRoughness;
-float gW = 0.5 - 2.0 / (3.0 * PI);
-float oj = 2.0 / 3.0 - 28.0 / (15.0 * PI);
-float oB = lightLocal.z;
-float mB = viewLocal.z;
-float hP = dot(lightLocal, viewLocal) - oB * mB;
-float gT = hP > 0.0
-? hP / max(max(oB, mB), 1e-7)
+float gX = 0.5 - 2.0 / (3.0 * PI);
+float oi = 2.0 / 3.0 - 28.0 / (15.0 * PI);
+float oA = lightLocal.z;
+float mA = viewLocal.z;
+float hP = dot(lightLocal, viewLocal) - oA * mA;
+float gU = hP > 0.0
+? hP / max(max(oA, mA), 1e-7)
 : hP;
-float il = 1.0 / (1.0 + gW * roughness);
-vec3 nA = color * INVPI * il
-* (1.0 + roughness * gT);
+float il = 1.0 / (1.0 + gX * roughness);
+vec3 nv = color * INVPI * il
+* (1.0 + roughness * gU);
 
-float dd = 1.0 - oB;
-float cP = 1.0 - mB;
-float ot = dd * (
+float dd = 1.0 - oA;
+float cP = 1.0 - mA;
+float os = dd * (
 0.0571085289 + dd * (
 0.491881867 + dd * (
 -0.332181442 + dd * 0.0714429953
 )
 )
 );
-float nq = cP * (
+float np = cP * (
 0.0571085289 + cP * (
 0.491881867 + cP * (
 -0.332181442 + cP * 0.0714429953
 )
 )
 );
-float pv = (1.0 + roughness * ot)
-/ (1.0 + gW * roughness);
-float oD = (1.0 + roughness * nq)
-/ (1.0 + gW * roughness);
-float fU = il * (1.0 + oj * roughness);
-vec3 hF = color * color * fU
-/ max(vec3(1e-7), vec3(1.0) - color * (1.0 - fU));
-vec3 lF = hF * INVPI
-* max(1e-7, 1.0 - oD)
+float pv = (1.0 + roughness * os)
+/ (1.0 + gX * roughness);
+float oC = (1.0 + roughness * np)
+/ (1.0 + gX * roughness);
+float fV = il * (1.0 + oi * roughness);
+vec3 hF = color * color * fV
+/ max(vec3(1e-7), vec3(1.0) - color * (1.0 - fV));
+vec3 lE = hF * INVPI
+* max(1e-7, 1.0 - oC)
 * max(1e-7, 1.0 - pv)
-/ max(1e-7, 1.0 - fU);
+/ max(1e-7, 1.0 - fV);
 pdf = lightLocal.z * INVPI;
-return (nA + lF) * ft;
+return (nv + lE) * fu;
 }
 
 float aO(float viewCosine, float roughness) {
@@ -737,7 +737,7 @@ return vec3(0.0);
 }
 
 vec2 alpha = vec2(material.alphaX, material.alphaY);
-float distribution = gK(V, alpha);
+float distribution = gL(V, alpha);
 float jV = bk(viewLocal, alpha);
 float ea = jV
 * bk(lightLocal, alpha);
@@ -770,7 +770,7 @@ if (bQ <= 0.0 || kL >= 0.0) {
 return vec3(0.0);
 }
 vec2 alpha = vec2(material.alphaX, material.alphaY);
-float distribution = gK(V, alpha);
+float distribution = gL(V, alpha);
 float jV = bk(viewLocal, alpha);
 float ea = jV
 * bk(lightLocal, alpha);
@@ -803,11 +803,11 @@ vec3 aP(
 vec3 ah,
 float transmissionWeight
 ) {
-vec3 gk = 2.0 * ah
+vec3 gm = 2.0 * ah
 / (vec3(1.0) + ah);
 return mix(
 ah,
-gk,
+gm,
 clamp(transmissionWeight, 0.0, 1.0)
 );
 }
@@ -842,12 +842,12 @@ if (viewLocal.z <= 0.0 || lightLocal.z >= 0.0) {
 return vec3(0.0);
 }
 float S = -lightLocal.z;
-float og = cu(
+float oe = cu(
 viewLocal.z,
 material.relativeIor
 );
 pdf = S * INVPI;
-return vec3(1.0 - og) * INVPI;
+return vec3(1.0 - oe) * INVPI;
 }
 
 void dR(inout ag prepared) {
@@ -861,9 +861,9 @@ prepared.probabilities[hU] = 0.0;
 }
 return;
 }
-float ow = 1.0 / total;
+float ov = 1.0 / total;
 for (int hU = 0; hU < OPENPBR_LOBE_COUNT; hU++) {
-prepared.probabilities[hU] *= ow;
+prepared.probabilities[hU] *= ov;
 }
 }
 
@@ -877,8 +877,8 @@ return 0.997118 + 0.1014 * eta - 0.965241 * eta * eta - 0.130607 * eta * eta * e
 
 vec3 bP(vec3 f0, vec3 tint) {
 float dk = 1.0 / 7.0;
-vec3 fI = mix(f0, vec3(1.0), aE(dk));
-vec3 b = fI * (vec3(1.0) - tint) / (dk * pow(1.0 - dk, 6.0));
+vec3 fJ = mix(f0, vec3(1.0), aE(dk));
+vec3 b = fJ * (vec3(1.0) - tint) / (dk * pow(1.0 - dk, 6.0));
 return clamp(f0 + (vec3(1.0) - f0) / 21.0 - b / 126.0, vec3(0.0), vec3(1.0));
 }
 
@@ -886,12 +886,12 @@ return clamp(f0 + (vec3(1.0) - f0) / 21.0 - b / 126.0, vec3(0.0), vec3(1.0));
 
 vec3 cD(J material, float au) {
 if (au <= 0.0) { return vec3(1.0); }
-float lH = sqrt(max(0.0, 1.0 - (1.0 - au * au) / (material.coatIor * material.coatIor)));
-vec3 tD = pow(max(material.coatColor, vec3(0.0)), vec3(0.5 / max(lH, 1e-5)));
+float lG = sqrt(max(0.0, 1.0 - (1.0 - au * au) / (material.coatIor * material.coatIor)));
+vec3 tD = pow(max(material.coatColor, vec3(0.0)), vec3(0.5 / max(lG, 1e-5)));
 return mix(vec3(1.0), tD, material.coatWeight);
 }
 
-float gp(J material, float au) {
+float gq(J material, float au) {
 if (material.coatRoughness <= ROUGHNESS_MIN) {
 return af(au, 1.0 / material.coatIor);
 }
@@ -901,21 +901,21 @@ return clamp(1.0 - aJ(material.coatIor,
 material.coatRoughness * material.coatRoughness, au), 0.0, 1.0);
 }
 
-vec3 ha(ag prepared) {
+vec3 hb(ag prepared) {
 J material = prepared.material;
 float dielectric = 1.0 - material.baseMetalness;
 float opaque = dielectric * (1.0 - material.transmissionWeight) * (1.0 - material.subsurfaceWeight);
 float sss = dielectric * (1.0 - material.transmissionWeight) * material.subsurfaceWeight;
 float ug = dielectric * material.transmissionWeight;
-float fO = bM(prepared.specularEtaTOverEtaI);
+float fP = bM(prepared.specularEtaTOverEtaI);
 float kU = bM(1.0 / prepared.transmissionReflectionIor);
-float pR = clamp(opaque * fO + (sss + ug) * kU + material.baseMetalness, 0.0, 1.0);
+float pR = clamp(opaque * fP + (sss + ug) * kU + material.baseMetalness, 0.0, 1.0);
 float jp = mix(1.0, material.specularRoughness, pR);
 float ks = bM(material.coatIor);
 float kr = 1.0 - (1.0 - ks) / (material.coatIor * material.coatIor);
 float k = mix(ks, kr, jp);
 vec3 eb = material.baseMetalness * material.specularWeight * bP(material.baseWeight * material.baseColor, material.specularColor)
-+ opaque * mix(material.baseWeight * material.baseColor, vec3(1.0), fO)
++ opaque * mix(material.baseWeight * material.baseColor, vec3(1.0), fP)
 + sss * material.subsurfaceColor + vec3(ug);
 vec3 qU = vec3(1.0 - k) / max(vec3(1.0) - eb * k, vec3(1e-6));
 return mix(vec3(1.0), qU, material.coatWeight * material.coatDarkening);
@@ -961,7 +961,7 @@ max(material.specularAnisotropy, material.coatAnisotropy)
 );
 prepared.coatBasis = prepared.basis;
 prepared.directionFrames = false;
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 
 
 if (material.coatNormalEnabled) {
@@ -978,7 +978,7 @@ prepared.coatBasis = du(prepared.coatBasis, material.geometryTangent, material.g
 prepared.directionFrames = true;
 }
 prepared.viewLocal = openpbr_to_local(prepared.basis, bF);
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 prepared.coatViewLocal = openpbr_to_local(prepared.coatBasis, bF);
 #endif
 prepared.diffuseColor = material.baseColor;
@@ -1047,7 +1047,7 @@ float ah = af(
 viewCosine,
 1.0 / prepared.specularEtaTOverEtaI
 );
-vec3 fw = material.specularColor * (
+vec3 fA = material.specularColor * (
 material.thinWalled
 ? mix(
 ah,
@@ -1064,7 +1064,7 @@ material.specularColor
 float eO = material.thinWalled
 ? cS(af(viewCosine, prepared.transmissionReflectionIor))
 : af(viewCosine, prepared.transmissionReflectionIor);
-vec3 gN = bG(
+vec3 gO = bG(
 material,
 viewCosine,
 prepared.refractionEtaTOverEtaI
@@ -1074,12 +1074,12 @@ prepared.specularEtaTOverEtaI,
 prepared.specularAlpha,
 viewCosine
 );
-float gr = cr(
+float gs = cr(
 prepared.specularEtaTOverEtaI,
 prepared.specularAlpha
 );
 prepared.diffuseSpecularEnergyCompensation = iu
-/ max(gr, 1e-12);
+/ max(gs, 1e-12);
 
 prepared.probabilities[OPENPBR_LOBE_FUZZ] = prepared.weights[OPENPBR_LOBE_FUZZ]
 * aw(material.fuzzColor)
@@ -1090,21 +1090,21 @@ material.fuzzRoughness
 prepared.probabilities[OPENPBR_LOBE_COAT] = 0.0;
 prepared.coatBaseScale = vec3(1.0);
 if (material.coatWeight > 0.0 && !material.inside) {
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 float coatViewCosine = material.coatNormalEnabled ? max(prepared.coatViewLocal.z, 0.0) : viewCosine;
-float kB = gp(material, coatViewCosine);
+float kB = gq(material, coatViewCosine);
 #else
-float kB = gp(material, viewCosine);
+float kB = gq(material, viewCosine);
 #endif
 prepared.probabilities[OPENPBR_LOBE_COAT] = prepared.weights[OPENPBR_LOBE_COAT] * kB;
 prepared.coatBaseScale = cD(material,
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 coatViewCosine
 #else
 viewCosine
 #endif
 )
-* (1.0 - prepared.weights[OPENPBR_LOBE_COAT] * kB) * ha(prepared);
+* (1.0 - prepared.weights[OPENPBR_LOBE_COAT] * kB) * hb(prepared);
 }
 prepared.probabilities[OPENPBR_LOBE_METAL] = prepared.weights[OPENPBR_LOBE_METAL]
 * aw(hV);
@@ -1121,10 +1121,10 @@ prepared.probabilities[OPENPBR_LOBE_METAL] += fi;
 prepared.metalMsProbability = fi / max(prepared.probabilities[OPENPBR_LOBE_METAL], 1e-12);
 }
 prepared.probabilities[OPENPBR_LOBE_SPECULAR] = prepared.weights[OPENPBR_LOBE_SPECULAR]
-* aw(fw);
+* aw(fA);
 prepared.probabilities[OPENPBR_LOBE_TRANSMISSION] = prepared.weights[OPENPBR_LOBE_TRANSMISSION]
 * (1.0 - eO)
-* aw(gN);
+* aw(gO);
 
 
 
@@ -1139,14 +1139,14 @@ prepared.dielectricMsProbability = 0.0;
 if (!material.thinWalled && material.transmissionWeight > 0.0 &&
 prepared.specularAlpha >= 0.0016 && prepared.weights[OPENPBR_LOBE_TRANSMISSION] > 0.0 &&
 abs(prepared.refractionEtaTOverEtaI - 1.0) > 1e-6) {
-float lG = prepared.weights[OPENPBR_LOBE_TRANSMISSION] + prepared.weights[OPENPBR_LOBE_SUBSURFACE];
-prepared.dielectricMsReflectionScale = (material.inside ? vec3(1.0) : material.specularColor) * lG;
-prepared.dielectricMsTransmissionScale = gN * prepared.weights[OPENPBR_LOBE_TRANSMISSION]
+float lF = prepared.weights[OPENPBR_LOBE_TRANSMISSION] + prepared.weights[OPENPBR_LOBE_SUBSURFACE];
+prepared.dielectricMsReflectionScale = (material.inside ? vec3(1.0) : material.specularColor) * lF;
+prepared.dielectricMsTransmissionScale = gO * prepared.weights[OPENPBR_LOBE_TRANSMISSION]
 + vec3(prepared.weights[OPENPBR_LOBE_SUBSURFACE]);
 prepared.dielectricMsReflectionRatio = ch(prepared.refractionEtaTOverEtaI, prepared.specularAlpha);
 prepared.dielectricMsViewLoss = bO(prepared.refractionEtaTOverEtaI, prepared.specularAlpha, viewCosine);
-vec3 nW = mix(prepared.dielectricMsTransmissionScale, prepared.dielectricMsReflectionScale, prepared.dielectricMsReflectionRatio);
-float fi = aw(nW) * prepared.dielectricMsViewLoss;
+vec3 nV = mix(prepared.dielectricMsTransmissionScale, prepared.dielectricMsReflectionScale, prepared.dielectricMsReflectionRatio);
+float fi = aw(nV) * prepared.dielectricMsViewLoss;
 prepared.probabilities[OPENPBR_LOBE_TRANSMISSION] += fi;
 prepared.dielectricMsProbability = fi / max(prepared.probabilities[OPENPBR_LOBE_TRANSMISSION], 1e-12);
 }
@@ -1165,12 +1165,12 @@ prepared.probabilities[OPENPBR_LOBE_SPECULAR] = max(prepared.probabilities[OPENP
 prepared.probabilities[OPENPBR_LOBE_METAL] = max(prepared.probabilities[OPENPBR_LOBE_METAL], prepared.weights[OPENPBR_LOBE_METAL] * material.specularWeight * lj);
 }
 if (material.coatWeight > 0.0 && !material.inside) {
-float gs = max(max(prepared.coatBaseScale.x, prepared.coatBaseScale.y), prepared.coatBaseScale.z);
-prepared.probabilities[OPENPBR_LOBE_METAL] *= gs;
-prepared.probabilities[OPENPBR_LOBE_SPECULAR] *= gs;
-prepared.probabilities[OPENPBR_LOBE_TRANSMISSION] *= gs;
-prepared.probabilities[OPENPBR_LOBE_DIFFUSE] *= gs;
-prepared.probabilities[OPENPBR_LOBE_SUBSURFACE] *= gs;
+float gt = max(max(prepared.coatBaseScale.x, prepared.coatBaseScale.y), prepared.coatBaseScale.z);
+prepared.probabilities[OPENPBR_LOBE_METAL] *= gt;
+prepared.probabilities[OPENPBR_LOBE_SPECULAR] *= gt;
+prepared.probabilities[OPENPBR_LOBE_TRANSMISSION] *= gt;
+prepared.probabilities[OPENPBR_LOBE_DIFFUSE] *= gt;
+prepared.probabilities[OPENPBR_LOBE_SUBSURFACE] *= gt;
 }
 dR(prepared);
 return prepared;
@@ -1182,9 +1182,9 @@ return af(au, prepared.material.relativeIor);
 }
 float kp = af(au, prepared.transmissionReflectionIor);
 if (!reflection) { return kp; }
-float nl = af(au, 1.0 / prepared.specularEtaTOverEtaI);
+float nk = af(au, 1.0 / prepared.specularEtaTOverEtaI);
 float rP = prepared.material.transmissionWeight + (1.0 - prepared.material.transmissionWeight) * prepared.material.subsurfaceWeight;
-return mix(nl, kp, rP);
+return mix(nk, kp, rP);
 }
 
 vec3 bI(
@@ -1196,7 +1196,7 @@ J material = prepared.material;
 vec3 viewLocal = prepared.viewLocal;
 vec3 lightLocal = openpbr_to_local(prepared.basis, lightDirection);
 bool reflection = lightLocal.z * viewLocal.z > 0.0;
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 bool independentCoat = material.coatNormalEnabled;
 bool geometricReflection = dot(material.geometricNormal, lightDirection) > 0.0;
 float coatLightCosine = dot(prepared.coatBasis.normal, lightDirection);
@@ -1226,7 +1226,7 @@ prepared.specularAlpha,
 abs(lightLocal.z)
 );
 
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 if (!independentCoat || (lightLocal.z != 0.0 && reflection == geometricReflection)) {
 #endif
 if (reflection) {
@@ -1340,12 +1340,12 @@ vec3 df = normalize(kY + viewLocal);
 if (df.z < 0.0) {
 df = -df;
 }
-float nR = abs(dot(viewLocal, df));
-vec3 lL = vec3(cR(prepared, nR, false));
+float nQ = abs(dot(viewLocal, df));
+vec3 lK = vec3(cR(prepared, nQ, false));
 if (material.thinFilmWeight > 0.0) {
-lL = bW(
-lL,
-nR,
+lK = bW(
+lK,
+nQ,
 material.thinFilmThickness,
 material.thinFilmIor,
 prepared.thinFilmBaseIor,
@@ -1353,8 +1353,8 @@ material.thinFilmWeight,
 prepared.thinFilmExteriorIor
 );
 }
-vec3 gk = aP(
-lL,
+vec3 gm = aP(
+lK,
 1.0
 );
 vec3 tint = bG(
@@ -1368,7 +1368,7 @@ material,
 viewLocal,
 kY,
 df,
-tint * (vec3(1.0) - gk),
+tint * (vec3(1.0) - gm),
 aI
 );
 }
@@ -1392,13 +1392,13 @@ pdf += prepared.probabilities[OPENPBR_LOBE_TRANSMISSION] * aI;
 }
 if (prepared.weights[OPENPBR_LOBE_SUBSURFACE] > 0.0) {
 if (material.thinWalled) {
-vec3 oi = vec3(lightLocal.xy, -lightLocal.z);
+vec3 oh = vec3(lightLocal.xy, -lightLocal.z);
 response += 0.5 * prepared.weights[OPENPBR_LOBE_SUBSURFACE]
 * cE(
 material,
 material.subsurfaceColor,
 viewLocal,
-oi,
+oh,
 diffuseSpecularEnergyCompensation,
 aI
 );
@@ -1433,24 +1433,24 @@ pdf += prepared.probabilities[OPENPBR_LOBE_TRANSMISSION] * prepared.dielectricMs
 }
 }
 
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 } 
 #endif
 if (material.coatWeight > 0.0) {
 response *= ds(prepared,
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 independentCoat ? coatLightCosine : lightLocal.z
 #else
 lightLocal.z
 #endif
 );
 }
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 if (independentCoat) { response *= abs(lightLocal.z); }
 #endif
 
 if (
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 (independentCoat ? coatReflection : reflection)
 #else
 reflection
@@ -1458,17 +1458,17 @@ reflection
 && prepared.weights[OPENPBR_LOBE_COAT] > 0.0) {
 vec3 dI = viewLocal;
 vec3 kD = lightLocal;
-vec3 gv = V;
+vec3 gw = V;
 float jK = bQ;
 if (prepared.directionFrames) {
 dI = openpbr_to_local(prepared.coatBasis, openpbr_to_world(prepared.basis, viewLocal));
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 if (independentCoat) { dI = prepared.coatViewLocal; }
 #endif
 kD = openpbr_to_local(prepared.coatBasis, lightDirection);
-gv = normalize(kD + dI);
-if (gv.z < 0.0) { gv = -gv; }
-jK = abs(dot(dI, gv));
+gw = normalize(kD + dI);
+if (gw.z < 0.0) { gw = -gw; }
+jK = abs(dot(dI, gw));
 }
 
 vec3 lg = vec3(af(
@@ -1480,14 +1480,14 @@ vec2 jx = aK(material.coatRoughness, material.coatAnisotropy);
 dH.alphaX = jx.x;
 dH.alphaY = jx.y;
 response += prepared.weights[OPENPBR_LOBE_COAT]
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 * (independentCoat ? max(coatLightCosine, 0.0) : 1.0)
 #endif
 * am(
 dH,
 dI,
 kD,
-gv,
+gw,
 lg,
 aI
 );
@@ -1495,7 +1495,7 @@ pdf += prepared.probabilities[OPENPBR_LOBE_COAT] * aI;
 }
 
 if (
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 (independentCoat ? geometricReflection : reflection)
 #else
 reflection
@@ -1510,7 +1510,7 @@ vec3(0.0),
 vec3(1.0 - prepared.weights[OPENPBR_LOBE_FUZZ] * qz)
 );
 response += prepared.weights[OPENPBR_LOBE_FUZZ]
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 * (independentCoat ? max(lightLocal.z, 0.0) : 1.0)
 #endif
 * jY(
@@ -1522,7 +1522,7 @@ aI
 pdf += prepared.probabilities[OPENPBR_LOBE_FUZZ] * aI;
 }
 
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 if (independentCoat) { return response; }
 #endif
 return response * abs(lightLocal.z);
@@ -1574,7 +1574,7 @@ out bool isTransmissionEvent
 J material = prepared.material;
 vec3 viewLocal = prepared.viewLocal;
 float cy = cm.x;
-float fu = cm.y;
+float fv = cm.y;
 float bm = cm.z;
 pdf = 0.0;
 isTransmissionEvent = false;
@@ -1589,7 +1589,7 @@ lightDirection = openpbr_to_world(prepared.basis, -viewLocal);
 pdf = 1.0;
 isTransmissionEvent = true;
 return (bn(prepared.material) * ds(prepared,
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 prepared.material.coatNormalEnabled ? dot(prepared.coatBasis.normal, lightDirection) : -prepared.viewLocal.z
 #else
 -prepared.viewLocal.z
@@ -1610,25 +1610,25 @@ vec3 lightLocal;
 if (bm < cdf[OPENPBR_LOBE_FUZZ] || (
 bm >= cdf[OPENPBR_LOBE_TRANSMISSION] && bm < cdf[OPENPBR_LOBE_DIFFUSE]
 )) {
-lightLocal = bi(vec2(cy, fu));
+lightLocal = bi(vec2(cy, fv));
 }
 else if (bm < cdf[OPENPBR_LOBE_COAT]) {
 vec3 dI = viewLocal;
 if (prepared.directionFrames) { dI = openpbr_to_local(prepared.coatBasis, openpbr_to_world(prepared.basis, viewLocal)); }
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 if (material.coatNormalEnabled) { dI = prepared.coatViewLocal; }
 #endif
 vec3 V = aQ(
 dI,
 
 aK(material.coatRoughness, material.coatAnisotropy),
-vec2(cy, fu)
+vec2(cy, fv)
 );
 if (V.z < 0.0) {
 V = -V;
 }
 lightLocal = normalize(reflect(-dI, V));
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 if (material.coatNormalEnabled) {
 lightDirection = openpbr_to_world(prepared.coatBasis, lightLocal);
 if (lightLocal.z <= 0.0 || dot(material.geometricNormal, lightDirection) <= 0.0) { return vec3(0.0); }
@@ -1643,14 +1643,14 @@ float rM = (bm - cdf[OPENPBR_LOBE_COAT]) / max(prepared.probabilities[OPENPBR_LO
 if (tw && rM < prepared.metalMsProbability) {
 float z = cy;
 float fl = sqrt(max(0.0, 1.0 - z * z));
-float br = TWOPI * fu;
+float br = TWOPI * fv;
 lightLocal = vec3(fl * cos(br), fl * sin(br), z);
 }
 else {
 vec3 V = aQ(
 viewLocal,
 vec2(material.alphaX, material.alphaY),
-vec2(cy, fu)
+vec2(cy, fv)
 );
 if (V.z < 0.0) {
 V = -V;
@@ -1665,20 +1665,20 @@ isTransmissionEvent = true;
 float us = (bm - cdf[OPENPBR_LOBE_SPECULAR]) / max(prepared.probabilities[OPENPBR_LOBE_TRANSMISSION], 1e-12);
 if (prepared.dielectricMsProbability > 0.0 && us < prepared.dielectricMsProbability) {
 float ja = prepared.dielectricMsReflectionRatio;
-bool lZ = cy < ja;
+bool lY = cy < ja;
 float z;
-if (lZ) { z = min(cy / ja, 0.99999994); }
+if (lY) { z = min(cy / ja, 0.99999994); }
 else { z = -min((cy - ja) / (1.0 - ja), 0.99999994); }
 float fl = sqrt(max(0.0, 1.0 - z * z));
-float br = TWOPI * fu;
+float br = TWOPI * fv;
 lightLocal = vec3(fl * cos(br), fl * sin(br), z);
-isTransmissionEvent = !lZ;
+isTransmissionEvent = !lY;
 }
 else {
 vec3 V = aQ(
 viewLocal,
 vec2(material.alphaX, material.alphaY),
-vec2(cy, fu)
+vec2(cy, fv)
 );
 if (V.z < 0.0) {
 V = -V;
@@ -1725,7 +1725,7 @@ bool pT = kK >= 0.5;
 cy = pT
 ? (kK - 0.5) * 2.0
 : kK * 2.0;
-lightLocal = bi(vec2(cy, fu));
+lightLocal = bi(vec2(cy, fv));
 if (pT) {
 lightLocal.z = -lightLocal.z;
 }
@@ -1734,7 +1734,7 @@ isTransmissionEvent = false;
 }
 }
 else {
-lightLocal = bi(vec2(cy, fu));
+lightLocal = bi(vec2(cy, fv));
 lightLocal.z = -lightLocal.z;
 }
 }
@@ -1744,7 +1744,7 @@ lightDirection = openpbr_to_world(prepared.basis, lightLocal);
 if (lightLocal.z == 0.0 || (lightLocal.z < 0.0) != isTransmissionEvent) {
 return vec3(0.0);
 }
-#ifdef NUM_COAT_NORMAL_MAPS
+#ifdef USE_COAT_NORMAL_FRAMES
 if (material.coatNormalEnabled &&
 ((dot(material.geometricNormal, lightDirection) <= 0.0) != isTransmissionEvent)) { return vec3(0.0); }
 #endif