@meimu/mutracer 0.3.0 → 0.3.1

package/lib/renderer/wgsl/chunks/sampleMaterial.wgsl.js

@@ -1,10 +1,10 @@
 // Next-event estimation with resampled importance sampling over the light
 // candidates, followed by BSDF (or phase function) sampling, as described in
 // http://www.pbr-book.org/3ed-2018/Light_Transport_I_Surface_Reflection/Direct_Lighting.html#EstimatingtheDirectLightingIntegral
-export function createSampleMaterialWgsl(hasAnisotropyDirections = true, hasCoatNormals = false, caustics = false, researchContribution = '', photonMapping = false) {
+export function createSampleMaterialWgsl(hasAnisotropyDirections = true, hasCoatNormals = false, caustics = false, researchContribution = '', photonMapping = false, channelIndependentRis = false) {
     return /* wgsl */ `
 
-struct nR {
+struct oQ {
 ray: Ray,
 maxDistance: f32,
 triangleIndex: i32,
@@ -16,7 +16,7 @@ lightSelectionPmf: f32,
 valid: bool,
 }
 
-fn rZ(
+fn tw(
 si: ptr<function, SurfaceInteraction>,
 ma: OpenPbrResolvedMaterial,
 path: ptr<function, Path>,
@@ -25,11 +25,11 @@ isSurface: bool,
 lightSample: LightSampleRec,
 f: vec3f,
 scatteringPdf: f32,
-gj: ptr<function, nR>
+eO: ptr<function, oQ>
 ) -> bool {
-(*gj).valid = false;
-(*gj).lightSelectionPmf = 0.0;
-(*gj).risTarget = 0.0;
+(*eO).valid = false;
+(*eO).lightSelectionPmf = 0.0;
+(*eO).risTarget = 0.0;
 var Li = lightSample.emission;
 
 let lightDir = lightSample.direction;${caustics ? /* wgsl */ `
@@ -38,7 +38,7 @@ var connection=*path;
 causticAdvance(&connection,ma,dot(ffnormal,lightDir)<0.0,true);
 if(causticHitOwned(connection,lightSample.sourceType!=0u,true)){return false;}
 }` : ''}
-let qR = -(*path).ray.d;
+let sg = -(*path).ray.d;
 let lightPdf = lightSample.pdf;
 let lightSelectionPmf = lightSample.selectionPmf;
 
@@ -55,103 +55,109 @@ if ((scatteringPdf <= 0.0) | (max(max(f.x, f.y), f.z) <= 0.0)) {
 return false;
 }
 
-var mY: Ray;
-var eO = (*si).position + EPS * lightDir;
+var oa: Ray;
+var eY = (*si).position + EPS * lightDir;
 if (isSurface) {
-eO = sO((*si).position, (*si).faceNormal, lightDir);
+eY = un((*si).position, (*si).faceNormal, lightDir);
 let shadowTerminatorCutoff = 0.1;
-var dj = dot((*si).normal, lightDir);
-${hasCoatNormals ? /* wgsl */ `    if (ma.coatNormalEnabled) { dj = dot((*si).faceNormal, lightDir); }` : ''}
+var dl = dot((*si).normal, lightDir);
+${hasCoatNormals ? /* wgsl */ `    if (ma.coatNormalEnabled) { dl = dot((*si).faceNormal, lightDir); }` : ''}
 let geometricNormal = select(
 (*si).faceNormal,
 -(*si).faceNormal,
-dj < 0.0
+dl < 0.0
 );
-dj = abs(dj);
-let hO = dot(geometricNormal, lightDir);
-let pf = select(
-clamp(1.0 - hO / shadowTerminatorCutoff, 0.0, 1.0),
+dl = abs(dl);
+let iw = dot(geometricNormal, lightDir);
+let qo = select(
+clamp(1.0 - iw / shadowTerminatorCutoff, 0.0, 1.0),
 clamp(
-2.0 - (hO + dj) / shadowTerminatorCutoff,
+2.0 - (iw + dl) / shadowTerminatorCutoff,
 0.0,
 1.0
 ),
-dj < shadowTerminatorCutoff
+dl < shadowTerminatorCutoff
 );
-eO += (*si).shadowOffset * pf;
+eY += (*si).shadowOffset * qo;
 }
 
 
 
 
-var mh = lightDir;
-var nC = lightSample.dist - EPS;
+var mZ = lightDir;
+var oy = lightSample.dist - EPS;
 if (lightSample.sourceType == 1u) {
-let us =
+let wc =
 (*si).position + lightSample.direction * lightSample.dist;
-let qU = us + EPS * lightSample.normal;
-let rk = qU - eO;
-nC = length(rk);
-mh = normalize(rk);
+let sk = wc + EPS * lightSample.normal;
+let sB = sk - eY;
+oy = length(sB);
+mZ = normalize(sB);
 }
-initRay(&mY, eO, mh);
+initRay(&oa, eY, mZ);
 
 
 
 
 if (isSurface & (cosThetaL < 0.0) & (lightSample.sourceType == 0u)) {
-let background = ft(mY);
+let background = fI(oa);
 Li = background.rgb * background.a;
 }
-if (SPECTRAL) {
+if (SPECTRAL${channelIndependentRis ? ' && rtUniform.dispersionWavelengths == 1' : ''}) {
 Li = sampling_spectral_rgb_filter(Li, (*si).spectralChannel);
 }
 
 
 
 let misWeight = select(
-uY(lightPdf, scatteringPdf),
+wM(lightPdf, scatteringPdf),
 1.0,
 lightSample.isDelta
 );
 if (misWeight > 0.0) {
-let kB = Li * f / lightPdf * (*path).beta;
-(*gj).risTarget = max(
-dot(max(kB * lightSelectionPmf, vec3f(0.0)), luminance),
+let ll = Li * f / lightPdf * (*path).beta;
+(*eO).risTarget = max(
+dot(max(ll * lightSelectionPmf, vec3f(0.0)), ${channelIndependentRis ? 'select(luminance, vec3f(1.0 / 3.0), SPECTRAL && rtUniform.dispersionWavelengths != 1)' : 'luminance'}),
 0.0
 );
-(*gj).ray = mY;
-(*gj).maxDistance = nC;
-(*gj).triangleIndex = (*si).triangleIndex;
-(*gj).contribution = misWeight * kB;
-(*gj).lightSelectionPmf = lightSelectionPmf;
-(*gj).valid = true;
+(*eO).ray = oa;
+(*eO).maxDistance = oy;
+(*eO).triangleIndex = (*si).triangleIndex;
+(*eO).contribution = misWeight * ll;${channelIndependentRis ? /* wgsl */ `
+
+
+
+if (SPECTRAL && rtUniform.dispersionWavelengths != 1) {
+(*eO).contribution = sampling_spectral_rgb_filter((*eO).contribution, (*si).spectralChannel);
+}` : ''}
+(*eO).lightSelectionPmf = lightSelectionPmf;
+(*eO).valid = true;
 return true;
 }
 return false;
 }
 
-struct pX {
+struct rb {
 direction: vec3f,
 response: vec3f,
 pdf: f32,
 transmission: bool,
 }
 
-fn sV(
+fn ps(
 si: ptr<function, SurfaceInteraction>,
 ma: OpenPbrResolvedMaterial,
 prepared: OpenPbrPreparedBsdf,
 path: ptr<function, Path>,
 ffnormal: vec3f,
 isSurface: bool
-) -> pX {
-let candidateCount = ke();
-var selected: nR;
+) -> rb {
+let candidateCount = kL();
+var selected: oQ;
 selected.valid = false;
-var nq = 0.0;
-var lW = 0.0;
-var result: pX;
+var oo = 0.0;
+var mQ = 0.0;
+var result: rb;
 
 
 
@@ -162,37 +168,37 @@ var lightSample: LightSampleRec;
 var lightDir: vec3f;
 var scatteringPdf = 0.0;
 var response = vec3f(0.0);
-var tF = false;
+var vg = false;
 if (continuation) {
-var oI = 1.0;
+var pP = 1.0;
 var valid = selected.valid;
 if (candidateCount > 1u) {
-valid = valid & (nq > 0.0);
+valid = valid & (oo > 0.0);
 if (valid) {
-oI = selected.lightSelectionPmf * lW /
-(f32(candidateCount) * nq);
+pP = selected.lightSelectionPmf * mQ /
+(f32(candidateCount) * oo);
 }
 }
 if (valid && !intersectSceneShadow(selected.ray, selected.maxDistance, selected.triangleIndex, (*si).instanceIndex)) {
 ${caustics ? `        var connection=*path;
 if(isSurface&&isCausticSpecular(ma)){causticAdvance(&connection,ma,dot(ffnormal,selected.ray.d)<0.0,true);}
-connection.beta=vec3f(1.0);causticHotRecord(connection,selected.contribution*oI,0u);
-` : ''}        (*path).li += selected.contribution * oI;
+connection.beta=vec3f(1.0);causticHotRecord(connection,selected.contribution*pP,0u);
+` : ''}        (*path).li += selected.contribution * pP;
 }
 if (!isSurface) {
-result.direction = fj(-(*path).ray.d,
-(*si).mediumAnisotropy, sample2D(bE(PHASE_DIRECTION)));
-result.pdf = bB(
+result.direction = dQ(-(*path).ray.d,
+(*si).mediumAnisotropy, sample2D(aX(PHASE_DIRECTION)));
+result.pdf = ba(
 dot(result.direction, -(*path).ray.d), (*si).mediumAnisotropy);
 return result;
 }
-let wh = vec3f(sample2D(bE(BSDF_DIRECTION)), sample1D(bE(BSDF_LOBE)));
-tF = !prepared.material.thinWalled &
+let yh = vec3f(sample2D(aX(BSDF_DIRECTION)), sample1D(aX(BSDF_LOBE)));
+vg = !prepared.material.thinWalled &
 (abs(prepared.material.relativeIor - 1.0) <= 1e-6) &
 (prepared.probabilities[OPENPBR_LOBE_TRANSMISSION] >= 1.0 - 1e-6);
-if (tF) {
+if (vg) {
 lightDir = openpbr_to_world(prepared.basis, -prepared.viewLocal);
-response = ba(prepared.material) * cm(prepared,
+response = bb(prepared.material) * cp(prepared,
 ${hasCoatNormals ? 'select(-prepared.viewLocal.z, dot(prepared.coatBasis.normal, lightDir), prepared.material.coatNormalEnabled)' : '-prepared.viewLocal.z'});
 scatteringPdf = 1.0;
 result.transmission = true;
@@ -201,13 +207,13 @@ var roughness = 1.0; var specular = false; var diffuse = true;
 var lobe = u32(OPENPBR_LOBE_DIFFUSE);
 
 var transmission = false;
-if (!iW(prepared, wh, &lightDir, &transmission,
+if (!jC(prepared, yh, &lightDir, &transmission,
 &roughness, &specular, &diffuse, &lobe)) { return result; }
 result.transmission = transmission;
 }
 } else {
-let mZ = vec3f(sample2D(sf(event, 1u)), sample1D(sf(event, 0u)));
-nk((*si).position, mZ, event, candidateCount, &lightSample);
+let ob = vec3f(sample2D(tF(event, 1u)), sample1D(tF(event, 0u)));
+oj((*si).position, ob, event, candidateCount, &lightSample);
 lightDir = lightSample.direction;
 if ((lightSample.pdf <= 0.0) | (lightSample.selectionPmf <= 0.0) |
 (max(max(lightSample.emission.x, lightSample.emission.y), lightSample.emission.z) <= 0.0)) { continue; }
@@ -215,11 +221,11 @@ ${hasCoatNormals ? /* wgsl */ `var cosThetaL = dot(ffnormal, lightDir);
 if (isSurface & ma.coatNormalEnabled) { cosThetaL = dot(ma.geometricNormal, lightDir); }` : /* wgsl */ `let cosThetaL = dot(ffnormal, lightDir);`}
 if (isSurface & (cosThetaL <= 0.0) & (ma.transmissionWeight <= 0.0) & (ma.subsurfaceWeight <= 0.0)) { continue; }
 }
-if (!tF) {
+if (!vg) {
 if (isSurface) {
 response = openpbr_eval_prepared(prepared, lightDir, &scatteringPdf);
 } else {
-scatteringPdf = bB(
+scatteringPdf = ba(
 dot(-(*path).ray.d, lightDir), (*si).mediumAnisotropy);
 response = vec3f(scatteringPdf);
 }
@@ -228,21 +234,21 @@ if (continuation) {
 result.direction = lightDir; result.response = response; result.pdf = scatteringPdf;
 return result;
 }
-var candidate: nR;
-let tv = rZ(si, ma, path, ffnormal, isSurface,
+var candidate: oQ;
+let uY = tw(si, ma, path, ffnormal, isSurface,
 lightSample, response, scatteringPdf, &candidate);
-if (!tv) { continue; }
+if (!uY) { continue; }
 if (candidateCount == 1u) {
 selected = candidate;
 continue;
 }
-let kt = candidate.risTarget / max(candidate.lightSelectionPmf, 1e-20);
-if (!(kt > 0.0) | (kt != kt)) { continue; }
-lW += kt;
+let kZ = candidate.risTarget / max(candidate.lightSelectionPmf, 1e-20);
+if (!(kZ > 0.0) | (kZ != kZ)) { continue; }
+mQ += kZ;
 if (!selected.valid ||
-qp(event) * lW <= kt) {
+rA(event) * mQ <= kZ) {
 selected = candidate;
-nq = candidate.risTarget;
+oo = candidate.risTarget;
 }
 }
 return result;
@@ -255,8 +261,8 @@ path: ptr<function, Path>
 if (causticHitOwned(*path, true, true)) { return 0.0; }` : ''}
 
 
-let om = dot((*si).faceNormal, -(*path).ray.d);
-if (om <= 0.0 && materialsBuffer[(*si).materialIndex].doubleSided < 0.5) { return 0.0; }
+let pi = dot((*si).faceNormal, -(*path).ray.d);
+if (pi <= 0.0 && materialsBuffer[(*si).materialIndex].doubleSided < 0.5) { return 0.0; }
 if ((*path).fromEye | (rtUniform.lightWeightTotal <= 0.0) |
 (i32(materialsBuffer[(*si).materialIndex].matType) == UNLIT)) {
 return 1.0;
@@ -265,53 +271,53 @@ let samplingLuminance = dot(
 materialsBuffer[(*si).materialIndex].emission,
 luminance
 );
-if ((samplingLuminance <= 0.0) | (om <= 0.0)) {
+if ((samplingLuminance <= 0.0) | (pi <= 0.0)) {
 return 1.0;
 }
-let tc = distance((*si).position, (*path).ray.o);
+let uF = distance((*si).position, (*path).ray.o);
 let lightPdf = samplingLuminance / rtUniform.lightWeightTotal *
-tc * tc / max(om, 1e-8);
-return fV((*path).scatteringPdf, lightPdf);
+uF * uF / max(pi, 1e-8);
+return gm((*path).scatteringPdf, lightPdf);
 }
 
 ${hasCoatNormals ? /* wgsl */ `
 
 
-fn fE(input: vec3f, face: vec3f, view: vec3f) -> vec3f {
+fn fQ(input: vec3f, face: vec3f, view: vec3f) -> vec3f {
 let front = dot(face, view) >= 0.0;
-let wd = select(-face, face, front);
-let rY = select(-input, input, front);
-if ((dot(input, face) <= 0.0) | (dot(rY, view) <= 1e-6)) { return wd; }
-return rY;
+let yc = select(-face, face, front);
+let tv = select(-input, input, front);
+if ((dot(input, face) <= 0.0) | (dot(tv, view) <= 1e-6)) { return yc; }
+return tv;
 }
 ` : ''}
-fn mx(
+fn nB(
 si: ptr<function, SurfaceInteraction>,
 ma: ptr<function, OpenPbrResolvedMaterial>,
 path: ptr<function, Path>
 ) {
 ${hasCoatNormals ? /* wgsl */ `
-let bA = (*si).faceNormal;
-let ni = (*si).normal;
+let bC = (*si).faceNormal;
+let oh = (*si).normal;
 ` : ''}
-var sL: f32 = -dot((*si).faceNormal, (*path).ray.d);
-var tY: f32 = -dot((*si).normal, (*path).ray.d);
+var uk: f32 = -dot((*si).faceNormal, (*path).ray.d);
+var vH: f32 = -dot((*si).normal, (*path).ray.d);
 if ((((*ma).transmissionWeight > 0.0) | ((*ma).subsurfaceWeight > 0.0)) & (*ma).thinWalled) {
 
-if (sL < 0.0) {
+if (uk < 0.0) {
 (*si).faceNormal = -(*si).faceNormal;
-sL = -sL;
+uk = -uk;
 }
-if (tY < 0.0) {
+if (vH < 0.0) {
 (*si).normal = -(*si).normal;
-tY = -tY;
+vH = -vH;
 }
 }
 
 
-var qE: bool = (sL >= 0.0) & (tY < 0.0);
-var ndv: f32 = select(tY, sL, qE);
-var N: vec3f = select((*si).normal, (*si).faceNormal, qE);
+var rS: bool = (uk >= 0.0) & (vH < 0.0);
+var ndv: f32 = select(vH, uk, rS);
+var N: vec3f = select((*si).normal, (*si).faceNormal, rS);
 
 (*ma).inside = (ndv <= 0.0) & !(*ma).thinWalled;
 
@@ -320,63 +326,76 @@ var ffnormal = select(-N, N, ndv >= 0.0);
 ${hasCoatNormals ? /* wgsl */ `
 if ((*ma).coatNormalEnabled) {
 let view = -(*path).ray.d;
-let fZ = dot(bA, view);
-(*ma).geometricNormal = select(-bA, bA, fZ >= 0.0);
-ffnormal = fE(ni, bA, view);
-(*ma).coatNormal = fE((*si).coatNormal, bA, view);
-(*ma).inside = (fZ <= 0.0) & !(*ma).thinWalled;
-(*ma).relativeIor = select((*ma).specularIor, 1.0 / (*ma).specularIor, (fZ > 0.0) | (*ma).thinWalled);
+let gr = dot(bC, view);
+(*ma).geometricNormal = select(-bC, bC, gr >= 0.0);
+ffnormal = fQ(oh, bC, view);
+(*ma).coatNormal = fQ((*si).coatNormal, bC, view);
+(*ma).inside = (gr <= 0.0) & !(*ma).thinWalled;
+(*ma).relativeIor = select((*ma).specularIor, 1.0 / (*ma).specularIor, (gr > 0.0) | (*ma).thinWalled);
 }
 ` : ''}
 
 (*path).scatteringIsDelta = false;
 var mediumSampled = false;
-var hj = false;
+var hE = false;
 let mediumType = (*si).mediumType;
 
 var scatteringPdf: f32;
-var df: vec3f;
+var di: vec3f;
 
 if (HAS_MEDIUM) {
 let d = distance((*si).position, (*path).ray.o);
-let od = (*path).ray.o;
+let pd = (*path).ray.o;
 let extinction = (*si).mediumExtinction;
 let scattering = min((*si).mediumScattering, extinction);
-let tU = max(max(extinction.x, extinction.y), extinction.z);
-if ((mediumType > 0) & (tU > 0.0)) {
+let vD = max(max(extinction.x, extinction.y), extinction.z);
+if ((mediumType > 0) & (vD > 0.0)) {
 
 
-let nX = min(i32(sample1D(bE(MEDIUM_CHANNEL)) * 3.0), 2);
-let fD = extinction[nX];
-let ij = select(
+let oW = min(i32(sample1D(aX(MEDIUM_CHANNEL)) * 3.0), 2);
+let fP = extinction[oW];
+let iO = select(
 d,
-min(-log(max(sample1D(bE(MEDIUM_DISTANCE)), 1e-7)) / fD, d),
-fD > 0.0
+min(-log(max(sample1D(aX(MEDIUM_DISTANCE)), 1e-7)) / fP, d),
+fP > 0.0
 );
-mediumSampled = ij < d;
-let transmittance = exp(-extinction * ij);
-let oK = select(
+mediumSampled = iO < d;
+let transmittance = exp(-extinction * iO);
+let density = select(
 transmittance,
 extinction * transmittance,
 mediumSampled
 );
-let mediumPdf = max((oK.x + oK.y + oK.z) / 3.0, 1e-8);
+let mediumPdf = max((density.x + density.y + density.z) / 3.0, 1e-8);
 if (mediumSampled) {
 (*path).beta *= transmittance * scattering / mediumPdf;
 
-(*path).ray.o = od + ij * (*path).ray.d;
+if (all((*path).beta == vec3f(0.0))) { (*path).abort = true; return; }
+
+(*path).ray.o = pd + iO * (*path).ray.d;
 (*si).position = (*path).ray.o;
+
+(*si).triangleIndex = -1;
+(*si).instanceIndex = -1;
 }
 else {
 (*path).beta *= transmittance / mediumPdf;
+
+if (all((*path).beta == vec3f(0.0))) { (*path).abort = true; return; }
 }
 }
 }
 
 if (!mediumSampled) {
-${caustics ? `    let mM=emissiveHitMisWeight(si,path);
-causticHotRecord(*path,mM*(*ma).emission,1u);causticEmitterRecord(*si,*path,mM,(*ma).emission);
-(*path).li+=mM*(*ma).emission*(*path).beta;` : '    (*path).li += emissiveHitMisWeight(si, path) * (*ma).emission * (*path).beta;'}
+
+
+var surfaceEmission = (*ma).emission;
+if (SPECTRAL) {
+surfaceEmission = sampling_spectral_rgb_filter(surfaceEmission, (*si).spectralChannel);
+}
+${caustics ? `    let nO=emissiveHitMisWeight(si,path);
+causticHotRecord(*path,nO*surfaceEmission,1u);causticEmitterRecord(*si,*path,nO,surfaceEmission);
+(*path).li+=nO*surfaceEmission*(*path).beta;` : '    (*path).li += emissiveHitMisWeight(si, path) * surfaceEmission * (*path).beta;'}
 }
 if ((*ma).materialType == UNLIT) {
 (*path).abort = true;
@@ -392,22 +411,22 @@ ${hasAnisotropyDirections ? /* wgsl */ `
 (*ma).geometryTangent = (*si).geometryTangent;
 (*ma).geometryBitangent = (*si).geometryBitangent;
 ` : /* wgsl */ ``}
-prepared = bV((*si).tangent, *ma, -(*path).ray.d, ffnormal);
+prepared = bX((*si).tangent, *ma, -(*path).ray.d, ffnormal);
 }
-${researchContribution}${photonMapping ? /* wgsl */ `  if(!mediumSampled){let value=(*path).beta*rI(*si,prepared,(*path).fromEye,!(*path).causticHasReceiver);causticEstimateRecord(value,1u);(*path).li+=value;}
-` : ''}  let qP = sV(si, *ma, prepared, path, ffnormal, !mediumSampled);
-df = qP.direction;
-scatteringPdf = qP.pdf;
+${researchContribution}${photonMapping ? /* wgsl */ `  if(!mediumSampled){let value=(*path).beta*sY(*si,prepared,(*path).fromEye,!(*path).causticHasReceiver);causticEstimateRecord(value,1u);(*path).li+=value;}
+` : ''}  let lX = ps(si, *ma, prepared, path, ffnormal, !mediumSampled);
+di = lX.direction;
+scatteringPdf = lX.pdf;
 if (!mediumSampled) {
-let f = qP.response;
-let isNextRefraction = qP.transmission;
+let f = lX.response;
+let isNextRefraction = lX.transmission;
 
 
 
 
 if (!(scatteringPdf > 0.0) |
 !all(f == f) | !all(abs(f) < vec3f(3.402823e38)) |
-(dot(df, df) < 0.5)) {
+(dot(di, di) < 0.5)) {
 (*path).scatteringPdf = 0.0;
 (*path).abort = true;
 return;
@@ -420,17 +439,19 @@ return;
 ${caustics ? /* wgsl */ `    causticAdvance(path, *ma, isNextRefraction, true);
 ` : ''}    (*path).beta *= f / scatteringPdf;
 
-hj = isNextRefraction & !(*ma).thinWalled;
+if (all((*path).beta == vec3f(0.0))) { (*path).abort = true; return; }
+
+hE = isNextRefraction & !(*ma).thinWalled;
 (*path).isNextRefraction = isNextRefraction;
 
 
-(*path).ray.o = (*si).position + EPS * df;
+(*path).ray.o = (*si).position + EPS * di;
 ${hasCoatNormals ? /* wgsl */ `
-if ((*ma).coatNormalEnabled) { (*path).ray.o = (*si).position + EPS * select(-bA, bA, dot(bA, df) >= 0.0); }
+if ((*ma).coatNormalEnabled) { (*path).ray.o = (*si).position + EPS * select(-bC, bC, dot(bC, di) >= 0.0); }
 ` : ''}
 }
 (*path).scatteringPdf = scatteringPdf;
-(*path).ray.d = df;
+(*path).ray.d = di;
 if (mediumSampled) {${caustics ? /* wgsl */ `
 causticAdvance(path, *ma, false, false);` : ''}
 (*path).isNextRefraction = false;
@@ -441,11 +462,12 @@ causticAdvance(path, *ma, false, false);` : ''}
 if (HAS_MEDIUM) {
 
 
-if (!mediumSampled & hj & ((*ma).mediumType > 0)) {
-if (sL >= 0.0) {
+if (!mediumSampled & hE & ((*ma).mediumType > 0)) {
+if (uk >= 0.0) {
 (*si).mediumType = (*ma).mediumType;
 (*si).mediumExtinction = (*ma).mediumExtinction;
 (*si).mediumScattering = (*ma).mediumScattering;
+(*path).scatteringMediumEntered = (*path).scatteringMediumEntered || any((*ma).mediumScattering > vec3f(0.0));
 (*si).mediumAnisotropy = (*ma).mediumAnisotropy;
 }
 else {