@woosh/meep-engine 3.67.0 → 3.68.0

package/src/shade/renderer/volumetrics/irradiance_clipmap/chunk_irradiance_clipmap_gi_sample.js

@@ -120,3 +120,5 @@ chunk_irradiance_clipmap_gi_sample.add(ShadeIndirectLightingMode.IBL, chunk_irra
 chunk_irradiance_clipmap_gi_sample.add(ShadeIndirectLightingMode.Brick4, chunk_irradiance_clipmap_gi_sample_brick4);
 chunk_irradiance_clipmap_gi_sample.add(ShadeIndirectLightingMode.LPV, chunk_irradiance_clipmap_gi_sample_lpv);
 chunk_irradiance_clipmap_gi_sample.add(ShadeIndirectLightingMode.ProbeClipmap, chunk_irradiance_clipmap_gi_sample_probe_clipmap);
+// the screen probes light only the deferred opaque surfaces: every other reader takes the world-space probes
+chunk_irradiance_clipmap_gi_sample.add(ShadeIndirectLightingMode.ScreenProbes, chunk_irradiance_clipmap_gi_sample_probe_clipmap);

package/src/shade/renderer/volumetrics/shader_volumetrics_build_lighting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_volumetrics_build_lighting.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/shader_volumetrics_build_lighting.js"],"names":[],"mappings":"AA+CA;;;;;;;;;;;;;;;GAeG;AACH,wDAFU,MAAM,EAAE,CAEiD;AAEnE;;;;;GAKG;AACH,gDAFU,MAAM,CAEoC;AA+XpD,8DAIE;8BApb4B,4BAA4B"}
+{"version":3,"file":"shader_volumetrics_build_lighting.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/shader_volumetrics_build_lighting.js"],"names":[],"mappings":"AAgDA;;;;;;;;;;;;;;;GAeG;AACH,wDAFU,MAAM,EAAE,CAEiD;AAEnE;;;;;GAKG;AACH,gDAFU,MAAM,CAEoC;AAgYpD,8DAIE;8BAtb4B,4BAA4B"}

package/src/shade/renderer/volumetrics/shader_volumetrics_build_lighting.js

@@ -1,8 +1,8 @@
 import { vec3f } from "../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
 import { WebGPUArray } from "../shader/type/WebGPUArray.js";
 import { CAMERA_UNIFORM_STRUCT } from "../camera/CAMERA_UNIFORM_STRUCT.js";
-import { chunk_rgb_to_luminance } from "../shader/chunk/color/chunk_rgb_to_luminance.js";
-import { F16_MAX_DEFINITION } from "../shader/chunk/math/F16_MAX_DEFINITION.js";
+import { chunk_rgb_to_luminance } from "../shader/chunk/color/chunk_rgb_to_luminance.js";
+import { F16_MAX_DEFINITION } from "../shader/chunk/math/F16_MAX_DEFINITION.js";
 import { F32_MAX_DEFINITION } from "../shader/chunk/math/F32_MAX_DEFINITION.js";
 import { chunk_stbn_sample_vec3 } from "../shader/chunk/noise/chunk_stbn_sample_vec3.js";
 import { chunk_camera_ray_from_uv } from "../shader/chunk/geometry/ray/chunk_camera_ray_from_uv.js";
@@ -31,7 +31,8 @@ import { chunk_cluster_depth_to_z_slice } from "../light/cluster/chunk_cluster_d
 import { chunk_light_cluster_counts } from "../light/cluster/chunk_light_cluster_counts.js";
 import { chunk_light_cluster_metadata_by_position } from "../light/cluster/chunk_light_cluster_metadata_by_position.js";
 import { LIGHT_CLUSTER_LOOKUP_STRUCT } from "../light/cluster/shader_cluster_assign_lights.js";
-import { chunk_sky_lut_compute_uv } from "../atmosphere/chunk_sky_lut_compute_uv.js";
+import { ATMOSPHERE_PARAMETERS_STRUCT } from "../atmosphere/ATMOSPHERE_PARAMETERS_STRUCT.js";
+import { chunk_sky_lut_compute_uv_for } from "../atmosphere/chunk_sky_lut_compute_uv.js";
 import { chunk_calculate_multiscattering } from "./chunk_calculate_multiscattering.js";
 import { chunk_camera_ray_planar_depth_scale } from "./chunk_camera_ray_planar_depth_scale.js";
 import { chunk_volumetrics_froxel_content_offset } from "./chunk_volumetrics_froxel_content_offset.js";
@@ -77,6 +78,7 @@ const primary_group = resources.createGroup()
     .addUniform("volumetrics_metadata", VOLUMETRICS_METADATA_STRUCT)
     .addUniform("camera", CAMERA_UNIFORM_STRUCT)
     .addUniform("view", VIEW_UNIFORM_STRUCT)
+    .addUniform("atmosphere", ATMOSPHERE_PARAMETERS_STRUCT)
     .addTexture("tSunTransmittance", "float", "2d")
     .addTexture("tMultiScattering", "float", "2d")
     .addSampler("sLinear", "filtering", SAMPLER_LINEAR_UPSCALE)
@@ -240,7 +242,7 @@ fn main(
 
             let sun = get_directional_light_info_by_index(&light_data, directional_index);
 
-            let sun_lut_uv = sky_lut_compute_uv(position_ws, sun.direction, vec2<f32>(textureDimensions(tSunTransmittance)));
+            let sun_lut_uv = sky_lut_compute_uv_for(atmosphere, position_ws, sun.direction, vec2<f32>(textureDimensions(tSunTransmittance)));
 
             let shadow_term = shadowmap_get_directional_light_visibility(
                 &light_data,
@@ -408,21 +410,21 @@ fn main(
     // depth-attenuation of the in-scatter.
     let extinction = extinctionSum / f32(SAMPLE_COUNT);
 
-    // tLighting is rgba16float: any finite f32 value above F16_MAX saturates to +Inf on hardware
-    // store, which then turns into NaN inside the 3D TAA's 27-tap YCoCg neighbourhood variance.
-    let lighting_raw = vec4<f32>(inScattering, extinction);
-    let lighting_finite = (lighting_raw == lighting_raw) & (abs(lighting_raw) < vec4<f32>(F32_MAX));
-    let lighting_storable = select(
-        vec4<f32>(0.0),
-        clamp(lighting_raw, vec4<f32>(0.0), vec4<f32>(F16_MAX)),
-        lighting_finite
-    );
-
+    // tLighting is rgba16float: any finite f32 value above F16_MAX saturates to +Inf on hardware
+    // store, which then turns into NaN inside the 3D TAA's 27-tap YCoCg neighbourhood variance.
+    let lighting_raw = vec4<f32>(inScattering, extinction);
+    let lighting_finite = (lighting_raw == lighting_raw) & (abs(lighting_raw) < vec4<f32>(F32_MAX));
+    let lighting_storable = select(
+        vec4<f32>(0.0),
+        clamp(lighting_raw, vec4<f32>(0.0), vec4<f32>(F16_MAX)),
+        lighting_finite
+    );
+
     textureStore(tLighting, voxel_coord, lighting_storable);
 }
     `, [
-        F16_MAX_DEFINITION,
-        F32_MAX_DEFINITION,
+        F16_MAX_DEFINITION,
+        F32_MAX_DEFINITION,
         chunk_cluster_depth_from_z_slice,
         chunk_cluster_depth_to_z_slice,
         chunk_texel_coordinate_to_uv,
@@ -441,7 +443,7 @@ fn main(
         chunk_get_spot_light_info_by_index,
         chunk_shadowmap_get_light_visibility,
         chunk_volumetrics_local_light_shadow,
-        chunk_sky_lut_compute_uv,
+        chunk_sky_lut_compute_uv_for,
 
         RAY_STRUCT.declaration_chunk,
         chunk_integrate_optical_depth,

package/src/shade/renderer/volumetrics/shader_volumetrics_build_scattering_lut.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_volumetrics_build_scattering_lut.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/shader_volumetrics_build_scattering_lut.js"],"names":[],"mappings":"AAiRA,oEAIG;8BA5Q2B,4BAA4B"}
+{"version":3,"file":"shader_volumetrics_build_scattering_lut.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/shader_volumetrics_build_scattering_lut.js"],"names":[],"mappings":"AAmRA,oEAIG;8BA9Q2B,4BAA4B"}

package/src/shade/renderer/volumetrics/shader_volumetrics_build_scattering_lut.js

@@ -17,7 +17,8 @@ import { WebGPUArray } from "../shader/type/WebGPUArray.js";
 import { chunk_camera_ray_from_uv } from "../shader/chunk/geometry/ray/chunk_camera_ray_from_uv.js";
 import { chunk_directional_lights_iteration_mask } from "../shader/chunk/light/io/chunk_directional_lights_iteration_mask.js";
 import { chunk_get_directional_light_info_by_index } from "../shader/chunk/light/io/chunk_get_directional_light_info_by_index.js";
-import { chunk_sky_lut_compute_uv } from "../atmosphere/chunk_sky_lut_compute_uv.js";
+import { ATMOSPHERE_PARAMETERS_STRUCT } from "../atmosphere/ATMOSPHERE_PARAMETERS_STRUCT.js";
+import { chunk_sky_lut_compute_uv_for } from "../atmosphere/chunk_sky_lut_compute_uv.js";
 import { chunk_calculate_multiscattering } from "./chunk_calculate_multiscattering.js";
 import { chunk_camera_ray_planar_depth_scale } from "./chunk_camera_ray_planar_depth_scale.js";
 import { chunk_participating_media_volumes_iterate } from "./chunk_participating_media_volumes_iterate.js";
@@ -39,6 +40,7 @@ resources.createGroup()
     // the volumes any part of which lies beyond froxel_far, as the split lists them
     .addStorageBuffer("far_field", VOLUMETRICS_MEDIA_VOLUME_LIST)
     .addStorageBuffer("light_data", WebGPUArray.u32)
+    .addUniform("atmosphere", ATMOSPHERE_PARAMETERS_STRUCT)
     .addTexture("tSunTransmittance", "float", "2d")
     .addSampler("sLinear")
     .addStorageTexture("tOutput", "rgba16float", "3d", "write-only");
@@ -115,7 +117,7 @@ fn far_sample_lighting(depth: f32, uvw_grid: vec3<f32>, world_pos: vec3<f32>, ra
 
         let sun = get_directional_light_info_by_index(&light_data, directional_index);
         let u = dot(sun.direction, ray_dir);
-        let sun_lut_uv = sky_lut_compute_uv(world_pos, sun.direction, vec2<f32>(textureDimensions(tSunTransmittance)));
+        let sun_lut_uv = sky_lut_compute_uv_for(atmosphere, world_pos, sun.direction, vec2<f32>(textureDimensions(tSunTransmittance)));
         let transmittance_atmospheric = textureSampleLevel(tSunTransmittance, sLinear, sun_lut_uv, 0.0).rgb;
 
         let ms = calculate_multiscattering(vec3<f32>(0.0), s.scattering, s.extinction, u, s.phase_g, volumetrics_metadata.ms_octave_count, volumetrics_metadata.ms_extinction_decay);
@@ -265,7 +267,7 @@ fn main(
         chunk_camera_ray_planar_depth_scale,
         chunk_directional_lights_iteration_mask,
         chunk_get_directional_light_info_by_index,
-        chunk_sky_lut_compute_uv,
+        chunk_sky_lut_compute_uv_for,
         chunk_calculate_multiscattering,
         chunk_participating_media_volumes_iterate,
     ]

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

@@ -110,3 +110,5 @@ chunk_water_gi.add(ShadeIndirectLightingMode.IBL, chunk_water_gi_ibl);
 chunk_water_gi.add(ShadeIndirectLightingMode.Brick4, chunk_water_gi_brick4);
 chunk_water_gi.add(ShadeIndirectLightingMode.LPV, chunk_water_gi_ibl);
 chunk_water_gi.add(ShadeIndirectLightingMode.ProbeClipmap, chunk_water_gi_probe_clipmap);
+// the screen probes light only the deferred opaque surfaces: every other reader takes the world-space probes
+chunk_water_gi.add(ShadeIndirectLightingMode.ScreenProbes, chunk_water_gi_probe_clipmap);

package/src/shade/renderer/water/query/GPUWaterQueries.d.ts

@@ -24,7 +24,7 @@ export class GPUWaterQueries {
      * @param {PipelineEnquiry} enquiry
      */
     static enquirePipelines(enquiry: PipelineEnquiry): void;
-    static "__#285@#execute"(pass: any, resources: any, context: any): void;
+    static "__#288@#execute"(pass: any, resources: any, context: any): void;
     /**
      * @param {object} options
      * @param {GPUDevice} options.device

package/src/shade/renderer/wind/GPUSceneWind.d.ts

@@ -53,7 +53,7 @@ export class GPUSceneWind {
      * @param {number} capacity
      * @returns {GPUTileAtlas3D}
      */
-    static "__#175@#make_atlas"(device: GPUDevice, content: ArrayLike<number>, capacity: number): GPUTileAtlas3D;
+    static "__#176@#make_atlas"(device: GPUDevice, content: ArrayLike<number>, capacity: number): GPUTileAtlas3D;
     /**
      * @param {GPUDevice} device
      */

package/src/engine/graphics/sh3/path_tracer/make_sky_hosek.d.ts

@@ -1,2 +0,0 @@
-export function make_sky_hosek(sun?: number[], turbidity?: number, overcast?: number, albedo?: number[]): (result: any, result_offset: any, direction: any, direction_offset: any) => void;
-//# sourceMappingURL=make_sky_hosek.d.ts.map

package/src/engine/graphics/sh3/path_tracer/make_sky_hosek.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"make_sky_hosek.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/make_sky_hosek.js"],"names":[],"mappings":"AASA,2LAmCC"}

package/src/engine/graphics/sh3/path_tracer/make_sky_hosek.js

@@ -1,45 +0,0 @@
-import {
-    sky_hosek_compute_irradiance_by_direction,
-    sky_hosek_precompute
-} from "../sky/hosek/sky_hosek_compute_irradiance_by_direction.js";
-import { v3_scale_array } from "../../../../core/geom/vec3/v3_scale_array.js";
-import { v3_normalize_array } from "../../../../core/geom/vec3/v3_normalize_array.js";
-import { array_copy } from "../../../../core/collection/array/array_copy.js";
-import { max2 } from "../../../../core/math/max2.js";
-
-export function make_sky_hosek(sun = [0, 1, 0], turbidity = 1, overcast = 0, albedo = [0, 0, 0]) {
-    const coeffs = new Float32Array(27);
-    const rad = new Float32Array([1, 1, 1]);
-    const sun_position = new Float32Array([sun[0], sun[1], sun[2]]);
-
-    v3_normalize_array(sun_position, 0, sun_position, 0);
-
-    sky_hosek_precompute(coeffs, rad, sun_position, turbidity, albedo, overcast);
-
-    const v3 = [];
-
-    const value_scale = 8e-5;
-
-    return (result, result_offset, direction, direction_offset) => {
-        const d_x = direction[direction_offset];
-        const d_y = direction[direction_offset + 1];
-        const d_z = direction[direction_offset + 2];
-
-        sky_hosek_compute_irradiance_by_direction(
-            v3, coeffs, rad, sun_position,
-            d_x,
-            d_y,
-            d_z,
-        );
-
-        v3_scale_array(v3, 0, v3, 0, value_scale);
-
-        // clamp sky contribution
-        v3[0] = max2(0, v3[0]);
-        v3[1] = max2(0, v3[1]);
-        v3[2] = max2(0, v3[2]);
-
-
-        array_copy(v3, 0, result, result_offset, 3);
-    }
-}

package/src/engine/graphics/sh3/path_tracer/make_sky_rtiw.d.ts

@@ -1,2 +0,0 @@
-export function make_sky_rtiw(): (out: any, out_offset: any, direction: any, direction_offset: any) => void;
-//# sourceMappingURL=make_sky_rtiw.d.ts.map

package/src/engine/graphics/sh3/path_tracer/make_sky_rtiw.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"make_sky_rtiw.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/make_sky_rtiw.js"],"names":[],"mappings":"AAEA,4GAYC"}

package/src/engine/graphics/sh3/path_tracer/make_sky_rtiw.js

@@ -1,17 +0,0 @@
-import { lerp } from "../../../../core/math/lerp.js";
-
-export function make_sky_rtiw() {
-    // see https://raytracing.github.io/books/RayTracingInOneWeekend.html
-
-    return (out, out_offset, direction, direction_offset) => {
-
-        const dir_y = direction[direction_offset + 1];
-        const t = 0.5 * (dir_y + 1);
-
-        out[out_offset] = lerp(0.5, 1, t);
-        out[out_offset + 1] = lerp(0.7, 1, t);
-        out[out_offset + 2] = lerp(1, 1, t);
-    }
-}
-
-

package/src/engine/graphics/sh3/sky/hosek/README.md

@@ -1,4 +0,0 @@
-based on The Hosek Clear Sky model. (From "An Analytic Model for Full Spectral Sky-Dome Radiance", Hosek & Wilkie.)
-
-code is heavily influenced by this implementation:
-https://github.com/andrewwillmott/sun-sky

package/src/engine/graphics/sh3/sky/hosek/data.d.ts

@@ -1,17 +0,0 @@
-/**
- * [albedo][turbidity][quinticCoeffs][coeffs]
- * float kHosekCoeffsX[2][10][6][9]
- * @type {Float32Array}
- */
-export const kHosekCoeffsX: Float32Array;
-/**
- * [albedo][turbidity][quinticCoeffs]
- * float kHosekRadX[2][10][6]
- * @type {Float32Array}
- */
-export const kHosekRadX: Float32Array;
-export const kHosekCoeffsY: Float32Array;
-export const kHosekRadY: Float32Array;
-export const kHosekCoeffsZ: Float32Array;
-export const kHosekRadZ: Float32Array;
-//# sourceMappingURL=data.d.ts.map

package/src/engine/graphics/sh3/sky/hosek/data.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/sky/hosek/data.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,4BAFU,YAAY,CAilCnB;AACH;;;;GAIG;AACH,yBAFU,YAAY,CA+InB;AACH,yCA6kCG;AACH,sCA6IG;AACH,yCA6kCG;AACH,sCA6IG"}