@woosh/meep-engine 2.49.7 → 2.49.9

package/src/engine/graphics/render/forward_plus/prototype/prototypeLightManager.js

@@ -26,7 +26,7 @@ import { RingBuffer } from "../../../../../core/collection/RingBuffer.js";
 import { query_bvh_frustum_from_objects } from "../query/query_bvh_frustum_from_objects.js";
 import { prettyPrint } from "../../../../../core/NumberFormat.js";
 import { FPlusDebugMaterial } from "../materials/FPlusDebugMaterial.js";
-import { parseColor } from "../../../../../core/color/ColorUtils.js";
+import { parseColor } from "../../../../../core/color/parseColor.js";
 import { buildLightClusterWidget } from "../debug/buildLightClusterWidget.js";
 import domify from "../../../../../view/DOM.js";
 import { createScreenGrid } from "../debug/createScreenGrid.js";

package/src/engine/graphics/render/visibility/hiz/prototypeHiZ.js

@@ -39,7 +39,7 @@ import { FogOfWarSystem } from "../../../../ecs/fow/FogOfWarSystem.js";
 import { FogOfWarRevealerSystem } from "../../../../ecs/fow/FogOfWarRevealerSystem.js";
 import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
 import { SerializationMetadataSystem } from "../../../../ecs/systems/SerializationMetadataSystem.js";
-import { InverseKinematicsSystem } from "../../../../ecs/animation/InverseKinematicsSystem.js";
+import { InverseKinematicsSystem } from "../../../../ecs/ik/InverseKinematicsSystem.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
 import RenderSystem from "../../../../ecs/systems/RenderSystem.js";
@@ -49,7 +49,6 @@ import EntityBuilder from "../../../../ecs/EntityBuilder.js";
 import { Transform } from "../../../../ecs/transform/Transform.js";
 import Mesh from "../../../ecs/mesh/Mesh.js";
 import { PathDisplaySystem } from "../../../ecs/path/PathDisplaySystem.js";
-import { MicronRenderPlugin } from "../../../micron/plugin/MicronRenderPlugin.js";
 import { StandardFrameBuffers } from "../../../StandardFrameBuffers.js";
 import { HierarchicalZBuffer } from "./buffer/HierarchicalZBuffer.js";
 import ViewportPosition from "../../../../ecs/gui/position/ViewportPosition.js";
@@ -67,9 +66,9 @@ import { inverseLerp } from "../../../../../core/math/inverseLerp.js";
 import { clamp } from "../../../../../core/math/clamp.js";
 import { max2 } from "../../../../../core/math/max2.js";
 import { min2 } from "../../../../../core/math/min2.js";
-import { buildCubeURLs } from "../../../texture/cubemap/buildCubeURLs.js";
 import { mat4 } from "gl-matrix";
 import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
+import { load_and_set_cubemap_v0 } from "../../../load_and_set_cubemap_v0.js";
 
 const engineHarness = new EngineHarness();
 
@@ -137,7 +136,6 @@ function makeConfig(engine) {
 
 
     // Plugins
-    config.addPlugin(MicronRenderPlugin);
 
 
     // Knowledge
@@ -162,7 +160,7 @@ async function init(harness) {
 
     enableEditor(engine);
 
-    await engine.graphics.loadEnvironmentMap(buildCubeURLs('data/textures/cubemaps/hip_miramar/32/', '.png'));
+    await load_and_set_cubemap_v0(engine.graphics, 'data/textures/cubemaps/hip_miramar/32/', '.png');
 
     await harness.initialize();
 

package/src/engine/graphics/sh3/prototypeSH3Probe.js

@@ -25,13 +25,13 @@ import { GLTFAssetLoader } from "../../asset/loaders/GLTFAssetLoader.js";
 import { three_object_to_entity_composition } from "../ecs/mesh-v2/three_object_to_entity_composition.js";
 import { TransformAttachmentSystem } from "../../ecs/transform-attachment/TransformAttachmentSystem.js";
 import { ShadedGeometryFlags } from "../ecs/mesh-v2/ShadedGeometryFlags.js";
-import { AABB3 } from "../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../core/geom/3d/aabb/AABB3.js";
 import { delay } from "../../../core/process/delay.js";
 import { make_justified_point_grid } from "../../../core/geom/3d/util/make_justified_point_grid.js";
 import LightSystem from "../ecs/light/LightSystem.js";
 import { Light } from "../ecs/light/Light.js";
 import { LightType } from "../ecs/light/LightType.js";
-import { buildCubeURLs } from "../texture/cubemap/buildCubeURLs.js";
+import { load_and_set_cubemap_v0 } from "../load_and_set_cubemap_v0.js";
 
 /**
  *
@@ -193,7 +193,7 @@ async function main(engine) {
         distance: 54,
         shadowmapResolution: 4096
     });
-    engine.graphics.loadEnvironmentMap(buildCubeURLs('data/textures/cubemaps/hip_miramar/32/', '.png'));
+    load_and_set_cubemap_v0(engine.graphics, 'data/textures/cubemaps/hip_miramar/32/', '.png');
 
     const ecd = engine.entityManager.dataset;
 
@@ -421,7 +421,7 @@ new EngineHarness().initialize({
     configuration(config, engine) {
         config.addSystem(new ShadedGeometrySystem(engine));
         config.addSystem(new TransformAttachmentSystem());
-        config.addSystem(new LightSystem(engine,{
+        config.addSystem(new LightSystem(engine, {
             shadowResolution: 2048
         }));
 

package/src/engine/graphics/texture/sampler/copy_Sampler2D_channel_data.js

@@ -19,9 +19,7 @@ export function copy_Sampler2D_channel_data(source, destination) {
     const destination_data = destination.data;
     const source_data = source.data;
 
-    let i, j;
-
-    const saturated_channel_value = saturated_value_by_constructor(destination_data.constructor);
+    let i=0, j=0;
 
     if (source_item_size === destination_item_size) {
         // just copy data chunk
@@ -39,6 +37,9 @@ export function copy_Sampler2D_channel_data(source, destination) {
         }
 
     } else if (source_item_size === 3 && destination_item_size === 4) {
+
+        const saturated_channel_value = saturated_value_by_constructor(destination_data.constructor);
+
         // RGB -> RGBA
         for (i = 0; i < pixel_count; i++) {
             const i3 = i * 3;

package/src/engine/graphics/texture/sampler/filter/kaiser_1.js

@@ -1,7 +1,10 @@
-import { bessel_i0 } from "../../../../../core/math/bessel_i0.js";
+import { modified_bessel_i0 } from "../../../../../core/math/modified_bessel_i0.js";
 import { clamp } from "../../../../../core/math/clamp.js";
 
-const BASE_I0 = bessel_i0(6.5);
+const PI2 = 2 * Math.PI;
+
+const BASE_I0 = modified_bessel_i0(PI2);
+const INV_BESSEL_I0 = 1 / BASE_I0;
 
 /**
  * Support kernel size is 1
@@ -11,9 +14,10 @@ const BASE_I0 = bessel_i0(6.5);
  */
 export function kaiser_1(x) {
     const i = clamp(x * 0.6666666666666666, -1.0, 1.0);
-    const i0a = 1 / BASE_I0;
 
-    return bessel_i0(6.5 * Math.sqrt(1 - i * i)) * i0a;
+    const t = Math.sqrt(1 - i * i);
+
+    return modified_bessel_i0(PI2 * t) * INV_BESSEL_I0;
 }
 
 kaiser_1.support = 1;

package/src/engine/graphics/texture/sampler/filter/kaiser_bessel_window.js

@@ -13,7 +13,9 @@ const INV_BESSEL_3_PI_3 = 1 / BESSEL_3_PI_3;
  */
 export function kaiser_bessel_window(x) {
     const i = clamp(x * 0.6666666666666666, -1.0, 1.0);
+
     const t = Math.sqrt(1.0 - i * i);
+
     return bessel_3(PI3 * t) * INV_BESSEL_3_PI_3;
 }
 

package/src/engine/graphics/texture/virtual/VirtualTexture.js

@@ -5,6 +5,7 @@ import Vector2 from "../../../../core/geom/Vector2.js";
 import { TilePage } from "./page/TilePage.js";
 import { create32BitCodec } from "../../../../core/binary/32BitEncoder.js";
 import { TileStatus } from "./tile/TileStatus.js";
+import { assert } from "../../../../core/assert.js";
 
 /**
  *
@@ -13,6 +14,14 @@ import { TileStatus } from "./tile/TileStatus.js";
  * @returns {{encode: (function(..value:number): number), decode: (function(number, number[]): void)}}
  */
 function buildAddressEncoder(tileSize, textureSize) {
+    assert.isNumber(tileSize,'tileSize');
+    assert.notNaN(tileSize,'tileSize');
+    assert.isNonNegativeInteger(tileSize,'tileSize');
+
+    assert.isNumber(textureSize,'textureSize');
+    assert.notNaN(textureSize,'textureSize');
+    assert.isNonNegativeInteger(textureSize,'textureSize');
+
     const numberOfTiles = Math.ceil(textureSize / tileSize);
     const numberOfMips = Math.ceil(Math.log2(numberOfTiles));
 

package/src/engine/graphics/texture/virtual/VirtualTexture.spec.js

@@ -3,7 +3,7 @@ import Vector2 from "../../../../core/geom/Vector2.js";
 
 function mockAssetManager() {
     const assetManager = {
-        get: function (path, type, success, failure) {
+        get: function ({ path, type, success, failure }) {
             const delay = Math.random() * 100;
             setTimeout(function () {
                 success({
@@ -12,7 +12,8 @@ function mockAssetManager() {
                     }
                 });
             }, delay);
-        }
+        },
+        isAssetManager: true
     };
 
     return assetManager;
@@ -21,13 +22,13 @@ function mockAssetManager() {
 test("constructor doesn't throw", () => {
     const assetManager = mockAssetManager();
 
-    new VirtualTexture({ assetManager })
+    new VirtualTexture(assetManager)
 });
 
 test("init computes sizes correctly", () => {
     const assetManager = mockAssetManager();
 
-    const sut = new VirtualTexture({ assetManager });
+    const sut = new VirtualTexture(assetManager);
 
     sut.init({ padding: 4, resolution: new Vector2(16, 3), tileResolution: new Vector2(1, 1) });
 

package/src/engine/graphics/texture/virtual/tile/TileLoader.js

@@ -5,6 +5,7 @@
 import { Tile } from "./Tile.js";
 import { TileStatus } from "./TileStatus.js";
 import { TileRequest } from "./TileRequest.js";
+import { assert } from "../../../../../core/assert.js";
 
 
 export class TileLoader {
@@ -13,6 +14,10 @@ export class TileLoader {
      * @param {AssetManager} assetManager
      */
     constructor(assetManager) {
+        assert.defined(assetManager, 'assetManager');
+        assert.notNull(assetManager, 'assetManager');
+        assert.equal(assetManager.isAssetManager, true, 'assetManager.isAssetManager !== true');
+
         /**
          * @type {AssetManager}
          */

package/src/engine/input/devices/PointerDevice.spec.js

@@ -0,0 +1,7 @@
+import { PointerDevice } from "./PointerDevice.js";
+
+test("constructor does not throw", () => {
+    const element = document.createElement('div');
+
+    expect(() => new PointerDevice(element)).not.toThrow();
+});

package/src/engine/platform/InMemoryEnginePlatform.js

@@ -0,0 +1,20 @@
+import { EnginePlatform } from "./EnginePlatform.js";
+import { StorageAchievementGateway } from "../achievements/gateway/StorageAchievementGateway.js";
+import { InMemoryStorage } from "../save/storage/InMemoryStorage.js";
+
+export class InMemoryEnginePlatform extends EnginePlatform {
+    #storage = new InMemoryStorage();
+    #achievements = new StorageAchievementGateway(this.#storage);
+
+    getStorage() {
+        return this.#storage;
+    }
+
+    getAchievementGateway() {
+        return this.#achievements;
+    }
+
+    pickDefaultLocale(options) {
+        return options[0];
+    }
+}

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

@@ -1,15 +1,15 @@
 export default class Storage {
-    storeBinary(key: string, value: ArrayBuffer, resolve: Function, reject: Function, progress: Function)
+    storeBinary(key: string, value: ArrayBuffer, resolve: Function, reject: Function, progress: Function): void
 
-    loadBinary(key:string, resolve:Function, reject:Function, progress:Function)
+    loadBinary(key: string, resolve: Function, reject: Function, progress: Function): void
 
-    store(key:string, value:any, resolve:Function, reject:Function, progress:Function)
+    store(key: string, value: any, resolve: Function, reject: Function, progress: Function): void
 
-    load(key:string, resolve:Function, reject:Function, progress:Function)
+    load(key: string, resolve: Function, reject: Function, progress: Function): void
 
-    list(resolve:Function, reject:Function)
+    list(resolve: Function, reject: Function): void
 
-    remove(key:string, resolve:Function, reject:Function)
+    remove(key: string, resolve: Function, reject: Function): void
 
-    contains(key:string, resolve:Function, reject:Function)
+    contains(key: string, resolve: Function, reject: Function): void
 }

package/src/engine/save/storage/InMemoryStorage.js

@@ -0,0 +1,34 @@
+import Storage from "../Storage.js";
+import { collectIteratorValueToArray } from "../../../core/collection/collectIteratorValueToArray.js";
+
+export class InMemoryStorage extends Storage {
+    #data = new Map();
+
+    store(key, value, resolve, reject, progress) {
+        this.#data.set(key, value);
+
+        resolve();
+    }
+
+    load(key, resolve, reject, progress) {
+        resolve(this.#data.get(key));
+    }
+
+    remove(key, resolve, reject) {
+        this.#data.delete(key);
+
+        resolve();
+    }
+
+    contains(key, resolve, reject) {
+        resolve(this.#data.has(key));
+    }
+
+    list(resolve, reject) {
+        const result = [];
+
+        collectIteratorValueToArray(result, this.#data.keys());
+
+        resolve(result);
+    }
+}

package/src/generation/filtering/numeric/complex/CellFilterAngleToNormal.js

@@ -3,6 +3,12 @@ import Vector3 from "../../../../core/geom/Vector3.js";
 import { assert } from "../../../../core/assert.js";
 import { v3_angle_between } from "../../../../core/geom/v3_angle_between.js";
 
+/**
+ * Distance from the reference point where support points will be sampled to compute derivative
+ * @type {number}
+ */
+const DERIVATIVE_OFFSET = 1;
+
 /**
  * Builds surface normal of another filter, and then computes the angle to a fixed 3d vector
  */
@@ -27,6 +33,7 @@ export class CellFilterAngleToNormal extends CellFilter {
      *
      * @param {CellFilter} surface
      * @param {Vector3} [reference=Vector3.forward]
+     * @returns {CellFilterAngleToNormal}
      */
     static from(surface, reference = Vector3.forward) {
         assert.equal(surface.isCellFilter, true, 'surface.isCellFilter !== true');
@@ -51,12 +58,12 @@ export class CellFilterAngleToNormal extends CellFilter {
         const filter = this.surface;
 
         //read surrounding points
-        const top = filter.execute(grid, x, y - 1, 0);
+        const top = filter.execute(grid, x, y - DERIVATIVE_OFFSET, 0);
 
-        const left = filter.execute(grid, x - 1, y, 0);
-        const right = filter.execute(grid, x + 1, y, 0);
+        const left = filter.execute(grid, x - DERIVATIVE_OFFSET, y, 0);
+        const right = filter.execute(grid, x + DERIVATIVE_OFFSET, y, 0);
 
-        const bottom = filter.execute(grid, x, y + 1, 0);
+        const bottom = filter.execute(grid, x, y + DERIVATIVE_OFFSET, 0);
 
         // compute gradients
         const dX = (right) - (left);

package/src/generation/filtering/numeric/complex/CellFilterAngleToNormal.spec.js

@@ -0,0 +1,30 @@
+import { CellFilterAngleToNormal } from "./CellFilterAngleToNormal.js";
+import { CellFilterLiteralFloat } from "../CellFilterLiteralFloat.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
+import { GridData } from "../../../grid/GridData.js";
+import { DEG_TO_RAD } from "../../../../core/math/DEG_TO_RAD.js";
+
+test("constructor does not throw", () => {
+    expect(() => new CellFilterAngleToNormal()).not.toThrow();
+});
+
+test("angle to flat surface exactly on normal", () => {
+    const data = new GridData();
+
+    const filter = CellFilterAngleToNormal.from(CellFilterLiteralFloat.from(0), new Vector3(0, 0, 1));
+
+    filter.initialize(data, 0);
+
+    expect(filter.execute(data, 0, 0, 0)).toBeCloseTo(0);
+});
+
+test("angle to flat surface at 30deg off normal", () => {
+
+    const data = new GridData();
+
+    const filter = CellFilterAngleToNormal.from(CellFilterLiteralFloat.from(0), new Vector3(0, 0.49999999999999994, 0.8660254037844386));
+
+    filter.initialize(data, 0);
+
+    expect(filter.execute(data, 0, 0, 0)).toBeCloseTo(30 * DEG_TO_RAD);
+})

package/src/generation/filtering/numeric/complex/CellFilterGaussianBlur.js

@@ -47,6 +47,22 @@ function buildKernel(result, samplesX, samplesY, sigma_x, sigma_y) {
     return powerTotal;
 }
 
+/**
+ *
+ * even number of samples, make odd to ensure we sample reference point
+ * @param {number} x
+ * @return {number}
+ */
+function makeNextOdd(x) {
+    if (x % 2 === 0) {
+        // even, make odd
+        return x + 1;
+    }
+
+    // already odd
+    return x;
+}
+
 export class CellFilterGaussianBlur extends CellFilter {
     constructor() {
         super();
@@ -141,8 +157,8 @@ export class CellFilterGaussianBlur extends CellFilter {
 
         r.source = source;
 
-        r.samples_x = max2(2, Math.round(quality * x));
-        r.samples_y = max2(2, Math.round(quality * y));
+        r.samples_x = max2(3, makeNextOdd(Math.round(quality * x)));
+        r.samples_y = max2(3, makeNextOdd(Math.round(quality * y)));
 
         r.size_x = x;
         r.size_y = y;

package/src/generation/filtering/numeric/complex/CellFilterGaussianBlur.spec.js

@@ -0,0 +1,17 @@
+import { CellFilterGaussianBlur } from "./CellFilterGaussianBlur.js";
+import { GridData } from "../../../grid/GridData.js";
+import { CellFilterLiteralFloat } from "../CellFilterLiteralFloat.js";
+
+test("constructor does not throw", () => {
+    expect(() => new CellFilterGaussianBlur()).not.toThrow();
+});
+
+test("sample on constant value source", () => {
+    const data = new GridData();
+
+    const filter = CellFilterGaussianBlur.from(CellFilterLiteralFloat.from(7), 3, 3, 1);
+
+    filter.initialize(data, 0);
+
+    expect(filter.execute(data, 0, 0, 0)).toBeCloseTo(7);
+});

package/src/generation/filtering/numeric/complex/CellFilterSimplexNoise.js

@@ -4,7 +4,7 @@ import { CellFilterAdd } from "../math/algebra/CellFilterAdd.js";
 import { CellFilterMultiply } from "../math/algebra/CellFilterMultiply.js";
 import { CellFilterLiteralFloat } from "../CellFilterLiteralFloat.js";
 import { CellFilterDivide } from "../math/algebra/CellFilterDivide.js";
-import { createNoise2D } from "../../../../core/math/noise/create_noise_2d.js";
+import { create_simplex_noise_2d } from "../../../../core/math/noise/create_simplex_noise_2d.js";
 
 export class CellFilterSimplexNoise extends CellFilter {
     constructor() {
@@ -109,7 +109,7 @@ export class CellFilterSimplexNoise extends CellFilter {
     initialize(grid, seed) {
         this.random.setCurrentSeed(seed + this.__seed);
 
-        this.noise = createNoise2D(this.random);
+        this.noise = create_simplex_noise_2d(this.random);
 
         super.initialize(grid, seed);
     }

package/src/generation/grid/GridData.js

@@ -203,66 +203,6 @@ export class GridData {
         );
     }
 
-    /**
-     *
-     * @param {number} x
-     * @param {number} y
-     * @param {number} mask
-     */
-    clearTags(x, y, mask) {
-
-        const cellIndex = y * this.width + x;
-
-        const current = this.tags[cellIndex];
-
-        const newValue = current & (~mask);
-
-        this.tags[cellIndex] = newValue;
-    }
-
-    /**
-     *
-     * @param {number} x
-     * @param {number} y
-     * @param {number} tags
-     */
-    writeTags(x, y, tags) {
-        const cellIndex = y * this.width + x;
-
-        this.tags[cellIndex] = tags;
-    }
-
-    /**
-     *
-     * @param {number} x
-     * @param {number} y
-     * @param {number} mask
-     */
-    setTags(x, y, mask) {
-
-        const cellIndex = y * this.width + x;
-
-        const current = this.tags[cellIndex];
-
-        const newValue = current | mask;
-
-        this.tags[cellIndex] = newValue;
-    }
-
-    /**
-     *
-     * @param {number} x
-     * @param {number} y
-     * @return {number}
-     */
-    readTags(x, y) {
-        const _x = x | 0;
-        const _y = y | 0;
-
-        const cellIndex = _y * this.width + _x;
-
-        return this.tags[cellIndex];
-    }
 }
 
 

package/src/generation/grid/generation/road/GridTaskGenerateRoads.js

@@ -11,9 +11,9 @@ import { buildPathFromDistanceMap } from "../util/buildPathFromDistanceMap.js";
 import { GridCellActionPlaceTags } from "../../../placement/action/GridCellActionPlaceTags.js";
 import { GridTags } from "../../../GridTags.js";
 import { CellMatcher } from "../../../rules/CellMatcher.js";
-import { collectIteratorValueToArray } from "../../../../core/collection/IteratorUtils.js";
+import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import { QuadTreeNode } from "../../../../core/geom/2d/quad-tree/QuadTreeNode.js";
-import AABB2 from "../../../../core/geom/AABB2.js";
+import AABB2 from "../../../../core/geom/2d/aabb/AABB2.js";
 import { PathEndPoint } from "./PathEndPoint.js";
 import { RoadConnection } from "./RoadConnection.js";
 import { readMarkerNodeGroupId } from "./readMarkerNodeGroupId.js";