@woosh/meep-engine 3.50.0 → 3.51.0

package/package.json

@@ -6,7 +6,7 @@
   "description": "Advanced 3D game engine",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "3.50.0",
+  "version": "3.51.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/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/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"}