@woosh/meep-engine 3.61.3 → 3.62.0

package/src/shade/renderer/water/shader_water.js

@@ -20,7 +20,8 @@ import { CodeChunk } from "../shader/compiler/CodeChunk.js";
 import {
     SCREEN_DEPTH_RESOURCE,
     SCREEN_HZB_RESOURCE,
-    SCREEN_NORMAL_RESOURCE
+    SCREEN_NORMAL_RESOURCE,
+    SCREEN_PBR_RESOURCE
 } from "../shader/chunk/screen_space/SCREEN_SPACE_RESOURCES.js";
 import { ShaderResourceDescriptor } from "../shader/resource/ShaderResourceDescriptor.js";
 import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
@@ -75,6 +76,7 @@ function water_resources(finalize = false) {
         .add(TRACE_RESOURCE)
         .add(SCREEN_DEPTH_RESOURCE)
         .add(SCREEN_NORMAL_RESOURCE)
+        .add(SCREEN_PBR_RESOURCE)
         .add(SCREEN_HZB_RESOURCE)
         .addTexture("tScene")
         .add(SCENE_DATABASE_RESOURCE)
@@ -383,7 +385,7 @@ fn water_hzb_crossing(origin: vec3f, direction: vec3f, budget: u32,
 fn water_exact_receiver(ray: Ray, input: ScreenSpaceRayHit) -> ScreenSpaceRayHit {
     var hit = input;
     if (hit.status != 0u) { return hit; }
-    let receiver = screen_space_ray_load_receiver(hit.uv, tDepth, tNormal,
+    let receiver = screen_space_ray_load_receiver(hit.uv, tDepth, tPBR,
         camera.projection_matrix_inverse, camera.view_matrix);
     let travel = plane_ray_raycast(ray.origin, ray.direction, receiver.plane);
     // Keep the analytic distance rather than the projection of the texel center onto the ray.
@@ -392,14 +394,14 @@ fn water_exact_receiver(ray: Ray, input: ScreenSpaceRayHit) -> ScreenSpaceRayHit
         hit.uv = project_position(ray_at(ray.origin, ray.direction, travel), camera.projection_matrix).xy;
         // Reprojection can change texel ownership at a silhouette. Validate that lookup
         // again; the analytic travel above already checked the ray's bounded interval.
-        let checked = screen_space_ray_validate(Ray(ray.origin,ray.direction,1e20),hit.uv,tDepth,tNormal,
+        let checked = screen_space_ray_validate(Ray(ray.origin,ray.direction,1e20),hit.uv,tDepth,tPBR,
             camera.projection_matrix,camera.projection_matrix_inverse,camera.view_matrix,trace.distance_tolerance);
         hit.status = checked.status;
         hit.residual = checked.residual;
         // The plane can carry a hit on the last texel before the sky across that edge. The texel the
         // traversal stopped on is still a receiver: accept it where it passes on its own.
         if (checked.status == 2u) {
-            let unsnapped = screen_space_ray_validate(ray, input.uv, tDepth, tNormal, camera.projection_matrix,
+            let unsnapped = screen_space_ray_validate(ray, input.uv, tDepth, tPBR, camera.projection_matrix,
                 camera.projection_matrix_inverse, camera.view_matrix, trace.distance_tolerance);
             if (unsnapped.status == 0u) { hit = unsnapped; }
         }
@@ -431,7 +433,7 @@ fn water_hzb_hit(ray: Ray, budget: u32) -> ScreenSpaceRayHit {
 `, [chunk_screen_space_newton_ray, chunk_ffx_sssr_advance_ray, chunk_ffx_sssr_load_depth, chunk_project_direction,
     chunk_ray_at]);
 
-for (const resource of [CAMERA_RESOURCE, TRACE_RESOURCE, SCREEN_DEPTH_RESOURCE, SCREEN_HZB_RESOURCE, SCREEN_NORMAL_RESOURCE]) {
+for (const resource of [CAMERA_RESOURCE, TRACE_RESOURCE, SCREEN_DEPTH_RESOURCE, SCREEN_HZB_RESOURCE, SCREEN_PBR_RESOURCE]) {
     chunk_water_screen_ray.requireResource(resource);
 }
 
@@ -448,7 +450,7 @@ struct WaterReceiver {
 // A screen-space receiver must lie below the surface point the ray entered at: the refracted ray runs
 // downward from it, so any point on the ray is lower, and one that is not is a root off the ray.
 fn water_receiver_submerged(uv: vec2f, surface: vec3f, normal: vec3f) -> bool {
-    let receiver = water_receiver_texel(tDepth, tNormal, vec2i(uv * vec2f(textureDimensions(tDepth, 0))),
+    let receiver = water_receiver_texel(tDepth, tNormal, tPBR, vec2i(uv * vec2f(textureDimensions(tDepth, 0))),
         camera.projection_matrix_inverse, camera.view_matrix_inverse);
     return dot(receiver.position - surface, normal) <= WATER_LEVEL_TOLERANCE;
 }
@@ -485,7 +487,7 @@ fn fs_main(in: WaterVertexOut, @builtin(front_facing) above: bool) -> WaterRecei
     if (above && trace.mode == 0u) {
         // Mayer et al. §2.2: a root within one pixel of the ray is accepted as is. Like the paper,
         // this can converge past a thin occluder; traversal is only the fallback for failures.
-        hit = screen_space_newton_ray(ray, uv, tDepth, tNormal, camera.projection_matrix,
+        hit = screen_space_newton_ray(ray, uv, tDepth, tPBR, camera.projection_matrix,
             camera.projection_matrix_inverse, camera.view_matrix, trace.max_updates, trace.distance_tolerance);
         newton_updates = hit.iterations;
         newton_failure = hit.status;
@@ -569,7 +571,7 @@ fn fs_main(in: WaterVertexOut, @builtin(front_facing) above: bool) -> WaterOptic
             // vignette validation. Its two-pixel rule must not reject normal-incidence refraction.
             let confidence = ffx_sssr_validate_hit(vec3f(reflected.uv, projected.z), uv,
                 reflection_direction, dimensions, max(trace.distance_tolerance, 0.02), 0.05);
-            let radiance = water_receiver_radiance(tScene, tDepth, tNormal, reflected.uv,
+            let radiance = water_receiver_radiance(tScene, tDepth, tNormal, tPBR, reflected.uv,
                 camera.projection_matrix_inverse, camera.view_matrix_inverse, in.world, interface_normal, false);
             reflection = mix(reflection, radiance.rgb,
                 confidence * min(radiance.a * 2.0, 1.0) * smoothstep(0.05, 0.5, reflected.distance)
@@ -584,14 +586,14 @@ fn fs_main(in: WaterVertexOut, @builtin(front_facing) above: bool) -> WaterOptic
     let lookup = select(uv, receiver_data.xy, valid);
     // The surface height here stands for the one above the displaced receiver: they differ by the
     // wave height across a few metres, against a tolerance the gather already allows.
-    let gathered = water_receiver_radiance(tScene, tDepth, tNormal, lookup,
+    let gathered = water_receiver_radiance(tScene, tDepth, tNormal, tPBR, lookup,
         camera.projection_matrix_inverse, camera.view_matrix_inverse, in.world, interface_normal, above);
     var path = bitcast<f32>(metadata.x);
     var color = original.rgb;
     // the receiver seen through the surface: refracted, or the pixel's own when there is none
     var receiver_coord = coord;
     if (valid && gathered.a > 0.0) {
-        path = min(water_receiver_path(tDepth, tNormal, lookup, camera.projection_matrix_inverse,
+        path = min(water_receiver_path(tDepth, tPBR, lookup, camera.projection_matrix_inverse,
             camera.view_matrix, origin), limit);
         color = gathered.rgb;
         receiver_coord = vec2i(lookup * dimensions);
@@ -600,7 +602,7 @@ fn fs_main(in: WaterVertexOut, @builtin(front_facing) above: bool) -> WaterOptic
     // (WATER_OPTICS_PLAN_2026_10_02.md §4.3). Seen from under the surface, the receiver is above it.
     // Its light is rebuilt on the normal it was shaded with: its triangle's turns at every edge of a
     // tessellated floor, and every edge would show through the water.
-    let receiver_texel = water_receiver_texel(tDepth, tNormal, receiver_coord, camera.projection_matrix_inverse,
+    let receiver_texel = water_receiver_texel(tDepth, tNormal, tPBR, receiver_coord, camera.projection_matrix_inverse,
         camera.view_matrix_inverse);
     if (above && !is_background(receiver_texel.depth)) {
         let camera_ws = camera.view_matrix_inverse[3].xyz;

package/src/shade/renderer/gbuffer/G_BUFFER_MIP_LEVELS.d.ts

@@ -1,7 +0,0 @@
-/**
- * How many mip levels to generate for each buffer
- * Lower resolution versions are used for further rendering passes that work on fractional resolution, such as 1/2 or 1/4
- * @type {number}
- */
-export const G_BUFFER_MIP_LEVELS: number;
-//# sourceMappingURL=G_BUFFER_MIP_LEVELS.d.ts.map

package/src/shade/renderer/gbuffer/G_BUFFER_MIP_LEVELS.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"G_BUFFER_MIP_LEVELS.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/gbuffer/G_BUFFER_MIP_LEVELS.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,kCAFU,MAAM,CAEqB"}

package/src/shade/renderer/gbuffer/G_BUFFER_MIP_LEVELS.js

@@ -1,6 +0,0 @@
-/**
- * How many mip levels to generate for each buffer
- * Lower resolution versions are used for further rendering passes that work on fractional resolution, such as 1/2 or 1/4
- * @type {number}
- */
-export const G_BUFFER_MIP_LEVELS = 5;

package/src/shade/renderer/postprocess/ssr/shader_downsample_encoded_normal.d.ts

@@ -1,3 +0,0 @@
-export const shader_downsample_encoded_normal: ImageShader;
-import { ImageShader } from "../../shader/ImageShader.js";
-//# sourceMappingURL=shader_downsample_encoded_normal.d.ts.map

package/src/shade/renderer/postprocess/ssr/shader_downsample_encoded_normal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shader_downsample_encoded_normal.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/postprocess/ssr/shader_downsample_encoded_normal.js"],"names":[],"mappings":"AA8FA,2DASG;4BA/FyB,6BAA6B"}

package/src/shade/renderer/postprocess/ssr/shader_downsample_encoded_normal.js

@@ -1,104 +0,0 @@
-import { chunk_decode_g_buffer_normal } from "../../shader/chunk/geometry/normal/chunk_decode_g_buffer_normal.js";
-import { chunk_encode_g_buffer_normal } from "../../shader/chunk/geometry/normal/chunk_encode_g_buffer_normal.js";
-import { chunk_texel_coordinate_to_uv } from "../../shader/chunk/texture/chunk_texel_coordinate_to_uv.js";
-import { chunk_uv_to_texel_coordinate } from "../../shader/chunk/texture/chunk_uv_to_texel_coordinate.js";
-import {
-    chunk_texture_sample_bilinear_exact
-} from "../../shader/chunk/texture/sample/chunk_texture_sample_bilinear_exact.js";
-import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
-
-const resources = new ShaderResourceSetDescriptor();
-
-// per-pass, eight bytes, read-only: immediate data rather than a uniform buffer
-resources.setImmediate("output_resolution", "vec2<f32>");
-resources.createGroup()
-    .addTexture("tInput", "uint")
-;
-
-const body = CodeChunk.from(
-    //language=WGSL
-    `
-@fragment
-fn main(
-    @builtin(position) coord: vec4<f32>,
-    @location(0) uv: vec2<f32>,
-) -> @location(0) vec4<u32> {
-    
-    let output_texel_uv_size =  1.0 / output_resolution;
-
-    let input_size_f = vec2<f32>(textureDimensions(tInput,0));
-    
-    // get scale
-    let scale = input_size_f / output_resolution ;
-
-    // sample quad
-    const offsets = array<vec2<u32>,4>(
-        vec2(0,0),
-        vec2(1,0),
-        vec2(0,1),
-        vec2(1,1),
-    ); 
-    
-    // TODO we can potentially skip decoding
-    
-    var direction_sum_0 = vec3();
-    var direction_sum_1 = vec3();
-    
-    for(var i = 0; i < 4; i++){
-        
-        let input_coord = vec2<u32>( coord.xy * scale + offset );
-        
-        if(input_coord >= vec2<u32>(input_size_f)){
-            // outside of the sampling region
-            continue;
-        }
-        
-        // distance to center
-        let input_uv = texel_coordinate_to_uv(input_coord, vec2<u32>(input_size_f)); 
-        
-        let output_coord = uv_to_texel_coordinate(input_uv, vec2<u32>(output_resolution));
-        
-        let distance = distance(output_coord, coord.xy);
-        
-        let texel = textureLoad(
-            tInput,
-            input_coord,
-            0
-        );
-        
-        let normal_0 = decode_g_buffer_normal(texel.xy);
-        let normal_1 = decode_g_buffer_normal(texel.zw);
-         
-        let weight = saturate( 1.7 - distance);
-        
-        direction_sum_0 += normal_0 * weight;
-        direction_sum_1 += normal_1 * weight;
-    }
-    
-    return vec4(
-        encode_g_buffer_normal(normalize(direction_sum_0)),
-        encode_g_buffer_normal(normalize(direction_sum_1)),
-    );
-}
-    `, [
-        chunk_texture_sample_bilinear_exact,
-        chunk_texel_coordinate_to_uv,
-        chunk_uv_to_texel_coordinate,
-        chunk_decode_g_buffer_normal,
-        chunk_encode_g_buffer_normal,
-    ]
-);
-
-export const shader_downsample_encoded_normal = new ImageShader({
-    descriptor: ShaderDescriptor.from({
-        label: "Reduce RGBA octahedral normal",
-        resources,
-        body,
-    }),
-    targets: [{
-        format: "rgba16uint"
-    }]
-});