three-realtime-rt 0.3.0 → 0.4.0

package/src/RestirPass.js

@@ -21,6 +21,7 @@ uniform sampler2D uGNormalMetal;
 uniform sampler2D uMaterialsTex;  // row 1: emissive tris, rows 2..65: blue noise
 uniform vec4 uLightPosType[MAX_LIGHTS];
 uniform vec4 uLightColorRadius[MAX_LIGHTS];
+uniform vec4 uLightDirCone[MAX_LIGHTS]; // spot: direction.xyz + cos(outer)
 uniform int uLightCount;
 uniform int uEmissiveCount;
 uniform float uFrame;
@@ -53,23 +54,45 @@ vec4 fetchBlueNoise() {
 
 float luminance(vec3 c) { return dot(c, vec3(0.299, 0.587, 0.114)); }
 
+// Primary-surface roughness, set per pixel in main(). Drives the cheap specular
+// lobe below so reservoirs favour lights that land on a highlight.
+float gRestirRough;
+
+// Cheap Blinn-Phong specular lobe for the target pdf ONLY (never shaded with
+// this). Deliberately approximate — no Fresnel or geometry term, one pow() per
+// candidate — since it just biases which light each reservoir keeps. wi points
+// from the surface toward the light. Returns a multiplier boost in [0, ~0.8].
+float restirSpecBoost(vec3 N, vec3 wi, vec3 P) {
+  vec3 V = normalize(uCameraPos - P);
+  vec3 H = normalize(wi + V);
+  float shin = mix(4.0, 256.0, 1.0 - gRestirRough);
+  return 0.8 * pow(max(dot(N, H), 0.0), shin);
+}
+
 // Unshadowed contribution of candidate (id, uv) at surface (P, N).
 vec3 candidateContribution(float id, vec2 uv, vec3 P, vec3 N) {
   if (id < float(MAX_LIGHTS)) {
     int i = int(id);
     vec4 posType = uLightPosType[i];
     vec4 colRad = uLightColorRadius[i];
-    if (posType.w < 0.5) {
+    if (posType.w < 0.5 || posType.w >= 1.5) {
       vec3 d = posType.xyz - P; // light CENTER: soft-radius jitter re-drawn at shading
       float dl = length(d);
       if (dl < 1e-5) return vec3(0.0);
       float NdotL = dot(N, d / dl);
       if (NdotL <= 0.0) return vec3(0.0);
-      return colRad.rgb * (NdotL / (dl * dl));
+      float cone = 1.0;
+      if (posType.w >= 1.5) {
+        // spot cone — MUST match RTLightingPass.spotFalloff for a consistent estimator
+        vec4 dc = uLightDirCone[i];
+        cone = smoothstep(dc.w, posType.w - 2.0, dot(dc.xyz, -d / dl));
+        if (cone <= 0.0) return vec3(0.0);
+      }
+      return colRad.rgb * (cone * NdotL / (dl * dl)) * (1.0 + restirSpecBoost(N, d / dl, P));
     }
     float NdotL = dot(N, -posType.xyz);
     if (NdotL <= 0.0) return vec3(0.0);
-    return colRad.rgb * NdotL;
+    return colRad.rgb * NdotL * (1.0 + restirSpecBoost(N, -posType.xyz, P));
   }
   int t = (int(id) - MAX_LIGHTS) * 4;
   vec4 t0 = texelFetch(uMaterialsTex, ivec2(t, 1), 0);
@@ -87,7 +110,7 @@ vec3 candidateContribution(float id, vec2 uv, vec3 P, vec3 N) {
   if (cosS <= 0.0 || cosL < 1e-4) return vec3(0.0);
   // Uniform pick within the emissive set happens at candidate level, so the
   // per-triangle contribution uses area only (count folds into pick pdf).
-  return vec3(t1.w, t2.w, t3.w) * (cosS * cosL * t0.w / max(d2, 1e-6));
+  return vec3(t1.w, t2.w, t3.w) * (cosS * cosL * t0.w / max(d2, 1e-6)) * (1.0 + restirSpecBoost(N, wi, P));
 }
 
 // v3: reservoirs select TRIANGLES, not points. The selection target is the
@@ -129,6 +152,7 @@ void main() {
   }
   vec3 P = wp.xyz;
   vec3 N = normalize(texture(uGNormalMetal, vUv).xyz);
+  gRestirRough = clamp(wp.w - 1.0, 0.0, 1.0);
 
   ivec2 px = ivec2(gl_FragCoord.xy);
   gSeed = uint(px.x) * 3079u + uint(px.y) * 9277u + uint(uFrame) * 26699u;
@@ -215,6 +239,7 @@ void main() {
   }
   vec3 P = wp.xyz;
   vec3 N = normalize(texture(uGNormalMetal, vUv).xyz);
+  gRestirRough = clamp(wp.w - 1.0, 0.0, 1.0);
 
   ivec2 px = ivec2(gl_FragCoord.xy);
   gSeed = uint(px.x) * 5417u + uint(px.y) * 7907u + uint(uFrame) * 15731u;
@@ -283,6 +308,7 @@ export class RestirPass {
           uMaterialsTex: { value: null },
           uLightPosType: { value: [] },
           uLightColorRadius: { value: [] },
+          uLightDirCone: { value: [] },
           uLightCount: { value: 0 },
           uEmissiveCount: { value: 0 },
           uFrame: { value: 0 },
@@ -334,6 +360,7 @@ export class RestirPass {
       u.uMaterialsTex.value = compiled.materialsTex;
       u.uLightPosType.value = compiled.lightPosType;
       u.uLightColorRadius.value = compiled.lightColorRadius;
+      u.uLightDirCone.value = compiled.lightDirCone;
       u.uLightCount.value = compiled.lightCount;
       u.uEmissiveCount.value = compiled.emissiveTriCount;
     }