@woosh/meep-engine 3.10.0 → 3.11.1

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":"AAqPA,oEAIG;8BAhP2B,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":"AAgQA,oEAIG;8BA3P2B,4BAA4B"}

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

@@ -19,6 +19,7 @@ import { chunk_directional_lights_iteration_mask } from "../shader/chunk/light/i
 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 { chunk_calculate_multiscattering } from "./chunk_calculate_multiscattering.js";
+import { chunk_camera_ray_planar_depth_scale } from "./chunk_camera_ray_planar_depth_scale.js";
 import { PARTICIPATING_MEDIA_VOLUME_STRUCT } from "./PARTICIPATING_MEDIA_VOLUME_STRUCT.js";
 import { SCENE_VOLUMETRICS_METADATA_STRUCT } from "./SCENE_VOLUMETRICS_METADATA_STRUCT.js";
 
@@ -145,6 +146,14 @@ fn main(
     var inScatter = vec3<f32>(0.0);
     var throughput = vec3<f32>(1.0);
 
+    // Every t below is a PLANAR view-space depth off the froxel curve, but the loop uses their
+    // difference as a segment length in Beer's law and walks them along a unit ray to place world
+    // positions. Both want arc length, which is longer by 1/cos(theta). Uncorrected, the optical
+    // path is under-integrated by cos(theta) and fog thins toward the frame edges.
+    //
+    // Constant for the whole column, so this is one reciprocal per invocation rather than per slice.
+    let depth_to_distance = camera_ray_planar_depth_scale(view_ray.direction, camera);
+
     // start at the near plane
     var t_prev = camera_near_far.x;
 
@@ -154,7 +163,7 @@ fn main(
 
     // in-scatter (.rgb) and the TAA-accumulated mono extinction coefficient (.a) now share the
     // volume-lighting texture, so a single sample provides both.
-    let vl_start = far_sample_lighting(camera_near_far.x, uvw_start, view_ray.origin + view_ray.direction * camera_near_far.x, view_ray.direction);
+    let vl_start = far_sample_lighting(camera_near_far.x, uvw_start, view_ray.origin + view_ray.direction * (camera_near_far.x * depth_to_distance), view_ray.direction);
     var light_prev = vl_start.rgb;
     var extinction_prev = vl_start.a;
 
@@ -187,12 +196,13 @@ fn main(
             f32(resolution.z)
         ));
 
-        let dt = max(0.0, t_next - t_prev);
+        // planar depth difference -> arc length along the view ray (C-01b)
+        let dt = max(0.0, t_next - t_prev) * depth_to_distance;
 
         // 2. Fetch "Next" Value (The end of this segment)
         let uvw_next = vec3<f32>(tile_uv, next_index_dithered / f32(resolution.z));
 
-        let world_pos_next = view_ray.origin + view_ray.direction * t_next;
+        let world_pos_next = view_ray.origin + view_ray.direction * (t_next * depth_to_distance);
         let vl_next = far_sample_lighting(t_next, uvw_next, world_pos_next, view_ray.direction);
         let media_extinction = vl_next.a;
         let light_next = vl_next.rgb;
@@ -236,6 +246,7 @@ fn main(
         chunk_cluster_depth_to_z_slice,
         chunk_stbn_sample_vec3,
         chunk_camera_ray_from_uv,
+        chunk_camera_ray_planar_depth_scale,
         chunk_directional_lights_iteration_mask,
         chunk_get_directional_light_info_by_index,
         chunk_sky_lut_compute_uv,

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

@@ -1 +1 @@
-{"version":3,"file":"volumetrics_position_world_to_froxel_uvw.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/volumetrics_position_world_to_froxel_uvw.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,uDAFU,SAAS,CA8BlB;0BAnCyB,iCAAiC"}
+{"version":3,"file":"volumetrics_position_world_to_froxel_uvw.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/volumetrics_position_world_to_froxel_uvw.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,uDAFU,SAAS,CAyClB;0BA/CyB,iCAAiC"}

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

@@ -1,37 +1,49 @@
-import { chunk_ndc_to_uv } from "../shader/chunk/texture/chunk_ndc_to_uv.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-
-/**
- * NOTE: we don't clamp final slice coordinate, this is intentional, we let the linear texture sampler take care of that.
- * See {@link build_light_cluster_parameters}
- * @type {CodeChunk}
- */
-export const volumetrics_position_world_to_froxel_uvw = CodeChunk.from(
-    //language=WGSL
-    `
-fn volumetrics_position_world_to_froxel_uvw(
-    position_ws: vec3<f32>
-) -> vec3<f32>{
-
-    let position_vs = camera.view_matrix * vec4(position_ws, 1.0);
-    let position_clip = camera.projection_matrix * position_vs;
-    
-    let uv = ndc_to_uv(position_clip.xy / position_clip.w);
- 
-    let view_depth = -position_vs.z;
-    let cluster_parameters = volumetrics_metadata.cluster_parameters;
-    
-    // see 'cluster_depth_to_z_slice' for explanation
-    let slice_position:f32 = log2(fma(view_depth, cluster_parameters.x, cluster_parameters.y)) * cluster_parameters.z;
-    
-    let w = (slice_position + 0.5) / f32(volumetrics_metadata.resolution.z);
-    
-    return vec3(
-        uv,
-        w
-    );
-}
-    `, [
-        chunk_ndc_to_uv,
-    ]
+import { chunk_ndc_to_uv } from "../shader/chunk/texture/chunk_ndc_to_uv.js";
+import { CodeChunk } from "../shader/compiler/CodeChunk.js";
+import { chunk_volumetrics_froxel_content_offset } from "./chunk_volumetrics_froxel_content_offset.js";
+
+/**
+ * NOTE: we don't clamp final slice coordinate, this is intentional, we let the linear texture sampler take care of that.
+ * See {@link build_light_cluster_parameters}
+ * @type {CodeChunk}
+ */
+export const volumetrics_position_world_to_froxel_uvw = CodeChunk.from(
+    //language=WGSL
+    `
+fn volumetrics_position_world_to_froxel_uvw(
+    position_ws: vec3<f32>
+) -> vec3<f32>{
+
+    let position_vs = camera.view_matrix * vec4(position_ws, 1.0);
+    let position_clip = camera.projection_matrix * position_vs;
+    
+    let uv = ndc_to_uv(position_clip.xy / position_clip.w);
+ 
+    let view_depth = -position_vs.z;
+
+    // froxel_cluster_parameters, NOT cluster_parameters: this addresses the FROXEL grid, which the
+    // participating-media pass builds on that curve. cluster_parameters is the aerial LUT's. The
+    // two are identical while froxel_far is unset — which is why the mix-up went unnoticed — and
+    // diverge as soon as the grid is packed into a shorter range.
+    let cluster_parameters = volumetrics_metadata.froxel_cluster_parameters;
+
+    // see 'cluster_depth_to_z_slice' for explanation
+    let slice_position:f32 = log2(fma(view_depth, cluster_parameters.x, cluster_parameters.y)) * cluster_parameters.z;
+
+    // A cell-averaged grid: texel k holds the slab [k+j, k+1+j], not the point at slice k, so the
+    // texel-centre convention alone reads about half a froxel too far out. See
+    // chunk_volumetrics_froxel_content_offset for where the ~0.53 comes from.
+    let content_offset = volumetrics_froxel_content_offset(cluster_parameters.z);
+
+    let w = (slice_position + 0.5 - content_offset) / f32(volumetrics_metadata.resolution.z);
+    
+    return vec3(
+        uv,
+        w
+    );
+}
+    `, [
+        chunk_ndc_to_uv,
+        chunk_volumetrics_froxel_content_offset,
+    ]
 )

package/src/engine/save/GameStateLoader.d.ts

@@ -1,49 +0,0 @@
-export default GameStateLoader;
-declare class GameStateLoader extends EnginePlugin {
-    /**
-     *
-     * @type {Storage}
-     */
-    storage: Storage;
-    startup(): Promise<void>;
-    save(name: any, resolve: any, reject: any, progress: any): void;
-    /**
-     * @deprecated
-     * @param {string} name
-     * @param {function} resolve
-     * @param {function} reject
-     * @param {function} progress
-     */
-    legacyLoad(name: string, resolve: Function, reject: Function, progress: Function): void;
-    /**
-     * @deprecated
-     * @param name
-     * @param resolve
-     * @param reject
-     */
-    legacyExists(name: any, resolve: any, reject: any): void;
-    /**
-     *
-     * @param {string} name
-     * @param {function(ArrayBuffer)} resolve
-     * @param {(reason: *) => void} reject
-     * @param {function(number)} [progress]
-     */
-    load(name: string, resolve: (arg0: ArrayBuffer) => any, reject: (reason: any) => void, progress?: (arg0: number) => any): void;
-    /**
-     *
-     * @param {string} name
-     * @param {function(number)} resolve
-     * @param {function} reject
-     */
-    count(name: string, resolve: (arg0: number) => any, reject: Function): void;
-    /**
-     *
-     * @param {string} name
-     * @param {function(boolean)} resolve
-     * @param {function} reject
-     */
-    exists(name: string, resolve: (arg0: boolean) => any, reject: Function): void;
-}
-import { EnginePlugin } from "../plugin/EnginePlugin.js";
-//# sourceMappingURL=GameStateLoader.d.ts.map

package/src/engine/save/GameStateLoader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"GameStateLoader.d.ts","sourceRoot":"","sources":["../../../../src/engine/save/GameStateLoader.js"],"names":[],"mappings":";AAIA;IAII;;;OAGG;IACH,SAFU,OAAO,CAEF;IAEf,yBAEC;IAED,gEAeC;IAED;;;;;;OAMG;IACH,iBALW,MAAM,iEAShB;IAED;;;;;OAKG;IACH,yDAIC;IAED;;;;;;OAMG;IACH,WALW,MAAM,kBACG,WAAW,mCACL,IAAI,oBACV,MAAM,gBA6CzB;IAED;;;;;OAKG;IACH,YAJW,MAAM,kBACG,MAAM,kCAoBzB;IAED;;;;;OAKG;IACH,aAJW,MAAM,kBACG,OAAO,kCAwB1B;CACJ;6BAnK4B,2BAA2B"}

package/src/engine/save/GameStateLoader.js

@@ -1,168 +0,0 @@
-import { GameSaveStateMetadata } from "../../../../view/game/save/GameSaveStateMetadata.js";
-import { array_pick_best_element } from "../../core/collection/array/array_pick_best_element.js";
-import { EnginePlugin } from "../plugin/EnginePlugin.js";
-
-class GameStateLoader extends EnginePlugin {
-
-    id = 'game-state-loader';
-
-    /**
-     *
-     * @type {Storage}
-     */
-    storage = null;
-
-    async startup() {
-        this.storage = this.engine.storage;
-    }
-
-    save(name, resolve, reject, progress) {
-        const engine = this.engine;
-
-        const currentScene = engine.sceneManager.current_scene;
-
-
-        /**
-         *
-         * @type {GameSaveStateManager}
-         */
-        const gameSaves = engine.plugins.getById('game-save-state-manager');
-
-        const saveComplete = gameSaves.store({ scene: currentScene, name });
-        saveComplete.then(resolve, reject);
-
-    }
-
-    /**
-     * @deprecated
-     * @param {string} name
-     * @param {function} resolve
-     * @param {function} reject
-     * @param {function} progress
-     */
-    legacyLoad(name, resolve, reject, progress) {
-        console.warn('legacyLoad', name);
-
-        this.storage.loadBinary(name, resolve, reject, progress);
-    }
-
-    /**
-     * @deprecated
-     * @param name
-     * @param resolve
-     * @param reject
-     */
-    legacyExists(name, resolve, reject) {
-        console.warn('legacyExists', name);
-
-        this.storage.contains(name, resolve, reject);
-    }
-
-    /**
-     *
-     * @param {string} name
-     * @param {function(ArrayBuffer)} resolve
-     * @param {(reason: *) => void} reject
-     * @param {function(number)} [progress]
-     */
-    load(name, resolve, reject, progress) {
-        const engine = this.engine;
-
-
-        /**
-         *
-         * @type {GameSaveStateManager}
-         */
-        const gameSaves = engine.plugins.getById('game-save-state-manager');
-
-        gameSaves.update()
-            .then(() => {
-                /**
-                 *
-                 * @type {Array<GameSaveStateMetadata>}
-                 */
-                const matches = gameSaves.data.filter(m => {
-
-                    if (m.locked) {
-                        return false;
-                    }
-
-                    if (m.name === name) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                });
-
-                //find most recent
-                const mostRecent = array_pick_best_element(matches, m => m.timestamp);
-
-
-                if (mostRecent === undefined) {
-                    //try legacy
-                    return new Promise((lResolve, lReject) => this.legacyLoad(name, lResolve, lReject, progress));
-
-                } else {
-
-                    return gameSaves.loadData(mostRecent.id);
-                }
-
-            }).then(resolve, reject);
-    }
-
-    /**
-     *
-     * @param {string} name
-     * @param {function(number)} resolve
-     * @param {function} reject
-     */
-    count(name, resolve, reject) {
-        const engine = this.engine;
-
-        /**
-         *
-         * @type {GameSaveStateManager}
-         */
-        const gameSaves = engine.plugins.getById('game-save-state-manager');
-
-        gameSaves.update()
-            .then(() => {
-
-                const matches = gameSaves.data.filter(m => m.name === name);
-
-                resolve(matches.length);
-
-            });
-    }
-
-    /**
-     *
-     * @param {string} name
-     * @param {function(boolean)} resolve
-     * @param {function} reject
-     */
-    exists(name, resolve, reject) {
-        const engine = this.engine;
-
-        /**
-         *
-         * @type {GameSaveStateManager}
-         */
-        const gameSaves = engine.plugins.getById('game-save-state-manager');
-
-        gameSaves.update()
-            .then(() => {
-                const exists = gameSaves.data.some(m => !m.locked && (m.name === name));
-
-                if (!exists) {
-                    //try legacy
-                    this.legacyExists(name, resolve, reject);
-                } else {
-                    resolve(exists);
-                }
-
-            }).catch(reject);
-    }
-}
-
-export default GameStateLoader;