@meimu/mutracer 0.2.0 → 0.3.1

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

@@ -5,13 +5,13 @@ import { glsl } from '../../shader.js';
 export default glsl `
 uvec4 s0;
 
-void gW(vec2 p, int frame) {
+void fA(vec2 p, int frame) {
 
 s0 = uvec4(p, uint(frame), uint(p.x) + uint(p.y));
 }
 
 
-void xd(inout uvec4 v) {
+void zF(inout uvec4 v) {
 v = v * 1664525u + 1013904223u;
 v.x += v.y*v.w; v.y += v.z*v.x; v.z += v.x*v.y; v.w += v.y*v.z;
 v = v ^ (v>>16u);
@@ -19,7 +19,7 @@ v.x += v.y*v.w; v.y += v.z*v.x; v.z += v.x*v.y; v.w += v.y*v.z;
 }
 
 float rand() {
-xd(s0); return float(s0.x)/float(0xffffffffu);
+zF(s0); return float(s0.x)/float(0xffffffffu);
 }
 
 `;

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

@@ -10,15 +10,15 @@ export default createShaderMixin({
 
 ${sobol}
 
-void rG() {
-aZ = uvec2(v_Texcoord / pixelSize);
-aQ = uint(sampleCount);
-bT = 0u; cP = 0u;
+void sP() {
+aJ = uvec2(v_Texcoord / pixelSize);
+aC = uint(sampleCount);
+samplingBounce = 0u; hashedCounter = 0u;
 }
 
-vec2 tg() {
+vec2 uH() {
 if (samplingPattern == 0 || samplingPattern == 1) {
-return (dZ(CAMERA_PIXEL) - 0.5) * pixelSize;
+return (sample2D(CAMERA_PIXEL) - 0.5) * pixelSize;
 }
 return jitter;
 }

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

@@ -1,2 +1,3 @@
+export declare function createRayTraceCoreGlsl(fragments?: Readonly<Record<string, string>>): import("../../shader.js").ShaderMixin;
 declare const _default: import("../../shader.js").ShaderMixin;
 export default _default;

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

@@ -4,26 +4,27 @@
 import { createShaderMixin, glsl, Shader } from '../../shader.js';
 import { ShadowCatcherMaterial, UnlitMaterial } from '../../../constants.js';
 import { CONSTANT_SPOT_LIGHT } from '../../lightConstants.js';
-export default createShaderMixin({
-    uniforms: {
-        lightsTex: Shader.uniform('sampler2D'),
-        iesProfileData: Shader.uniform('sampler2D'),
-        iesProfileColumns: Shader.uniform('int', 1),
-        pixelSize: Shader.uniform('vec2'),
-        jitter: Shader.uniform('vec2'),
-        sampleCount: Shader.uniform('int'),
-        envLightSelectionPmf: Shader.uniform('float', 0)
-    },
-    defines: {
-        STANDARD: 0,
-        UNLIT: UnlitMaterial,
-        SHADOW_CATCHER: ShadowCatcherMaterial,
-        SPOT_LIGHT: CONSTANT_SPOT_LIGHT
-    },
-    main: glsl `
+export function createRayTraceCoreGlsl(fragments = {}) {
+    return createShaderMixin({
+        uniforms: {
+            lightsTex: Shader.uniform('sampler2D'),
+            iesProfileData: Shader.uniform('sampler2D'),
+            iesProfileColumns: Shader.uniform('int', 1),
+            pixelSize: Shader.uniform('vec2'),
+            jitter: Shader.uniform('vec2'),
+            sampleCount: Shader.uniform('int'),
+            envLightSelectionPmf: Shader.uniform('float', 0)
+        },
+        defines: {
+            STANDARD: 0,
+            UNLIT: UnlitMaterial,
+            SHADOW_CATCHER: ShadowCatcherMaterial,
+            SPOT_LIGHT: CONSTANT_SPOT_LIGHT
+        },
+        main: glsl `
 
 const vec3 luminance = vec3(0.2126, 0.7152, 0.0722);
-const int xk = 8;
+const int zL = 8;
 
 #define RAY_MAX_DISTANCE 9999.0
 
@@ -81,7 +82,7 @@ float mediumAnisotropy;
 struct OpenPbrResolvedMaterial {
 int materialType;
 
-float specularRoughness;
+float specularRoughness;${fragments['core0'] ?? ''}
 float baseMetalness;
 vec3 baseColor;
 float specularIor;
@@ -157,29 +158,31 @@ float selectionCdf;
 vec3 iesReference;
 };
 
-void gC(inout Ray ray, vec3 origin, vec3 direction) {
+void initRay(inout Ray ray, vec3 origin, vec3 direction) {
 ray.o = origin;
 ray.d = direction;
 ray.tMax = RAY_MAX_DISTANCE;
 }
 
 
-ivec2 hd(int i, int jY) {
+ivec2 uO(int i, int ki) {
 ivec2 u;
-u.y = i >> jY; 
-u.x = i - (u.y << jY); 
+u.y = i >> ki; 
+u.x = i - (u.y << ki); 
 return u;
 }
 
-vec4 lm(sampler2D s, int i, int jY) {
-return texelFetch(s, hd(i, jY), 0);
+vec4 fetchData(sampler2D s, int i, int ki) {
+return texelFetch(s, uO(i, ki), 0);
 }
 
-ivec4 lm(highp isampler2D s, int i, int jY) {
-return texelFetch(s, hd(i, jY), 0);
+ivec4 fetchData(highp isampler2D s, int i, int ki) {
+return texelFetch(s, uO(i, ki), 0);
 }
 
 struct Path {
+
+bool scatteringMediumEntered;
 Ray ray;
 vec3 li;
 float alpha;
@@ -188,7 +191,7 @@ bool fromEye;
 bool abort;
 float scatteringPdf;
 bool scatteringIsDelta;
-bool isNextRefraction;
+bool isNextRefraction;${fragments['core1'] ?? ''}
 };
 
 struct LightSampleRec {
@@ -198,27 +201,29 @@ vec3 direction;
 float dist;
 float pdf;
 bool isDelta;
+int sourceType;
+int sourceIndex;
 };
 
 
-Light rB(int i) {
+Light fetchLight(int i) {
 int firstTexel = i * 6;
-vec4 qD = texelFetch(
+vec4 positionAndPmf = texelFetch(
 lightsTex,
 ivec2(firstTexel, 0),
 0
 );
-vec4 ql = texelFetch(
+vec4 emissionAndCdf = texelFetch(
 lightsTex,
 ivec2(firstTexel + 1, 0),
 0
 );
-vec4 oL = texelFetch(
+vec4 pG = texelFetch(
 lightsTex,
 ivec2(firstTexel + 2, 0),
 0
 );
-vec4 my = texelFetch(
+vec4 mW = texelFetch(
 lightsTex,
 ivec2(firstTexel + 3, 0),
 0
@@ -229,33 +234,33 @@ ivec2(firstTexel + 4, 0),
 0
 );
 return Light(
-qD.xyz,
-ql.xyz,
-oL.xyz,
-my.xyz,
+positionAndPmf.xyz,
+emissionAndCdf.xyz,
+pG.xyz,
+mW.xyz,
 shape.x,
 shape.y,
 shape.z,
-int(my.w),
-oL.w,
-qD.w,
-ql.w,
+int(mW.w),
+pG.w,
+positionAndPmf.w,
+emissionAndCdf.w,
 texelFetch(lightsTex, ivec2(firstTexel + 5, 0), 0).xyz
 );
 }
 
-float cS(int el, int mc) {
-int iK = el + mc / 4;
+float cI(int ec, int mC) {
+int iR = ec + mC / 4;
 vec4 packed = texelFetch(
 iesProfileData,
-ivec2(iK % iesProfileColumns, iK / iesProfileColumns),
+ivec2(iR % iesProfileColumns, iR / iesProfileColumns),
 0
 );
-return packed[mc % 4];
+return packed[mC % 4];
 }
 
-float lB(int el, vec2 uv) {
-if (el < 0) return 1.0;
+float lW(int ec, vec2 uv) {
+if (ec < 0) return 1.0;
 vec2 pixel = fract(uv) * 128.0 - 0.5;
 ivec2 p0 = ivec2(floor(pixel));
 vec2 f = fract(pixel);
@@ -263,26 +268,28 @@ int xa = p0.x < 0 ? 127 : p0.x;
 int xb = p0.x >= 127 ? 0 : p0.x + 1;
 int ya = p0.y < 0 ? 127 : p0.y;
 int yb = p0.y >= 127 ? 0 : p0.y + 1;
-float a = cS(el, ya * 128 + xa);
-float b = cS(el, ya * 128 + xb);
-float c = cS(el, yb * 128 + xa);
-float d = cS(el, yb * 128 + xb);
+float a = cI(ec, ya * 128 + xa);
+float b = cI(ec, ya * 128 + xb);
+float c = cI(ec, yb * 128 + xa);
+float d = cI(ec, yb * 128 + xb);
 return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);
 }
 
-float bP(Light light, vec3 dV) {
+float evaluateSpotEmissionMultiplier(Light light, vec3 dL) {
 vec3 axis = normalize(light.u);
-float ci = dot(axis, dV);
-float vm = light.v.y > light.v.x + 1e-6
-? smoothstep(light.v.x, light.v.y, ci)
-: step(light.v.x, ci);
-if (vm <= 0.0 || light.textureIndex < 0) return vm;
-vec3 vK = light.iesReference;
-vec3 xj = cross(axis, vK);
-float vertical = acos(clamp(ci, -1.0, 1.0));
-float horizontal = atan(dot(dV, xj), dot(dV, vK));
-return vm * lB(light.textureIndex, vec2(vertical / PI, horizontal / TWOPI + 0.5));
+float cv = dot(axis, dL);
+float xm = light.v.y > light.v.x + 1e-6
+? smoothstep(light.v.x, light.v.y, cv)
+: step(light.v.x, cv);
+if (xm <= 0.0 || light.textureIndex < 0) return xm;
+vec3 xT = light.iesReference;
+vec3 zK = cross(axis, xT);
+float vertical = acos(clamp(cv, -1.0, 1.0));
+float horizontal = atan(dot(dL, zK), dot(dL, xT));
+return xm * lW(light.textureIndex, vec2(vertical / PI, horizontal / TWOPI + 0.5));
 }
 `
-});
+    });
+}
+export default createRayTraceCoreGlsl();
 //# sourceMappingURL=rayTraceCore.glsl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"rayTraceCore.glsl.js","sourceRoot":"","sources":["../../../../src/renderer/glsl/chunks/rayTraceCore.glsl.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,sDAAsD;AACtD,kFAAkF;AAElF,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,eAAe,iBAAiB,CAAC;IAC/B,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QACtC,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QAC3C,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3C,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QAC9B,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;QAClC,oBAAoB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;KACjD;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,aAAa;QACpB,cAAc,EAAE,qBAAqB;QACrC,UAAU,EAAE,mBAAmB;KAChC;IACD,IAAI,EAAE,IAAI,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuQX;CACA,CAAC,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 { createShaderMixin, glsl, Shader } from '../../shader.js';\nimport { ShadowCatcherMaterial, UnlitMaterial } from '../../../constants.js';\nimport { CONSTANT_SPOT_LIGHT } from '../../lightConstants.js';\n\nexport default createShaderMixin({\n  uniforms: {\n    lightsTex: Shader.uniform('sampler2D'),\n    iesProfileData: Shader.uniform('sampler2D'),\n    iesProfileColumns: Shader.uniform('int', 1),\n    pixelSize: Shader.uniform('vec2'),\n    jitter: Shader.uniform('vec2'),\n    sampleCount: Shader.uniform('int'),\n    envLightSelectionPmf: Shader.uniform('float', 0)\n  },\n  defines: {\n    STANDARD: 0,\n    UNLIT: UnlitMaterial,\n    SHADOW_CATCHER: ShadowCatcherMaterial,\n    SPOT_LIGHT: CONSTANT_SPOT_LIGHT\n  },\n  main: glsl`\n// https://www.w3.org/WAI/GL/wiki/Relative_luminance\nconst vec3 luminance = vec3(0.2126, 0.7152, 0.0722);\nconst int bounceSamples = 8;\n\n#define RAY_MAX_DISTANCE 9999.0\n\n#define NO_UNROLL(X) (X + min(0, sampleCount))\n#define NO_UNROLLU(X) (X + uint(min(0, sampleCount)))\n\nstruct Ray {\n  vec3 o;\n  vec3 d;\n  float tMax;\n};\n\nstruct SurfaceInteraction {\n  bool hit;\n  vec3 position;\n  vec3 normal; // material shading normal\n#ifdef USE_COAT_NORMAL_FRAMES\n  vec3 coatNormal;\n#endif\n  vec3 vertexNormal; // interpolated mesh normal before normal mapping\n  vec3 shadowOffset; // smooth-surface offset used by direct-light shadow rays\n  \n  vec2 uv;\n  vec2 uv1;\n  vec3 vertexColor;\n\n#ifdef USE_TANGENT\n  vec3 tangent;\n#endif\n  vec3 directionTangent;\n  vec3 directionBitangent;\n  vec3 geometryTangent;\n  vec3 geometryBitangent;\n  vec3 faceNormal; // normal of the triangle\n\n  bool isTransparency;\n  // For perfect specular or transmission surface\n  // We use the albedo and normal of first diffuse or glossy surface hit instead for denoising\n  // See albedo section in https://www.openimagedenoise.org/documentation.html\n  bool albedoSampled;\n\n  int triangleIndex;\n  int instanceIndex;\n  int materialIndex;\n\n  int mediumType;\n  vec3 mediumExtinction;\n  vec3 mediumScattering;\n  float mediumAnisotropy;\n};\n\n// Texture-resolved OpenPBR inputs used by the surface integrator. The storage\n// buffer keeps its compact legacy layout; getMaterial() is the compatibility\n// boundary that maps it to these canonical names.\nstruct OpenPbrResolvedMaterial {\n  int materialType;\n\n  float specularRoughness;\n  float baseMetalness;\n  vec3 baseColor;\n  float specularIor;\n  vec3 emission;\n  float transmissionWeight;\n  bool thinWalled;\n  float specularAnisotropy;\n  float alpha;\n\n  float transmissionDispersionScale;\n  float dispersionAbbeNumber;\n  float thinFilmThickness;\n  float thinFilmIor;\n  float thinFilmWeight;\n\n  // Medium\n  int mediumType;\n  vec3 mediumExtinction;\n  vec3 mediumScattering;\n  float mediumAnisotropy;\n\n  float baseWeight;\n  float diffuseRoughness;\n  float specularWeight;\n  vec3 specularColor;\n  float subsurfaceWeight;\n  vec3 subsurfaceColor;\n  vec3 transmissionColor;\n  float fuzzWeight;\n  vec3 fuzzColor;\n  float fuzzRoughness;\n  float coatWeight;\n  vec3 coatColor;\n  float coatRoughness;\n  float coatAnisotropy;\n  vec2 anisotropyDirection;\n  bool anisotropyDirectionEnabled;\n  float coatAnisotropyRotation;\n  vec3 directionTangent;\n  vec3 directionBitangent;\n  vec3 geometryTangent;\n  vec3 geometryBitangent;\n#ifdef USE_COAT_NORMAL_FRAMES\n  vec3 coatNormal;\n  bool coatNormalEnabled;\n  vec3 geometricNormal;\n#endif\n  float coatIor;\n  float coatDarkening;\n\n  float bevel;\n\n  // Calculated\n  float relativeIor;\n  bool inside;\n  float alphaX;\n  float alphaY;\n};\n\n\nstruct Light {\n  vec3 position;\n  vec3 emission;\n  vec3 u;\n  vec3 v;\n  float radius;\n  float area;\n  float type;\n  int textureIndex;\n  float spread;\n  float selectionPmf;\n  float selectionCdf;\n  vec3 iesReference;\n};\n\nvoid initRay(inout Ray ray, vec3 origin, vec3 direction) {\n  ray.o = origin;\n  ray.d = direction;\n  ray.tMax = RAY_MAX_DISTANCE;\n}\n\n// given the index from a 1D array, retrieve corresponding position from packed 2D texture\nivec2 unpackTexel(int i, int columnsLog2) {\n  ivec2 u;\n  u.y = i >> columnsLog2; // equivalent to (i / 2^columnsLog2)\n  u.x = i - (u.y << columnsLog2); // equivalent to (i % 2^columnsLog2)\n  return u;\n}\n\nvec4 fetchData(sampler2D s, int i, int columnsLog2) {\n  return texelFetch(s, unpackTexel(i, columnsLog2), 0);\n}\n\nivec4 fetchData(highp isampler2D s, int i, int columnsLog2) {\n  return texelFetch(s, unpackTexel(i, columnsLog2), 0);\n}\n\nstruct Path {\n  Ray ray;\n  vec3 li;\n  float alpha;\n  vec3 beta;\n  bool fromEye;\n  bool abort;\n  float scatteringPdf;\n  bool scatteringIsDelta;\n  bool isNextRefraction;\n};\n\nstruct LightSampleRec {\n  vec3 normal;\n  vec3 emission;\n  vec3 direction;\n  float dist;\n  float pdf;\n  bool isDelta;\n};\n\n\nLight fetchLight(int i) {\n  int firstTexel = i * 6;\n  vec4 positionAndPmf = texelFetch(\n    lightsTex,\n    ivec2(firstTexel, 0),\n    0\n  );\n  vec4 emissionAndCdf = texelFetch(\n    lightsTex,\n    ivec2(firstTexel + 1, 0),\n    0\n  );\n  vec4 tangentAndSpread = texelFetch(\n    lightsTex,\n    ivec2(firstTexel + 2, 0),\n    0\n  );\n  vec4 bitangentAndTexture = texelFetch(\n    lightsTex,\n    ivec2(firstTexel + 3, 0),\n    0\n  );\n  vec4 shape = texelFetch(\n    lightsTex,\n    ivec2(firstTexel + 4, 0),\n    0\n  );\n  return Light(\n    positionAndPmf.xyz,\n    emissionAndCdf.xyz,\n    tangentAndSpread.xyz,\n    bitangentAndTexture.xyz,\n    shape.x,\n    shape.y,\n    shape.z,\n    int(bitangentAndTexture.w),\n    tangentAndSpread.w,\n    positionAndPmf.w,\n    emissionAndCdf.w,\n    texelFetch(lightsTex, ivec2(firstTexel + 5, 0), 0).xyz\n  );\n}\n\nfloat iesProfileScalar(int baseTexel, int scalarIndex) {\n  int texelIndex = baseTexel + scalarIndex / 4;\n  vec4 packed = texelFetch(\n    iesProfileData,\n    ivec2(texelIndex % iesProfileColumns, texelIndex / iesProfileColumns),\n    0\n  );\n  return packed[scalarIndex % 4];\n}\n\nfloat sampleIESProfile(int baseTexel, vec2 uv) {\n  if (baseTexel < 0) return 1.0;\n  vec2 pixel = fract(uv) * 128.0 - 0.5;\n  ivec2 p0 = ivec2(floor(pixel));\n  vec2 f = fract(pixel);\n  int xa = p0.x < 0 ? 127 : p0.x;\n  int xb = p0.x >= 127 ? 0 : p0.x + 1;\n  int ya = p0.y < 0 ? 127 : p0.y;\n  int yb = p0.y >= 127 ? 0 : p0.y + 1;\n  float a = iesProfileScalar(baseTexel, ya * 128 + xa);\n  float b = iesProfileScalar(baseTexel, ya * 128 + xb);\n  float c = iesProfileScalar(baseTexel, yb * 128 + xa);\n  float d = iesProfileScalar(baseTexel, yb * 128 + xb);\n  return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);\n}\n\nfloat evaluateSpotEmissionMultiplier(Light light, vec3 lightToSurface) {\n  vec3 axis = normalize(light.u);\n  float cosTheta = dot(axis, lightToSurface);\n  float cone = light.v.y > light.v.x + 1e-6\n    ? smoothstep(light.v.x, light.v.y, cosTheta)\n    : step(light.v.x, cosTheta);\n  if (cone <= 0.0 || light.textureIndex < 0) return cone;\n  vec3 xAxis = light.iesReference;\n  vec3 yAxis = cross(axis, xAxis);\n  float vertical = acos(clamp(cosTheta, -1.0, 1.0));\n  float horizontal = atan(dot(lightToSurface, yAxis), dot(lightToSurface, xAxis));\n  return cone * sampleIESProfile(light.textureIndex, vec2(vertical / PI, horizontal / TWOPI + 0.5));\n}\n`\n});\n"]}
+{"version":3,"file":"rayTraceCore.glsl.js","sourceRoot":"","sources":["../../../../src/renderer/glsl/chunks/rayTraceCore.glsl.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,sDAAsD;AACtD,kFAAkF;AAElF,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,UAAU,sBAAsB,CAAC,YAA8C,EAAE;IAAI,OAAO,iBAAiB,CAAC;QAClH,QAAQ,EAAE;YACR,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;YACtC,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;YAC3C,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;YAC3C,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YACjC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;YAClC,oBAAoB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;SACjD;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,CAAC;YACX,KAAK,EAAE,aAAa;YACpB,cAAc,EAAE,qBAAqB;YACrC,UAAU,EAAE,mBAAmB;SAChC;QACD,IAAI,EAAE,IAAI,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA6DgB,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBA6G1B,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiGjD;KACA,CAAC,CAAC;AACH,CAAC;AACD,eAAe,sBAAsB,EAAE,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 { createShaderMixin, glsl, Shader } from '../../shader.js';\nimport { ShadowCatcherMaterial, UnlitMaterial } from '../../../constants.js';\nimport { CONSTANT_SPOT_LIGHT } from '../../lightConstants.js';\n\nexport function createRayTraceCoreGlsl(fragments: Readonly<Record<string, string>> = {}) { return createShaderMixin({\n  uniforms: {\n    lightsTex: Shader.uniform('sampler2D'),\n    iesProfileData: Shader.uniform('sampler2D'),\n    iesProfileColumns: Shader.uniform('int', 1),\n    pixelSize: Shader.uniform('vec2'),\n    jitter: Shader.uniform('vec2'),\n    sampleCount: Shader.uniform('int'),\n    envLightSelectionPmf: Shader.uniform('float', 0)\n  },\n  defines: {\n    STANDARD: 0,\n    UNLIT: UnlitMaterial,\n    SHADOW_CATCHER: ShadowCatcherMaterial,\n    SPOT_LIGHT: CONSTANT_SPOT_LIGHT\n  },\n  main: glsl`\n// https://www.w3.org/WAI/GL/wiki/Relative_luminance\nconst vec3 luminance = vec3(0.2126, 0.7152, 0.0722);\nconst int bounceSamples = 8;\n\n#define RAY_MAX_DISTANCE 9999.0\n\n#define NO_UNROLL(X) (X + min(0, sampleCount))\n#define NO_UNROLLU(X) (X + uint(min(0, sampleCount)))\n\nstruct Ray {\n  vec3 o;\n  vec3 d;\n  float tMax;\n};\n\nstruct SurfaceInteraction {\n  bool hit;\n  vec3 position;\n  vec3 normal; // material shading normal\n#ifdef USE_COAT_NORMAL_FRAMES\n  vec3 coatNormal;\n#endif\n  vec3 vertexNormal; // interpolated mesh normal before normal mapping\n  vec3 shadowOffset; // smooth-surface offset used by direct-light shadow rays\n  \n  vec2 uv;\n  vec2 uv1;\n  vec3 vertexColor;\n\n#ifdef USE_TANGENT\n  vec3 tangent;\n#endif\n  vec3 directionTangent;\n  vec3 directionBitangent;\n  vec3 geometryTangent;\n  vec3 geometryBitangent;\n  vec3 faceNormal; // normal of the triangle\n\n  bool isTransparency;\n  // For perfect specular or transmission surface\n  // We use the albedo and normal of first diffuse or glossy surface hit instead for denoising\n  // See albedo section in https://www.openimagedenoise.org/documentation.html\n  bool albedoSampled;\n\n  int triangleIndex;\n  int instanceIndex;\n  int materialIndex;\n\n  int mediumType;\n  vec3 mediumExtinction;\n  vec3 mediumScattering;\n  float mediumAnisotropy;\n};\n\n// Texture-resolved OpenPBR inputs used by the surface integrator. The storage\n// buffer keeps its compact legacy layout; getMaterial() is the compatibility\n// boundary that maps it to these canonical names.\nstruct OpenPbrResolvedMaterial {\n  int materialType;\n\n  float specularRoughness;${fragments['core0'] ?? ''}\n  float baseMetalness;\n  vec3 baseColor;\n  float specularIor;\n  vec3 emission;\n  float transmissionWeight;\n  bool thinWalled;\n  float specularAnisotropy;\n  float alpha;\n\n  float transmissionDispersionScale;\n  float dispersionAbbeNumber;\n  float thinFilmThickness;\n  float thinFilmIor;\n  float thinFilmWeight;\n\n  // Medium\n  int mediumType;\n  vec3 mediumExtinction;\n  vec3 mediumScattering;\n  float mediumAnisotropy;\n\n  float baseWeight;\n  float diffuseRoughness;\n  float specularWeight;\n  vec3 specularColor;\n  float subsurfaceWeight;\n  vec3 subsurfaceColor;\n  vec3 transmissionColor;\n  float fuzzWeight;\n  vec3 fuzzColor;\n  float fuzzRoughness;\n  float coatWeight;\n  vec3 coatColor;\n  float coatRoughness;\n  float coatAnisotropy;\n  vec2 anisotropyDirection;\n  bool anisotropyDirectionEnabled;\n  float coatAnisotropyRotation;\n  vec3 directionTangent;\n  vec3 directionBitangent;\n  vec3 geometryTangent;\n  vec3 geometryBitangent;\n#ifdef USE_COAT_NORMAL_FRAMES\n  vec3 coatNormal;\n  bool coatNormalEnabled;\n  vec3 geometricNormal;\n#endif\n  float coatIor;\n  float coatDarkening;\n\n  float bevel;\n\n  // Calculated\n  float relativeIor;\n  bool inside;\n  float alphaX;\n  float alphaY;\n};\n\n\nstruct Light {\n  vec3 position;\n  vec3 emission;\n  vec3 u;\n  vec3 v;\n  float radius;\n  float area;\n  float type;\n  int textureIndex;\n  float spread;\n  float selectionPmf;\n  float selectionCdf;\n  vec3 iesReference;\n};\n\nvoid initRay(inout Ray ray, vec3 origin, vec3 direction) {\n  ray.o = origin;\n  ray.d = direction;\n  ray.tMax = RAY_MAX_DISTANCE;\n}\n\n// given the index from a 1D array, retrieve corresponding position from packed 2D texture\nivec2 unpackTexel(int i, int columnsLog2) {\n  ivec2 u;\n  u.y = i >> columnsLog2; // equivalent to (i / 2^columnsLog2)\n  u.x = i - (u.y << columnsLog2); // equivalent to (i % 2^columnsLog2)\n  return u;\n}\n\nvec4 fetchData(sampler2D s, int i, int columnsLog2) {\n  return texelFetch(s, unpackTexel(i, columnsLog2), 0);\n}\n\nivec4 fetchData(highp isampler2D s, int i, int columnsLog2) {\n  return texelFetch(s, unpackTexel(i, columnsLog2), 0);\n}\n\nstruct Path {\n  // Retain deferred roulette after an SSS walk reaches its boundary.\n  bool scatteringMediumEntered;\n  Ray ray;\n  vec3 li;\n  float alpha;\n  vec3 beta;\n  bool fromEye;\n  bool abort;\n  float scatteringPdf;\n  bool scatteringIsDelta;\n  bool isNextRefraction;${fragments['core1'] ?? ''}\n};\n\nstruct LightSampleRec {\n  vec3 normal;\n  vec3 emission;\n  vec3 direction;\n  float dist;\n  float pdf;\n  bool isDelta;\n  int sourceType;\n  int sourceIndex;\n};\n\n\nLight fetchLight(int i) {\n  int firstTexel = i * 6;\n  vec4 positionAndPmf = texelFetch(\n    lightsTex,\n    ivec2(firstTexel, 0),\n    0\n  );\n  vec4 emissionAndCdf = texelFetch(\n    lightsTex,\n    ivec2(firstTexel + 1, 0),\n    0\n  );\n  vec4 tangentAndSpread = texelFetch(\n    lightsTex,\n    ivec2(firstTexel + 2, 0),\n    0\n  );\n  vec4 bitangentAndTexture = texelFetch(\n    lightsTex,\n    ivec2(firstTexel + 3, 0),\n    0\n  );\n  vec4 shape = texelFetch(\n    lightsTex,\n    ivec2(firstTexel + 4, 0),\n    0\n  );\n  return Light(\n    positionAndPmf.xyz,\n    emissionAndCdf.xyz,\n    tangentAndSpread.xyz,\n    bitangentAndTexture.xyz,\n    shape.x,\n    shape.y,\n    shape.z,\n    int(bitangentAndTexture.w),\n    tangentAndSpread.w,\n    positionAndPmf.w,\n    emissionAndCdf.w,\n    texelFetch(lightsTex, ivec2(firstTexel + 5, 0), 0).xyz\n  );\n}\n\nfloat iesProfileScalar(int baseTexel, int scalarIndex) {\n  int texelIndex = baseTexel + scalarIndex / 4;\n  vec4 packed = texelFetch(\n    iesProfileData,\n    ivec2(texelIndex % iesProfileColumns, texelIndex / iesProfileColumns),\n    0\n  );\n  return packed[scalarIndex % 4];\n}\n\nfloat sampleIESProfile(int baseTexel, vec2 uv) {\n  if (baseTexel < 0) return 1.0;\n  vec2 pixel = fract(uv) * 128.0 - 0.5;\n  ivec2 p0 = ivec2(floor(pixel));\n  vec2 f = fract(pixel);\n  int xa = p0.x < 0 ? 127 : p0.x;\n  int xb = p0.x >= 127 ? 0 : p0.x + 1;\n  int ya = p0.y < 0 ? 127 : p0.y;\n  int yb = p0.y >= 127 ? 0 : p0.y + 1;\n  float a = iesProfileScalar(baseTexel, ya * 128 + xa);\n  float b = iesProfileScalar(baseTexel, ya * 128 + xb);\n  float c = iesProfileScalar(baseTexel, yb * 128 + xa);\n  float d = iesProfileScalar(baseTexel, yb * 128 + xb);\n  return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);\n}\n\nfloat evaluateSpotEmissionMultiplier(Light light, vec3 lightToSurface) {\n  vec3 axis = normalize(light.u);\n  float cosTheta = dot(axis, lightToSurface);\n  float cone = light.v.y > light.v.x + 1e-6\n    ? smoothstep(light.v.x, light.v.y, cosTheta)\n    : step(light.v.x, cosTheta);\n  if (cone <= 0.0 || light.textureIndex < 0) return cone;\n  vec3 xAxis = light.iesReference;\n  vec3 yAxis = cross(axis, xAxis);\n  float vertical = acos(clamp(cosTheta, -1.0, 1.0));\n  float horizontal = atan(dot(lightToSurface, yAxis), dot(lightToSurface, xAxis));\n  return cone * sampleIESProfile(light.textureIndex, vec2(vertical / PI, horizontal / TWOPI + 0.5));\n}\n`\n});\n}\nexport default createRayTraceCoreGlsl();\n"]}

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

@@ -1,16 +1,17 @@
+import emissive from './emissiveLight.glsl.js';
 import { glsl } from '../../shader.js';
 export default glsl `
 #ifdef NUM_LIGHTS
-void eY(
+void eR(
 in Light light,
 in vec3 shadingPoint,
 in vec2 samplePoint,
 inout LightSampleRec result
 ) {
-vec3 oN = light.position - shadingPoint;
-float ak = length(oN);
+vec3 pH = light.position - shadingPoint;
+float ao = length(pH);
 if (light.radius <= 0.0) {
-if (ak <= 1e-6) {
+if (ao <= 1e-6) {
 result.direction = vec3(0.0, 0.0, 1.0);
 result.normal = vec3(0.0, 0.0, -1.0);
 result.dist = 0.0;
@@ -19,11 +20,11 @@ result.emission = vec3(0.0);
 result.isDelta = true;
 return;
 }
-result.direction = oN / ak;
+result.direction = pH / ao;
 result.normal = -result.direction;
-result.dist = ak;
+result.dist = ao;
 result.pdf = 1.0;
-result.emission = light.emission / max(ak * ak, 1e-8);
+result.emission = light.emission / max(ao * ao, 1e-8);
 result.isDelta = true;
 return;
 }
@@ -31,46 +32,50 @@ float radius = max(light.radius, 1e-6);
 result.isDelta = false;
 vec3 direction;
 
-if (ak <= radius) {
+if (ao <= radius) {
 float z = 1.0 - 2.0 * samplePoint.x;
-float ex = sqrt(max(0.0, 1.0 - z * z));
+float dw = sqrt(max(0.0, 1.0 - z * z));
 float azimuth = TWOPI * samplePoint.y;
-direction = vec3(ex * cos(azimuth), ex * sin(azimuth), z);
+direction = vec3(dw * cos(azimuth), dw * sin(azimuth), z);
 result.pdf = INV4PI;
 }
 else {
-vec3 axis = oN / ak;
-float sX = min(
+vec3 axis = pH / ao;
+float pv = min(
 1.0,
-radius * radius / (ak * ak)
+radius * radius / (ao * ao)
 );
-float tc = sqrt(max(0.0, 1.0 - sX));
-float cosine = mix(1.0, tc, samplePoint.x);
-float vF = sqrt(max(0.0, 1.0 - cosine * cosine));
+float xn = sqrt(max(0.0, 1.0 - pv));
+
+
+float mX = pv / (1.0 + xn);
+float oe = samplePoint.x * mX;
+float cosine = 1.0 - oe;
+float wk = sqrt(max(0.0, oe * (2.0 - oe)));
 float azimuth = TWOPI * samplePoint.y;
 vec3 tangent;
 vec3 bitangent;
-aP(axis, tangent, bitangent);
+sampling_orthonormal_basis(axis, tangent, bitangent);
 direction = axis * cosine
-+ tangent * (vF * cos(azimuth))
-+ bitangent * (vF * sin(azimuth));
-result.pdf = 1.0 / max(TWOPI * (1.0 - tc), 1e-8);
++ tangent * (wk * cos(azimuth))
++ bitangent * (wk * sin(azimuth));
+result.pdf = 1.0 / max(TWOPI * mX, 1e-8);
 }
 
-float jC = dot(direction, oN);
-float br = jC * jC
-- dot(oN, oN) + radius * radius;
-float yn = sqrt(max(0.0, br));
-float cV = jC - yn;
-float cM = jC + yn;
-result.dist = cV > 1e-6 ? cV : cM;
+float jM = dot(direction, pH);
+float bk = jM * jM
+- dot(pH, pH) + radius * radius;
+float root = sqrt(max(0.0, bk));
+float cK = jM - root;
+float cB = jM + root;
+result.dist = cK > 1e-6 ? cK : cB;
 result.direction = direction;
 vec3 surfacePoint = shadingPoint + direction * result.dist;
 result.normal = normalize(surfacePoint - light.position);
 result.emission = light.emission;
 }
 
-void dn(
+void bD(
 in Light light,
 in vec3 surfacePoint,
 in vec3 lowerLeft,
@@ -80,17 +85,17 @@ inout LightSampleRec result
 if (light.textureIndex >= 0) {
 float width = length(light.u);
 float height = length(light.v);
-vec3 ek = surfacePoint - lowerLeft;
+vec3 ea = surfacePoint - lowerLeft;
 vec2 uv = vec2(
-dot(ek, light.u / width) / width,
-dot(ek, light.v / height) / height
+dot(ea, light.u / width) / width,
+dot(ea, light.v / height) / height
 );
 result.emission *= sampleMap(light.textureIndex, uv).rgb;
 }
 #endif
 }
 
-void kw(
+void kF(
 in Light light,
 in vec3 shadingPoint,
 in vec2 samplePoint,
@@ -101,28 +106,28 @@ vec3 lowerLeft = light.position - 0.5 * (light.u + light.v);
 float spread = clamp(light.spread, 0.0, 1.0);
 
 if (spread <= 0.001) {
-float gw = dot(normal, shadingPoint - light.position);
-vec3 surfacePoint = shadingPoint - normal * gw;
-vec3 ek = surfacePoint - lowerLeft;
+float gy = dot(normal, shadingPoint - light.position);
+vec3 surfacePoint = shadingPoint - normal * gy;
+vec3 ea = surfacePoint - lowerLeft;
 float width = length(light.u);
 float height = length(light.v);
 vec2 uv = vec2(
-dot(ek, light.u / width) / width,
-dot(ek, light.v / height) / height
+dot(ea, light.u / width) / width,
+dot(ea, light.v / height) / height
 );
-if (gw <= 0.0 || any(lessThan(uv, vec2(0.0)))
+if (gy <= 0.0 || any(lessThan(uv, vec2(0.0)))
 || any(greaterThan(uv, vec2(1.0)))) {
 result.emission = vec3(0.0);
 result.pdf = 0.0;
 return;
 }
 result.direction = -normal;
-result.dist = gw;
+result.dist = gy;
 result.normal = normal;
 result.emission = light.emission;
 result.pdf = 1.0;
 result.isDelta = true;
-dn(light, surfacePoint, lowerLeft, result);
+bD(light, surfacePoint, lowerLeft, result);
 return;
 }
 
@@ -130,20 +135,20 @@ vec3 surfacePoint = lowerLeft
 + light.u * samplePoint.x
 + light.v * samplePoint.y;
 vec3 offset = surfacePoint - shadingPoint;
-float hE = dot(offset, offset);
-result.dist = sqrt(hE);
+float bG = dot(offset, offset);
+result.dist = sqrt(bG);
 result.direction = offset / result.dist;
 result.normal = normal;
-float gn = dot(-result.direction, normal);
-float pK = cos(0.5 * PI * spread);
-if (gn <= 0.0 || gn < pK) {
+float gq = dot(-result.direction, normal);
+float qB = cos(0.5 * PI * spread);
+if (gq <= 0.0 || gq < qB) {
 result.emission = vec3(0.0);
 result.pdf = 0.0;
 return;
 }
 result.emission = light.emission;
-result.pdf = hE / max(light.area * gn, 1e-8);
-dn(light, surfacePoint, lowerLeft, result);
+result.pdf = bG / max(light.area * gq, 1e-8);
+bD(light, surfacePoint, lowerLeft, result);
 }
 
 void gs(
@@ -159,94 +164,103 @@ result.pdf = 1.0;
 result.isDelta = true;
 }
 
-void kx(
+void kG(
 in Light light,
 in vec3 shadingPoint,
 in vec2 samplePoint,
 inout LightSampleRec result
 ) {
-eY(light, shadingPoint, samplePoint, result);
+eR(light, shadingPoint, samplePoint, result);
 vec3 surfacePoint = shadingPoint + result.direction * result.dist;
-result.emission *= bP(
+result.emission *= evaluateSpotEmissionMultiplier(
 light,
 normalize(shadingPoint - surfacePoint)
 );
 }
 
-void jg(
+void sampleAnalyticLight(
 in Light light,
 in vec3 shadingPoint,
 in vec2 samplePoint,
 inout LightSampleRec result
 ) {
-int ec = int(light.type);
+int dU = int(light.type);
 #ifdef HAS_RECT_LIGHTS
-if (ec == RECT_LIGHT) {
-kw(light, shadingPoint, samplePoint, result);
+if (dU == RECT_LIGHT) {
+kF(light, shadingPoint, samplePoint, result);
 return;
 }
 #endif
 #ifdef HAS_SPHERE_LIGHTS
-if (ec == SPHERE_LIGHT) {
-eY(light, shadingPoint, samplePoint, result);
+if (dU == SPHERE_LIGHT) {
+eR(light, shadingPoint, samplePoint, result);
 return;
 }
 #endif
 #ifdef HAS_SPOT_LIGHTS
-if (ec == SPOT_LIGHT) {
-kx(light, shadingPoint, samplePoint, result);
+if (dU == SPOT_LIGHT) {
+kG(light, shadingPoint, samplePoint, result);
 return;
 }
 #endif
 #ifdef HAS_DIRECTIONAL_LIGHTS
-if (ec == DIRECTIONAL_LIGHT) {
+if (dU == DIRECTIONAL_LIGHT) {
 gs(light, shadingPoint, result);
 }
 #endif
 }
 #endif
 
-void nD(in vec2 samplePoint, inout LightSampleRec result) {
+void iM(in vec2 samplePoint, inout LightSampleRec result) {
 vec2 uv;
-result.direction = pI(samplePoint, uv, result.pdf);
+result.direction = qx(samplePoint, uv, result.pdf);
 result.emission = textureLinear(envMap, uv).rgb;
 result.dist = INF;
 }
 
+#ifdef HAS_EMISSIVE_LIGHTS
+${emissive}
+#endif
+
 void sampleLight(
 in vec3 shadingPoint,
 in vec3 randomSampleValue,
 inout LightSampleRec result,
-bool tk
+bool uP
 ) {
+#ifdef HAS_EMISSIVE_LIGHTS
+pc(shadingPoint,randomSampleValue,result);return;
+#endif
+result.sourceType=0;result.sourceIndex=-1;
 result.isDelta = false;
-float vE = randomSampleValue.z;
-bool le = false;
+float xJ = randomSampleValue.z;
+bool lG = false;
 #ifdef USE_ENVMAP
-le = vE < envLightSelectionPmf;
-if (le) {
-nD(randomSampleValue.xy, result);
+lG = xJ < envLightSelectionPmf;
+if (lG) {
+iM(randomSampleValue.xy, result);
 result.pdf *= envLightSelectionPmf;
 }
 #endif
 
 #ifdef NUM_LIGHTS
-if (!le) {
-int lM = NUM_LIGHTS - 1;
+if (!lG) {
+int jG = NUM_LIGHTS - 1;
 for (int index = 0; index < NUM_LIGHTS; index++) {
-if (vE < rB(index).selectionCdf) {
-lM = index;
+if (xJ < fetchLight(index).selectionCdf) {
+jG = index;
 break;
 }
 }
-Light rp = rB(lM);
-jg(
-rp,
+result.sourceType=2;result.sourceIndex=jG;
+Light sz = fetchLight(jG);
+sampleAnalyticLight(
+sz,
 shadingPoint,
 randomSampleValue.xy,
 result
 );
-result.pdf *= rp.selectionPmf;
+result.pdf *= sz.selectionPmf;
 }
 #endif
 }