@forgeax/engine-shader 0.1.7 → 0.1.20

package/src/common.wgsl

@@ -24,6 +24,9 @@ fn sampleMaterialTexture(
 }
 
 // Shared linear-LDR -> display-sRGB OETF for raw swap-chain storage writes.
+// The high branch deliberately locks Three.js r184's reference literal
+// (`0.41666`) instead of spelling the mathematically exact `1.0 / 2.4`.
+// That literal is part of the byte-level parity contract at 8-bit boundaries.
 // sRGB texture views perform this conversion on attachment writes, but the
 // native output and FXAA passes intentionally target the non-sRGB storage view.
 fn linearToSrgbOetf(color : vec3<f32>) -> vec3<f32> {
@@ -73,8 +76,7 @@ fn linearToSrgbOetf(color : vec3<f32>) -> vec3<f32> {
 //   array fold (feat-20260625 w25) removes the standalone @group(0) binding 9
 //   uniform buffer so the WebGL2 fallback fragment uniform-buffer count returns
 //   to 11 (GLES 3.0 max).
-//   temporal projection facts and Fog payload append after the spot matrix;
-//   total = 960 B.
+//   temporal projection facts append after the spot matrix; total = 960 B.
 //
 // Field order must stay byte-for-byte identical to every prior release
 // (charter P4 consistent abstraction); new fields append at the tail.
@@ -125,19 +127,6 @@ fn linearToSrgbOetf(color : vec3<f32>) -> vec3<f32> {
 // 960 (renderer-factory.ts) and writes the full 240 f32
 // payload (render-system-record.ts). Lane N = the spot with `shadowAtlasTile
 // === N` (cap = 4); `evalSpotShadowed` reads `view.spotLightViewProj[tile]`.
-struct FogViewParams {
-  color         : vec3<f32>,
-  density       : f32,
-  heightFalloff : f32,
-  maxOpacity    : f32,
-};
-
-struct FogRay {
-  origin    : vec3<f32>,
-  direction : vec3<f32>,
-  distance  : f32,
-};
-
 struct View {
   worldViewProj   : mat4x4<f32>,
   lightDir        : vec3<f32>,
@@ -164,7 +153,9 @@ struct View {
   temporalPreviousViewProj : mat4x4<f32>,
   // x = near, y = far, z = 1 for orthographic and 0 for perspective.
   temporalProjection : vec4<f32>,
-  fog                 : FogViewParams,
+  // Accepted camera origin at the previous submitted frame. This occupies
+  // the existing tail padding and keeps temporal reprojection on one SSOT.
+  temporalPreviousCameraPos : vec4<f32>,
 };
 
 // Per-instance mesh slot (feat-20260518-pbr-direct-lighting-mvp M2 / w8.5,
@@ -199,7 +190,7 @@ struct Mesh {
 //             color * intensity so the shader avoids the per-fragment mul)
 //     [   7 ] pad f32 = 0
 //
-//   SpotLight (64 B / 16 floats):
+//   SpotLight (80 B / 20 floats):
 //     [ 0..2 ] position vec3<f32>
 //     [   3 ] invRangeSquared f32
 //     [ 4..6 ] colorTimesIntensity vec3<f32>
@@ -208,9 +199,11 @@ struct Mesh {
 //     [ 8..10] direction vec3<f32> (raw outgoing vector; shader reads
 //             via dot(L, -direction) for cone angle test)
 //     [  11 ] cosOuter f32
-//     [12..14] spotPad vec3<f32> = 0 (std430 vec4-alignment padding)
+//     [12] depthBias f32, [13] normalBias f32, [14] pcfKernelSize f32
 //     [  15 ] shadowAtlasTile i32 (sentinel -1 = unassigned/clipped,
 //             0..3 = spot atlas tile index; feat-20260625 M2/M3 D-4)
+//     [  16 ] shadowIntensity f32 (fraction of sampled shadow to apply)
+//     [17..19] alignment tail padding
 //
 // WGSL std430 alignment audit: vec3<f32> alignof=16 / sizeof=12. The
 // f32 lane wedged immediately after each vec3 fills the 4 B remainder
@@ -218,10 +211,10 @@ struct Mesh {
 // prev.size, this.alignof) - for f32 alignof=4 the round-up is a
 // no-op, so position[3] / color[3] / direction[3] sit at byte
 // offsets 12 / 28 / 44 with zero internal padding). PointLight stays
-// 32 B; SpotLight grows to 64 B (feat-20260625 M2/M3 D-4): the trailing
-// `spotPad: vec3<f32>` + `shadowAtlasTile: i32` form one vec4-aligned block
-// at bytes 48..64, with `shadowAtlasTile` at byte 60. These struct sizes
-// match the host packers (packPointLight 32 B / packSpotLight 64 B) exactly.
+// 32 B; SpotLight grows from 64 B (feat-20260625 M2/M3 D-4) for the three
+// receiver controls plus `shadowAtlasTile: i32`, then to 80 B for the
+// parity-only `shadowIntensity` lane at byte 64. These struct sizes match the
+// host packers (packPointLight 32 B / packSpotLight 80 B) exactly.
 //
 // Header `count: u32` lives in a wrapper struct with the trailing
 // runtime-sized array. Array-of-vec4-aligned-struct alignof = 16, so
@@ -252,19 +245,14 @@ struct SpotLight {
   direction           : vec3<f32>,
   cosOuter            : f32,
   // feat-20260625-spot-light-shadow-mapping M3 / w13 (plan-strategy D-4):
-  // The prior 8-lane (48 B) SpotLight had no spare pad lane (unlike PointLight
-  // which repurposed `pointPadW`), so the clip-signal field needs a fresh
-  // vec4-aligned block. `spotPad` fills bytes 48..60 (host packSpotLight slots
-  // 12..14 stay zero); `shadowAtlasTile` (i32 sentinel, -1 = no shadow /
-  // clipped, 0..3 = spot atlas tile) lands at byte 60 (host slot 15, written
-  // through an Int32Array view). The fragment path gates on
-  // `shadowAtlasTile >= 0` (evalSpotShadowed vs evalSpot). Field names are
-  // unique across the composed module surface so naga_oil writeback
-  // substitution does not collide with prior `pad0` members. (naga_oil
-  // reserves the `__` identifier prefix, so the pad lane is `spotPad`, not
-  // `__pad`.)
-  spotPad             : vec3<f32>,
+  // The trailing vec4 transports receiver controls and the tile identity.
+  // Host packSpotLight writes slots 12..14 from the same snapshot; slot 15 is
+  // the i32 shadow tile sentinel and slot 16 carries shadowIntensity.
+  depthBias           : f32,
+  normalBias          : f32,
+  pcfKernelSize       : f32,
   shadowAtlasTile     : i32,
+  shadowIntensity     : f32,
 };
 
 struct PointLightsArray {
@@ -278,6 +266,7 @@ struct SpotLightsArray {
 };
 
 @group(0) @binding(0) var<uniform> view : View;
+
 #if STORAGE_BUFFER_AVAILABLE == true
 @group(0) @binding(1) var<storage, read> pointLightsBuffer : PointLightsArray;
 @group(0) @binding(2) var<storage, read> spotLightsBuffer  : SpotLightsArray;
@@ -391,7 +380,17 @@ struct ShadowCasterCascade {
 // — folded there in feat-20260625 w25 (scope-amend) to keep the WebGL2 fallback
 // fragment uniform-buffer count <= 11; binding 8 is the last view-BG binding.
 @group(0) @binding(8) var spotShadowMap : texture_depth_2d;
-
+// Optional authored SpotLight projector. Surface and volume bind the same
+// accepted TextureAsset view and linear-clamp sampler; an unprojected spot
+// receives the renderer-owned white fallback. The declaration is capability
+// gated because the complete HDRP PBR view/material ABI reaches the WebGPU
+// minimum of 16 sampled textures without this optional cookie. Devices that
+// cannot expose the 17th sampled texture select the matching white-projector
+// shader variant and omit these resources from the view BGL.
+#ifdef PROJECTOR_AVAILABLE
+@group(0) @binding(11) var projectorTexture : texture_2d<f32>;
+@group(0) @binding(12) var projectorSampler : sampler;
+#endif
 #if STORAGE_BUFFER_AVAILABLE == true
 @group(2) @binding(0) var<storage, read> meshes : array<Mesh>;
 #else
@@ -445,36 +444,6 @@ struct InstanceData {
 #endif
 };
 
-fn sceneTemporalUv(clip : vec4<f32>) -> vec2<f32> {
-  let safeW = select(1e-6, clip.w, abs(clip.w) >= 1e-6);
-  let ndc = clip.xy / safeW;
-  return vec2<f32>(ndc.x * 0.5 + 0.5, 0.5 - ndc.y * 0.5);
-}
-
-fn sceneTemporalViewDepth(clip : vec4<f32>) -> f32 {
-  let perspectiveDepth = max(clip.w, 0.0);
-  let ndcDepth = clip.z / max(abs(clip.w), 1e-6);
-  let orthographicDepth = view.temporalProjection.x +
-    ndcDepth * (view.temporalProjection.y - view.temporalProjection.x);
-  let viewDepth = select(
-    perspectiveDepth,
-    max(orthographicDepth, 0.0),
-    view.temporalProjection.z >= 0.5,
-  );
-  return log2(1.0 + viewDepth);
-}
-
-fn packSceneTemporal(
-  currentClip : vec4<f32>,
-  previousClip : vec4<f32>,
-  reactive : f32,
-) -> vec4<f32> {
-  return vec4<f32>(
-    sceneTemporalUv(currentClip) - sceneTemporalUv(previousClip),
-    sceneTemporalViewDepth(currentClip),
-    clamp(reactive, 0.0, 1.0),
-  );
-}
 #if STORAGE_BUFFER_AVAILABLE == true
 @group(3) @binding(0) var<storage, read> instances : array<InstanceData>;
 #else

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

@@ -1,11 +1,10 @@
-#import forgeax_view::common::{View, FogViewParams, FogRay, Mesh, InstanceData, view, meshes, instances, PointLight, SpotLight, pointLightsBuffer, spotLightsBuffer, shadowMap, shadowSampler, sampleMaterialTexture}
+#import forgeax_view::common::{View, Mesh, InstanceData, view, meshes, instances, PointLight, SpotLight, pointLightsBuffer, spotLightsBuffer, shadowMap, shadowSampler, sampleMaterialTexture}
 #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}
-#import forgeax_view::fog::{apply_fog}
 #ifdef POINT_SHADOW_AVAILABLE
 #import forgeax_pbr::lighting_punctual::{evalPointShadowed}
 #import forgeax_view::common::{shadowParams}
@@ -88,6 +87,11 @@ struct Material {
   clearcoatRoughness : f32,
   specularTint       : vec3<f32>,
   normalScale                   : f32,
+  transmission                  : f32,
+  ior                           : f32,
+  thickness                     : f32,
+  attenuationColor              : vec3<f32>,
+  attenuationDistance           : f32,
   baseColorTextureCoordinatesTransform : vec4<f32>,
   baseColorTextureCoordinatesMetadata : vec4<f32>,
   metallicRoughnessTextureCoordinatesTransform : vec4<f32>,
@@ -100,6 +104,10 @@ struct Material {
   emissiveTextureCoordinatesMetadata : vec4<f32>,
   occlusionTextureCoordinatesTransform : vec4<f32>,
   occlusionTextureCoordinatesMetadata : vec4<f32>,
+  transmissionTextureCoordinatesTransform : vec4<f32>,
+  transmissionTextureCoordinatesMetadata : vec4<f32>,
+  thicknessTextureCoordinatesTransform : vec4<f32>,
+  thicknessTextureCoordinatesMetadata : vec4<f32>,
 };
 
 @group(1) @binding(0) var<uniform> material : Material;
@@ -115,6 +123,10 @@ struct Material {
 @group(1) @binding(10) var emissiveTexture : texture_2d<f32>;
 @group(1) @binding(11) var occlusionSampler : sampler;
 @group(1) @binding(12) var occlusionTexture : texture_2d<f32>;
+@group(1) @binding(13) var transmissionSampler : sampler;
+@group(1) @binding(14) var transmissionTexture : texture_2d<f32>;
+@group(1) @binding(15) var thicknessSampler : sampler;
+@group(1) @binding(16) var thicknessTexture : texture_2d<f32>;
 
 // Preserve filtering reflection for resources passed to the shared sampler.
 fn materialTextureFilteringWitness() {
@@ -124,12 +136,16 @@ fn materialTextureFilteringWitness() {
   let specularTint = specularTintTexture;
   let emissive = emissiveTexture;
   let occlusion = occlusionTexture;
+  let transmission = transmissionTexture;
+  let thickness = thicknessTexture;
   let baseWitness = textureSample(base, baseColorSampler, vec2<f32>(0.0));
   let metallicRoughnessWitness = textureSample(metallicRoughness, metallicRoughnessSampler, vec2<f32>(0.0));
   let normalWitness = textureSample(normal, normalSampler, vec2<f32>(0.0));
   let specularTintWitness = textureSample(specularTint, specularTintSampler, vec2<f32>(0.0));
   let emissiveWitness = textureSample(emissive, emissiveSampler, vec2<f32>(0.0));
   let occlusionWitness = textureSample(occlusion, occlusionSampler, vec2<f32>(0.0));
+  let transmissionWitness = textureSample(transmission, transmissionSampler, vec2<f32>(0.0));
+  let thicknessWitness = textureSample(thickness, thicknessSampler, vec2<f32>(0.0));
 }
 
 struct SkylightUniforms {
@@ -146,13 +162,13 @@ struct SkylightUniforms {
   colorB : f32,
   rotation : vec4<f32>,
 };
-@group(1) @binding(13) var irradianceMap        : texture_cube<f32>;
-@group(1) @binding(14) var irradianceSampler    : sampler;
-@group(1) @binding(15) var prefilterMap         : texture_cube<f32>;
-@group(1) @binding(16) var prefilterSampler     : sampler;
-@group(1) @binding(17) var brdfLut              : texture_2d<f32>;
-@group(1) @binding(18) var brdfLutSampler       : sampler;
-@group(1) @binding(19) var<uniform> skylight    : SkylightUniforms;
+@group(1) @binding(17) var irradianceMap        : texture_cube<f32>;
+@group(1) @binding(18) var irradianceSampler    : sampler;
+@group(1) @binding(19) var prefilterMap         : texture_cube<f32>;
+@group(1) @binding(20) var prefilterSampler     : sampler;
+@group(1) @binding(21) var brdfLut              : texture_2d<f32>;
+@group(1) @binding(22) var brdfLutSampler       : sampler;
+@group(1) @binding(23) var<uniform> skylight    : SkylightUniforms;
 
 #if STORAGE_BUFFER_AVAILABLE == true
 @group(2) @binding(1) var<storage, read> palette : array<mat4x4<f32>>;
@@ -213,22 +229,6 @@ fn pick_channel(rgba : vec4<f32>, channelIndex : u32) -> f32 {
   }
 }
 
-fn applySceneFog(viewParams : View, color : vec3<f32>, alpha : f32, worldPos : vec3<f32>) -> vec4<f32> {
-  var origin = viewParams.cameraPos;
-  var direction = normalize(worldPos - origin);
-  var rayDistance = length(worldPos - origin);
-  if (viewParams.temporalProjection.z >= 0.5) {
-    let nearH = viewParams.inverseViewProj * vec4<f32>(0.0, 0.0, 0.0, 1.0);
-    let farH = viewParams.inverseViewProj * vec4<f32>(0.0, 0.0, 1.0, 1.0);
-    let nearPoint = nearH.xyz / nearH.w;
-    let farPoint = farH.xyz / farH.w;
-    direction = normalize(farPoint - nearPoint);
-    origin = worldPos - direction * dot(worldPos - viewParams.cameraPos, direction);
-    rayDistance = max(dot(worldPos - origin, direction), 0.0);
-  }
-  return apply_fog(viewParams.fog, FogRay(origin, direction, rayDistance), vec4<f32>(color, alpha));
-}
-
 @vertex
 fn vs_main(in : VsIn, @builtin(instance_index) idx : u32) -> VsOut {
   // 4-bone weighted skinning (plan-strategy D-3 / D-3a).
@@ -456,7 +456,7 @@ fn fs_main(in : VsOut) -> @location(0) vec4<f32> {
       );
     }
   }
-  return applySceneFog(view, color, alpha, in.worldPos);
+  return vec4<f32>(color, alpha);
 }
 
 struct TemporalVsOut {
@@ -469,8 +469,8 @@ struct TemporalVsOut {
   @location(5) uv5 : vec2<f32>,
   @location(6) uv6 : vec2<f32>,
   @location(7) uv7 : vec2<f32>,
-  @location(8) @interpolate(linear) currentClip : vec4<f32>,
-  @location(9) @interpolate(linear) previousClip : vec4<f32>,
+  @location(8) @interpolate(perspective) currentClip : vec4<f32>,
+  @location(9) @interpolate(perspective) previousClip : vec4<f32>,
 #ifdef VERTEX_COLOR_AVAILABLE
   @location(14) color : vec4<f32>,
 #endif
@@ -531,6 +531,7 @@ fn fs_temporal(in : TemporalVsOut) -> @location(0) vec4<f32> {
     material.baseColorTextureCoordinatesMetadata,
     in.currentClip,
     in.previousClip,
+    view.temporalProjection,
     reactive,
     in.uv, in.uv1, in.uv2, in.uv3,
     in.uv4, in.uv5, in.uv6, in.uv7,