@meimu/mutracer 0.1.2 → 0.1.3

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

@@ -32,7 +32,7 @@ return;
 // So here the code are injected separately.
 const bounceCodeOnIntelMac = glsl `
 
-for(int vI = 0; vI < BOUNCES; vI++) {{
+for(int vN = 0; vN < BOUNCES; vN++) {{
 if (aa.abort) {
 return vec4(aa.li, aa.alpha);
 }
@@ -40,10 +40,10 @@ bounce(aa, depth, si, mat, outAux);
 }}
 `;
 const bounceCodeOnOther = glsl `
-bool uT = !si.isTransparency;
-int qB = min(BOUNCES, bounceLimit);
+bool uY = !si.isTransparency;
+int qF = min(BOUNCES, bounceLimit);
 for(int idx = 0; idx < min(BOUNCES * 3, ${MAX_PATH_EVENTS}); idx++) {
-if (uT && idx > qB) {
+if (uY && idx > qF) {
 aa.abort = true;
 }
 if (aa.abort) {
@@ -93,7 +93,7 @@ ${envMap.main}
 ${samplingGlsl}
 ${openPbrBsdfGlsl}
 
-float mh;
+float mk;
 float bf;
 
 ${sampleLightGlsl}
@@ -110,7 +110,7 @@ bool isShadowCatcher;
 };
 
 void bounce(inout Path aa, inout int depth, inout ad si, inout J mat, inout RayTraceAuxiliary outAux) {
-cE = uint(max(depth, 0));
+cF = uint(max(depth, 0));
 
 
 
@@ -135,26 +135,26 @@ if (aa.isNextRefraction) {
 
 
 
-vec4 bg = cw(aa.ray.o, aa.ray.d);
+vec4 bg = cx(aa.ray.o, aa.ray.d);
 bg.rgb = ai(bg.rgb, bf);
 float cT = aa.scatteringIsDelta ? 1.0
-: aF(aa.scatteringPdf,
+: aG(aa.scatteringPdf,
 iv(aS(aa.ray.d)) * envLightSelectionPmf);
 aa.li += cT * aa.beta * bg.rgb * bg.a;
 aa.alpha = max(aa.alpha, bg.a);
 }
 else {
-vec2 tE = aS(aa.ray.d);
-vec3 emission = textureLinear(envMap, tE).rgb;
+vec2 tJ = aS(aa.ray.d);
+vec3 emission = textureLinear(envMap, tJ).rgb;
 emission = ai(emission, bf);
 aa.li += aa.beta * emission *
-aF(
+aG(
 aa.scatteringPdf,
-iv(tE) * envLightSelectionPmf
+iv(tJ) * envLightSelectionPmf
 );
 }
 #else
-vec4 bg = cw(aa.ray.o, aa.ray.d);
+vec4 bg = cx(aa.ray.o, aa.ray.d);
 bg.rgb = ai(bg.rgb, bf);
 aa.li += aa.beta * bg.rgb * bg.a;
 #endif
@@ -165,7 +165,7 @@ return;
 
 if (!si.hit) {
 
-vec4 bg = cw(aa.ray.o, aa.ray.d);
+vec4 bg = cx(aa.ray.o, aa.ray.d);
 
 
 
@@ -177,10 +177,10 @@ aa.alpha = bg.a;
 outAux.isBlank = bg.a < 0.01;
 }
 else {
-Ray cam = hz(v_Texcoord + rN());
-bool mz = dot(cam.d, aa.ray.d) > 0.0;
+Ray cam = hy(v_Texcoord + rS());
+bool mC = dot(cam.d, aa.ray.d) > 0.0;
 if (transmissiveOutputAlphaMin < 1.0) {
-if (mz) {
+if (mC) {
 aa.alpha = max(aa.alpha, bg.a);
 } else {
 aa.alpha = 1.0;
@@ -188,8 +188,8 @@ aa.alpha = 1.0;
 }
 #if !defined(USE_ENVMAP)
 
-if (mz) {
-aa.li = aa.beta * aF(aa.scatteringPdf, 1.0) * bg.rgb;
+if (mC) {
+aa.li = aa.beta * aG(aa.scatteringPdf, 1.0) * bg.rgb;
 }
 #endif
 }
@@ -197,7 +197,7 @@ aa.abort = true;
 return;
 }
 
-bool cG = false;
+bool cH = false;
 if ((mat.materialType == STANDARD || mat.materialType == UNLIT)) {
 if (transmissiveOutputAlphaMin < 1.0) {
 
@@ -210,18 +210,18 @@ if (alpha < 1.0) {
 
 aa.alpha = max(aa.alpha, alpha);
 if (eo(3u) > alpha) {
-cG = true;
+cH = true;
 }
 }
-if (!cG) {
-lO(si, mat, aa);
+if (!cH) {
+lR(si, mat, aa);
 }
 else {
 aa.ray.o = si.position + aa.ray.d * EPS;
 }
 }
 
-if (!si.albedoSampled && !cG) {
+if (!si.albedoSampled && !cH) {
 
 if ((mat.materialType == STANDARD || mat.materialType == UNLIT) &&
 !(mat.transmissionWeight > 0.5 ||
@@ -243,11 +243,11 @@ si.albedoSampled = true;
 
 
 #ifdef USE_RR
-if (depth >= RR_MAX && !cG) {
+if (depth >= RR_MAX && !cH) {
 
-float oj = max(max(aa.beta.x, aa.beta.y), aa.beta.z);
-float q = max(0.0, 1.0 - oj);
-if (dz(cv(RUSSIAN_ROULETTE)) < q) {
+float oo = max(max(aa.beta.x, aa.beta.y), aa.beta.z);
+float q = max(0.0, 1.0 - oo);
+if (dz(cw(RUSSIAN_ROULETTE)) < q) {
 
 
 aa.alpha = 1.0;
@@ -272,7 +272,7 @@ si.isTransparency = mat.transmissionWeight > 0.001 || mat.subsurfaceWeight > 0.0
 
 
 if (dispersionWavelengths == 1 && si.hit && mat.transmissionWeight > 0.001 && mat.transmissionDispersionScale > 0.001) {
-bf = mh;
+bf = mk;
 }
 if (mat.transmissionWeight > 0.001 && bf > 0.0) {
 mat.specularIor = eK(
@@ -283,7 +283,7 @@ mat.dispersionAbbeNumber
 );
 }
 
-if (cG) {
+if (cH) {
 return;
 }
 
@@ -293,12 +293,12 @@ bool hu = eo(3u) < mat.alpha;
 LightSampleRec lightSample;
 for (int i = 0; i < NUM_LIGHTS; i++) {
 
-Light light = ql(i);
-float d = mk(aa.ray, light, lightSample);
-bool mp = si.hit && d > distance(si.position, aa.ray.o);
-if (d != INF && !(mp && hu)) {
+Light light = qp(i);
+float d = mo(aa.ray, light, lightSample);
+bool mt = si.hit && d > distance(si.position, aa.ray.o);
+if (d != INF && !(mt && hu)) {
 lightSample.pdf *= light.selectionPmf;
-float eW = aF(aa.scatteringPdf, lightSample.pdf);
+float eW = aG(aa.scatteringPdf, lightSample.pdf);
 lightSample.emission = ai(lightSample.emission, bf);
 aa.li += eW * aa.beta * lightSample.emission;
 
@@ -313,10 +313,10 @@ if (!(si.hit && hu)) {
 if (aa.isNextRefraction) {
 
 
-vec4 bg = cw(aa.ray.o, aa.ray.d);
+vec4 bg = cx(aa.ray.o, aa.ray.d);
 bg.rgb = ai(bg.rgb, bf);
 float cT = aa.scatteringIsDelta ? 1.0
-: aF(aa.scatteringPdf,
+: aG(aa.scatteringPdf,
 iv(aS(aa.ray.d)) * envLightSelectionPmf);
 aa.li += cT * aa.beta * bg.rgb * bg.a;
 aa.alpha = max(aa.alpha, bg.a);
@@ -325,7 +325,7 @@ return;
 }
 vec2 uv = aS(aa.ray.d);
 vec3 emission = textureLinear(envMap, uv).rgb;
-float eW = aF(
+float eW = aG(
 aa.scatteringPdf,
 iv(uv) * envLightSelectionPmf
 );
@@ -345,105 +345,105 @@ depth++;
 }
 
 
-vec2 kn(float radius, float xi) {
+vec2 kp(float radius, float xi) {
 float x = 0.25;
-for (int np = 0; np < 10; np++) {
+for (int ns = 0; ns < 10; ns++) {
 float x2 = x * x;
 float x3 = x2 * x;
-float kD = 1.0 - x;
+float kG = 1.0 - x;
 float value = 10.0 * x2 - 20.0 * x3 + 15.0 * x2 * x2 -
 4.0 * x2 * x3 - xi;
-float lV = 20.0 * x * kD * kD * kD;
-if (abs(value) < 1e-6 || lV == 0.0) break;
-x = clamp(x - value / lV, 0.0, 1.0);
+float lY = 20.0 * x * kG * kG * kG;
+if (abs(value) < 1e-6 || lY == 0.0) break;
+x = clamp(x - value / lY, 0.0, 1.0);
 }
-float jh = x * radius;
+float jj = x * radius;
 return vec2(
-jh,
-sqrt(max(radius * radius - jh * jh, 0.0))
+jj,
+sqrt(max(radius * radius - jj * jj, 0.0))
 );
 }
 
-float iN(float radius, float gr) {
-if (gr >= radius) return 0.0;
-float nS = radius - gr;
-return nS * nS * nS;
+float iO(float radius, float gs) {
+if (gs >= radius) return 0.0;
+float nV = radius - gs;
+return nV * nV * nV;
 }
 
 
-vec3 mf(ad source, float radius) {
+vec3 mi(ad source, float radius) {
 vec3 geometricNormal = source.faceNormal;
 if (dot(geometricNormal, source.vertexNormal) < 0.0) geometricNormal = -geometricNormal;
 vec3 tangent;
 vec3 bitangent;
-aK(geometricNormal, tangent, bitangent);
+aL(geometricNormal, tangent, bitangent);
 vec3 iB = vec3(0.0);
 
-for (int ib = 0; ib < BEVEL_SAMPLES; ib++) {
-vec2 oU = fk(CAMERA_BEVEL_BASE + uint(ib));
-float cz = oU.x;
-float ou = oU.y;
+for (int ia = 0; ia < BEVEL_SAMPLES; ia++) {
+vec2 oY = fk(CAMERA_BEVEL_BASE + uint(ia));
+float cA = oY.x;
+float ox = oY.y;
 vec3 di = geometricNormal;
 vec3 fE = tangent;
 vec3 ek = bitangent;
-float fZ = 0.5;
-float hV = 0.25;
-float gy = 0.25;
-if (cz < 0.5) {
-cz *= 2.0;
-}
-else if (cz < 0.75) {
-vec3 mx = di;
+float ga = 0.5;
+float hU = 0.25;
+float gA = 0.25;
+if (cA < 0.5) {
+cA *= 2.0;
+}
+else if (cA < 0.75) {
+vec3 mA = di;
 di = fE;
-fE = mx;
-fZ = 0.25;
-hV = 0.5;
-cz = (cz - 0.5) * 4.0;
+fE = mA;
+ga = 0.25;
+hU = 0.5;
+cA = (cA - 0.5) * 4.0;
 }
 else {
-vec3 mx = di;
+vec3 mA = di;
 di = ek;
-ek = mx;
-fZ = 0.25;
-gy = 0.5;
-cz = (cz - 0.75) * 4.0;
+ek = mA;
+ga = 0.25;
+gA = 0.5;
+cA = (cA - 0.75) * 4.0;
 }
 
-vec2 gO = kn(radius, ou);
-float phi = TWOPI * cz;
-vec3 qj = gO.x *
+vec2 gQ = kp(radius, ox);
+float phi = TWOPI * cA;
+vec3 qn = gQ.x *
 (cos(phi) * fE + sin(phi) * ek);
 Ray ray;
 iw(
 ray,
-source.position + di * gO.y + qj,
+source.position + di * gQ.y + qn,
 -di
 );
 ad hit;
-iG(
+iH(
 ray,
 hit,
 source.instanceIndex,
-max(2.0 * gO.y, EPS)
+max(2.0 * gQ.y, EPS)
 );
 if (!hit.hit) continue;
 
-float kE = fZ * abs(dot(di, hit.faceNormal));
-float mt = hV * abs(dot(fE, hit.faceNormal));
-float jS = gy * abs(dot(ek, hit.faceNormal));
-float weight = kE / max(
-kE * kE + mt * mt +
-jS * jS,
+float kH = ga * abs(dot(di, hit.faceNormal));
+float mw = hU * abs(dot(fE, hit.faceNormal));
+float jU = gA * abs(dot(ek, hit.faceNormal));
+float weight = kH / max(
+kH * kH + mw * mw +
+jU * jU,
 1e-8
 );
-weight *= iN(radius, distance(hit.position, source.position)) /
-max(iN(radius, gO.x), 1e-8);
+weight *= iO(radius, distance(hit.position, source.position)) /
+max(iO(radius, gQ.x), 1e-8);
 iB += weight * hit.vertexNormal;
 }
 
 if (dot(iB, iB) <= 1e-12) return source.normal;
-vec3 jA = normalize(iB);
-vec3 result = source.normal + jA - source.vertexNormal;
+vec3 jC = normalize(iB);
+vec3 result = source.normal + jC - source.vertexNormal;
 return dot(result, result) > 1e-12 ? normalize(result) : source.normal;
 }
 
@@ -473,49 +473,49 @@ return bw(si, ray, mat, outAux);
 
 
 
-Ray nK = ray;
-nK.o = si.position + ray.d * (EPS * 0.02);
+Ray nN = ray;
+nN.o = si.position + ray.d * (EPS * 0.02);
 ad dU = si;
 dU.albedoSampled = false;
-cY(nK, dU, false);
-J nJ;
-eT(nJ, dU.materialIndex, dU.uv, dU.uv1, dU.instanceIndex);
-RayTraceAuxiliary gg = outAux;
-if (dU.hit && (nJ.materialType == STANDARD || nJ.materialType == UNLIT)) {
-gg.albedo = nJ.transmissionWeight > 0.5
+cY(nN, dU, false);
+J nM;
+eT(nM, dU.materialIndex, dU.uv, dU.uv1, dU.instanceIndex);
+RayTraceAuxiliary gh = outAux;
+if (dU.hit && (nM.materialType == STANDARD || nM.materialType == UNLIT)) {
+gh.albedo = nM.transmissionWeight > 0.5
 ? vec3(1.0)
-: nJ.baseColor;
-gg.normal = dot(
+: nM.baseColor;
+gh.normal = dot(
 dU.normal,
 dU.position - vec3(viewInv[3])
 ) > 0.0
 ? -dU.normal
 : dU.normal;
-dU.albedoSampled = nJ.transmissionWeight > 0.5;
+dU.albedoSampled = nM.transmissionWeight > 0.5;
 }
-vec4 back = bw(dU, nK, nJ, gg);
+vec4 back = bw(dU, nN, nM, gh);
 if (coverage <= 0.0) {
-outAux = gg;
+outAux = gh;
 return back;
 }
 
-ad te = si;
-J tF = mat;
-tF.alpha = 1.0;
-RayTraceAuxiliary iQ = outAux;
-vec4 qL = bw(te, ray, tF, iQ);
-outAux.albedo = mix(gg.albedo, iQ.albedo, coverage);
-vec3 fR = mix(gg.normal, iQ.normal, coverage);
+ad tk = si;
+J tK = mat;
+tK.alpha = 1.0;
+RayTraceAuxiliary iR = outAux;
+vec4 qQ = bw(tk, ray, tK, iR);
+outAux.albedo = mix(gh.albedo, iR.albedo, coverage);
+vec3 fR = mix(gh.normal, iR.normal, coverage);
 outAux.normal = dot(fR, fR) > 1e-12
 ? normalize(fR)
 : vec3(0.0);
-outAux.isBlank = gg.isBlank && iQ.isBlank;
-return mix(back, qL, coverage);
+outAux.isBlank = gh.isBlank && iR.isBlank;
+return mix(back, qQ, coverage);
 }
 
 
 
-vec4 mj(Ray ray, out RayTraceAuxiliary outAux) {
+vec4 mn(Ray ray, out RayTraceAuxiliary outAux) {
 
 ad si;
 J mat;
@@ -534,7 +534,7 @@ si.isTransparency = mat.transmissionWeight > 0.001 || mat.subsurfaceWeight > 0.0
 
 #ifdef HAS_BEVEL
 if (bevelEnabled && mat.bevel > 0.0) {
-si.normal = mf(si, mat.bevel);
+si.normal = mi(si, mat.bevel);
 }
 #endif
 
@@ -563,20 +563,20 @@ return iz(si, ray, mat, outAux);
 
 void main() {
 
-se();
-jY(v_Texcoord * viewportSize, int(uint(sampleCount) ^ eg(uint(sequenceSeed))));
+sk();
+ka(v_Texcoord * viewportSize, int(uint(sampleCount) ^ eg(uint(sequenceSeed))));
 
 
 bf = dispersionWavelengths == 1 ? 0.0 : wavelength;
-mh = wavelength;
+mk = wavelength;
 if (dispersionWavelengths == 1 && wavelength > 0.0) {
 float channel = floor(dz(CAMERA_WAVELENGTH) * 3.0);
-mh = channel < 1.0 ? 650.0 : channel < 2.0 ? 510.0 : 475.0;
+mk = channel < 1.0 ? 650.0 : channel < 2.0 ? 510.0 : 475.0;
 }
 
 
 
-Ray cam = nv();
+Ray cam = nC();
 
 RayTraceAuxiliary outAux;
 outAux.albedo = vec3(0.0);
@@ -584,38 +584,38 @@ outAux.normal = vec3(0.0);
 outAux.isBlank = false;
 outAux.isShadowCatcher = false;
 
-vec4 aN = mj(cam, outAux);
+vec4 aF = mn(cam, outAux);
 
 
 
 #ifdef CLAMPING
 float clamping = float(CLAMPING);
-aN.rgb = clamp(aN.rgb, -clamping, clamping);
+aF.rgb = clamp(aF.rgb, -clamping, clamping);
 #endif
 
 
 if (bf > 0.0) {
 
-aN.rgb *= 3.0;
+aF.rgb *= 3.0;
 if (dispersionWavelengths != 1) {
 
 
-aN.a /= 3.0;
+aF.a /= 3.0;
 }
 }
-if (!(aN.x < INF && aN.x > -EPS)) {
-aN = vec4(0, 0, 0, 1);
+if (!(aF.x < INF && aF.x > -EPS)) {
+aF = vec4(0, 0, 0, 1);
 }
 
-out_color = aN;
+out_color = aF;
 out_albedo = vec4(outAux.albedo, outAux.isBlank ? 0.0 : 1.0);
 out_normal = vec4(outAux.normal, 1.0);
 
 
-float jj = dot(aN.rgb, vec3(0.2126, 0.7152, 0.0722));
+float jl = dot(aF.rgb, vec3(0.2126, 0.7152, 0.0722));
 out_moments = outAux.isShadowCatcher
 ? vec4(0.0)
-: vec4(jj, jj * jj, 1.0, 0.0);
+: vec4(jl, jl * jl, 1.0, 0.0);
 
 }`
     });

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

@@ -52,7 +52,7 @@ ${cameraRayGlsl}
 
 
 
-vec4 mj(inout Ray ray, out vec4 background) {
+vec4 mn(inout Ray ray, out vec4 background) {
 background = vec4(0.0);
 Path aa;
 aa.ray = ray;
@@ -81,7 +81,7 @@ if (mat.materialType != SHADOW_CATCHER) {
 return vec4(0.0, 0.0, 0.0, 1.0);
 }
 
-vec4 bg = cw(ray.o, ray.d);
+vec4 bg = cx(ray.o, ray.d);
 background = vec4(bg.rgb * bg.a, bg.a);
 if (!aa.abort) {
 sampleShadowCatcher(si, 0, aa);
@@ -90,28 +90,28 @@ return vec4(1.0, bg.a, bg.a >= 0.01 ? 1.0 : 0.0, aa.alpha);
 }
 
 void main() {
-se();
-jY(v_Texcoord * viewportSize, int(uint(sampleCount) ^ eg(uint(sequenceSeed))));
+sk();
+ka(v_Texcoord * viewportSize, int(uint(sampleCount) ^ eg(uint(sequenceSeed))));
 
 if (dispersionWavelengths == 1 && wavelength > 0.0) { dz(CAMERA_WAVELENGTH); }
-Ray cam = nv();
+Ray cam = nC();
 vec4 background;
-vec4 aN = mj(cam, background);
+vec4 aF = mn(cam, background);
 
-if (!(aN.x < INF && aN.x > -EPS)) {
-aN = vec4(0, 0, 0, 1);
+if (!(aF.x < INF && aF.x > -EPS)) {
+aF = vec4(0, 0, 0, 1);
 }
 
-out_shadowCatcher = aN;
+out_shadowCatcher = aF;
 out_catcherBackground = background;
 
 
 
-float jj = aN.a * (background.a >= 0.01
+float jl = aF.a * (background.a >= 0.01
 ? dot(background.rgb / background.a, vec3(0.2126, 0.7152, 0.0722))
 : 1.0);
-out_catcherMoments = aN.r > 0.0
-? vec4(jj, jj * jj, 1.0, 0.0)
+out_catcherMoments = aF.r > 0.0
+? vec4(jl, jl * jl, 1.0, 0.0)
 : vec4(0.0);
 
 }`