@meimu/mutracer 0.3.0 → 0.3.1

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

@@ -11,16 +11,14 @@ import random from './chunks/random.glsl.js';
 import cameraRay from './chunks/cameraRay.glsl.js';
 import rand from './chunks/rand.glsl.js';
 const surface = /* glsl */ `
-uint jK(int index) { ivec2 size = textureSize(aovScene,0); uvec4 v = texelFetch(aovScene, ivec2((index/4)%size.x, (index/4)/size.x),0); return v[index%4]; }
-vec3 iu(int offset){return vec3(uintBitsToFloat(jK(offset)),uintBitsToFloat(jK(offset+1)),uintBitsToFloat(jK(offset+2)));}
-mat4 oi(int offset) { mat4 m; for (int i=0;i<4;i++) for(int j=0;j<4;j++) m[i][j]=uintBitsToFloat(jK(offset+i*4+j)); return m; }
-Ray xj(vec2 uv) {
-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; initRay(ray, origin.xyz/origin.w, normalize(target.xyz*origin.w-origin.xyz*target.w)); return ray;
+uint kp(int index) { ivec2 size = textureSize(aovScene,0); uvec4 v = texelFetch(aovScene, ivec2((index/4)%size.x, (index/4)/size.x),0); return v[index%4]; }
+vec3 iV(int offset){return vec3(uintBitsToFloat(kp(offset)),uintBitsToFloat(kp(offset+1)),uintBitsToFloat(kp(offset+2)));}
+mat4 lC(int offset) { mat4 m; for (int i=0;i<4;i++) for(int j=0;j<4;j++) m[i][j]=uintBitsToFloat(kp(offset+i*4+j)); return m; }
+Ray zl(vec2 uv) {
+return cV(uv);
 }
-bool mC(Ray xA, out SurfaceInteraction si, out OpenPbrResolvedMaterial material) {
-Ray ray=xA; si.triangleIndex=-1;
+bool jS(Ray zB, out SurfaceInteraction si, out OpenPbrResolvedMaterial material) {
+Ray ray=zB; si.triangleIndex=-1;
 for(int layer=0;layer<32;layer++) {
 intersectScene(ray,si,false); if(!si.hit) return false;
 getMaterial(material,si.materialIndex,si.uv,si.uv1,si.instanceIndex,si.vertexColor);
@@ -35,7 +33,7 @@ export function aovTraceFragment(center) {
         outputs: center ? ['id', 'motion'] : ['geometry', 'position', 'diffuse', 'specular'],
         outputTypes: center ? { id: 'uvec4' } : {}, defines: { DEPTH_QUERY_MODE: true },
         includes: [core, materials, intersect, random],
-        uniforms: { viewProjectionInv: Shader.uniform('mat4'), viewInv: Shader.uniform('mat4'),
+        uniforms: { viewProjectionInv: Shader.uniform('mat4'), projectionInv: Shader.uniform('mat4'), viewInv: Shader.uniform('mat4'),
             cameraApertureRadius: Shader.uniform('float', 0), cameraFocusDistance: Shader.uniform('float', 10),
             viewportSize: Shader.uniform('vec2'), aovScene: Shader.uniform('usampler2D'),
             previousId: Shader.uniform('usampler2D'), previousMotion: Shader.uniform('sampler2D'),
@@ -57,60 +55,70 @@ ${surface}
 void main() {
 ${center ? /* glsl */ `
 out_id=uvec4(0xffffffffu); out_motion=vec4(0.0);
-Ray ray=xj((floor(gl_FragCoord.xy)+0.5)/viewportSize);
+Ray ray=zl((floor(gl_FragCoord.xy)+0.5)/viewportSize);
 SurfaceInteraction si; OpenPbrResolvedMaterial material;
-if(!mC(ray,si,material)) return;
+if(!jS(ray,si,material)) return;
 int offset=52+si.instanceIndex*24;
-out_id=uvec4(jK(offset),jK(offset+1),jK(int(jK(16))+si.materialIndex),jK(int(jK(17))+si.triangleIndex));
-out_motion.z=dot(si.position-iu(36),iu(40));
-if(jK(offset+2)==0u)return;
-vec4 qs=oi(offset+4)*vec4(si.position,1.0);
-vec4 pg=oi(0)*qs;
-if(pg.w<=0.0)return;
-vec3 ua=pg.xyz/pg.w;vec2 hU=(ua.xy*0.5+0.5)*viewportSize;
-if(any(lessThan(hU,vec2(0.0)))||any(greaterThanEqual(hU,viewportSize))||abs(ua.z)>1.0)return;
-uvec4 identity=texelFetch(previousId,ivec2(hU),0);float qr=texelFetch(previousMotion,ivec2(hU),0).z;
-if(any(notEqual(identity.xy,out_id.xy))||abs(qr-dot(qs.xyz-iu(44),iu(48)))>max(1e-4,abs(qr)*1e-3))return;
-out_motion=vec4((hU-gl_FragCoord.xy)*vec2(1.0,-1.0),out_motion.z,3.0);
+out_id=uvec4(kp(offset),kp(offset+1),kp(int(kp(16))+si.materialIndex),kp(int(kp(17))+si.triangleIndex));
+out_motion.z=dot(si.position-iV(36),iV(40));
+if(kp(offset+2)==0u)return;
+vec4 rF=lC(offset+4)*vec4(si.position,1.0);
+vec4 qp=lC(0)*rF;
+if(qp.w<=0.0)return;
+vec3 vJ=qp.xyz/qp.w;vec2 iF=(vJ.xy*0.5+0.5)*viewportSize;
+if(any(lessThan(iF,vec2(0.0)))||any(greaterThanEqual(iF,viewportSize))||abs(vJ.z)>1.0)return;
+uvec4 identity=texelFetch(previousId,ivec2(iF),0);float rE=texelFetch(previousMotion,ivec2(iF),0).z;
+if(any(notEqual(identity.xy,out_id.xy))||abs(rE-dot(rF.xyz-iV(44),iV(48)))>max(1e-4,abs(rE)*1e-3))return;
+out_motion=vec4((iF-gl_FragCoord.xy)*vec2(1.0,-1.0),out_motion.z,3.0);
 ` : /* glsl */ `
 ivec2 coord=ivec2(gl_FragCoord.xy);
 out_geometry=aovSample==0 ? vec4(0.0) : texelFetch(previousGeometry,coord,0);
 out_position=aovSample==0 ? vec4(0.0) : texelFetch(previousPosition,coord,0);
 out_diffuse=aovSample==0 ? vec4(0.0) : texelFetch(previousDiffuse,coord,0);
 out_specular=aovSample==0 ? vec4(0.0) : texelFetch(previousSpecular,coord,0);
-rA(); aI=uvec2(floor(gl_FragCoord.xy));
-fi(floor(gl_FragCoord.xy),int(aC ^ cB(uint(sequenceSeed))));
-Ray ray=xj((floor(gl_FragCoord.xy)+sample2D(CAMERA_PIXEL))/viewportSize);
+sP(); aJ=uvec2(floor(gl_FragCoord.xy));
+fA(floor(gl_FragCoord.xy),int(aC ^ cD(uint(sequenceSeed))));
+Ray ray=zl((floor(gl_FragCoord.xy)+sample2D(CAMERA_PIXEL))/viewportSize);
 if(cameraApertureRadius>0.0) {
 vec3 eye=viewInv[3].xyz, forward=-normalize(viewInv[2].xyz);
-vec3 ju=eye+ray.d*(cameraFocusDistance/dot(ray.d,forward));
-vec2 uV=cameraApertureRadius*kq(sample2D(CAMERA_LENS));
-vec3 origin=(viewInv*vec4(uV,0.0,1.0)).xyz;
-initRay(ray,origin,normalize(ju-origin));
+vec3 jY=eye+ray.d*(cameraFocusDistance/dot(ray.d,forward));
+vec2 wJ=cameraApertureRadius*kX(sample2D(CAMERA_LENS));
+vec3 origin=(viewInv*vec4(wJ,0.0,1.0)).xyz;
+initRay(ray,origin,normalize(jY-origin));
 }
 SurfaceInteraction si; OpenPbrResolvedMaterial material;
-if(!mC(ray,si,material)) return;
+if(!jS(ray,si,material)) return;
 float depth=max(dot(si.position-viewInv[3].xyz,-normalize(viewInv[2].xyz)),0.0);
 bool unsupported=material.materialType!=STANDARD || material.alpha<1.0 || material.coatWeight>0.0 || material.fuzzWeight>0.0 || material.specularAnisotropy>0.0 || material.subsurfaceWeight>0.0 || dot(material.mediumScattering,material.mediumScattering)>0.0 || material.bevel>0.0 || material.thinFilmWeight>0.0 || material.transmissionDispersionScale>0.0;
 out_geometry+=vec4(depth,material.specularRoughness,material.baseMetalness,unsupported?1.0:0.0);
 #ifdef AOV_REFLECTANCE
 if((aovMask&24)!=0 && !unsupported){
-vec3 normal=si.normal,face=si.faceNormal;float cosine=-dot(normal,ray.d),fa=-dot(face,ray.d);
+vec3 normal=si.normal,face=si.faceNormal;float cosine=-dot(normal,ray.d),fk=-dot(face,ray.d);
 if(material.thinWalled&&(material.transmissionWeight>0.0||material.subsurfaceWeight>0.0)){
-if(cosine<0.0){normal=-normal;cosine=-cosine;}if(fa<0.0){face=-face;fa=-fa;}
+if(cosine<0.0){normal=-normal;cosine=-cosine;}if(fk<0.0){face=-face;fk=-fk;}
 }
-if(fa>=0.0&&cosine<0.0){normal=face;cosine=fa;}
+if(fk>=0.0&&cosine<0.0){normal=face;cosine=fk;}
 if(cosine<0.0)normal=-normal;
 material.inside=cosine<=0.0&&!material.thinWalled;material.relativeIor=cosine>0.0?1.0/material.specularIor:material.specularIor;
 vec3 tangent=vec3(0.0);
 #ifdef USE_TANGENT
 tangent=si.tangent;
 #endif
-OpenPbrPreparedBsdf prepared=bV(tangent,material,-ray.d,normal);
+OpenPbrPreparedBsdf prepared=bX(tangent,material,-ray.d,normal);
 vec3 diffuse,specular;aovReflectance(prepared,(aovMask&8)!=0,(aovMask&16)!=0,diffuse,specular);
-out_diffuse+=vec4(diffuse,1.0);out_specular+=vec4(specular,1.0);
+if((aovMask&8)!=0)out_diffuse+=vec4(diffuse,1.0);
+if((aovMask&16)!=0)out_specular+=vec4(specular,1.0);
 }
 #endif
+
+if((aovMask&384)!=0 && material.materialType==STANDARD && material.alpha>=1.0 && material.transmissionWeight<=0.0 && dot(material.mediumScattering,material.mediumScattering)<=0.0){
+float metal=clamp(material.baseMetalness,0.0,1.0);
+vec3 base=material.baseWeight*material.baseColor;
+vec3 layer=mix(vec3(1.0),material.coatColor,clamp(material.coatWeight,0.0,1.0));
+float f=(material.specularIor-1.0)/(material.specularIor+1.0);
+if((aovMask&128)!=0)out_diffuse+=vec4(layer*base*(1.0-metal),1.0);
+if((aovMask&256)!=0)out_specular+=vec4(layer*(metal*base+(1.0-metal)*material.specularWeight*material.specularColor*f*f),1.0);
+}
 out_position+=vec4(si.position,1.0);
 `}
 }

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

@@ -1 +1 @@
-{"version":3,"file":"aovTrace.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/aovTrace.frag.ts"],"names":[],"mappings":"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","sourcesContent":["import bsdf from './chunks/openPbrBsdf.glsl.js';\nimport sampling from './chunks/sampling.glsl.js';\nimport reflectance from './aovReflectance.glsl.js';\nimport {FragmentShader, Shader} from '../shader.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 cameraRay from './chunks/cameraRay.glsl.js';\nimport rand from './chunks/rand.glsl.js';\nconst surface = /* glsl */ `\nuint aovWord(int index) { ivec2 size = textureSize(aovScene,0); uvec4 v = texelFetch(aovScene, ivec2((index/4)%size.x, (index/4)/size.x),0); return v[index%4]; }\nvec3 aovVector(int offset){return vec3(uintBitsToFloat(aovWord(offset)),uintBitsToFloat(aovWord(offset+1)),uintBitsToFloat(aovWord(offset+2)));}\nmat4 aovMatrix(int offset) { mat4 m; for (int i=0;i<4;i++) for(int j=0;j<4;j++) m[i][j]=uintBitsToFloat(aovWord(offset+i*4+j)); return m; }\nRay aovRay(vec2 uv) {\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; initRay(ray, origin.xyz/origin.w, normalize(target.xyz*origin.w-origin.xyz*target.w)); return ray;\n}\nbool aovSurface(Ray inputRay, out SurfaceInteraction si, out OpenPbrResolvedMaterial material) {\n  Ray ray=inputRay; si.triangleIndex=-1;\n  for(int layer=0;layer<32;layer++) {\n    intersectScene(ray,si,false); if(!si.hit) return false;\n    getMaterial(material,si.materialIndex,si.uv,si.uv1,si.instanceIndex,si.vertexColor);\n    if(material.materialType!=SHADOW_CATCHER && material.alpha>=0.5) return true;\n    ray.o=si.position+ray.d*(EPS*0.02);\n  }\n  return false;\n}\n`;\nexport function aovTraceFragment(center: boolean) {\n  const shader = new FragmentShader({name: center ? 'AOV center' : 'AOV accumulation',\n    outputs: center ? ['id','motion'] : ['geometry','position','diffuse','specular'],\n    outputTypes: center ? {id: 'uvec4'} : {}, defines: {DEPTH_QUERY_MODE: true},\n    includes: [core,materials,intersect,random],\n    uniforms: {viewProjectionInv: Shader.uniform('mat4'), viewInv: Shader.uniform('mat4'),\n      cameraApertureRadius: Shader.uniform('float',0), cameraFocusDistance: Shader.uniform('float',10),\n      viewportSize: Shader.uniform('vec2'), aovScene: Shader.uniform('usampler2D'),\n      previousId: Shader.uniform('usampler2D'), previousMotion: Shader.uniform('sampler2D'),\n      previousGeometry: Shader.uniform('sampler2D'), previousPosition: Shader.uniform('sampler2D'),\n      previousDiffuse: Shader.uniform('sampler2D'), previousSpecular: Shader.uniform('sampler2D'),\n      openPbrEnergyLut: Shader.uniform('sampler2D'), aovMask: Shader.uniform('int',0),\n      aovSample: Shader.uniform('int',0)},\n    main: /* glsl */ `\n${common}\n${rand}\n${random.main}\n${core.main}\n${uvProjection}\n${materials.main}\n${intersect.main}\n${cameraRay}\n${center ? '' : sampling+bsdf+reflectance}\n${surface}\nvoid main() {\n  ${center ? /* glsl */ `\n  out_id=uvec4(0xffffffffu); out_motion=vec4(0.0);\n  Ray ray=aovRay((floor(gl_FragCoord.xy)+0.5)/viewportSize);\n  SurfaceInteraction si; OpenPbrResolvedMaterial material;\n  if(!aovSurface(ray,si,material)) return;\n  int offset=52+si.instanceIndex*24;\n  out_id=uvec4(aovWord(offset),aovWord(offset+1),aovWord(int(aovWord(16))+si.materialIndex),aovWord(int(aovWord(17))+si.triangleIndex));\n  out_motion.z=dot(si.position-aovVector(36),aovVector(40));\n  if(aovWord(offset+2)==0u)return;\n  vec4 oldWorld=aovMatrix(offset+4)*vec4(si.position,1.0);\n  vec4 oldClip=aovMatrix(0)*oldWorld;\n  if(oldClip.w<=0.0)return;\n  vec3 oldNdc=oldClip.xyz/oldClip.w;vec2 oldPixel=(oldNdc.xy*0.5+0.5)*viewportSize;\n  if(any(lessThan(oldPixel,vec2(0.0)))||any(greaterThanEqual(oldPixel,viewportSize))||abs(oldNdc.z)>1.0)return;\n  uvec4 identity=texelFetch(previousId,ivec2(oldPixel),0);float oldDepth=texelFetch(previousMotion,ivec2(oldPixel),0).z;\n  if(any(notEqual(identity.xy,out_id.xy))||abs(oldDepth-dot(oldWorld.xyz-aovVector(44),aovVector(48)))>max(1e-4,abs(oldDepth)*1e-3))return;\n  out_motion=vec4((oldPixel-gl_FragCoord.xy)*vec2(1.0,-1.0),out_motion.z,3.0);\n  ` : /* glsl */ `\n  ivec2 coord=ivec2(gl_FragCoord.xy);\n  out_geometry=aovSample==0 ? vec4(0.0) : texelFetch(previousGeometry,coord,0);\n  out_position=aovSample==0 ? vec4(0.0) : texelFetch(previousPosition,coord,0);\n  out_diffuse=aovSample==0 ? vec4(0.0) : texelFetch(previousDiffuse,coord,0);\n  out_specular=aovSample==0 ? vec4(0.0) : texelFetch(previousSpecular,coord,0);\n  initRandom(); samplingPixel=uvec2(floor(gl_FragCoord.xy));\n  rng_initialize(floor(gl_FragCoord.xy),int(pixelSampleIndex ^ sampleHash(uint(sequenceSeed))));\n  Ray ray=aovRay((floor(gl_FragCoord.xy)+sample2D(CAMERA_PIXEL))/viewportSize);\n  if(cameraApertureRadius>0.0) {\n    vec3 eye=viewInv[3].xyz, forward=-normalize(viewInv[2].xyz);\n    vec3 focusPoint=eye+ray.d*(cameraFocusDistance/dot(ray.d,forward));\n    vec2 lens=cameraApertureRadius*sampleCircle(sample2D(CAMERA_LENS));\n    vec3 origin=(viewInv*vec4(lens,0.0,1.0)).xyz;\n    initRay(ray,origin,normalize(focusPoint-origin));\n  }\n  SurfaceInteraction si; OpenPbrResolvedMaterial material;\n  if(!aovSurface(ray,si,material)) return;\n  float depth=max(dot(si.position-viewInv[3].xyz,-normalize(viewInv[2].xyz)),0.0);\n  bool unsupported=material.materialType!=STANDARD || material.alpha<1.0 || material.coatWeight>0.0 || material.fuzzWeight>0.0 || material.specularAnisotropy>0.0 || material.subsurfaceWeight>0.0 || dot(material.mediumScattering,material.mediumScattering)>0.0 || material.bevel>0.0 || material.thinFilmWeight>0.0 || material.transmissionDispersionScale>0.0;\n  out_geometry+=vec4(depth,material.specularRoughness,material.baseMetalness,unsupported?1.0:0.0);\n  #ifdef AOV_REFLECTANCE\n  if((aovMask&24)!=0 && !unsupported){\n    vec3 normal=si.normal,face=si.faceNormal;float cosine=-dot(normal,ray.d),faceCosine=-dot(face,ray.d);\n    if(material.thinWalled&&(material.transmissionWeight>0.0||material.subsurfaceWeight>0.0)){\n      if(cosine<0.0){normal=-normal;cosine=-cosine;}if(faceCosine<0.0){face=-face;faceCosine=-faceCosine;}\n    }\n    if(faceCosine>=0.0&&cosine<0.0){normal=face;cosine=faceCosine;}\n    if(cosine<0.0)normal=-normal;\n    material.inside=cosine<=0.0&&!material.thinWalled;material.relativeIor=cosine>0.0?1.0/material.specularIor:material.specularIor;\n    vec3 tangent=vec3(0.0);\n#ifdef USE_TANGENT\n    tangent=si.tangent;\n#endif\n    OpenPbrPreparedBsdf prepared=openpbr_prepare(tangent,material,-ray.d,normal);\n    vec3 diffuse,specular;aovReflectance(prepared,(aovMask&8)!=0,(aovMask&16)!=0,diffuse,specular);\n    out_diffuse+=vec4(diffuse,1.0);out_specular+=vec4(specular,1.0);\n  }\n  #endif\n  out_position+=vec4(si.position,1.0);\n  `}\n}\n`});\n  shader.parallelCompile = true;\n  return shader;\n}\n"]}
+{"version":3,"file":"aovTrace.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/aovTrace.frag.ts"],"names":[],"mappings":"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","sourcesContent":["import bsdf from './chunks/openPbrBsdf.glsl.js';\nimport sampling from './chunks/sampling.glsl.js';\nimport reflectance from './aovReflectance.glsl.js';\nimport {FragmentShader, Shader} from '../shader.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 cameraRay from './chunks/cameraRay.glsl.js';\nimport rand from './chunks/rand.glsl.js';\nconst surface = /* glsl */ `\nuint aovWord(int index) { ivec2 size = textureSize(aovScene,0); uvec4 v = texelFetch(aovScene, ivec2((index/4)%size.x, (index/4)/size.x),0); return v[index%4]; }\nvec3 aovVector(int offset){return vec3(uintBitsToFloat(aovWord(offset)),uintBitsToFloat(aovWord(offset+1)),uintBitsToFloat(aovWord(offset+2)));}\nmat4 aovMatrix(int offset) { mat4 m; for (int i=0;i<4;i++) for(int j=0;j<4;j++) m[i][j]=uintBitsToFloat(aovWord(offset+i*4+j)); return m; }\nRay aovRay(vec2 uv) {\n  return initCameraRay(uv);\n}\nbool aovSurface(Ray inputRay, out SurfaceInteraction si, out OpenPbrResolvedMaterial material) {\n  Ray ray=inputRay; si.triangleIndex=-1;\n  for(int layer=0;layer<32;layer++) {\n    intersectScene(ray,si,false); if(!si.hit) return false;\n    getMaterial(material,si.materialIndex,si.uv,si.uv1,si.instanceIndex,si.vertexColor);\n    if(material.materialType!=SHADOW_CATCHER && material.alpha>=0.5) return true;\n    ray.o=si.position+ray.d*(EPS*0.02);\n  }\n  return false;\n}\n`;\nexport function aovTraceFragment(center: boolean) {\n  const shader = new FragmentShader({name: center ? 'AOV center' : 'AOV accumulation',\n    outputs: center ? ['id','motion'] : ['geometry','position','diffuse','specular'],\n    outputTypes: center ? {id: 'uvec4'} : {}, defines: {DEPTH_QUERY_MODE: true},\n    includes: [core,materials,intersect,random],\n    uniforms: {viewProjectionInv: Shader.uniform('mat4'), projectionInv: Shader.uniform('mat4'), viewInv: Shader.uniform('mat4'),\n      cameraApertureRadius: Shader.uniform('float',0), cameraFocusDistance: Shader.uniform('float',10),\n      viewportSize: Shader.uniform('vec2'), aovScene: Shader.uniform('usampler2D'),\n      previousId: Shader.uniform('usampler2D'), previousMotion: Shader.uniform('sampler2D'),\n      previousGeometry: Shader.uniform('sampler2D'), previousPosition: Shader.uniform('sampler2D'),\n      previousDiffuse: Shader.uniform('sampler2D'), previousSpecular: Shader.uniform('sampler2D'),\n      openPbrEnergyLut: Shader.uniform('sampler2D'), aovMask: Shader.uniform('int',0),\n      aovSample: Shader.uniform('int',0)},\n    main: /* glsl */ `\n${common}\n${rand}\n${random.main}\n${core.main}\n${uvProjection}\n${materials.main}\n${intersect.main}\n${cameraRay}\n${center ? '' : sampling+bsdf+reflectance}\n${surface}\nvoid main() {\n  ${center ? /* glsl */ `\n  out_id=uvec4(0xffffffffu); out_motion=vec4(0.0);\n  Ray ray=aovRay((floor(gl_FragCoord.xy)+0.5)/viewportSize);\n  SurfaceInteraction si; OpenPbrResolvedMaterial material;\n  if(!aovSurface(ray,si,material)) return;\n  int offset=52+si.instanceIndex*24;\n  out_id=uvec4(aovWord(offset),aovWord(offset+1),aovWord(int(aovWord(16))+si.materialIndex),aovWord(int(aovWord(17))+si.triangleIndex));\n  out_motion.z=dot(si.position-aovVector(36),aovVector(40));\n  if(aovWord(offset+2)==0u)return;\n  vec4 oldWorld=aovMatrix(offset+4)*vec4(si.position,1.0);\n  vec4 oldClip=aovMatrix(0)*oldWorld;\n  if(oldClip.w<=0.0)return;\n  vec3 oldNdc=oldClip.xyz/oldClip.w;vec2 oldPixel=(oldNdc.xy*0.5+0.5)*viewportSize;\n  if(any(lessThan(oldPixel,vec2(0.0)))||any(greaterThanEqual(oldPixel,viewportSize))||abs(oldNdc.z)>1.0)return;\n  uvec4 identity=texelFetch(previousId,ivec2(oldPixel),0);float oldDepth=texelFetch(previousMotion,ivec2(oldPixel),0).z;\n  if(any(notEqual(identity.xy,out_id.xy))||abs(oldDepth-dot(oldWorld.xyz-aovVector(44),aovVector(48)))>max(1e-4,abs(oldDepth)*1e-3))return;\n  out_motion=vec4((oldPixel-gl_FragCoord.xy)*vec2(1.0,-1.0),out_motion.z,3.0);\n  ` : /* glsl */ `\n  ivec2 coord=ivec2(gl_FragCoord.xy);\n  out_geometry=aovSample==0 ? vec4(0.0) : texelFetch(previousGeometry,coord,0);\n  out_position=aovSample==0 ? vec4(0.0) : texelFetch(previousPosition,coord,0);\n  out_diffuse=aovSample==0 ? vec4(0.0) : texelFetch(previousDiffuse,coord,0);\n  out_specular=aovSample==0 ? vec4(0.0) : texelFetch(previousSpecular,coord,0);\n  initRandom(); samplingPixel=uvec2(floor(gl_FragCoord.xy));\n  rng_initialize(floor(gl_FragCoord.xy),int(pixelSampleIndex ^ sampleHash(uint(sequenceSeed))));\n  Ray ray=aovRay((floor(gl_FragCoord.xy)+sample2D(CAMERA_PIXEL))/viewportSize);\n  if(cameraApertureRadius>0.0) {\n    vec3 eye=viewInv[3].xyz, forward=-normalize(viewInv[2].xyz);\n    vec3 focusPoint=eye+ray.d*(cameraFocusDistance/dot(ray.d,forward));\n    vec2 lens=cameraApertureRadius*sampleCircle(sample2D(CAMERA_LENS));\n    vec3 origin=(viewInv*vec4(lens,0.0,1.0)).xyz;\n    initRay(ray,origin,normalize(focusPoint-origin));\n  }\n  SurfaceInteraction si; OpenPbrResolvedMaterial material;\n  if(!aovSurface(ray,si,material)) return;\n  float depth=max(dot(si.position-viewInv[3].xyz,-normalize(viewInv[2].xyz)),0.0);\n  bool unsupported=material.materialType!=STANDARD || material.alpha<1.0 || material.coatWeight>0.0 || material.fuzzWeight>0.0 || material.specularAnisotropy>0.0 || material.subsurfaceWeight>0.0 || dot(material.mediumScattering,material.mediumScattering)>0.0 || material.bevel>0.0 || material.thinFilmWeight>0.0 || material.transmissionDispersionScale>0.0;\n  out_geometry+=vec4(depth,material.specularRoughness,material.baseMetalness,unsupported?1.0:0.0);\n  #ifdef AOV_REFLECTANCE\n  if((aovMask&24)!=0 && !unsupported){\n    vec3 normal=si.normal,face=si.faceNormal;float cosine=-dot(normal,ray.d),faceCosine=-dot(face,ray.d);\n    if(material.thinWalled&&(material.transmissionWeight>0.0||material.subsurfaceWeight>0.0)){\n      if(cosine<0.0){normal=-normal;cosine=-cosine;}if(faceCosine<0.0){face=-face;faceCosine=-faceCosine;}\n    }\n    if(faceCosine>=0.0&&cosine<0.0){normal=face;cosine=faceCosine;}\n    if(cosine<0.0)normal=-normal;\n    material.inside=cosine<=0.0&&!material.thinWalled;material.relativeIor=cosine>0.0?1.0/material.specularIor:material.specularIor;\n    vec3 tangent=vec3(0.0);\n#ifdef USE_TANGENT\n    tangent=si.tangent;\n#endif\n    OpenPbrPreparedBsdf prepared=openpbr_prepare(tangent,material,-ray.d,normal);\n    vec3 diffuse,specular;aovReflectance(prepared,(aovMask&8)!=0,(aovMask&16)!=0,diffuse,specular);\n    if((aovMask&8)!=0)out_diffuse+=vec4(diffuse,1.0);\n    if((aovMask&16)!=0)out_specular+=vec4(specular,1.0);\n  }\n  #endif\n  // Resolved texture colors (diffuseColor/specularColor), matching WGSL.\n  if((aovMask&384)!=0 && material.materialType==STANDARD && material.alpha>=1.0 && material.transmissionWeight<=0.0 && dot(material.mediumScattering,material.mediumScattering)<=0.0){\n    float metal=clamp(material.baseMetalness,0.0,1.0);\n    vec3 base=material.baseWeight*material.baseColor;\n    vec3 layer=mix(vec3(1.0),material.coatColor,clamp(material.coatWeight,0.0,1.0));\n    float f=(material.specularIor-1.0)/(material.specularIor+1.0);\n    if((aovMask&128)!=0)out_diffuse+=vec4(layer*base*(1.0-metal),1.0);\n    if((aovMask&256)!=0)out_specular+=vec4(layer*(metal*base+(1.0-metal)*material.specularWeight*material.specularColor*f*f),1.0);\n  }\n  out_position+=vec4(si.position,1.0);\n  `}\n}\n`});\n  shader.parallelCompile = true;\n  return shader;\n}\n"]}

package/lib/renderer/glsl/chunks/cameraProjection.glsl.d.ts

@@ -0,0 +1,2 @@
+declare const _default: "\nRay initCameraRay(vec2 coord) {\n  vec4 origin = projectionInv * vec4(coord * 2.0 - 1.0, -1.0, 1.0);\n  vec4 center = projectionInv * vec4(coord * 2.0 - 1.0, 1.0, 1.0);\n  vec3 direction = center.xyz * origin.w - origin.xyz * center.w;\n  Ray cam;\n  initRay(cam, (viewInv * vec4(origin.xyz / origin.w, 1.0)).xyz,\n    normalize((viewInv * vec4(direction, 0.0)).xyz));\n  return cam;\n}\n";
+export default _default;

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

@@ -0,0 +1,16 @@
+// Portions adapted from ray-tracing-renderer@0.10.15
+// (https://github.com/hoverinc/ray-tracing-renderer).
+// Copyright (c) 2019 HOVER, MIT license; see LICENSES/RayTracingRenderer-MIT.txt.
+// Keep unprojection in camera space to avoid cancellation from world translation.
+export default /* glsl */ `
+Ray cV(vec2 coord) {
+vec4 origin = projectionInv * vec4(coord * 2.0 - 1.0, -1.0, 1.0);
+vec4 center = projectionInv * vec4(coord * 2.0 - 1.0, 1.0, 1.0);
+vec3 direction = center.xyz * origin.w - origin.xyz * center.w;
+Ray cam;
+initRay(cam, (viewInv * vec4(origin.xyz / origin.w, 1.0)).xyz,
+normalize((viewInv * vec4(direction, 0.0)).xyz));
+return cam;
+}
+`;
+//# sourceMappingURL=cameraProjection.glsl.js.map

package/lib/renderer/glsl/chunks/cameraProjection.glsl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cameraProjection.glsl.js","sourceRoot":"","sources":["../../../../src/renderer/glsl/chunks/cameraProjection.glsl.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,sDAAsD;AACtD,kFAAkF;AAElF,kFAAkF;AAClF,eAAe,UAAU,CAAC;;;;;;;;;;CAUzB,CAAC","sourcesContent":["// Portions adapted from ray-tracing-renderer@0.10.15\n// (https://github.com/hoverinc/ray-tracing-renderer).\n// Copyright (c) 2019 HOVER, MIT license; see LICENSES/RayTracingRenderer-MIT.txt.\n\n// Keep unprojection in camera space to avoid cancellation from world translation.\nexport default /* glsl */ `\nRay initCameraRay(vec2 coord) {\n  vec4 origin = projectionInv * vec4(coord * 2.0 - 1.0, -1.0, 1.0);\n  vec4 center = projectionInv * vec4(coord * 2.0 - 1.0, 1.0, 1.0);\n  vec3 direction = center.xyz * origin.w - origin.xyz * center.w;\n  Ray cam;\n  initRay(cam, (viewInv * vec4(origin.xyz / origin.w, 1.0)).xyz,\n    normalize((viewInv * vec4(direction, 0.0)).xyz));\n  return cam;\n}\n`;\n"]}

package/lib/renderer/glsl/chunks/cameraRay.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "\nRay initCameraRay(vec2 coord) {\n  vec4 origin = viewProjectionInv * vec4(coord * 2.0 - 1.0, -1.0, 1.0);\n  vec4 target = viewProjectionInv * vec4(coord * 2.0 - 1.0, 1.0, 1.0);\n  Ray cam;\n  initRay(cam, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));\n\n  return cam;\n}\n\nvec2 sampleCircle(vec2 p) {\n  p = 2.0 * p - 1.0;\n  bool greater = abs(p.x) > abs(p.y);\n  float r = greater ? p.x : p.y;\n  float theta = greater ? 0.25 * PI * p.y / p.x : PI * (0.5 - 0.25 * p.x / p.y);\n  return r * vec2(cos(theta), sin(theta));\n}\n\nRay primaryCameraRay() {\n  Ray cam = initCameraRay(v_Texcoord + pixelJitter());\n  if (cameraApertureRadius > 0.0) {\n    // Thin lens: the focus plane is perpendicular to the view direction.\n    vec3 eye = viewInv[3].xyz;\n    vec3 forward = -normalize(viewInv[2].xyz);\n    vec3 focusPoint = eye + cam.d * (cameraFocusDistance / dot(cam.d, forward));\n    vec2 lensPoint = cameraApertureRadius * sampleCircle(sample2D(CAMERA_LENS));\n    vec3 origin = vec3(viewInv * vec4(lensPoint, 0.0, 1.0));\n    initRay(cam, origin, normalize(focusPoint - origin));\n  }\n  return cam;\n}\n";
+declare const _default: string;
 export default _default;

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

@@ -1,18 +1,11 @@
 // Portions adapted from ray-tracing-renderer@0.10.15
 // (https://github.com/hoverinc/ray-tracing-renderer).
 // Copyright (c) 2019 HOVER, MIT license; see LICENSES/RayTracingRenderer-MIT.txt.
+import cameraProjection from './cameraProjection.glsl.js';
 // Shared primary-ray construction keeps beauty and catcher coverage aligned.
 export default /* glsl */ `
-Ray eT(vec2 coord) {
-vec4 origin = viewProjectionInv * vec4(coord * 2.0 - 1.0, -1.0, 1.0);
-vec4 target = viewProjectionInv * vec4(coord * 2.0 - 1.0, 1.0, 1.0);
-Ray cam;
-initRay(cam, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));
-
-return cam;
-}
-
-vec2 kq(vec2 p) {
+${cameraProjection}
+vec2 kX(vec2 p) {
 p = 2.0 * p - 1.0;
 bool greater = abs(p.x) > abs(p.y);
 float r = greater ? p.x : p.y;
@@ -20,16 +13,16 @@ float theta = greater ? 0.25 * PI * p.y / p.x : PI * (0.5 - 0.25 * p.x / p.y);
 return r * vec2(cos(theta), sin(theta));
 }
 
-Ray ow() {
-Ray cam = eT(v_Texcoord + te());
+Ray pq() {
+Ray cam = cV(v_Texcoord + uH());
 if (cameraApertureRadius > 0.0) {
 
 vec3 eye = viewInv[3].xyz;
 vec3 forward = -normalize(viewInv[2].xyz);
-vec3 ju = eye + cam.d * (cameraFocusDistance / dot(cam.d, forward));
-vec2 sH = cameraApertureRadius * kq(sample2D(CAMERA_LENS));
-vec3 origin = vec3(viewInv * vec4(sH, 0.0, 1.0));
-initRay(cam, origin, normalize(ju - origin));
+vec3 jY = eye + cam.d * (cameraFocusDistance / dot(cam.d, forward));
+vec2 uh = cameraApertureRadius * kX(sample2D(CAMERA_LENS));
+vec3 origin = vec3(viewInv * vec4(uh, 0.0, 1.0));
+initRay(cam, origin, normalize(jY - origin));
 }
 return cam;
 }

package/lib/renderer/glsl/chunks/cameraRay.glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"cameraRay.glsl.js","sourceRoot":"","sources":["../../../../src/renderer/glsl/chunks/cameraRay.glsl.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,sDAAsD;AACtD,kFAAkF;AAElF,6EAA6E;AAC7E,eAAe,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BzB,CAAC","sourcesContent":["// Portions adapted from ray-tracing-renderer@0.10.15\n// (https://github.com/hoverinc/ray-tracing-renderer).\n// Copyright (c) 2019 HOVER, MIT license; see LICENSES/RayTracingRenderer-MIT.txt.\n\n// Shared primary-ray construction keeps beauty and catcher coverage aligned.\nexport default /* glsl */ `\nRay initCameraRay(vec2 coord) {\n  vec4 origin = viewProjectionInv * vec4(coord * 2.0 - 1.0, -1.0, 1.0);\n  vec4 target = viewProjectionInv * vec4(coord * 2.0 - 1.0, 1.0, 1.0);\n  Ray cam;\n  initRay(cam, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));\n\n  return cam;\n}\n\nvec2 sampleCircle(vec2 p) {\n  p = 2.0 * p - 1.0;\n  bool greater = abs(p.x) > abs(p.y);\n  float r = greater ? p.x : p.y;\n  float theta = greater ? 0.25 * PI * p.y / p.x : PI * (0.5 - 0.25 * p.x / p.y);\n  return r * vec2(cos(theta), sin(theta));\n}\n\nRay primaryCameraRay() {\n  Ray cam = initCameraRay(v_Texcoord + pixelJitter());\n  if (cameraApertureRadius > 0.0) {\n    // Thin lens: the focus plane is perpendicular to the view direction.\n    vec3 eye = viewInv[3].xyz;\n    vec3 forward = -normalize(viewInv[2].xyz);\n    vec3 focusPoint = eye + cam.d * (cameraFocusDistance / dot(cam.d, forward));\n    vec2 lensPoint = cameraApertureRadius * sampleCircle(sample2D(CAMERA_LENS));\n    vec3 origin = vec3(viewInv * vec4(lensPoint, 0.0, 1.0));\n    initRay(cam, origin, normalize(focusPoint - origin));\n  }\n  return cam;\n}\n`;\n"]}
+{"version":3,"file":"cameraRay.glsl.js","sourceRoot":"","sources":["../../../../src/renderer/glsl/chunks/cameraRay.glsl.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,sDAAsD;AACtD,kFAAkF;AAElF,OAAO,gBAAgB,MAAM,4BAA4B,CAAC;AAE1D,6EAA6E;AAC7E,eAAe,UAAU,CAAC;EACxB,gBAAgB;;;;;;;;;;;;;;;;;;;;;;CAsBjB,CAAC","sourcesContent":["// Portions adapted from ray-tracing-renderer@0.10.15\n// (https://github.com/hoverinc/ray-tracing-renderer).\n// Copyright (c) 2019 HOVER, MIT license; see LICENSES/RayTracingRenderer-MIT.txt.\n\nimport cameraProjection from './cameraProjection.glsl.js';\n\n// Shared primary-ray construction keeps beauty and catcher coverage aligned.\nexport default /* glsl */ `\n${cameraProjection}\nvec2 sampleCircle(vec2 p) {\n  p = 2.0 * p - 1.0;\n  bool greater = abs(p.x) > abs(p.y);\n  float r = greater ? p.x : p.y;\n  float theta = greater ? 0.25 * PI * p.y / p.x : PI * (0.5 - 0.25 * p.x / p.y);\n  return r * vec2(cos(theta), sin(theta));\n}\n\nRay primaryCameraRay() {\n  Ray cam = initCameraRay(v_Texcoord + pixelJitter());\n  if (cameraApertureRadius > 0.0) {\n    // Thin lens: the focus plane is perpendicular to the view direction.\n    vec3 eye = viewInv[3].xyz;\n    vec3 forward = -normalize(viewInv[2].xyz);\n    vec3 focusPoint = eye + cam.d * (cameraFocusDistance / dot(cam.d, forward));\n    vec2 lensPoint = cameraApertureRadius * sampleCircle(sample2D(CAMERA_LENS));\n    vec3 origin = vec3(viewInv * vec4(lensPoint, 0.0, 1.0));\n    initRay(cam, origin, normalize(focusPoint - origin));\n  }\n  return cam;\n}\n`;\n"]}

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

@@ -1,16 +1,16 @@
 export default /* glsl */ `
-vec4 ei(int i) { return fetchData(emissiveLightData,i,emissiveLightColumns); }
-void jb(vec3 x, vec3 rnd, inout LightSampleRec ls) {
+vec4 ep(int i) { return fetchData(emissiveLightData,i,emissiveLightColumns); }
+void pc(vec3 x, vec3 rnd, inout LightSampleRec ls) {
 ls.pdf=0.0;ls.isDelta=false;ls.sourceType=0;ls.sourceIndex=-1;
 if(emissiveChoiceCount<=0) return;
 float scaled=rnd.z*float(emissiveChoiceCount);int column=min(int(scaled),emissiveChoiceCount-1);
-vec4 first=ei(emissiveChoiceOffset+column);
+vec4 first=ep(emissiveChoiceOffset+column);
 int chosen=fract(scaled)<first.x?column:floatBitsToInt(first.y);
-vec4 choice=ei(emissiveChoiceOffset+chosen);int kind=floatBitsToInt(choice.z),index=floatBitsToInt(choice.w);
-float pmf=ei(emissivePmfOffset+chosen).x;
+vec4 choice=ep(emissiveChoiceOffset+chosen);int kind=floatBitsToInt(choice.z),index=floatBitsToInt(choice.w);
+float pmf=ep(emissivePmfOffset+chosen).x;
 if(kind==1) {
 #ifdef USE_ENVMAP
-ig(rnd.xy,ls);ls.pdf*=pmf;
+iM(rnd.xy,ls);ls.pdf*=pmf;
 #endif
 } else if(kind==2) {
 #ifdef NUM_LIGHTS
@@ -20,8 +20,8 @@ ls.sourceType=2;ls.sourceIndex=index;
 sampleAnalyticLight(light,x,rnd.xy,ls);ls.pdf*=pmf;
 #endif
 } else if(kind==3) {
-vec4 a=ei(index*6),b=ei(index*6+1),c=ei(index*6+2);
-vec4 d=ei(index*6+3),e=ei(index*6+4),f=ei(index*6+5);
+vec4 a=ep(index*6),b=ep(index*6+1),c=ep(index*6+2);
+vec4 d=ep(index*6+3),e=ep(index*6+4),f=ep(index*6+5);
 float u=sqrt(rnd.x);vec3 bary=vec3(1.0-u,u*(1.0-rnd.y),u*rnd.y);
 vec3 p=a.xyz*bary.x+b.xyz*bary.y+c.xyz*bary.z;
 ls.normal=normalize(cross(b.xyz-a.xyz,c.xyz-a.xyz));ls.direction=normalize(p-x);ls.dist=distance(x,p);

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

@@ -16,17 +16,17 @@ export default createShaderMixin({
         groundedBackgroundCenter: Shader.uniform('vec2')
     },
     main: glsl `
-vec2 eF(vec3 gh) {
-float phi = mod(atan(-gh.z, -gh.x), TWOPI);
-float theta = acos(clamp(gh.y, -1.0, 1.0));
+vec2 eP(vec3 gz) {
+float phi = mod(atan(-gz.z, -gz.x), TWOPI);
+float theta = acos(clamp(gz.y, -1.0, 1.0));
 return vec2(phi * 0.5 * INVPI, theta * INVPI);
 }
 
-vec2 cT(vec3 nD) {
-return eF(transpose(environmentRotation) * nD);
+vec2 cU(vec3 oA) {
+return eP(transpose(environmentRotation) * oA);
 }
 
-float rv(float u, out int vOffset, out float pdf) {
+float sN(float u, out int vOffset, out float pdf) {
 ivec2 size = textureSize(envMap, 0);
 
 int left = 0;
@@ -52,7 +52,7 @@ pdf = s0.y;
 return (float(vOffset) +  (u - s0.x) / (s1.x - s0.x)) / float(size.y);
 }
 
-float ru(float u, int vOffset, out float pdf) {
+float sM(float u, int vOffset, out float pdf) {
 ivec2 size = textureSize(envMap, 0);
 
 int left = 0;
@@ -66,16 +66,16 @@ left = mid + 1;
 right = mid;
 }
 }
-int pw = left - 1;
+int qG = left - 1;
 
 
 
-vec2 s0 = texelFetch(envMapDistribution, ivec2(1 + pw, vOffset), 0).xy;
-vec2 s1 = texelFetch(envMapDistribution, ivec2(1 + pw + 1, vOffset), 0).xy;
+vec2 s0 = texelFetch(envMapDistribution, ivec2(1 + qG, vOffset), 0).xy;
+vec2 s1 = texelFetch(envMapDistribution, ivec2(1 + qG + 1, vOffset), 0).xy;
 
 pdf = s0.y;
 
-return (float(pw) + (u - s0.x) / (s1.x - s0.x)) / float(size.x);
+return (float(qG) + (u - s0.x) / (s1.x - s0.x)) / float(size.x);
 }
 
 
@@ -86,21 +86,21 @@ return partialPdf.x * partialPdf.y * INVPI2 / (2.0 * sinTheta);
 }
 
 
-vec3 pn(vec2 random, out vec2 uv, out float pdf) {
+vec3 qx(vec2 random, out vec2 uv, out float pdf) {
 vec2 partialPdf;
 int vOffset;
 
-uv.y = rv(random.x, vOffset, partialPdf.y);
-uv.x = ru(random.y, vOffset, partialPdf.x);
+uv.y = sN(random.x, vOffset, partialPdf.y);
+uv.x = sM(random.y, vOffset, partialPdf.x);
 
 float phi = uv.x * TWOPI;
 float theta = uv.y * PI;
-float ct = cos(theta);
+float cv = cos(theta);
 float sinTheta = sin(theta);
-float vZ = cos(phi);
-float wr = sin(phi);
+float xV = cos(phi);
+float yo = sin(phi);
 
-vec3 dir = vec3(-sinTheta * vZ, ct, -sinTheta * wr);
+vec3 dir = vec3(-sinTheta * xV, cv, -sinTheta * yo);
 
 pdf = envMapSolidAnglePdf(partialPdf, uv.y);
 
@@ -112,82 +112,82 @@ vec2 size = vec2(textureSize(envMap, 0));
 
 ivec2 pixel = clamp(ivec2(uv * size), ivec2(0), ivec2(size) - ivec2(1));
 
-float ue = texelFetch(envMapDistribution, ivec2(1 + pixel.x, pixel.y), 0).y;
-float uf = texelFetch(envMapDistribution, ivec2(0, pixel.y), 0).y;
+float vO = texelFetch(envMapDistribution, ivec2(1 + pixel.x, pixel.y), 0).y;
+float vP = texelFetch(envMapDistribution, ivec2(0, pixel.y), 0).y;
 
-return envMapSolidAnglePdf(vec2(ue, uf), uv.y);
+return envMapSolidAnglePdf(vec2(vO, vP), uv.y);
 }
 
-float di(vec3 point, float height, float radius) {
-float fQ = length(point);
-if (fQ < 0.00001) {
+float dk(vec3 point, float height, float radius) {
+float gc = length(point);
+if (gc < 0.00001) {
 return -radius;
 }
 
-float iG = radius * point.y / fQ;
-float iq = -1.5 * height;
-float eq;
-if (iG >= 0.0) {
-eq = radius;
-} else if (iG < iq) {
-eq = -height * fQ / point.y;
+float jf = radius * point.y / gc;
+float iS = -1.5 * height;
+float ez;
+if (jf >= 0.0) {
+ez = radius;
+} else if (jf < iS) {
+ez = -height * gc / point.y;
 } else {
-float cv = 1.0
-- iG * iG / (3.0 * iq * iq);
-eq = radius * cv;
+float cA = 1.0
+- jf * jf / (3.0 * iS * iS);
+ez = radius * cA;
 }
-return fQ - eq;
+return gc - ez;
 }
 
-vec3 eM(vec3 origin, vec3 d) {
+vec3 eW(vec3 origin, vec3 d) {
 #ifdef USE_GROUNDED_BACKGROUND
 float height = groundedBackgroundParams.x;
 float radius = groundedBackgroundParams.y;
-float yd = groundedBackgroundParams.z;
-vec3 bS = normalize(d);
-vec3 bs = origin - vec3(
+float zZ = groundedBackgroundParams.z;
+vec3 bT = normalize(d);
+vec3 bA = origin - vec3(
 groundedBackgroundCenter.x,
-yd + height,
+zZ + height,
 groundedBackgroundCenter.y
 );
 
 
 
-float eE = dot(bs, bS);
-float bj = eE * eE
-- dot(bs, bs) + radius * radius;
-if (bj > 0.0) {
-float cw = -eE + sqrt(bj);
+float eN = dot(bA, bT);
+float bk = eN * eN
+- dot(bA, bA) + radius * radius;
+if (bk > 0.0) {
+float cB = -eN + sqrt(bk);
 if (
-cw > 0.0
-&& di(bs, height, radius) <= 0.0
+cB > 0.0
+&& dk(bA, height, radius) <= 0.0
 ) {
-vec3 oA = bs + bS * cw;
-if (oA.y >= 0.0) {
-return normalize(oA);
+vec3 pw = bA + bT * cB;
+if (pw.y >= 0.0) {
+return normalize(pw);
 }
 
-if (bS.y < -0.00001 && radius > 1.5 * height) {
-float hP = (-height - bs.y) / bS.y;
-vec3 ot = bs + bS * hP;
-float oT = (2.0 / 3.0)
+if (bT.y < -0.00001 && radius > 1.5 * height) {
+float iz = (-height - bA.y) / bT.y;
+vec3 pm = bA + bT * iz;
+float qb = (2.0 / 3.0)
 * sqrt(radius * radius - 2.25 * height * height);
-if (hP > 0.0 && length(ot.xz) <= oT) {
-return normalize(ot);
+if (iz > 0.0 && length(pm.xz) <= qb) {
+return normalize(pm);
 }
 }
 
-float cI = 0.0;
+float cK = 0.0;
 for (int i = 0; i < 14; i++) {
-float fd = (cI + cw) * 0.5;
-vec3 qq = bs + bS * fd;
-if (di(qq, height, radius) > 0.0) {
-cw = fd;
+float fp = (cK + cB) * 0.5;
+vec3 rD = bA + bT * fp;
+if (dk(rD, height, radius) > 0.0) {
+cB = fp;
 } else {
-cI = fd;
+cK = fp;
 }
 }
-vec3 hit = bs + bS * ((cI + cw) * 0.5);
+vec3 hit = bA + bT * ((cK + cB) * 0.5);
 return normalize(hit);
 }
 }
@@ -195,15 +195,15 @@ return normalize(hit);
 return d;
 }
 
-vec4 cn(vec3 origin, vec3 d) {
-d = eM(origin, d);
+vec4 cq(vec3 origin, vec3 d) {
+d = eW(origin, d);
 #ifdef USE_BACKGROUND
 vec4 t = backgroundMapTransform;
 d = vec3(t.x * d.x - t.y * d.z, d.y, t.y * d.x + t.x * d.z);
-vec4 aW = textureLinear(backgroundMap, eF(transpose(backgroundMapRotation) * d));
+vec4 aW = textureLinear(backgroundMap, eP(transpose(backgroundMapRotation) * d));
 return vec4(aW.rgb * t.z, aW.a);
 #else
-return textureLinear(backgroundMap, cT(d));
+return textureLinear(backgroundMap, cU(d));
 #endif
 }`
 });