@woosh/meep-engine 3.17.2 → 3.18.0

package/src/shade/renderer/global_illumination/brick4/gpu/draw/chunk_brick4_sample_specular.js

@@ -0,0 +1,51 @@
+import { chunk_stbn_sample_vec2 } from "../../../../shader/chunk/noise/chunk_stbn_sample_vec2.js";
+import { CodeChunk } from "../../../../shader/compiler/CodeChunk.js";
+import { chunk_brick4_node_by_position } from "./chunk_brick4_node_by_position.js";
+import { chunk_brick4_node_sample_probes_meta } from "./chunk_brick4_node_sample_probes_meta.js";
+import { chunk_brick4_resolve_probe_meta_wrs } from "./chunk_brick4_resolve_probe_meta_wrs.js";
+
+/** GGX-convolved radiance shared by standalone specular and SSR fallback. */
+export const chunk_brick4_sample_specular = CodeChunk.from(
+    //language=WGSL
+    `
+fn brick4_sample_specular(
+    position_ws: vec3f, shading_normal: vec3f, view_direction: vec3f,
+    roughness: f32, coord: vec2u, frame_index: u32,
+) -> vec3f {
+    let alpha = roughness * roughness;
+
+    let reflection_direction = reflect(-view_direction, shading_normal);
+
+    // Mixing the reflection with the normal is more accurate and keeps rough objects from gathering light from behind their tangent plane.
+    // see Sebastien Lagarde https://seblagarde.files.wordpress.com/2015/07/course_notes_moving_frostbite_to_pbr_v32.pdf page 69
+    let sample_vector = normalize( mix( reflection_direction, shading_normal, alpha) );
+
+    let node = brick4_node_by_position(position_ws);
+
+    let probe_meta = brick4_node_sample_probes_meta(
+        node.bounds,
+        position_ws,
+        shading_normal,
+    );
+
+    // TODO re-weigh the probes using GGX pdf
+
+    let sample_noise = stbn_sample_vec2(vec3u(coord, frame_index));
+
+    let spec = brick4_resolve_probe_meta_wrs(
+        node.address,
+        probe_meta,
+        sample_noise,
+        sample_vector,
+        alpha,
+    );
+
+    return spec;
+}
+    `, [
+        chunk_brick4_node_by_position,
+        chunk_brick4_node_sample_probes_meta,
+        chunk_brick4_resolve_probe_meta_wrs,
+        chunk_stbn_sample_vec2,
+    ],
+);

package/src/shade/renderer/global_illumination/brick4/gpu/draw/shader_brick4_specular.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_brick4_specular.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/global_illumination/brick4/gpu/draw/shader_brick4_specular.js"],"names":[],"mappings":"AAsGA,iDAaE;4BAzG0B,mCAAmC"}
+{"version":3,"file":"shader_brick4_specular.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/global_illumination/brick4/gpu/draw/shader_brick4_specular.js"],"names":[],"mappings":"AAwEA,iDAaE;4BA3E0B,mCAAmC"}

package/src/shade/renderer/global_illumination/brick4/gpu/draw/shader_brick4_specular.js

@@ -1,5 +1,5 @@
+import { chunk_brick4_sample_specular } from "./chunk_brick4_sample_specular.js";
 import { CAMERA_UNIFORM_STRUCT } from "../../../../camera/CAMERA_UNIFORM_STRUCT.js";
-import { chunk_stbn_sample_vec2 } from "../../../../shader/chunk/noise/chunk_stbn_sample_vec2.js";
 import { DEPTH_STENCIL_FOREGROUND_ONLY } from "../../../../depth/DEPTH_STENCIL_FOREGROUND_ONLY.js";
 import {
     chunk_project_position_from_depth
@@ -13,9 +13,6 @@ import { ShaderResourceSetDescriptor } from "../../../../shader/resource/ShaderR
 import { ShaderDescriptor } from "../../../../shader/ShaderDescriptor.js";
 import { VIEW_UNIFORM_STRUCT } from "../../../../view/VIEW_UNIFORM_STRUCT.js";
 import { BRICK4_DATA_STRUCT } from "../BRICK4_DATA_STRUCT.js";
-import { chunk_brick4_node_by_position } from "./chunk_brick4_node_by_position.js";
-import { chunk_brick4_node_sample_probes_meta } from "./chunk_brick4_node_sample_probes_meta.js";
-import { chunk_brick4_resolve_probe_meta_wrs } from "./chunk_brick4_resolve_probe_meta_wrs.js";
 
 const resources = new ShaderResourceSetDescriptor();
 
@@ -58,34 +55,10 @@ fn main(
     
     let roughness = decode_g_buffer_roughness(textureLoad(tPBR, i_coord, 0));
     
-    let alpha = roughness * roughness;
-    
-    let reflection_direction = reflect(-view_direction, shading_normal);
-    
-    // Mixing the reflection with the normal is more accurate and keeps rough objects from gathering light from behind their tangent plane.
-    // see Sebastien Lagarde https://seblagarde.files.wordpress.com/2015/07/course_notes_moving_frostbite_to_pbr_v32.pdf page 69
-    let sample_vector = normalize( mix( reflection_direction, shading_normal, alpha) );
-    
-    let node = brick4_node_by_position(position_ws);
-    
-    let probe_meta = brick4_node_sample_probes_meta(
-        node.bounds,
-        position_ws,
-        shading_normal,
+    let spec = brick4_sample_specular(
+        position_ws, shading_normal, view_direction, roughness, i_coord, view.frame_index,
     );
-    
-    // TODO re-weigh the probes using GGX pdf
-    
-    let sample_noise = stbn_sample_vec2(vec3u(i_coord, view.frame_index));
-     
-    let spec = brick4_resolve_probe_meta_wrs(
-        node.address,
-        probe_meta,
-        sample_noise,
-        sample_vector,
-        alpha,
-    );
-    
+
     return  vec4( spec, 1.0 );
 }
     `, [
@@ -93,10 +66,7 @@ fn main(
         chunk_mat4_extract_position,
         chunk_decode_g_buffer_normal,
         chunk_decode_g_buffer_roughness,
-        chunk_brick4_node_by_position,
-        chunk_brick4_node_sample_probes_meta,
-        chunk_brick4_resolve_probe_meta_wrs,
-        chunk_stbn_sample_vec2,
+        chunk_brick4_sample_specular,
     ]
 )