@woosh/meep-engine 3.50.0 → 3.52.0

package/src/shade/renderer/fluid/pressure/GPUFluidPressureSolve.d.ts

@@ -34,7 +34,7 @@ export class GPUFluidPressureSolve {
      * @param {*} _resources
      * @param {{encoder: ShadeGPUCommandContext}} context
      */
-    static "__#262@#execute"(data: {
+    static "__#263@#execute"(data: {
         solve: GPUFluidPressureSolve;
         arm: number;
         count: number;

package/src/shade/renderer/fluid/query/GPUFluidQueries.d.ts

@@ -49,7 +49,7 @@ export class GPUFluidQueries {
      * @param {import("../../../../engine/graphics/render/frame_graph/FramePassResources.js").FramePassResources} resources
      * @param {{encoder: import("../../../device/ShadeGPUCommandContext.js").ShadeGPUCommandContext}} context
      */
-    static "__#267@#execute"(pass: object, resources: import("../../../../engine/graphics/render/frame_graph/FramePassResources.js").FramePassResources, context: {
+    static "__#268@#execute"(pass: object, resources: import("../../../../engine/graphics/render/frame_graph/FramePassResources.js").FramePassResources, context: {
         encoder: import("../../../device/ShadeGPUCommandContext.js").ShadeGPUCommandContext;
     }): void;
     /**

package/src/shade/renderer/global_illumination/brick4/gpu/bake/shader_brick4_bake_probes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_brick4_bake_probes.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/global_illumination/brick4/gpu/bake/shader_brick4_bake_probes.js"],"names":[],"mappings":"AAqHA,sDAIG;8BA1G2B,qCAAqC"}
+{"version":3,"file":"shader_brick4_bake_probes.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/global_illumination/brick4/gpu/bake/shader_brick4_bake_probes.js"],"names":[],"mappings":"AAuHA,sDAIG;8BA5G2B,qCAAqC"}

package/src/shade/renderer/global_illumination/brick4/gpu/bake/shader_brick4_bake_probes.js

@@ -19,6 +19,7 @@ import { RESOURCE_GROUP_RTX } from "../../../../geometry/sr_create_group_RTX.js"
 import { PARTICIPATING_MEDIA_NOISE_SAMPLER_DESCRIPTOR } from "../../../../volumetrics/noise/PARTICIPATING_MEDIA_NOISE.js";
 import { wind_field_add_resources } from "../../../../wind/wind_field_add_resources.js";
 import { chunk_direction_by_index_rand1 } from "./sampling/chunk_direction_by_index_rand1.js";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../../../../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 const resources = new ShaderResourceSetDescriptor();
 
@@ -32,7 +33,8 @@ resources.createGroup()
 // the scene's wind, which carries the fog volumes' noise: one uniform, one texture, one sampler
 wind_field_add_resources(resources.createGroup()
     .addStorageBuffer("light_data", WebGPUArray.u32)
-    .addTexture("tEnvironment", "unfilterable-float", "2d")
+    .addTexture("tEnvironment", "float", "2d")
+    .add(ENVIRONMENT_MAP_SAMPLER_RESOURCE)
     // the fog volumes' noise, read through participating_media_volume_density_at
     .addTexture("tParticipatingMediaNoise", "float", "3d")
     .addSampler("sParticipatingMediaNoise", "filtering", PARTICIPATING_MEDIA_NOISE_SAMPLER_DESCRIPTOR));

package/src/shade/renderer/global_illumination/ibl/shader_diffuse_IBL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_diffuse_IBL.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/global_illumination/ibl/shader_diffuse_IBL.js"],"names":[],"mappings":"AAyCA,6CAaE;4BAlD0B,6BAA6B"}
+{"version":3,"file":"shader_diffuse_IBL.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/global_illumination/ibl/shader_diffuse_IBL.js"],"names":[],"mappings":"AA2CA,6CAaE;4BApD0B,6BAA6B"}

package/src/shade/renderer/global_illumination/ibl/shader_diffuse_IBL.js

@@ -5,12 +5,14 @@ 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";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 const resources = new ShaderResourceSetDescriptor();
 resources.createGroup()
     .addTexture("tBentNormals", "uint")
     .addTexture("tGBufferAlbedo")
-    .addTexture("tEnvironment")
+    .addTexture("tEnvironment", "float")
+    .add(ENVIRONMENT_MAP_SAMPLER_RESOURCE)
 
 const body = CodeChunk.from(
     //language=WGSL

package/src/shade/renderer/global_illumination/ibl/shader_specular_IBL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_specular_IBL.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/global_illumination/ibl/shader_specular_IBL.js"],"names":[],"mappings":"AAuEA,8CAaE;4BA5E0B,6BAA6B"}
+{"version":3,"file":"shader_specular_IBL.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/global_illumination/ibl/shader_specular_IBL.js"],"names":[],"mappings":"AAyEA,8CAaE;4BA9E0B,6BAA6B"}

package/src/shade/renderer/global_illumination/ibl/shader_specular_IBL.js

@@ -9,12 +9,14 @@ 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";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 const resources = new ShaderResourceSetDescriptor();
 resources.createGroup()
     .addTexture("tBentNormals", "uint")
     .addTexture("tNormals", "uint")
-    .addTexture("tEnvironment")
+    .addTexture("tEnvironment", "float")
+    .add(ENVIRONMENT_MAP_SAMPLER_RESOURCE)
     .addTexture("tPBR")
     .addTexture("tDepth")
     .addUniform("camera", CAMERA_UNIFORM_STRUCT)

package/src/shade/renderer/global_illumination/lpv/deprecated/probe_trace_compute_shader_code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probe_trace_compute_shader_code.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/global_illumination/lpv/deprecated/probe_trace_compute_shader_code.js"],"names":[],"mappings":"AA2BA,sDAIG;AAwKH,4DAIG;6BAzM0B,sCAAsC;8BAiBrC,kCAAkC"}
+{"version":3,"file":"probe_trace_compute_shader_code.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/global_illumination/lpv/deprecated/probe_trace_compute_shader_code.js"],"names":[],"mappings":"AA4BA,sDAIG;AAyKH,4DAIG;6BA3M0B,sCAAsC;8BAiBrC,kCAAkC"}

package/src/shade/renderer/global_illumination/lpv/deprecated/probe_trace_compute_shader_code.js

@@ -24,6 +24,7 @@ import { LIGHT_PROBE_STRUCT } from "../LIGHT_PROBE_STRUCT.js";
 import { LIGHT_PROBE_VOLUME_METADATA_STRUCT } from "../LIGHT_PROBE_VOLUME_METADATA_STRUCT.js";
 import { PARTICIPATING_MEDIA_NOISE_SAMPLER_DESCRIPTOR } from "../../../volumetrics/noise/PARTICIPATING_MEDIA_NOISE.js";
 import { wind_field_add_resources } from "../../../wind/wind_field_add_resources.js";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../../../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 export const PROBE_BAKE_UNIFORMS_STRUCT = WebGPUStruct.from({
     direction: vec3f,
@@ -45,7 +46,8 @@ wind_field_add_resources(resources.createGroup({ label: 'LPV & scene' })
     .addUniform('media', MEDIA_TABLE_STRUCT)
     .addTexture('textures', 'unfilterable-float', '2d-array', false)
     .addUniform('bake_settings', PROBE_BAKE_UNIFORMS_STRUCT)
-    .addTexture('tEnvironment', 'unfilterable-float')
+    .addTexture("tEnvironment", "float", "2d")
+    .add(ENVIRONMENT_MAP_SAMPLER_RESOURCE)
     // the fog volumes' noise, read through participating_media_volume_density_at
     .addTexture("tParticipatingMediaNoise", "float", "3d")
     .addSampler("sParticipatingMediaNoise", "filtering", PARTICIPATING_MEDIA_NOISE_SAMPLER_DESCRIPTOR));

package/src/shade/renderer/global_illumination/probe/octahedral/shader_lpv_build_gbuffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_lpv_build_gbuffer.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/global_illumination/probe/octahedral/shader_lpv_build_gbuffer.js"],"names":[],"mappings":"AAmMA,mDA4BG;4BAvLyB,gCAAgC"}
+{"version":3,"file":"shader_lpv_build_gbuffer.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/global_illumination/probe/octahedral/shader_lpv_build_gbuffer.js"],"names":[],"mappings":"AAqMA,mDA4BG;4BAzLyB,gCAAgC"}

package/src/shade/renderer/global_illumination/probe/octahedral/shader_lpv_build_gbuffer.js

@@ -44,6 +44,7 @@ import { ShaderDescriptor } from "../../../shader/ShaderDescriptor.js";
 import { sr_create_group_RTX } from "../../../geometry/sr_create_group_RTX.js";
 import { LIGHT_PROBE_STRUCT } from "../../lpv/LIGHT_PROBE_STRUCT.js";
 import { ProbeGBufferTypes } from "./ProbeGBufferTypes.js";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../../../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 const PUSH_CONSTANTS = WebGPUStruct.from({
     probe_resolution: u32,
@@ -65,7 +66,8 @@ resources.createGroup()
 resources.createGroup({ label: "materials" })
     .addUniform("materials", INDIRECT_MATERIAL_ARRAY_TYPE)
     .addTexture("textures", "unfilterable-float", "2d-array", false)
-    .addTexture("tEnvironment")
+    .addTexture("tEnvironment", "float")
+    .add(ENVIRONMENT_MAP_SAMPLER_RESOURCE)
 ;
 
 sr_create_group_RTX(resources);
@@ -131,7 +133,7 @@ fn main(
     if(hit.t <= 0.0){
     
         // didn't hit anything
-        output.emissive = rgbe9995_encode( sample_environment_color(tEnvironment, ray.direction) );
+        output.emissive = rgbe9995_encode( sample_environment_color(tEnvironment, sEnvironment, ray.direction) );
         output.pbr.a = 1; // mark a miss
         output.position = vec4(ray.direction, 0.0); // needed to reconstruct direction later on
         

package/src/shade/renderer/light/GPULightCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GPULightCollection.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/light/GPULightCollection.js"],"names":[],"mappings":"AA+CA;IAEI;;;;;OAKG;IACH,iCAFW,eAAe,QAMzB;IAoJD;;;;;;OAMG;IACH,sBALW,eAAe,aACf,eAAe,EAqCzB;IApLD;;;OAGG;IACH,6DAEC;IAeD;;OAEG;IACH,4BAEC;IAED;;;;;;OAMG;IACH,6BAEC;IAED;;;;;;;OAOG;IACH,qFAEC;IAWD;;OAEG;IACH,+CAEC;IAgDD;;;OAGG;IACH,qCAEC;IAED;;;;;;OAMG;IACH,gCAEC;IAGD,4BAKC;IAgID;;;OAGG;IACH,YAFW,eAAe,QA8BzB;IAED;;;;;;;;;OASG;IACH,gBAFW,OAAO,+BAA+B,EAAE,YAAY,QAkC9D;IAED;;;;;;OAMG;IACH,uBAHW,sBAAsB,mCAyBhC;IAwED,gBASC;;CACJ;8BAjfY,OAAO,0CAA0C,EAAE,eAAe;8BAClE,OAAO,uBAAuB,EAAE,eAAe;8BAC/C,OAAO,6BAA6B,EAAE,eAAe;8BACrD,OAAO,sBAAsB,EAAE,eAAe;4BAzB/B,gCAAgC;yCACnB,2CAA2C;kCAClD,iCAAiC;uCAH5B,wCAAwC"}
+{"version":3,"file":"GPULightCollection.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/light/GPULightCollection.js"],"names":[],"mappings":"AAkDA;IAEI;;;;;OAKG;IACH,iCAFW,eAAe,QAMzB;IAoJD;;;;;;OAMG;IACH,sBALW,eAAe,aACf,eAAe,EAqCzB;IApLD;;;OAGG;IACH,6DAEC;IAeD;;OAEG;IACH,4BAEC;IAED;;;;;;OAMG;IACH,6BAEC;IAED;;;;;;;OAOG;IACH,qFAEC;IAWD;;OAEG;IACH,+CAEC;IAgDD;;;OAGG;IACH,qCAEC;IAED;;;;;;OAMG;IACH,gCAEC;IAGD,4BAKC;IAyKD;;;OAGG;IACH,YAFW,eAAe,QA8BzB;IAED;;;;;;;;;OASG;IACH,gBAFW,OAAO,+BAA+B,EAAE,YAAY,QAkC9D;IAED;;;;;;OAMG;IACH,uBAHW,sBAAsB,mCAyBhC;IAwED,gBASC;;CACJ;8BA1hBY,OAAO,0CAA0C,EAAE,eAAe;8BAClE,OAAO,uBAAuB,EAAE,eAAe;8BAC/C,OAAO,6BAA6B,EAAE,eAAe;8BACrD,OAAO,sBAAsB,EAAE,eAAe;4BA3B/B,gCAAgC;yCACnB,2CAA2C;kCAClD,iCAAiC;uCAH5B,wCAAwC"}

package/src/shade/renderer/light/GPULightCollection.js

@@ -1,4 +1,5 @@
 import { assert } from "../../../core/assert.js";
+import { gpu_texture_format_info } from "../../descriptor/texture/format/gpu_texture_format_info.js";
 import { isImageBitmap } from "../../../core/dom/isImageBitmap.js";
 import { ShadeGPUCommandContext } from "../../device/ShadeGPUCommandContext.js";
 import { GPUDatabase } from "../buffer/table/GPUDatabase.js";
@@ -10,6 +11,8 @@ import {
     enquire_filter_environment_map_pipelines,
     execute_filter_environment_map
 } from "./environment/execute_filter_environment_map.js";
+import { SPHERE_PROBE_MIPMAP_LEVELS } from "./environment/DEFINES.js";
+import { octahedral_skirt_matches } from "./environment/octahedral_skirt_matches.js";
 import { ENVIRONMENT_SH_TYPE, shader_project_environment_sh } from "./environment/shader_project_environment_sh.js";
 import { LIGHT_DATABASE_SPEC } from "./LIGHT_DATABASE_SPEC.js";
 import { light_record_directional } from "./model/io/light_record_directional.js";
@@ -287,6 +290,47 @@ export class GPULightCollection {
         }
 
         const source_image = source_env.image;
+
+        /*
+         An environment map comes with a one-texel octahedral skirt: the octahedral square in the
+         interior, each texel of the outer ring a copy of the one the fold puts beside it. The renderer
+         filters it in hardware through that skirt and skirts the levels it filters itself; an
+         unskirted map is the caller's error, and it would read as seams along the octahedron's
+         edges. Every level the roughness mapping reaches needs an interior, so 3 texels at the last.
+         `resample_equirectangular_to_octahedral` and the offline converter write the skirt by default.
+
+         Checked where the pixels are on hand; an ImageBitmap's are not.
+        */
+        assert.greaterThanOrEqual(
+            source_image.width >> (SPHERE_PROBE_MIPMAP_LEVELS - 1),
+            3,
+            'environment map too small for its last filtered level'
+        );
+
+        assert.equal(source_image.width, source_image.height, 'an octahedral environment map is square');
+
+        const source_texels = source_image.source;
+
+        if (source_texels?.isSampler2D === true) {
+            assert.ok(
+                octahedral_skirt_matches(source_texels.data, source_texels.itemSize, source_texels.width),
+                'environment map has no octahedral skirt (see sampler2d_octahedral_skirt_fill)'
+            );
+        } else if (
+            source_texels?.isShadeTexelData === true
+            && source_texels.levels[0] !== undefined
+            && gpu_texture_format_info(source_texels.format).block_width === 1
+        ) {
+            assert.ok(
+                octahedral_skirt_matches(
+                    source_texels.levels[0],
+                    gpu_texture_format_info(source_texels.format).bytes_per_block,
+                    source_texels.width
+                ),
+                'environment map has no octahedral skirt (see sampler2d_octahedral_skirt_fill)'
+            );
+        }
+
         gpu_ctx.resize(source_image.width, source_image.height);
         /*
          The environment map is equirectangular and this context is built 2D a few lines up — the

package/src/shade/renderer/light/environment/ENVIRONMENT_MAP_RESOURCE.d.ts

@@ -1,5 +1,6 @@
 /**
- * The environment map, sampled by direction and roughness.
+ * The environment map, sampled by direction and roughness. Filterable: the hardware filters it through
+ * its octahedral skirt (`texture_octahedral_skirt_uv`) and `ENVIRONMENT_MAP_SAMPLER_RESOURCE`.
  * @type {ShaderResourceDescriptor}
  */
 export const ENVIRONMENT_MAP_RESOURCE: ShaderResourceDescriptor;

package/src/shade/renderer/light/environment/ENVIRONMENT_MAP_RESOURCE.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ENVIRONMENT_MAP_RESOURCE.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/ENVIRONMENT_MAP_RESOURCE.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,uCAFU,wBAAwB,CAEuD;yCANhD,mDAAmD"}
+{"version":3,"file":"ENVIRONMENT_MAP_RESOURCE.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/ENVIRONMENT_MAP_RESOURCE.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,uCAFU,wBAAwB,CAEgE;yCAPzD,mDAAmD"}

package/src/shade/renderer/light/environment/ENVIRONMENT_MAP_RESOURCE.js

@@ -1,7 +1,8 @@
 import { ShaderResourceDescriptor } from "../../shader/resource/ShaderResourceDescriptor.js";
 
 /**
- * The environment map, sampled by direction and roughness.
+ * The environment map, sampled by direction and roughness. Filterable: the hardware filters it through
+ * its octahedral skirt (`texture_octahedral_skirt_uv`) and `ENVIRONMENT_MAP_SAMPLER_RESOURCE`.
  * @type {ShaderResourceDescriptor}
  */
-export const ENVIRONMENT_MAP_RESOURCE = ShaderResourceDescriptor.texture("tEnvironment");
+export const ENVIRONMENT_MAP_RESOURCE = ShaderResourceDescriptor.texture("tEnvironment", "float");

package/src/shade/renderer/light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Bilinear within a level, clamped. Levels are chosen by the caller, one whole level per sample,
+ * because each level of a skirted map has a uv of its own (see `texture_octahedral_skirt_uv`).
+ * @type {SamplerDescriptor}
+ */
+export const ENVIRONMENT_MAP_SAMPLER_DESCRIPTOR: SamplerDescriptor;
+/**
+ * The sampler the environment map is read through.
+ * @type {ShaderResourceDescriptor}
+ */
+export const ENVIRONMENT_MAP_SAMPLER_RESOURCE: ShaderResourceDescriptor;
+import { SamplerDescriptor } from "../../../descriptor/texture/SamplerDescriptor.js";
+import { ShaderResourceDescriptor } from "../../shader/resource/ShaderResourceDescriptor.js";
+//# sourceMappingURL=ENVIRONMENT_MAP_SAMPLER_RESOURCE.d.ts.map

package/src/shade/renderer/light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ENVIRONMENT_MAP_SAMPLER_RESOURCE.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,iDAFU,iBAAiB,CAQvB;AAEJ;;;GAGG;AACH,+CAFU,wBAAwB,CAMhC;kCAxBgC,kDAAkD;yCAC3C,mDAAmD"}

package/src/shade/renderer/light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js

@@ -0,0 +1,25 @@
+import { SamplerDescriptor } from "../../../descriptor/texture/SamplerDescriptor.js";
+import { ShaderResourceDescriptor } from "../../shader/resource/ShaderResourceDescriptor.js";
+
+/**
+ * Bilinear within a level, clamped. Levels are chosen by the caller, one whole level per sample,
+ * because each level of a skirted map has a uv of its own (see `texture_octahedral_skirt_uv`).
+ * @type {SamplerDescriptor}
+ */
+export const ENVIRONMENT_MAP_SAMPLER_DESCRIPTOR = Object.freeze(SamplerDescriptor.from({
+    magFilter: "linear",
+    minFilter: "linear",
+    mipmapFilter: "nearest",
+    addressModeU: "clamp-to-edge",
+    addressModeV: "clamp-to-edge",
+}));
+
+/**
+ * The sampler the environment map is read through.
+ * @type {ShaderResourceDescriptor}
+ */
+export const ENVIRONMENT_MAP_SAMPLER_RESOURCE = ShaderResourceDescriptor.sampler(
+    "sEnvironment",
+    "filtering",
+    ENVIRONMENT_MAP_SAMPLER_DESCRIPTOR
+);

package/src/shade/renderer/light/environment/execute_filter_environment_map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute_filter_environment_map.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/execute_filter_environment_map.js"],"names":[],"mappings":"AAKA;;GAEG;AAEH;;;;GAIG;AACH,kEAFW,eAAe,QAIzB;AAED;;;;GAIG;AACH,8GAmDC;8BApEY,OAAO,6CAA6C,EAAE,eAAe"}
+{"version":3,"file":"execute_filter_environment_map.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/execute_filter_environment_map.js"],"names":[],"mappings":"AAKA;;GAEG;AAEH;;;;GAIG;AACH,kEAFW,eAAe,QAIzB;AAED;;;;GAIG;AACH,8GAkDC;8BAnEY,OAAO,6CAA6C,EAAE,eAAe"}

package/src/shade/renderer/light/environment/execute_filter_environment_map.js

@@ -39,10 +39,9 @@ export function execute_filter_environment_map(
      the allocation were two sources of truth for one number, and this is the one that decides what
      gets filtered.
 
-     Still open, and not this line's to fix: an environment map smaller than 16x16 has fewer than
-     five levels, so `roughness_to_lod` can ask for a level the texture does not have and the
-     sampler clamps to a blurrier one than the roughness wanted. That needs the mapping to know the
-     texture's real level count, which is a change to every shader that samples one.
+     Every level written here is skirted: the convolve computes the skirt texels as their interior
+     twins, so a level needs at least 3 texels, and `GPULightCollection` refuses a map whose last
+     filtered level would have fewer.
     */
     const mips = Math.min(map.descriptor.mipLevelCount, SPHERE_PROBE_MIPMAP_LEVELS);
 

package/src/shade/renderer/light/environment/octahedral_skirt_matches.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Whether a square octahedral level carries a one-texel octahedral skirt: at least 3x3, and every
+ * texel of the outer ring equal, element for element, to the interior texel the octahedral fold puts
+ * next to it.
+ *
+ * Exact equality, on purpose. A skirt is a copy, and a copy survives any encoding that maps equal
+ * values to equal values — RGBE and half floats both do — so a level that only nearly matches was not
+ * written with one. A constant level passes, which is right: its skirt is already what a fill would
+ * write. Elements are compared with `Object.is`, so this works on channel values and on raw bytes alike.
+ *
+ * Walks the perimeter only.
+ *
+ * @param {ArrayLike<number>} data texels, row-major, tightly packed
+ * @param {number} texel_stride elements per texel: channels of a sampler, or bytes of a raw payload
+ * @param {number} size side of the level
+ * @returns {boolean}
+ */
+export function octahedral_skirt_matches(data: ArrayLike<number>, texel_stride: number, size: number): boolean;
+//# sourceMappingURL=octahedral_skirt_matches.d.ts.map

package/src/shade/renderer/light/environment/octahedral_skirt_matches.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"octahedral_skirt_matches.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/octahedral_skirt_matches.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;GAgBG;AACH,+CALW,UAAU,MAAM,CAAC,gBACjB,MAAM,QACN,MAAM,GACJ,OAAO,CAqBnB"}

package/src/shade/renderer/light/environment/octahedral_skirt_matches.js

@@ -0,0 +1,67 @@
+import { octahedral_skirt_source_texel } from "./octahedral_skirt_source_texel.js";
+
+/**
+ * @type {Uint32Array}
+ */
+const SCRATCH_SOURCE = new Uint32Array(2);
+
+/**
+ * Whether a square octahedral level carries a one-texel octahedral skirt: at least 3x3, and every
+ * texel of the outer ring equal, element for element, to the interior texel the octahedral fold puts
+ * next to it.
+ *
+ * Exact equality, on purpose. A skirt is a copy, and a copy survives any encoding that maps equal
+ * values to equal values — RGBE and half floats both do — so a level that only nearly matches was not
+ * written with one. A constant level passes, which is right: its skirt is already what a fill would
+ * write. Elements are compared with `Object.is`, so this works on channel values and on raw bytes alike.
+ *
+ * Walks the perimeter only.
+ *
+ * @param {ArrayLike<number>} data texels, row-major, tightly packed
+ * @param {number} texel_stride elements per texel: channels of a sampler, or bytes of a raw payload
+ * @param {number} size side of the level
+ * @returns {boolean}
+ */
+export function octahedral_skirt_matches(data, texel_stride, size) {
+    if (size < 3) {
+        return false;
+    }
+
+    const last = size - 1;
+
+    for (let i = 0; i < size; i++) {
+        if (
+            !matches_source(data, texel_stride, size, i, 0)
+            || !matches_source(data, texel_stride, size, i, last)
+            || !matches_source(data, texel_stride, size, 0, i)
+            || !matches_source(data, texel_stride, size, last, i)
+        ) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * @param {ArrayLike<number>} data
+ * @param {number} texel_stride
+ * @param {number} size
+ * @param {number} x
+ * @param {number} y
+ * @returns {boolean}
+ */
+function matches_source(data, texel_stride, size, x, y) {
+    octahedral_skirt_source_texel(SCRATCH_SOURCE, x, y, size);
+
+    const target = (y * size + x) * texel_stride;
+    const source = (SCRATCH_SOURCE[1] * size + SCRATCH_SOURCE[0]) * texel_stride;
+
+    for (let c = 0; c < texel_stride; c++) {
+        if (!Object.is(data[target + c], data[source + c])) {
+            return false;
+        }
+    }
+
+    return true;
+}

package/src/shade/renderer/light/environment/octahedral_skirt_source_texel.d.ts

@@ -0,0 +1,16 @@
+/**
+ * The interior texel a texel of a skirted octahedral level carries — itself for an interior texel, and
+ * for a skirt texel the interior texel the octahedral fold mirrors it onto. Coordinates are in the
+ * skirted texture, so an interior texel comes back unchanged.
+ *
+ * CPU twin of the WGSL `texture_octahedral_skirt_texel_uv` (through
+ * `texture_octahedral_wrap_texel_coordinates`), which the GPU producers of skirted levels use; the two
+ * must agree texel for texel or a skirt written on one side reads as missing on the other.
+ *
+ * @param {number[]|Uint32Array} out receives `[x, y]`
+ * @param {number} x texel column in the skirted texture, `0` to `size - 1`
+ * @param {number} y texel row in the skirted texture, `0` to `size - 1`
+ * @param {number} size side of the skirted texture, interior plus two
+ */
+export function octahedral_skirt_source_texel(out: number[] | Uint32Array, x: number, y: number, size: number): void;
+//# sourceMappingURL=octahedral_skirt_source_texel.d.ts.map

package/src/shade/renderer/light/environment/octahedral_skirt_source_texel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"octahedral_skirt_source_texel.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/octahedral_skirt_source_texel.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,mDALW,MAAM,EAAE,GAAC,WAAW,KACpB,MAAM,KACN,MAAM,QACN,MAAM,QAsBhB"}

package/src/shade/renderer/light/environment/octahedral_skirt_source_texel.js

@@ -0,0 +1,35 @@
+/**
+ * The interior texel a texel of a skirted octahedral level carries — itself for an interior texel, and
+ * for a skirt texel the interior texel the octahedral fold mirrors it onto. Coordinates are in the
+ * skirted texture, so an interior texel comes back unchanged.
+ *
+ * CPU twin of the WGSL `texture_octahedral_skirt_texel_uv` (through
+ * `texture_octahedral_wrap_texel_coordinates`), which the GPU producers of skirted levels use; the two
+ * must agree texel for texel or a skirt written on one side reads as missing on the other.
+ *
+ * @param {number[]|Uint32Array} out receives `[x, y]`
+ * @param {number} x texel column in the skirted texture, `0` to `size - 1`
+ * @param {number} y texel row in the skirted texture, `0` to `size - 1`
+ * @param {number} size side of the skirted texture, interior plus two
+ */
+export function octahedral_skirt_source_texel(out, x, y, size) {
+    const interior = size - 2;
+
+    const tx = x - 1;
+    const ty = y - 1;
+
+    const wrapped_x = ((tx % interior) + interior) % interior;
+    const wrapped_y = ((ty % interior) + interior) % interior;
+
+    // which fold the texel is past, as the WGSL counts it: i32 division truncates toward zero
+    const fold_x = Math.abs(Math.trunc(tx / interior)) + (tx < 0 ? 1 : 0);
+    const fold_y = Math.abs(Math.trunc(ty / interior)) + (ty < 0 ? 1 : 0);
+
+    if (((fold_x ^ fold_y) & 1) !== 0) {
+        out[0] = interior - wrapped_x;
+        out[1] = interior - wrapped_y;
+    } else {
+        out[0] = wrapped_x + 1;
+        out[1] = wrapped_y + 1;
+    }
+}

package/src/shade/renderer/light/environment/resample_cube_to_octahedral.d.ts

@@ -13,9 +13,14 @@
  *
  * @param {Sampler2D[]} faces six faces in +X, -X, +Y, -Y, +Z, -Z order — what `buildCubeURLs`
  * emits and what `CubeTextureLoader` consumes
- * @param {number} output_resolution
+ * With `skirt`, the octahedral square is resampled into the interior `output_resolution - 2` texels and
+ * a one-texel octahedral skirt is written around it — the layout the renderer requires of an
+ * environment map (see `sampler2d_octahedral_skirt_fill`).
+ *
+ * @param {number} output_resolution side of the output, skirt included
+ * @param {boolean} [skirt]
  * @returns {Sampler2D} float32 RGBA, opaque
  */
-export function resample_cube_to_octahedral(faces: Sampler2D[], output_resolution: number): Sampler2D;
+export function resample_cube_to_octahedral(faces: Sampler2D[], output_resolution: number, skirt?: boolean): Sampler2D;
 import { Sampler2D } from "../../../../engine/graphics/texture/sampler/Sampler2D.js";
 //# sourceMappingURL=resample_cube_to_octahedral.d.ts.map

package/src/shade/renderer/light/environment/resample_cube_to_octahedral.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resample_cube_to_octahedral.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/resample_cube_to_octahedral.js"],"names":[],"mappings":"AAuFA;;;;;;;;;;;;;;;;;GAiBG;AACH,mDALW,SAAS,EAAE,qBAEX,MAAM,GACJ,SAAS,CAqDrB;0BA3JyB,0DAA0D"}
+{"version":3,"file":"resample_cube_to_octahedral.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/resample_cube_to_octahedral.js"],"names":[],"mappings":"AAwFA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,mDAVW,SAAS,EAAE,qBAMX,MAAM,UACN,OAAO,GACL,SAAS,CA+DrB;0BA3KyB,0DAA0D"}

package/src/shade/renderer/light/environment/resample_cube_to_octahedral.js

@@ -2,6 +2,7 @@ import { assert } from "../../../../core/assert.js";
 import { Sampler2D } from "../../../../engine/graphics/texture/sampler/Sampler2D.js";
 import { SAMPLE_OFFSETS, SAMPLE_WEIGHTS, SUPER_SAMPLE_COUNT } from "./octahedral_resample_kernel.js";
 import { octahedral_z_pole_uv_to_direction } from "./octahedral_z_pole_uv_to_direction.js";
+import { sampler2d_octahedral_skirt_fill } from "./sampler2d_octahedral_skirt_fill.js";
 
 /**
  * Standard cube-map face selection — the GL/D3D/WebGPU table — for a direction already in cube
@@ -100,28 +101,39 @@ const SCRATCH_SAMPLE = new Float64Array(3);
  *
  * @param {Sampler2D[]} faces six faces in +X, -X, +Y, -Y, +Z, -Z order — what `buildCubeURLs`
  * emits and what `CubeTextureLoader` consumes
- * @param {number} output_resolution
+ * With `skirt`, the octahedral square is resampled into the interior `output_resolution - 2` texels and
+ * a one-texel octahedral skirt is written around it — the layout the renderer requires of an
+ * environment map (see `sampler2d_octahedral_skirt_fill`).
+ *
+ * @param {number} output_resolution side of the output, skirt included
+ * @param {boolean} [skirt]
  * @returns {Sampler2D} float32 RGBA, opaque
  */
-export function resample_cube_to_octahedral(faces, output_resolution) {
+export function resample_cube_to_octahedral(faces, output_resolution, skirt = true) {
     assert.equal(faces.length, 6, 'faces.length');
     assert.isNonNegativeInteger(output_resolution, 'output_resolution');
+    assert.isBoolean(skirt, 'skirt');
+
+    const border = skirt ? 1 : 0;
+    const interior = output_resolution - 2 * border;
+
+    assert.greaterThan(interior, 0, 'interior resolution');
 
     const output = Sampler2D.float32(4, output_resolution, output_resolution);
 
     // the alpha channel is written once, here
     output.data.fill(1);
 
-    for (let y = 0; y < output_resolution; y++) {
-        for (let x = 0; x < output_resolution; x++) {
+    for (let y = 0; y < interior; y++) {
+        for (let x = 0; x < interior; x++) {
 
             SCRATCH_SAMPLE.fill(0);
 
             let weight_sum = 0;
 
             for (let s = 0; s < SUPER_SAMPLE_COUNT; s++) {
-                const u = (x + SAMPLE_OFFSETS[s * 2] + 0.5) / output_resolution;
-                const v = (y + SAMPLE_OFFSETS[s * 2 + 1] + 0.5) / output_resolution;
+                const u = (x + SAMPLE_OFFSETS[s * 2] + 0.5) / interior;
+                const v = (y + SAMPLE_OFFSETS[s * 2 + 1] + 0.5) / interior;
 
                 // the direction the GPU will sample this texel for
                 octahedral_z_pole_uv_to_direction(SCRATCH_DIRECTION, u, v);
@@ -148,10 +160,14 @@ export function resample_cube_to_octahedral(faces, output_resolution) {
             }
 
             for (let i = 0; i < 3; i++) {
-                output.writeChannel(x, y, i, SCRATCH_SAMPLE[i] / weight_sum);
+                output.writeChannel(x + border, y + border, i, SCRATCH_SAMPLE[i] / weight_sum);
             }
         }
     }
 
+    if (skirt) {
+        sampler2d_octahedral_skirt_fill(output);
+    }
+
     return output;
 }

package/src/shade/renderer/light/environment/resample_equirectangular_to_octahedral.d.ts

@@ -1,8 +1,14 @@
 /**
+ * With `skirt`, the octahedral square is resampled into the interior `output_resolution - 2` texels and
+ * a one-texel octahedral skirt is written around it — the layout the renderer requires of an
+ * environment map (see `sampler2d_octahedral_skirt_fill`). Without, the square fills the whole output,
+ * which is a map the renderer will refuse.
  *
  * @param {Sampler2D} input must be a float format
- * @param {number} output_resolution
+ * @param {number} output_resolution side of the output, skirt included
+ * @param {boolean} [skirt]
+ * @returns {Sampler2D} float32 RGBA
  */
-export function resample_equirectangular_to_octahedral(input: Sampler2D, output_resolution: number): Sampler2D;
+export function resample_equirectangular_to_octahedral(input: Sampler2D, output_resolution: number, skirt?: boolean): Sampler2D;
 import { Sampler2D } from "../../../../engine/graphics/texture/sampler/Sampler2D.js";
 //# sourceMappingURL=resample_equirectangular_to_octahedral.d.ts.map

package/src/shade/renderer/light/environment/resample_equirectangular_to_octahedral.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resample_equirectangular_to_octahedral.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/resample_equirectangular_to_octahedral.js"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,8DAHW,SAAS,qBACT,MAAM,aAoEhB;0BA5EyB,0DAA0D"}
+{"version":3,"file":"resample_equirectangular_to_octahedral.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/environment/resample_equirectangular_to_octahedral.js"],"names":[],"mappings":"AAOA;;;;;;;;;;GAUG;AACH,8DALW,SAAS,qBACT,MAAM,UACN,OAAO,GACL,SAAS,CA8ErB;0BA7FyB,0DAA0D"}