@woosh/meep-engine 3.50.0 → 3.52.0

package/package.json

@@ -6,7 +6,7 @@
   "description": "Advanced 3D game engine",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "3.50.0",
+  "version": "3.52.0",
   "exports": {
     "./build/*": "./build/*",
     "./src/*": "./src/*",

package/src/engine/graphics3/make_default_environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make_default_environment.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/make_default_environment.js"],"names":[],"mappings":"AA6DA;;;;;;;;;;;GAWG;AACH,4CAFa,YAAY,CAmCxB;6BAlG4B,8CAA8C"}
+{"version":3,"file":"make_default_environment.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/make_default_environment.js"],"names":[],"mappings":"AA8DA;;;;;;;;;;;GAWG;AACH,4CAFa,YAAY,CAwCxB;6BAvG4B,8CAA8C"}

package/src/engine/graphics3/make_default_environment.js

@@ -4,12 +4,13 @@ import { sampler2d_to_f16 } from "../graphics/texture/sampler/sampler2d_to_f16.j
 import {
     octahedral_uv_to_direction
 } from "../../shade/renderer/light/environment/octahedral_uv_to_direction.js";
+import { sampler2d_octahedral_skirt_fill } from "../../shade/renderer/light/environment/sampler2d_octahedral_skirt_fill.js";
 import { ColorSpace } from "../../shade/renderer/texture/ColorSpace.js";
 import { ShadeImage } from "../../shade/renderer/texture/source/ShadeImage.js";
 import { ShadeTexture } from "../../shade/renderer/texture/ShadeTexture.js";
 
 /**
- * Resolution of the generated map, per octahedral face grid.
+ * Side of the generated map, its one-texel octahedral skirt included.
  *
  * Small on purpose. This is an *ambient* source — it is convolved into irradiance and a handful of
  * roughness mips before anything samples it, so detail here buys nothing. What it has to be is
@@ -77,13 +78,16 @@ export function make_default_environment() {
     const data = sampler.data;
     const rgb = [0, 0, 0];
 
-    for (let v = 0; v < RESOLUTION; v++) {
-        for (let u = 0; u < RESOLUTION; u++) {
+    // the octahedral square inside the one-texel skirt an environment map carries
+    const interior = RESOLUTION - 2;
+
+    for (let v = 1; v <= interior; v++) {
+        for (let u = 1; u <= interior; u++) {
             // texel centres, so the mapping is symmetric across the octahedron's folds
             octahedral_uv_to_direction(
                 SCRATCH_DIRECTION,
-                (u + 0.5) / RESOLUTION,
-                (v + 0.5) / RESOLUTION
+                (u - 0.5) / interior,
+                (v - 0.5) / interior
             );
 
             sky_radiance(rgb, SCRATCH_DIRECTION.x, SCRATCH_DIRECTION.y, SCRATCH_DIRECTION.z);
@@ -97,6 +101,8 @@ export function make_default_environment() {
         }
     }
 
+    sampler2d_octahedral_skirt_fill(sampler);
+
     const image = ShadeImage.fromSampler2D(sampler2d_to_f16(sampler));
 
     // radiance, not colour: the values above are light arriving, and treating them as sRGB would

package/src/engine/physics/fluid/ecs/FluidObstacleSystem.d.ts

@@ -66,11 +66,11 @@ export class FluidObstacleSystem extends System<any> {
     /**
      * @param {FluidComponent} fluid
      */
-    static "__#461@#refresh_masks"(fluid: FluidComponent): void;
+    static "__#462@#refresh_masks"(fluid: FluidComponent): void;
     /**
      * @param {FluidComponent} fluid
      */
-    static "__#461@#clear_field"(fluid: FluidComponent): void;
+    static "__#462@#clear_field"(fluid: FluidComponent): void;
     /**
      * Mark every cell of `fluid` whose centre lies within `inflation` of the
      * posed shape as solid. Iteration is clipped to the shape's world AABB
@@ -82,7 +82,7 @@ export class FluidObstacleSystem extends System<any> {
      * @param {number} inflation       world-units SDF threshold
      * @param {Float64Array} point     length-3 scratch
      */
-    static "__#461@#voxelize"(fluid: FluidComponent, posed: PosedShape3D, aabb: Float64Array, inflation: number, point: Float64Array): void;
+    static "__#462@#voxelize"(fluid: FluidComponent, posed: PosedShape3D, aabb: Float64Array, inflation: number, point: Float64Array): void;
     /**
      * Write the obstacle's translation velocity onto every face of every cell
      * it voxelized — the moving-wall boundary condition. Runs AFTER the mask
@@ -102,7 +102,7 @@ export class FluidObstacleSystem extends System<any> {
      * @param {number} wvy
      * @param {number} wvz
      */
-    static "__#461@#stamp_wall_velocity"(fluid: FluidComponent, posed: PosedShape3D, aabb: Float64Array, inflation: number, point: Float64Array, wvx: number, wvy: number, wvz: number): void;
+    static "__#462@#stamp_wall_velocity"(fluid: FluidComponent, posed: PosedShape3D, aabb: Float64Array, inflation: number, point: Float64Array, wvx: number, wvy: number, wvz: number): void;
     constructor();
     dependencies: (typeof FluidObstacle)[];
     components_used: (ResourceAccessSpecification<typeof Transform64> | ResourceAccessSpecification<typeof FluidObstacle> | ResourceAccessSpecification<typeof Collider> | ResourceAccessSpecification<typeof RigidBody> | ResourceAccessSpecification<typeof FluidComponent>)[];

package/src/shade/playground/particle_ecs/moonlit_environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moonlit_environment.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/particle_ecs/moonlit_environment.js"],"names":[],"mappings":"AAyGA;;;;GAIG;AACH,uCAFa,YAAY,CAmCxB;AA9GD;;;;;GAKG;AACH,6BAFU,OAAO,CAEyD;6BAjC7C,wCAAwC;oBANjD,+BAA+B"}
+{"version":3,"file":"moonlit_environment.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/particle_ecs/moonlit_environment.js"],"names":[],"mappings":"AA0GA;;;;GAIG;AACH,uCAFa,YAAY,CAwCxB;AAnHD;;;;;GAKG;AACH,6BAFU,OAAO,CAEyD;6BAjC7C,wCAAwC;oBAPjD,+BAA+B"}

package/src/shade/playground/particle_ecs/moonlit_environment.js

@@ -2,6 +2,7 @@ import Vector3 from "../../../core/geom/Vector3.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 import { sampler2d_to_f16 } from "../../../engine/graphics/texture/sampler/sampler2d_to_f16.js";
 import { octahedral_z_pole_uv_to_direction } from "../../renderer/light/environment/octahedral_z_pole_uv_to_direction.js";
+import { sampler2d_octahedral_skirt_fill } from "../../renderer/light/environment/sampler2d_octahedral_skirt_fill.js";
 import { ColorSpace } from "../../renderer/texture/ColorSpace.js";
 import { ShadeImage } from "../../renderer/texture/source/ShadeImage.js";
 import { ShadeTexture } from "../../renderer/texture/ShadeTexture.js";
@@ -22,7 +23,7 @@ import { ShadeTexture } from "../../renderer/texture/ShadeTexture.js";
  */
 
 /**
- * Resolution per octahedral face grid.
+ * Side of the map, its one-texel octahedral skirt included.
  *
  * Small on purpose: this is an ambient source, convolved into irradiance and a handful of roughness
  * mips before anything samples it. What it has to be is smooth and correctly oriented.
@@ -114,13 +115,16 @@ export function moonlit_environment() {
     const data = sampler.data;
     const rgb = [0, 0, 0];
 
-    for (let v = 0; v < RESOLUTION; v++) {
-        for (let u = 0; u < RESOLUTION; u++) {
+    // the octahedral square inside the one-texel skirt an environment map carries
+    const interior = RESOLUTION - 2;
+
+    for (let v = 1; v <= interior; v++) {
+        for (let u = 1; u <= interior; u++) {
             // texel centres, so the mapping is symmetric across the octahedron's folds
             octahedral_z_pole_uv_to_direction(
                 SCRATCH_DIRECTION,
-                (u + 0.5) / RESOLUTION,
-                (v + 0.5) / RESOLUTION
+                (u - 0.5) / interior,
+                (v - 0.5) / interior
             );
 
             moonlit_radiance(rgb, SCRATCH_DIRECTION.x, SCRATCH_DIRECTION.y, SCRATCH_DIRECTION.z);
@@ -134,6 +138,8 @@ export function moonlit_environment() {
         }
     }
 
+    sampler2d_octahedral_skirt_fill(sampler);
+
     const image = ShadeImage.fromSampler2D(sampler2d_to_f16(sampler));
 
     // radiance, not colour: the values above are light arriving, and treating them as sRGB would

package/src/shade/playground/sh_exponential/sh_exp_playground_shaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sh_exp_playground_shaders.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/sh_exponential/sh_exp_playground_shaders.js"],"names":[],"mappings":"AAaA;;;GAGG;AACH,8BAFU,MAAM,EAAE,CAOhB;AAEF;;;;;;GAMG;AACH,oCAFU,MAAM,CAE0B;AAE1C;;;;;;;;;;;;;GAaG;AACH,qCAFU,YAAY,CAgBI;AAsC1B;;;;;;GAMG;AACH,qDAFU,aAAa,CAuDpB;AAcH;;;;;GAKG;AACH,qCAFU,aAAa,CA4FpB;6BAnQ0B,4CAA4C;8BAJ3C,wCAAwC"}
+{"version":3,"file":"sh_exp_playground_shaders.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/sh_exponential/sh_exp_playground_shaders.js"],"names":[],"mappings":"AAcA;;;GAGG;AACH,8BAFU,MAAM,EAAE,CAOhB;AAEF;;;;;;GAMG;AACH,oCAFU,MAAM,CAE0B;AAE1C;;;;;;;;;;;;;GAaG;AACH,qCAFU,YAAY,CAgBI;AAsC1B;;;;;;GAMG;AACH,qDAFU,aAAa,CAuDpB;AAeH;;;;;GAKG;AACH,qCAFU,aAAa,CA4FpB;6BArQ0B,4CAA4C;8BAJ3C,wCAAwC"}

package/src/shade/playground/sh_exponential/sh_exp_playground_shaders.js

@@ -10,6 +10,7 @@ import { WebGPUArray } from "../../renderer/shader/type/WebGPUArray.js";
 import { f32, u32, vec4f } from "../../renderer/shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
 import { WebGPUStruct } from "../../renderer/shader/type/WebGPUStruct.js";
 import { SAMPLER_LINEAR_UPSCALE } from "../../renderer/texture/SAMPLER_LINEAR_UPSCALE.js";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../../renderer/light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 /**
  * Rows of the sphere grid, top to bottom.
@@ -163,7 +164,8 @@ const view_resources = new ShaderResourceSetDescriptor();
 
 view_resources.createGroup()
     .addUniform("view", PLAYGROUND_VIEW_STRUCT)
-    .addTexture("tEnvironment")
+    .addTexture("tEnvironment", "float")
+    .add(ENVIRONMENT_MAP_SAMPLER_RESOURCE)
     .addTexture("tSplitSum", "float")
     .addSampler("sLinear", "filtering", SAMPLER_LINEAR_UPSCALE)
     .addStorageBuffer("probe", SH_EXP_P4Q2_PROBE_STRUCT, false)

package/src/shade/playground/tonemap_sdr/README.md

@@ -1,12 +1,14 @@
 # Tone mapping: GT7 and PBR Neutral, SDR and HDR
 
-The renderer has three tone mapping modes, each one operator on every output (`ShadeToneMappingMode`):
+The renderer has four tone mapping modes, each one choice for every output (`ShadeToneMappingMode`):
 
-- `GT7`, the default;
+- `ACES`, the default: Unreal Engine's look;
+- `GT7`;
 - `PBR_NEUTRAL`;
 - `NONE`.
 
-This page compares the two operators, and shows each one's HDR form beside its SDR form.
+This page compares GT7 and PBR Neutral, and shows each one's HDR form beside its SDR form. ACES is not one of its
+views; the engine's own canvas shows it, and `shader_tonemap_aces.spec.js` holds it to Unreal's and OpenColorIO's numbers.
 
 The engine renders and tonemaps each frame as usual. Two extensions then redraw the canvas from the HDR colour the
 tonemapper was given:

package/src/shade/renderer/Renderer.d.ts

@@ -40,7 +40,7 @@ export class Renderer {
     transparency_mode: ShadeTransparencyMode;
     /**
      * How the exposed scene colour becomes display colour, on every output. An SDR and an HDR display run the same
-     * mode, so a scene looks alike on both; see {@link ShadeToneMappingMode}. Read every frame, so it can be flipped
+     * mode, so a scene looks alike on both; see {@link ShadeToneMappingMode}. ACES, Unreal's default look, unless set. Read every frame, so it can be flipped
      * at runtime. A mode not in use at {@link initialize} compiles its pass on the first frame that draws with it.
      * @type {ShadeToneMappingMode}
      */

package/src/shade/renderer/Renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Renderer.d.ts","sourceRoot":"","sources":["../../../../src/shade/renderer/Renderer.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Renderer.d.ts","sourceRoot":"","sources":["../../../../src/shade/renderer/Renderer.js"],"names":[],"mappings":"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"}

package/src/shade/renderer/Renderer.js

@@ -22,13 +22,16 @@ import { shader_composite_volumetrics } from "./deferred/shader_composite_volume
 import { shader_deferred_main } from "./deferred/shader_deferred_main.js";
 import { LOCAL_LIGHT_SHADING } from "./deferred/LOCAL_LIGHT_SHADING.js";
 import { LocalLightShading } from "./deferred/LocalLightShading.js";
-import { shader_tonemap_HDR } from "./deferred/shader_tonemap_HDR.js";
-import { shader_tonemap_HDR_none } from "./deferred/shader_tonemap_HDR_none.js";
-import { shader_tonemap_HDR_pbr_neutral } from "./deferred/shader_tonemap_HDR_pbr_neutral.js";
-import { shader_tonemap_LDR } from "./deferred/shader_tonemap_LDR.js";
-import { shader_tonemap_LDR_none } from "./deferred/shader_tonemap_LDR_none.js";
-import { shader_tonemap_LDR_pbr_neutral } from "./deferred/shader_tonemap_LDR_pbr_neutral.js";
-import { TonemapDisplaySettings } from "./deferred/TonemapDisplaySettings.js";
+import { shader_tonemap_HDR } from "./deferred/tonemap/shader_tonemap_HDR.js";
+import { shader_tonemap_HDR_aces } from "./deferred/tonemap/shader_tonemap_HDR_aces.js";
+import { shader_tonemap_HDR_none } from "./deferred/tonemap/shader_tonemap_HDR_none.js";
+import { shader_tonemap_HDR_pbr_neutral } from "./deferred/tonemap/shader_tonemap_HDR_pbr_neutral.js";
+import { shader_tonemap_LDR } from "./deferred/tonemap/shader_tonemap_LDR.js";
+import { shader_tonemap_LDR_aces } from "./deferred/tonemap/shader_tonemap_LDR_aces.js";
+import { shader_tonemap_LDR_none } from "./deferred/tonemap/shader_tonemap_LDR_none.js";
+import { shader_tonemap_LDR_pbr_neutral } from "./deferred/tonemap/shader_tonemap_LDR_pbr_neutral.js";
+import { TonemapAces2Tables } from "./deferred/tonemap/TonemapAces2Tables.js";
+import { TonemapDisplaySettings } from "./deferred/tonemap/TonemapDisplaySettings.js";
 import { FrameContext } from "./extension/FrameContext.js";
 import { FramePhase } from "./extension/FramePhase.js";
 import { GBufferTextures } from "./extension/GBufferTextures.js";
@@ -225,11 +228,11 @@ export class Renderer {
 
     /**
      * How the exposed scene colour becomes display colour, on every output. An SDR and an HDR display run the same
-     * mode, so a scene looks alike on both; see {@link ShadeToneMappingMode}. Read every frame, so it can be flipped
+     * mode, so a scene looks alike on both; see {@link ShadeToneMappingMode}. ACES, Unreal's default look, unless set. Read every frame, so it can be flipped
      * at runtime. A mode not in use at {@link initialize} compiles its pass on the first frame that draws with it.
      * @type {ShadeToneMappingMode}
      */
-    tone_mapping_mode = ShadeToneMappingMode.GT7;
+    tone_mapping_mode = ShadeToneMappingMode.ACES;
 
     /**
      * Switches of the AVBOIT mode, read every frame while {@link transparency_mode} selects it.
@@ -1399,6 +1402,13 @@ export class Renderer {
      */
     #tonemap_settings = new TonemapDisplaySettings();
 
+    /**
+     * The ACES HDR pass's two output transforms, built for the display in {@link #tonemap_settings}.
+     *
+     * @type {TonemapAces2Tables}
+     */
+    #tonemap_aces2_tables = new TonemapAces2Tables();
+
     #update_presentation_format() {
 
         const format8bit = navigator.gpu.getPreferredCanvasFormat();
@@ -1741,6 +1751,10 @@ export class Renderer {
             return this.#hdr_supported ? shader_tonemap_HDR_none : shader_tonemap_LDR_none;
         }
 
+        if (this.tone_mapping_mode === ShadeToneMappingMode.ACES) {
+            return this.#hdr_supported ? shader_tonemap_HDR_aces : shader_tonemap_LDR_aces;
+        }
+
         if (this.tone_mapping_mode === ShadeToneMappingMode.PBR_NEUTRAL) {
             return this.#hdr_supported ? shader_tonemap_HDR_pbr_neutral : shader_tonemap_LDR_pbr_neutral;
         }
@@ -1822,6 +1836,7 @@ export class Renderer {
         this.#scene_sdfs.clear();
 
         this.#autoexposure?.destroy();
+        this.#tonemap_aces2_tables.destroy();
         this.#depth_of_field?.destroy();
         this.#depth_of_field_unreal?.destroy();
         this.#restir_di?.destroy();
@@ -3177,16 +3192,29 @@ export class Renderer {
 
         current_color_out = record_scene_color.color;
 
+        const tonemap_shader = this.#tonemap_shader();
+
         // every pass reads from the settings only the members its immediate struct names: the canvas's primaries
         // from its working space, and, on an HDR display, the peak
+        const tonemap_inputs = {
+            input_color: current_color_out,
+            settings: this.#tonemap_settings,
+            exposure,
+        };
+
+        if (tonemap_shader === shader_tonemap_HDR_aces) {
+            // the two ACES 2.0 transforms for this display, rebuilt only when the display changed
+            const display = this.#tonemap_settings;
+            const tables = this.#tonemap_aces2_tables;
+
+            tables.update(display.peak_nits);
+            tonemap_inputs.aces2_tables = graph_import_buffer(graph, tables.gpu_buffer(this.device), "tonemap/aces2 tables");
+        }
+
         [current_color_out] = graph_image_pass({
             graph,
-            shader: this.#tonemap_shader(),
-            inputs: {
-                input_color: current_color_out,
-                settings: this.#tonemap_settings,
-                exposure
-            },
+            shader: tonemap_shader,
+            inputs: tonemap_inputs,
             output: [gr_texture_canvas]
         });
 

package/src/shade/renderer/ShadeToneMappingMode.d.ts

@@ -2,13 +2,14 @@
  * How the exposed scene colour becomes display colour.
  *
  * One choice for every display. The same mode runs on an SDR and an HDR output, so a scene looks the same on both up
- * to the SDR display's limits. That is the reason Polyphony give for GT7's operator, and there is no per-output
- * setting on purpose.
+ * to the SDR display's limits. That is the reason Polyphony give for GT7's operator, and Epic's for how Unreal 5.8
+ * takes its Filmic picture to HDR, and there is no per-output setting on purpose.
  */
 export type ShadeToneMappingMode = number;
 export namespace ShadeToneMappingMode {
     let GT7: number;
     let NONE: number;
     let PBR_NEUTRAL: number;
+    let ACES: number;
 }
 //# sourceMappingURL=ShadeToneMappingMode.d.ts.map

package/src/shade/renderer/ShadeToneMappingMode.js

@@ -2,15 +2,15 @@
  * How the exposed scene colour becomes display colour.
  *
  * One choice for every display. The same mode runs on an SDR and an HDR output, so a scene looks the same on both up
- * to the SDR display's limits. That is the reason Polyphony give for GT7's operator, and there is no per-output
- * setting on purpose.
+ * to the SDR display's limits. That is the reason Polyphony give for GT7's operator, and Epic's for how Unreal 5.8
+ * takes its Filmic picture to HDR, and there is no per-output setting on purpose.
  *
  * @enum {number}
  */
 export const ShadeToneMappingMode = {
     /**
-     * GT7 tone mapping (Polyphony Digital, SIGGRAPH 2025). An exposed 1.0 shows at a 250 cd/m² paper white on both
-     * outputs. SDR clips at that paper white, the curve's SDR mode, and HDR rolls off to the display's peak.
+     * GT7 tone mapping (Polyphony Digital, SIGGRAPH 2025). An exposed 1.0 shows at the paper white on both outputs.
+     * SDR clips at that paper white, the curve's SDR mode, and HDR rolls off to the display's peak.
      */
     GT7: 0,
     /**
@@ -27,4 +27,15 @@ export const ShadeToneMappingMode = {
      * An exposed 0.18 shows at 0.14 of SDR white, where {@link GT7} shows it at 0.179.
      */
     PBR_NEUTRAL: 2,
+    /**
+     * Unreal Engine's default look, the default here too. SDR is UE's "Filmic" tone mapper at its default settings,
+     * the ACES-derived curve every Unreal title ships with unless it chose otherwise. HDR is what Unreal 5.8 does with
+     * the same method: the SDR picture, taken back to the scene through the inverse ACES 2.0 output transform for an
+     * SDR display, and rendered again with the ACES 2.0 output transform for the display's headroom.
+     *
+     * An exposed 0.18 shows at 0.18 of SDR white, as with {@link GT7}, with a mid-tone contrast of 1.36 against GT7's
+     * 1.05. On HDR the picture expands into the headroom and mid-grey rises with it, by ACES 2.0's design: 0.26 of SDR
+     * white at a 1000 cd/m² display.
+     */
+    ACES: 3,
 };

package/src/shade/renderer/atmosphere/chunk_sample_environment_color.d.ts

@@ -1,4 +1,7 @@
 /**
+ * The environment map's level 0 in a direction: one hardware bilinear tap through the octahedral
+ * skirt (see `texture_octahedral_skirt_uv`).
+ *
  * see {@link shader_sky_irradiance_lut}
  * @type {CodeChunk}
  */

package/src/shade/renderer/atmosphere/chunk_sample_environment_color.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_sample_environment_color.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/atmosphere/chunk_sample_environment_color.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH,6CAFU,SAAS,CAajB;0BAjBwB,iCAAiC"}
+{"version":3,"file":"chunk_sample_environment_color.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/atmosphere/chunk_sample_environment_color.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,6CAFU,SAAS,CAcjB;0BArBwB,iCAAiC"}

package/src/shade/renderer/atmosphere/chunk_sample_environment_color.js

@@ -1,21 +1,24 @@
-import {
-    chunk_texture_octahedral_sample_bilinear
-} from "../shader/chunk/texture/octahedral/chunk_texture_octahedral_sample_bilinear.js";
+import { chunk_uv_octahedral_unit_encode } from "../shader/chunk/geometry/octahedron/chunk_uv_octahedral_unit_encode.js";
+import { chunk_texture_octahedral_skirt_uv } from "../shader/chunk/texture/octahedral/chunk_texture_octahedral_skirt_uv.js";
 import { CodeChunk } from "../shader/compiler/CodeChunk.js";
 
 /**
+ * The environment map's level 0 in a direction: one hardware bilinear tap through the octahedral
+ * skirt (see `texture_octahedral_skirt_uv`).
+ *
  * see {@link shader_sky_irradiance_lut}
  * @type {CodeChunk}
  */
 export const chunk_sample_environment_color = CodeChunk.from(
 //language=WGSL
     `
-fn sample_environment_color( tEnvironment:texture_2d<f32>, rayDir: vec3<f32> )-> vec3<f32>{        
-    let texture_size = textureDimensions(tEnvironment, 0);
+fn sample_environment_color(tEnvironment: texture_2d<f32>, sEnvironment: sampler, rayDir: vec3<f32>) -> vec3<f32> {
+    let uv = texture_octahedral_skirt_uv(uv_octahedral_unit_encode(rayDir), f32(textureDimensions(tEnvironment).x));
 
-    return texture_octahedral_sample_bilinear( tEnvironment, vec2(0), texture_size.x, rayDir, 0 ).rgb;
+    return textureSampleLevel(tEnvironment, sEnvironment, uv, 0.0).rgb;
 }
     `, [
-        chunk_texture_octahedral_sample_bilinear,
+        chunk_uv_octahedral_unit_encode,
+        chunk_texture_octahedral_skirt_uv,
     ]
-);
+);

package/src/shade/renderer/atmosphere/shader_sky_irradiance_lut.d.ts

@@ -1,3 +1,9 @@
+/**
+ * Side of the sky irradiance map, skirt included: it is an environment map like any other, so its
+ * level 0 carries the one-texel octahedral skirt (see `texture_octahedral_skirt_uv`).
+ * @type {number}
+ */
+export const SKY_IRRADIANCE_LUT_RESOLUTION: number;
 export const shader_sky_irradiance_lut: ImageShader;
 import { ImageShader } from "../shader/ImageShader.js";
 //# sourceMappingURL=shader_sky_irradiance_lut.d.ts.map

package/src/shade/renderer/atmosphere/shader_sky_irradiance_lut.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_sky_irradiance_lut.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/atmosphere/shader_sky_irradiance_lut.js"],"names":[],"mappings":"AA4MA,oDAWG;4BA1LyB,0BAA0B"}
+{"version":3,"file":"shader_sky_irradiance_lut.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/atmosphere/shader_sky_irradiance_lut.js"],"names":[],"mappings":"AAiDA;;;;GAIG;AACH,4CAFU,MAAM,CAEkC;AAkKlD,oDAWG;4BAnMyB,0BAA0B"}