@forgeax/engine-shader 0.1.20 → 0.1.21

package/src/common.wgsl

@@ -36,6 +36,36 @@ fn linearToSrgbOetf(color : vec3<f32>) -> vec3<f32> {
   return select(high, low, safe <= vec3<f32>(0.0031308));
 }
 
+// Shared final-surface dither.  The output transform and FXAA are both
+// display-encoded fullscreen writers, so they must use one owner-level
+// algorithm rather than carrying subtly different copies in each pass.
+// The bounded shift is ±0.5/255 per channel, matching Three.js's optional
+// material dithering amplitude while the screen-space hash remains stable for
+// a still frame.  Callers decide whether this writer is the final 8-bit
+// boundary; intermediate float targets must leave it disabled.
+fn hash32(value : u32) -> u32 {
+  var hash = value;
+  hash = (hash ^ 61u) ^ (hash >> 16u);
+  hash = hash + (hash << 3u);
+  hash = hash ^ (hash >> 4u);
+  hash = hash * 668265261u;
+  hash = hash ^ (hash >> 15u);
+  return hash;
+}
+
+fn ditherNoise(pixelPosition : vec2<f32>) -> f32 {
+  let pixel = vec2<u32>(pixelPosition);
+  let seed = (pixel.x * 1973u) ^ (pixel.y * 9277u) ^ 89173u;
+  return f32(hash32(seed) & 1023u) / 1023.0;
+}
+
+fn ditherUnorm8(value : vec3<f32>, pixelPosition : vec2<f32>) -> vec3<f32> {
+  let noise = ditherNoise(pixelPosition);
+  var shift = vec3<f32>(0.25 / 255.0, -0.25 / 255.0, 0.25 / 255.0);
+  shift = mix(2.0 * shift, -2.0 * shift, noise);
+  return clamp(value + shift, vec3<f32>(0.0), vec3<f32>(1.0));
+}
+
 // @forgeax/engine-shader - common.wgsl (M5 T-18 feat-20260512-naga-oil-composition-hmr).
 //
 // Shared view + mesh structs extracted from pbr.wgsl + unlit.wgsl via
@@ -50,7 +80,7 @@ fn linearToSrgbOetf(color : vec3<f32>) -> vec3<f32> {
 // aligned with Bevy's bevy_view::common and matches charter proposition 5
 // (consistent abstraction - one View struct everywhere).
 
-// View UBO byte layout (592 B std140):
+// View UBO byte layout (960 B payload, 1024 B slot):
 //   [  0.. 64) worldViewProj    mat4x4<f32>  (align 16, size 64)
 //   [ 64.. 80) lightDir         vec3<f32>    (align 16, 12+4 pad)
 //   [ 80.. 96) lightColor       vec3<f32>    (align 16, 12+4 pad)
@@ -68,8 +98,7 @@ fn linearToSrgbOetf(color : vec3<f32>) -> vec3<f32> {
 //   [500..504) cascadeBlend     f32           (align 4, size 4)
 //   [504..508) depthBias        f32           (align 4, size 4)
 //   [508..512) normalBias       f32           (align 4, size 4)
-//   [512..516) pcfKernelSize    f32           (align 4, size 4)
-//   [516..528) _align_pad      —             (mat4 array align=16, 12 B)
+//   [512..528) directional shadow carrier f32[4] (profile, radius, penumbra, reserved)
 //   [528..784) spotLightViewProj array<mat4x4<f32>,4>  (align 16, size 256)
 //   WGSL prefix = 784 B. Host UBO = VIEW_UBO_BYTES = 960 B (renderer-factory.ts);
 //   view-ubo.ts writes the full 240 f32 payload. The spot matrix
@@ -99,14 +128,15 @@ fn linearToSrgbOetf(color : vec3<f32>) -> vec3<f32> {
 // shadow_caster.wgsl indexes the 4 fields via `shadowCasterCascade.index`
 // (binding 5, written per shadow pass).
 //
-// feat-20260621-merge-directionallightshadow-into-directionallight M3 / m3-t3:
-// the merged DirectionalLight's shadow bias + PCF kernel width append at the
-// tail (depthBias / normalBias / pcfKernelSize at bytes 504/508/512, floats
-// 126/127/128). Tail-append only -- field order is byte-for-byte stable
+// feat-20260827-directional-csm-pcss-quality M1:
+// the merged DirectionalLight's shadow bias + accepted filter carrier occupy
+// the existing tail (depthBias / normalBias at bytes 504/508, carrier at
+// bytes 512..528, floats 126/127/128..131). Tail reuse only -- field order is
+// byte-for-byte stable
 // (charter P4); the prior 88 B host tail pad shrinks to 64 B, total stays
 // View slot remains within the existing 1024 B stride. lighting-directional.wgsl drives the
-// directional shadow bias (D-1: bias = max(normalBias*(1-N.L), depthBias)) and
-// a pcfKernelSize-wide PCF loop from these fields.
+// directional shadow bias (D-1: bias = max(normalBias*(1-N.L), depthBias));
+// directional shadow carrier is the receiver-facing profile/radius/penumbra POD.
 //
 // feat-20260625-spot-light-shadow-mapping w25 (scope-amend webkit-fallback):
 // the per-spot perspective `spotLightViewProj` matrices (4 lanes, fragment-read)
@@ -122,7 +152,7 @@ fn linearToSrgbOetf(color : vec3<f32>) -> vec3<f32> {
 // matrix in the same frame (same-frame write contention); the FRAGMENT read
 // channel has no such contention — the host writes all <=4 spot matrices once
 // per frame before the forward pass, so the fold is safe. mat4 array align=16:
-// the array lands at byte 528 (next 16 B-aligned offset after pcfKernelSize at
+// the array lands at byte 528 (next 16 B-aligned offset after the filter carrier at
 // byte 512..516), spanning bytes 528..784. The host allocates VIEW_UBO_BYTES =
 // 960 (renderer-factory.ts) and writes the full 240 f32
 // payload (render-system-record.ts). Lane N = the spot with `shadowAtlasTile
@@ -142,10 +172,10 @@ struct View {
   cascadeBlend    : f32,
   depthBias       : f32,
   normalBias      : f32,
-  pcfKernelSize   : f32,
+  directionalShadowFilter : vec4<f32>,
   // feat-20260625-spot-light-shadow-mapping w25: per-spot perspective
   // light-view-projection matrices, fragment-read. Auto-aligned to byte 528
-  // (mat4 array align=16, after pcfKernelSize at byte 512); spans bytes
+  // (mat4 array align=16, after the four directional carrier lanes at byte 512); spans bytes
   // 528..784. Lane N = spot with shadowAtlasTile === N (cap = 4). Zeroed lanes
   // are safe (sample gated on shadowAtlasTile >= 0 in default-standard-pbr.wgsl).
   spotLightViewProj : array<mat4x4<f32>, 4>,

package/src/default-standard-pbr-skin.wgsl

@@ -1,18 +1,19 @@
-#import forgeax_view::common::{View, Mesh, InstanceData, view, meshes, instances, PointLight, SpotLight, pointLightsBuffer, spotLightsBuffer, shadowMap, shadowSampler, sampleMaterialTexture}
+#import forgeax_view::common::{View, Mesh, InstanceData, view, meshes, instances, sampleMaterialTexture}
+#import forgeax_scene_temporal::{sceneViewZ}
 #import forgeax_pbr::temporal::{projectPbrSceneTemporal}
 #import forgeax_pbr::brdf::{f_schlick, v_smith, d_ggx}
 #import forgeax_pbr::ibl_sampling::{sampleIblDiffuse, sampleIblSpecular}
 #import forgeax_pbr::tbn::{decodeTangentSpaceNormalRg, scaleTangentSpaceNormal, applyTBN}
 #import forgeax_pbr::lighting_directional::{evalDirectionalNoShadow, evalDirectionalShadowFactor}
-#import forgeax_pbr::lighting_punctual::{evalPoint, evalSpot}
-#ifdef POINT_SHADOW_AVAILABLE
-#import forgeax_pbr::lighting_punctual::{evalPointShadowed}
-#import forgeax_view::common::{shadowParams}
+#ifdef CLUSTER_FORWARD_AVAILABLE
+#import forgeax_standard::cluster::{evaluateStandardClusterLights}
 #endif
 
 #define_import_path forgeax_material::pbr-skin
 #pragma variant_axis STORAGE_BUFFER_AVAILABLE
+#pragma variant_axis CLUSTER_FORWARD_AVAILABLE
 #pragma variant_axis VERTEX_COLOR_AVAILABLE
+#pragma variant_axis DIRECTIONAL_PCSS_AVAILABLE
 
 // @forgeax/engine-shader - default-standard-pbr-skin.wgsl
 // (feat-20260523-skin-skeleton-animation M3 / T-29).
@@ -204,7 +205,6 @@ struct VsOut {
   @location(1) worldNormal : vec3<f32>,
   @location(2) uv : vec2<f32>,
   @location(3) worldTangent : vec4<f32>,
-  @location(4) @interpolate(flat) instanceIdx : u32,
   // feat-city-glb multi-UV tiling: second UV set varying at location 5
   // (parity with default-standard-pbr.wgsl).
   @location(5) uv1 : vec2<f32>,
@@ -217,6 +217,9 @@ struct VsOut {
 #ifdef VERTEX_COLOR_AVAILABLE
   @location(14) color : vec4<f32>,
 #endif
+  // Vertex-produced Standard cluster coordinates. Fragment builtin position
+  // is framebuffer-space and cannot recover the original clip-space NDC.
+  @location(6) ndc : vec3<f32>,
   @location(7) viewZ : f32,
 };
 
@@ -298,11 +301,14 @@ fn vs_main(in : VsIn, @builtin(instance_index) idx : u32) -> VsOut {
 #ifdef VERTEX_COLOR_AVAILABLE
   out.color = in.color;
 #endif
-  out.instanceIdx = idx;
   // feat-20260613-csm-cascaded-shadow-maps M5 / w19: viewZ replaces the
   // prior light-space-position varying; evalDirectional picks the cascade
   // matrix per fragment from viewZ + worldPos.
-  out.viewZ = -out.clip.w;
+  let clipPos = out.clip;
+  out.ndc = vec3(clipPos.xy / clipPos.w, clipPos.z / clipPos.w);
+  // Keep the cluster depth exactly aligned with the CPU binner for both
+  // perspective and off-axis orthographic projections.
+  out.viewZ = sceneViewZ(out.clip, view.temporalProjection);
   return out;
 }
 
@@ -397,65 +403,17 @@ fn fs_main(in : VsOut) -> @location(0) vec4<f32> {
     );
     color = color + directionalShadow * material.clearcoat * directionalClearcoat;
   }
-  let pointCount = pointLightsBuffer.count;
-  for (var i: u32 = 0u; i < pointCount; i = i + 1u) {
-    let p = pointLightsBuffer.slots[i];
-#ifdef POINT_SHADOW_AVAILABLE
-    if (p.shadowAtlasLayer >= 0) {
-      let lane = shadowParams[p.shadowAtlasLayer];
-      color = color + evalPointShadowed(
-        p.position, p.colorTimesIntensity, p.invRangeSquared,
-        in.worldPos, n, v, albedo, metallic, a, f0,
-        p.shadowAtlasLayer, lane.x, lane.y, 0.005, 0.05,
-      );
-      if (material.clearcoat != 0.0) {
-        color = color + material.clearcoat * evalPointShadowed(
-          p.position, p.colorTimesIntensity, p.invRangeSquared,
-          in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-          p.shadowAtlasLayer, lane.x, lane.y, 0.005, 0.05,
-        );
-      }
-    } else {
-      color = color + evalPoint(
-        p.position, p.colorTimesIntensity, p.invRangeSquared,
-        in.worldPos, n, v, albedo, metallic, a, f0,
-      );
-      if (material.clearcoat != 0.0) {
-        color = color + material.clearcoat * evalPoint(
-          p.position, p.colorTimesIntensity, p.invRangeSquared,
-          in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-        );
-      }
-    }
-#else
-    color = color + evalPoint(
-      p.position, p.colorTimesIntensity, p.invRangeSquared,
-      in.worldPos, n, v, albedo, metallic, a, f0,
-    );
-    if (material.clearcoat != 0.0) {
-      color = color + material.clearcoat * evalPoint(
-        p.position, p.colorTimesIntensity, p.invRangeSquared,
-        in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-      );
-    }
-#endif
-  }
-  let spotCount = spotLightsBuffer.count;
-  for (var i: u32 = 0u; i < spotCount; i = i + 1u) {
-    let s = spotLightsBuffer.slots[i];
-    color = color + evalSpot(
-      s.position, s.direction, s.colorTimesIntensity,
-      s.cosInner, s.cosOuter, s.invRangeSquared,
-      in.worldPos, n, v, albedo, metallic, a, f0,
+#ifdef CLUSTER_FORWARD_AVAILABLE
+  color = color + evaluateStandardClusterLights(
+    in.ndc, in.viewZ, in.worldPos, n, v, albedo, metallic, a, f0, false,
+  );
+  if (material.clearcoat != 0.0) {
+    color = color + material.clearcoat * evaluateStandardClusterLights(
+      in.ndc, in.viewZ, in.worldPos, n, v,
+      vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04), false,
     );
-    if (material.clearcoat != 0.0) {
-      color = color + material.clearcoat * evalSpot(
-        s.position, s.direction, s.colorTimesIntensity,
-        s.cosInner, s.cosOuter, s.invRangeSquared,
-        in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-      );
-    }
   }
+#endif
   return vec4<f32>(color, alpha);
 }
 
@@ -471,6 +429,7 @@ struct TemporalVsOut {
   @location(7) uv7 : vec2<f32>,
   @location(8) @interpolate(perspective) currentClip : vec4<f32>,
   @location(9) @interpolate(perspective) previousClip : vec4<f32>,
+  @location(10) @interpolate(flat) reactive : f32,
 #ifdef VERTEX_COLOR_AVAILABLE
   @location(14) color : vec4<f32>,
 #endif
@@ -492,6 +451,11 @@ fn vs_temporal(in : VsIn, @builtin(instance_index) idx : u32) -> TemporalVsOut {
   out.currentClip = view.temporalCurrentViewProj * currentWorld;
   out.clip = out.currentClip;
   out.previousClip = view.temporalPreviousViewProj * previousWorld;
+#if STORAGE_BUFFER_AVAILABLE == true
+  out.reactive = meshes[0].temporal.x;
+#else
+  out.reactive = 1.0;
+#endif
   out.uv = in.uv;
   out.uv1 = in.uv1;
   out.uv2 = in.uv2;
@@ -517,11 +481,6 @@ fn temporalVertexAlpha(in : TemporalVsOut) -> f32 {
 
 @fragment
 fn fs_temporal(in : TemporalVsOut) -> @location(0) vec4<f32> {
-#if STORAGE_BUFFER_AVAILABLE == true
-  let reactive = meshes[0].temporal.x;
-#else
-  let reactive = 1.0;
-#endif
   return projectPbrSceneTemporal(
     material.baseColor.a * temporalVertexAlpha(in),
     material.alphaCutoff,
@@ -532,7 +491,7 @@ fn fs_temporal(in : TemporalVsOut) -> @location(0) vec4<f32> {
     in.currentClip,
     in.previousClip,
     view.temporalProjection,
-    reactive,
+    in.reactive,
     in.uv, in.uv1, in.uv2, in.uv3,
     in.uv4, in.uv5, in.uv6, in.uv7,
   );

package/src/default-standard-pbr.wgsl

@@ -1,46 +1,34 @@
 #define_import_path forgeax_material::standard
-#import forgeax_view::common::{View, Mesh, InstanceData, view, meshes, instances, PointLight, SpotLight, pointLightsBuffer, spotLightsBuffer, shadowMap, shadowSampler, sampleMaterialTexture}
-#ifdef PROJECTOR_AVAILABLE
-#import forgeax_view::common::{projectorTexture, projectorSampler}
-#endif
+#import forgeax_view::common::{View, Mesh, InstanceData, view, meshes, instances, sampleMaterialTexture}
+#import forgeax_scene_temporal::{sceneViewZ}
 #import forgeax_pbr::temporal::{projectPbrSceneTemporal}
 #import forgeax_pbr::brdf::{f_schlick, v_smith, d_ggx}
-#import forgeax_pbr::ibl_sampling::{sampleIblDiffuse, sampleIblSpecular}
+#import forgeax_pbr::ibl_sampling::{box_project, sampleIblDiffuse, sampleIblSpecular, sampleReflectionProbeSpecular}
 #import forgeax_pbr::tbn::{decodeTangentSpaceNormalRg, scaleTangentSpaceNormal, applyTBN}
 #import forgeax_pbr::lighting_directional::{evalDirectionalNoShadow, evalDirectionalShadowFactor}
-#import forgeax_pbr::lighting_punctual::{evalPoint, evalSpot, evalSpotShadowed, projectSpotUv}
-#ifdef POINT_SHADOW_AVAILABLE
-#import forgeax_pbr::lighting_punctual::{evalPointShadowed}
-#import forgeax_view::common::{shadowParams}
-#endif
-
-fn sampleSpotProjector(lightViewProj : mat4x4<f32>, worldPos : vec3<f32>) -> vec3<f32> {
-#ifdef PROJECTOR_AVAILABLE
-  let uv = projectSpotUv(lightViewProj, worldPos);
-  if (!(uv.x >= 0.0 && uv.x <= 1.0 && uv.y >= 0.0 && uv.y <= 1.0)) {
-    // Three's SpotLight.map is a modulation inside the projected light
-    // frustum, not a second cone mask. Outside the map the original spot
-    // radiance remains intact; the cone/visibility terms already own whether
-    // the light reaches the fragment.
-    return vec3<f32>(1.0);
-  }
-  return textureSampleLevel(projectorTexture, projectorSampler, uv, 0.0).rgb;
-#else
-  // Keep the analytic SpotLight contribution intact on adapters whose
-  // fragment-stage sampled-texture budget cannot carry the optional cookie.
-  return vec3<f32>(1.0);
-#endif
-}
 #ifdef CLUSTER_FORWARD_AVAILABLE
-#import forgeax_hdrp::cluster_forward::{evaluate_cluster_lights, get_ssao_intensity}
+#import forgeax_standard::cluster::{evaluateStandardClusterLights, get_ssao_intensity}
 #endif
 
 #pragma variant_axis STORAGE_BUFFER_AVAILABLE
 #pragma variant_axis CLUSTER_FORWARD_AVAILABLE
 #pragma variant_axis VERTEX_COLOR_AVAILABLE
 #pragma variant_axis TRANSMISSION_AVAILABLE
+#pragma variant_axis DIRECTIONAL_PCSS_AVAILABLE
 #pragma variant_axis PROJECTOR_AVAILABLE
 
+// Reflection probes remain a bounded scene-projected sampling lane. Their
+// optional texture resources are the same Skylight inputs; when no probe is
+// admitted, the explicit Skylight path below remains authoritative.
+fn reflection_probe_sampling_contract(
+  worldPosition: vec3<f32>,
+  direction: vec3<f32>,
+  boxCenter: vec3<f32>,
+  boxExtents: vec3<f32>,
+) -> vec3<f32> {
+  return box_project(worldPosition, direction, boxCenter, boxExtents);
+}
+
 // @forgeax/engine-shader - default-standard-pbr.wgsl
 // (feat-20260523-shader-template-instance-split M5 / T04).
 //
@@ -274,7 +262,11 @@ struct VsOut {
   @location(1) worldNormal : vec3<f32>,
   @location(2) uv : vec2<f32>,
   @location(3) worldTangent : vec4<f32>,
-  @location(4) @interpolate(flat) instanceIdx : u32,
+#ifdef TRANSMISSION_AVAILABLE
+  // Keep mesh and instance storage vertex-only; transmission receives the
+  // transform basis from the vertex stage below.
+  @location(4) @interpolate(flat) transmissionBasis0 : vec4<f32>,
+#endif
   // feat-city-glb multi-UV tiling: second UV set inter-stage varying. Uses the
   // previously-vacant @location(5) so @location(6)/(7) stay byte-stable with
   // the prior layout (CSM M5/w19).
@@ -288,7 +280,7 @@ struct VsOut {
 #ifdef VERTEX_COLOR_AVAILABLE
   @location(14) color : vec4<f32>,
 #endif
-  @location(6) ndc : vec3<f32>,  // NDC for HDRP cluster lookup (w10)
+  @location(6) ndc : vec4<f32>,  // NDC for HDRP cluster lookup; .w = transmission basis tail
   // feat-20260609-hdrp-cluster-fragment-ggx M4.5-followup: view-space z is
   // needed by ndc_position_to_cluster (slice index uses log-z mapping that
   // takes negative view_z, NOT NDC z which is [0,1]). Earlier `in.ndc.z`
@@ -297,6 +289,9 @@ struct VsOut {
   // hot zone -- received zero light. Forward view_z explicitly. M5 / w19:
   // also feeds CSM cascade selection in evalDirectional.
   @location(7) viewZ : f32,
+#ifdef TRANSMISSION_AVAILABLE
+  @location(15) @interpolate(flat) transmissionBasis1 : vec4<f32>,
+#endif
 };
 
 fn pick_channel(rgba : vec4<f32>, channelIndex : u32) -> f32 {
@@ -358,6 +353,20 @@ fn vs_main(in : VsIn, @builtin(instance_index) idx : u32) -> VsOut {
   // (w=0); .w handedness preserved for bitangent reconstruction in fragment.
   let worldTangentXyz = normalize((entityWorld * instanceLocal * vec4<f32>(in.tangent.xyz, 0.0)).xyz);
   out.worldTangent = vec4<f32>(worldTangentXyz, in.tangent.w);
+#ifdef TRANSMISSION_AVAILABLE
+  out.transmissionBasis0 = vec4<f32>(
+    localToWorld[0].x,
+    localToWorld[0].y,
+    localToWorld[0].z,
+    localToWorld[1].x,
+  );
+  out.transmissionBasis1 = vec4<f32>(
+    localToWorld[1].y,
+    localToWorld[1].z,
+    localToWorld[2].x,
+    localToWorld[2].y,
+  );
+#endif
   out.uv = in.uv;
   out.uv1 = in.uv1;
   out.uv2 = in.uv2;
@@ -369,7 +378,6 @@ fn vs_main(in : VsIn, @builtin(instance_index) idx : u32) -> VsOut {
 #ifdef VERTEX_COLOR_AVAILABLE
   out.color = in.color;
 #endif
-  out.instanceIdx = idx;
   // feat-20260613-csm-cascaded-shadow-maps M5 / w19: the per-fragment
   // light-space position varying is gone; evalDirectional computes
   // per-cascade lightViewProj * worldPos in the fragment stage from
@@ -377,12 +385,14 @@ fn vs_main(in : VsIn, @builtin(instance_index) idx : u32) -> VsOut {
   // NDC for HDRP cluster lookup (feat-20260609-hdrp-cluster-fragment-ggx M2 / w10).
   // Perspective divide on clip-space position; ndc.z retains depth-buffer value.
   let clipPos = out.clip;
-  out.ndc = vec3(clipPos.xy / clipPos.w, clipPos.z / clipPos.w);
+  out.ndc = vec4(clipPos.xy / clipPos.w, clipPos.z / clipPos.w, localToWorld[2].z);
   // Standard WebGPU/GL perspective projection has clip.w = -view.z, so
   // view_z = -clip.w (negative in front of the camera). M4.5-followup:
   // ndc_position_to_cluster needs this for log-z slice mapping; passing
   // ndc.z (in [0,1]) instead made every fragment land in slice 0.
-  out.viewZ = -clipPos.w;
+  // Keep the cluster depth exactly aligned with the CPU binner for both
+  // perspective and off-axis orthographic projections.
+  out.viewZ = sceneViewZ(clipPos, view.temporalProjection);
   return out;
 }
 
@@ -587,12 +597,26 @@ fn fs_main(in : VsOut) -> @location(0) vec4<f32> {
   // shadow-map PCF lookup (CSM, feat-20260613).
   let kD = (vec3<f32>(1.0) - f_schlick(max(dot(n, v), 0.0), f0)) * (1.0 - metallic);
   let iblRoughness = clamp(max(finiteScalar(material.roughness, 0.5), 0.04) * roughnessTex, 0.04, 1.0);
-  let irradiance = sampleIblDiffuse(n, skylight.rotation, irradianceMap, irradianceSampler);
-  let specularIbl = sampleIblSpecular(
-    n, v, iblRoughness, f0,
-    skylight.rotation,
-    prefilterMap, prefilterSampler, brdfLut, brdfLutSampler,
-  );
+  var irradiance = vec3<f32>(0.0);
+  var specularIbl = vec3<f32>(0.0);
+  if (skylight.intensity < 0.0) {
+    // A negative intensity is the renderer-owned probe sentinel. The four
+    // color/rotation lanes carry probe center and half extents in this mode;
+    // Skylight resources remain unchanged and therefore preserve the ABI.
+    specularIbl = sampleReflectionProbeSpecular(
+      n, v, iblRoughness, f0, in.worldPos,
+      vec3<f32>(skylight.colorR, skylight.colorG, skylight.colorB),
+      skylight.rotation.xyz, vec4<f32>(0.0, 0.0, 0.0, 1.0),
+      prefilterMap, prefilterSampler, brdfLut, brdfLutSampler,
+    );
+  } else {
+    irradiance = sampleIblDiffuse(n, skylight.rotation, irradianceMap, irradianceSampler);
+    specularIbl = sampleIblSpecular(
+      n, v, iblRoughness, f0,
+      skylight.rotation,
+      prefilterMap, prefilterSampler, brdfLut, brdfLutSampler,
+    );
+  }
   let occlusionUv = transformedMaterialUv(material.occlusionTextureCoordinatesTransform, material.occlusionTextureCoordinatesMetadata, in);
   let aoSample = sampleMaterialTexture(occlusionTexture, occlusionSampler, occlusionUv, material.occlusionTextureCoordinatesMetadata.zw);
   let ao = mix(1.0, aoSample.r, material.occlusionStrength);
@@ -609,7 +633,11 @@ fn fs_main(in : VsOut) -> @location(0) vec4<f32> {
     );
     ambient = ambient + clearcoatIbl * material.clearcoat;
   }
-  ambient = ambient * skyColor * skylight.intensity * ao;
+  if (skylight.intensity < 0.0) {
+    ambient = ambient * (-skylight.intensity) * ao;
+  } else {
+    ambient = ambient * skyColor * skylight.intensity * ao;
+  }
 #ifdef CLUSTER_FORWARD_AVAILABLE
   // feat-20260612-hdrp-ssao M2 round-1 + M7 round-2 (plan-strategy D-7 + D-B + D-C):
   // SSAO ambient synthesis. Reads the half-res R8 `ssaoBlurredTexture` from
@@ -636,10 +664,17 @@ fn fs_main(in : VsOut) -> @location(0) vec4<f32> {
   // the fragment stage preserves that contract and keeps thickness in the
   // glTF unit-scale mesh space before measuring the refracted segment in world
   // metres.
-  let localToWorld = meshes[0].worldFromLocal * instances[in.instanceIdx].localFromInstance;
-  let localToWorld0 = localToWorld[0].xyz;
-  let localToWorld1 = localToWorld[1].xyz;
-  let localToWorld2 = localToWorld[2].xyz;
+  let localToWorld0 = in.transmissionBasis0.xyz;
+  let localToWorld1 = vec3<f32>(
+    in.transmissionBasis0.w,
+    in.transmissionBasis1.x,
+    in.transmissionBasis1.y,
+  );
+  let localToWorld2 = vec3<f32>(
+    in.transmissionBasis1.z,
+    in.transmissionBasis1.w,
+    in.ndc.w,
+  );
   let inverseCofactor0 = cross(localToWorld1, localToWorld2);
   let inverseCofactor1 = cross(localToWorld2, localToWorld0);
   let inverseCofactor2 = cross(localToWorld0, localToWorld1);
@@ -723,121 +758,13 @@ fn fs_main(in : VsOut) -> @location(0) vec4<f32> {
 #ifdef CLUSTER_FORWARD_AVAILABLE
   // NDC from vertex shader (perspective-divided clip-space, interpolated).
   // view_z: NDC depth for cluster Z-slice lookup.
-  color = color + evaluate_cluster_lights(in.ndc, in.viewZ, in.worldPos, n, v, diffuseAlbedo, metallic, a, f0);
+  color = color + evaluateStandardClusterLights(
+    in.ndc.xyz, in.viewZ, in.worldPos, n, v, diffuseAlbedo, metallic, a, f0, false,
+  );
   if (material.clearcoat != 0.0) {
-    color = color + material.clearcoat * evaluate_cluster_lights(
-      in.ndc, in.viewZ, in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-    );
-  }
-#else
-  let pointCount = pointLightsBuffer.count;
-  for (var i: u32 = 0u; i < pointCount; i = i + 1u) {
-    let p = pointLightsBuffer.slots[i];
-#ifdef POINT_SHADOW_AVAILABLE
-    // feat-20260612-point-light-shadows-urp-hdrp Round-2 F-1: gate between
-    // shadowed and unshadowed evaluation on the host-assigned
-    // shadowAtlasLayer (>= 0 means PointLightShadow companion exists; -1
-    // sentinel means no shadow). shadowParams[layer] = (near, far,
-    // 1/(far-near), 0) is bound at @group(0) @binding(6) (shadowParams
-    // declared in common.wgsl).
-    if (p.shadowAtlasLayer >= 0) {
-      let lane = shadowParams[p.shadowAtlasLayer];
-      color = color + evalPointShadowed(
-        p.position, p.colorTimesIntensity, p.invRangeSquared,
-        in.worldPos, n, v, diffuseAlbedo, metallic, a, f0,
-        p.shadowAtlasLayer, lane.x, lane.y, 0.005, 0.05,
-      );
-      if (material.clearcoat != 0.0) {
-        color = color + material.clearcoat * evalPointShadowed(
-          p.position, p.colorTimesIntensity, p.invRangeSquared,
-          in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-          p.shadowAtlasLayer, lane.x, lane.y, 0.005, 0.05,
-        );
-      }
-    } else {
-      color = color + evalPoint(
-        p.position, p.colorTimesIntensity, p.invRangeSquared,
-        in.worldPos, n, v, diffuseAlbedo, metallic, a, f0,
-      );
-      if (material.clearcoat != 0.0) {
-        color = color + material.clearcoat * evalPoint(
-          p.position, p.colorTimesIntensity, p.invRangeSquared,
-          in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-        );
-      }
-    }
-#else
-    color = color + evalPoint(
-      p.position, p.colorTimesIntensity, p.invRangeSquared,
-      in.worldPos, n, v, diffuseAlbedo, metallic, a, f0,
-    );
-    if (material.clearcoat != 0.0) {
-      color = color + material.clearcoat * evalPoint(
-        p.position, p.colorTimesIntensity, p.invRangeSquared,
-        in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-      );
-    }
-#endif
-  }
-  let spotCount = spotLightsBuffer.count;
-  // Surface and volume consume the same projectSpotUv / projectorRevision
-  // tuple; an accepted projector is sampled with textureSampleLevel.
-  const PROJECTOR_ONLY_TILE : i32 = -2;
-  for (var i: u32 = 0u; i < spotCount; i = i + 1u) {
-    let s = spotLightsBuffer.slots[i];
-    // feat-20260625-spot-light-shadow-mapping M3 / w15 (plan-strategy D-1
-    // fragment side + D-3 + D-4): gate on the host-assigned shadowAtlasTile
-    // (>= 0 means a spot atlas tile was allocated; -1 sentinel means no
-    // shadow / clipped / direction-degenerate). The shadowed path reads the
-    // per-spot perspective matrix from the View UBO `view.spotLightViewProj`
-    // array (lane N = shadowAtlasTile N; folded from the standalone binding 9
-    // into the View UBO in feat-20260625 w25 for WebGL2 uniform-buffer budget);
-    // the unshadowed path stays on evalSpot. Receiver controls come from the
-    // same packed SpotLight snapshot used by the volume path.
-    if (s.shadowAtlasTile >= 0) {
-      let projector = sampleSpotProjector(view.spotLightViewProj[s.shadowAtlasTile], in.worldPos);
-      color = color + evalSpotShadowed(
-        s.position, s.direction, s.colorTimesIntensity,
-        s.cosInner, s.cosOuter, s.invRangeSquared,
-        in.worldPos, n, v, albedo, metallic, a, f0,
-        view.spotLightViewProj[s.shadowAtlasTile], s.shadowAtlasTile, s.depthBias, s.normalBias, s.pcfKernelSize, s.shadowIntensity,
-      ) * projector;
-      if (material.clearcoat != 0.0) {
-        color = color + material.clearcoat * evalSpotShadowed(
-          s.position, s.direction, s.colorTimesIntensity,
-          s.cosInner, s.cosOuter, s.invRangeSquared,
-          in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-          view.spotLightViewProj[s.shadowAtlasTile], s.shadowAtlasTile, s.depthBias, s.normalBias, s.pcfKernelSize, s.shadowIntensity,
-        ) * projector;
-      }
-    } else if (s.shadowAtlasTile == PROJECTOR_ONLY_TILE) {
-      let projector = sampleSpotProjector(view.spotLightViewProj[0], in.worldPos);
-      color = color + evalSpot(
-        s.position, s.direction, s.colorTimesIntensity,
-        s.cosInner, s.cosOuter, s.invRangeSquared,
-        in.worldPos, n, v, albedo, metallic, a, f0,
-      ) * projector;
-      if (material.clearcoat != 0.0) {
-        color = color + material.clearcoat * evalSpot(
-          s.position, s.direction, s.colorTimesIntensity,
-          s.cosInner, s.cosOuter, s.invRangeSquared,
-          in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-        ) * projector;
-      }
-    } else {
-    color = color + evalSpot(
-        s.position, s.direction, s.colorTimesIntensity,
-        s.cosInner, s.cosOuter, s.invRangeSquared,
-        in.worldPos, n, v, diffuseAlbedo, metallic, a, f0,
+    color = color + material.clearcoat * evaluateStandardClusterLights(
+      in.ndc.xyz, in.viewZ, in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04), false,
     );
-    if (material.clearcoat != 0.0) {
-      color = color + material.clearcoat * evalSpot(
-        s.position, s.direction, s.colorTimesIntensity,
-        s.cosInner, s.cosOuter, s.invRangeSquared,
-        in.worldPos, n, v, vec3<f32>(0.0), 1.0, coatAlpha, vec3<f32>(0.04),
-      );
-    }
-    }
   }
 #endif // CLUSTER_FORWARD_AVAILABLE
   let emissiveUv = transformedMaterialUv(material.emissiveTextureCoordinatesTransform, material.emissiveTextureCoordinatesMetadata, in);
@@ -931,6 +858,7 @@ struct TemporalVsOut {
   @location(7) uv7 : vec2<f32>,
   @location(8) @interpolate(perspective) currentClip : vec4<f32>,
   @location(9) @interpolate(perspective) previousClip : vec4<f32>,
+  @location(10) @interpolate(flat) reactive : f32,
 #ifdef VERTEX_COLOR_AVAILABLE
   @location(14) color : vec4<f32>,
 #endif
@@ -949,6 +877,11 @@ fn vs_temporal(in : VsIn, @builtin(instance_index) idx : u32) -> TemporalVsOut {
   out.currentClip = view.temporalCurrentViewProj * currentWorld;
   out.clip = out.currentClip;
   out.previousClip = view.temporalPreviousViewProj * previousWorld;
+#if STORAGE_BUFFER_AVAILABLE == true
+  out.reactive = meshes[0].temporal.x;
+#else
+  out.reactive = 1.0;
+#endif
   out.uv = in.uv;
   out.uv1 = in.uv1;
   out.uv2 = in.uv2;
@@ -973,10 +906,6 @@ fn temporalVertexAlpha(in : TemporalVsOut) -> f32 {
 
 @fragment
 fn fs_temporal(in : TemporalVsOut) -> @location(0) vec4<f32> {
-  var reactive = 0.0;
-#if STORAGE_BUFFER_AVAILABLE == true
-  reactive = meshes[0].temporal.x;
-#endif
   return projectPbrSceneTemporal(
     material.baseColor.a * temporalVertexAlpha(in),
     material.alphaCutoff,
@@ -987,7 +916,7 @@ fn fs_temporal(in : TemporalVsOut) -> @location(0) vec4<f32> {
     in.currentClip,
     in.previousClip,
     view.temporalProjection,
-    reactive,
+    in.reactive,
     in.uv, in.uv1, in.uv2, in.uv3,
     in.uv4, in.uv5, in.uv6, in.uv7,
   );