@meimu/mutracer 0.2.0 → 0.3.1

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

@@ -1,3 +1,4 @@
+import cameraProjection from './chunks/cameraProjection.glsl.js';
 import { FragmentShader, Shader } from '../shader.js';
 import { DEPTH_SAMPLE_GRID } from '../depthQuery.js';
 import common from './chunks/common.glsl.js';
@@ -14,6 +15,7 @@ export default new FragmentShader({
     uniforms: {
         depthArea: Shader.uniform('vec4'),
         viewProjectionInv: Shader.uniform('mat4'),
+        projectionInv: Shader.uniform('mat4'),
         viewInv: Shader.uniform('mat4')
     },
     main: /* glsl */ `
@@ -24,16 +26,16 @@ ${core.main}
 ${uvProjection}
 ${materials.main}
 ${intersect.main}
+${cameraProjection}
 
 void main() {
+bool picking = depthArea.z < 0.0;
+if (picking && any(greaterThan(gl_FragCoord.xy, vec2(1.0)))) {out_depth = vec4(0.0); return;}
 vec2 offset = floor(gl_FragCoord.xy) / ${DEPTH_SAMPLE_GRID - 1}.0 * 2.0 - 1.0;
-vec2 uv = depthArea.xy + depthArea.zw * offset * vec2(1.0, -1.0);
+vec2 uv = picking ? depthArea.xy : depthArea.xy + depthArea.zw * offset * vec2(1.0, -1.0);
 out_depth = vec4(0.0);
 if (any(lessThan(uv, vec2(0.0))) || any(greaterThan(uv, vec2(1.0)))) return;
-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;
-gC(ray, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));
+Ray ray = cV(uv);
 vec3 eye = viewInv[3].xyz;
 vec3 forward = -normalize(viewInv[2].xyz);
 SurfaceInteraction si;
@@ -42,9 +44,13 @@ for (int layer = 0; layer < 32; layer++) {
 intersectScene(ray, si, false);
 if (!si.hit) return;
 OpenPbrResolvedMaterial material;
-dg(material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);
+getMaterial(material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);
 if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {
-out_depth.r = max(dot(si.position - eye, forward), 0.0);
+if (picking) {
+uint instance = uint(si.instanceIndex) + 1u, materialIndex = uint(si.materialIndex) + 1u;
+out_depth = vec4(float(instance & 65535u), float(instance >> 16u),
+float(materialIndex & 65535u), float(materialIndex >> 16u));
+} else out_depth.r = max(dot(si.position - eye, forward), 0.0);
 return;
 }
 ray.o = si.position + ray.d * (EPS * 0.02);

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

@@ -1 +1 @@
-{"version":3,"file":"depthQuery.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/depthQuery.frag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,IAAI,MAAM,+BAA+B,CAAC;AACjD,OAAO,SAAS,MAAM,iCAAiC,CAAC;AACxD,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAEzC,eAAe,IAAI,cAAc,CAAC;IAChC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC;IACtC,OAAO,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE;IACnC,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC;IAC9C,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KAChC;IACD,IAAI,EAAE,UAAU,CAAC;EACjB,MAAM;EACN,IAAI;EACJ,MAAM,CAAC,IAAI;EACX,IAAI,CAAC,IAAI;EACT,YAAY;EACZ,SAAS,CAAC,IAAI;EACd,SAAS,CAAC,IAAI;;;yCAG2B,iBAAiB,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAwB/D;CACA,CAAC,CAAC","sourcesContent":["import { FragmentShader, Shader } from '../shader.js';\nimport { DEPTH_SAMPLE_GRID } from '../depthQuery.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 rand from './chunks/rand.glsl.js';\n\nexport default new FragmentShader({\n  name: 'depthQuery', outputs: ['depth'],\n  defines: { DEPTH_QUERY_MODE: true },\n  includes: [core, materials, intersect, random],\n  uniforms: {\n    depthArea: Shader.uniform('vec4'),\n    viewProjectionInv: Shader.uniform('mat4'),\n    viewInv: Shader.uniform('mat4')\n  },\n  main: /* glsl */ `\n${common}\n${rand}\n${random.main}\n${core.main}\n${uvProjection}\n${materials.main}\n${intersect.main}\n\nvoid main() {\n  vec2 offset = floor(gl_FragCoord.xy) / ${DEPTH_SAMPLE_GRID - 1}.0 * 2.0 - 1.0;\n  vec2 uv = depthArea.xy + depthArea.zw * offset * vec2(1.0, -1.0);\n  out_depth = vec4(0.0);\n  if (any(lessThan(uv, vec2(0.0))) || any(greaterThan(uv, vec2(1.0)))) return;\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;\n  initRay(ray, origin.xyz / origin.w, normalize(target.xyz * origin.w - origin.xyz * target.w));\n  vec3 eye = viewInv[3].xyz;\n  vec3 forward = -normalize(viewInv[2].xyz);\n  SurfaceInteraction si;\n  si.triangleIndex = -1;\n  for (int layer = 0; layer < 32; layer++) {\n    intersectScene(ray, si, false);\n    if (!si.hit) return;\n    OpenPbrResolvedMaterial material;\n    getMaterial(material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);\n    if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {\n      out_depth.r = max(dot(si.position - eye, forward), 0.0);\n      return;\n    }\n    ray.o = si.position + ray.d * (EPS * 0.02);\n  }\n}\n`\n});\n"]}
+{"version":3,"file":"depthQuery.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/depthQuery.frag.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,IAAI,MAAM,+BAA+B,CAAC;AACjD,OAAO,SAAS,MAAM,iCAAiC,CAAC;AACxD,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAEzC,eAAe,IAAI,cAAc,CAAC;IAChC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC;IACtC,OAAO,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE;IACnC,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC;IAC9C,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QACrC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KAChC;IACD,IAAI,EAAE,UAAU,CAAC;EACjB,MAAM;EACN,IAAI;EACJ,MAAM,CAAC,IAAI;EACX,IAAI,CAAC,IAAI;EACT,YAAY;EACZ,SAAS,CAAC,IAAI;EACd,SAAS,CAAC,IAAI;EACd,gBAAgB;;;;;yCAKyB,iBAAiB,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;CAyB/D;CACA,CAAC,CAAC","sourcesContent":["import cameraProjection from './chunks/cameraProjection.glsl.js';\nimport { FragmentShader, Shader } from '../shader.js';\nimport { DEPTH_SAMPLE_GRID } from '../depthQuery.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 rand from './chunks/rand.glsl.js';\n\nexport default new FragmentShader({\n  name: 'depthQuery', outputs: ['depth'],\n  defines: { DEPTH_QUERY_MODE: true },\n  includes: [core, materials, intersect, random],\n  uniforms: {\n    depthArea: Shader.uniform('vec4'),\n    viewProjectionInv: Shader.uniform('mat4'),\n    projectionInv: Shader.uniform('mat4'),\n    viewInv: Shader.uniform('mat4')\n  },\n  main: /* glsl */ `\n${common}\n${rand}\n${random.main}\n${core.main}\n${uvProjection}\n${materials.main}\n${intersect.main}\n${cameraProjection}\n\nvoid main() {\n  bool picking = depthArea.z < 0.0;\n  if (picking && any(greaterThan(gl_FragCoord.xy, vec2(1.0)))) {out_depth = vec4(0.0); return;}\n  vec2 offset = floor(gl_FragCoord.xy) / ${DEPTH_SAMPLE_GRID - 1}.0 * 2.0 - 1.0;\n  vec2 uv = picking ? depthArea.xy : depthArea.xy + depthArea.zw * offset * vec2(1.0, -1.0);\n  out_depth = vec4(0.0);\n  if (any(lessThan(uv, vec2(0.0))) || any(greaterThan(uv, vec2(1.0)))) return;\n  Ray ray = initCameraRay(uv);\n  vec3 eye = viewInv[3].xyz;\n  vec3 forward = -normalize(viewInv[2].xyz);\n  SurfaceInteraction si;\n  si.triangleIndex = -1;\n  for (int layer = 0; layer < 32; layer++) {\n    intersectScene(ray, si, false);\n    if (!si.hit) return;\n    OpenPbrResolvedMaterial material;\n    getMaterial(material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);\n    if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {\n      if (picking) {\n        uint instance = uint(si.instanceIndex) + 1u, materialIndex = uint(si.materialIndex) + 1u;\n        out_depth = vec4(float(instance & 65535u), float(instance >> 16u),\n          float(materialIndex & 65535u), float(materialIndex >> 16u));\n      } else out_depth.r = max(dot(si.position - eye, forward), 0.0);\n      return;\n    }\n    ray.o = si.position + ray.d * (EPS * 0.02);\n  }\n}\n`\n});\n"]}

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

@@ -17,29 +17,29 @@ const normalizeRayTraceOutput = new FragmentShader({
     main: glsl `
 void main() {
 vec2 uv = lightScale * v_Texcoord;
-vec4 tb = sample_albedoTex(uv);
-float hit = tb.a;
-vec4 tf = sample_normalTex(uv);
+vec4 uB = sample_albedoTex(uv);
+float hit = uB.a;
+vec4 uG = sample_normalTex(uv);
 
 
 
-float tK = max(tf.a, 1.0);
-vec3 albedo = tb.rgb / tK;
-vec3 normal = tf.rgb / tK;
+float vp = max(uG.a, 1.0);
+vec3 albedo = uB.rgb / vp;
+vec3 normal = uG.rgb / vp;
 vec4 shadowCatcher = sample_shadowCatcherTex(uv);
 
 
 
-float tj = sample_catcherMomentsTex(uv).w;
-float opacity = tj > 0.0 ? shadowCatcher.a / tj : 0.0;
+float uK = sample_catcherMomentsTex(uv).w;
+float opacity = uK > 0.0 ? shadowCatcher.a / uK : 0.0;
 shadowCatcher /= sampleCount;
 shadowCatcher.a = 1.0 - shadowCatcher.r * opacity;
-vec4 tQ = sample_colorTex(uv);
+vec4 vC = sample_colorTex(uv);
 
 
 
 
-vec4 light = vec4(tQ.rgb / (hit > 0.0 ? hit : sampleCount), tQ.a / sampleCount);
+vec4 light = vec4(vC.rgb / (hit > 0.0 ? hit : sampleCount), vC.a / sampleCount);
 
 
 

package/lib/renderer/glsl/rayTrace.frag.d.ts

@@ -1,2 +1,2 @@
 import { FragmentShader } from '../shader.js';
-export default function createRayTraceFragmentShader(): FragmentShader<Record<string, import("../shader.js").ShaderDefineValue>, Record<string, import("../shader.js").ShaderUniform<unknown>>>;
+export default function createRayTraceFragmentShader(...options: unknown[]): FragmentShader<Record<string, import("../shader.js").ShaderDefineValue>, Record<string, import("../shader.js").ShaderUniform<unknown>>>;