@woosh/meep-engine 2.49.7 → 2.49.8

package/src/engine/graphics/ecs/compileAllMaterials.js

@@ -1,7 +1,7 @@
 import { Mesh, PlaneBufferGeometry } from "three";
 import Task from "../../../core/process/task/Task.js";
 import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
-import { collectIteratorValueToArray } from "../../../core/collection/IteratorUtils.js";
+import { collectIteratorValueToArray } from "../../../core/collection/collectIteratorValueToArray.js";
 import { clamp01 } from "../../../core/math/clamp01.js";
 
 /**

package/src/engine/graphics/ecs/mesh/createTaskWaitForMeshesToLoad.js

@@ -4,7 +4,7 @@ import Task from "../../../../core/process/task/Task.js";
 import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
 import { assert } from "../../../../core/assert.js";
 import { assetTypeByPath } from "./assetTypeByPath.js";
-import { collectIteratorValueToArray } from "../../../../core/collection/IteratorUtils.js";
+import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import { clamp01 } from "../../../../core/math/clamp01.js";
 
 /**

package/src/engine/graphics/impostors/octahedral/ImpostorBaker.js

@@ -14,7 +14,7 @@ import { UvEncoder } from "./grid/UvEncoder.js";
 import { OctahedralUvEncoder } from "./grid/OctahedralUvEncoder.js";
 import { HemiOctahedralUvEncoder } from "./grid/HemiOctahedralUvEncoder.js";
 import { prepare_bake_material } from "./bake/prepare_bake_material.js";
-import { collectIteratorValueToArray } from "../../../../core/collection/IteratorUtils.js";
+import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import { compute_bounding_sphere } from "./bake/compute_bounding_sphere.js";
 import { build_cutout_from_atlas_by_alpha } from "./util/build_cutout_from_atlas_by_alpha.js";
 

package/src/engine/graphics/load_and_set_cubemap_v0.js

@@ -0,0 +1,21 @@
+import { buildCubeURLs } from "./texture/cubemap/buildCubeURLs.js";
+import { load_environment_map } from "./texture/cubemap/load_environment_map.js";
+
+/**
+ *
+ * @param {GraphicsEngine} graphics
+ * @param {string} folder_path
+ * @param {string} file_extension
+ */
+export async function load_and_set_cubemap_v0(graphics, folder_path, file_extension) {
+    const paths = buildCubeURLs(folder_path, file_extension);
+
+    const { filtered } = await load_environment_map({
+        path: paths,
+        renderer: this.renderer,
+        original: false,
+        filtered: true
+    });
+
+    graphics.scene.environment = filtered;
+}

package/src/engine/graphics/material/optimization/MaterialOptimizationContext.js

@@ -7,7 +7,7 @@ import { Sampler2D } from "../../texture/sampler/Sampler2D.js";
 import { array_push_if_unique } from "../../../../core/collection/array/array_push_if_unique.js";
 import { computeMaterialHash } from "../../../asset/loaders/material/computeMaterialHash.js";
 import { computeMaterialEquality } from "../../../asset/loaders/material/computeMaterialEquality.js";
-import { collectIteratorValueToArray } from "../../../../core/collection/IteratorUtils.js";
+import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import {
     AdditiveBlending,
     ClampToEdgeWrapping,

package/src/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -27,7 +27,6 @@ import { PathDisplaySystem } from "../../../../../ecs/path/PathDisplaySystem.js"
 import RenderSystem from "../../../../../../ecs/systems/RenderSystem.js";
 import { makeEngineOptionsModel } from "../../../../../../../../../model/game/options/makeEngineOptionsModel.js";
 import { enableEditor } from "../../../../../../../../editor/enableEditor.js";
-import { buildCubeURLs } from "../../../../../texture/cubemap/buildCubeURLs.js";
 import {
     AmbientOcclusionPostProcessEffect
 } from "../../../../../render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
@@ -36,7 +35,7 @@ import Vector3 from "../../../../../../../core/geom/Vector3.js";
 import EntityBuilder from "../../../../../../ecs/EntityBuilder.js";
 import { Transform } from "../../../../../../ecs/transform/Transform.js";
 import Mesh from "../../../../../ecs/mesh/Mesh.js";
-import { AABB3 } from "../../../../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../../../../core/geom/3d/aabb/AABB3.js";
 import { ParticleVolume } from "./ParticleVolume.js";
 import { ParticleEmitterSystem } from "../../../../ecs/ParticleEmitterSystem.js";
 import { BehaviorComponent } from "../../../../../../intelligence/behavior/ecs/BehaviorComponent.js";
@@ -75,13 +74,13 @@ import ButtonView from "../../../../../../../view/elements/button/ButtonView.js"
 import { UnitSphereShape3D } from "../../../../../../../core/geom/3d/shape/UnitSphereShape3D.js";
 import TopDownCameraController from "../../../../../ecs/camera/topdown/TopDownCameraController.js";
 import { randomFloatBetween } from "../../../../../../../core/math/random/randomFloatBetween.js";
-import { MicronRenderPlugin } from "../../../../../micron/plugin/MicronRenderPlugin.js";
 import { obtainTerrain } from "../../../../../../ecs/terrain/util/obtainTerrain.js";
 import { pick } from "../../../../../../ecs/grid/pick.js";
 import { clamp01 } from "../../../../../../../core/math/clamp01.js";
 import { randomFromArray } from "../../../../../../../core/math/random/randomFromArray.js";
 import { SamplingFunctionKind } from "./SamplingFunctionKind.js";
 import { RGBA_LUT_HEATMAP_IR } from "../../parameter/sample/RGBA_LUT_HEATMAP_IR.js";
+import { load_and_set_cubemap_v0 } from "../../../../../load_and_set_cubemap_v0.js";
 
 const engineHarness = new EngineHarness();
 
@@ -134,7 +133,6 @@ function makeConfig(engine) {
 
 
     // Plugins
-    config.addPlugin(MicronRenderPlugin);
     config.addPlugin(AmbientOcclusionPostProcessEffect);
 
 
@@ -160,7 +158,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/render/buffer/buffers/prototypeNormalFrameBuffer.js

@@ -63,9 +63,8 @@ import {
 } from "three";
 import { AmbientOcclusionPostProcessEffect } from "../simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
 import { PathDisplaySystem } from "../../../ecs/path/PathDisplaySystem.js";
-import { MicronRenderPlugin } from "../../../micron/plugin/MicronRenderPlugin.js";
 import { StandardFrameBuffers } from "../../../StandardFrameBuffers.js";
-import { buildCubeURLs } from "../../../texture/cubemap/buildCubeURLs.js";
+import { load_and_set_cubemap_v0 } from "../../../load_and_set_cubemap_v0.js";
 
 const engineHarness = new EngineHarness();
 
@@ -133,7 +132,6 @@ function makeConfig(engine) {
 
 
     // Plugins
-    config.addPlugin(MicronRenderPlugin);
 
 
     // Knowledge
@@ -240,7 +238,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 engine.plugins.acquire(AmbientOcclusionPostProcessEffect);

package/src/engine/graphics/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -64,7 +64,7 @@ import { OrbitingBehavior } from "../../../../../../../model/game/util/behavior/
 import { BehaviorComponent } from "../../../../intelligence/behavior/ecs/BehaviorComponent.js";
 import { Light } from "../../../ecs/light/Light.js";
 import { LightType } from "../../../ecs/light/LightType.js";
-import { parseColor } from "../../../../../core/color/ColorUtils.js";
+import { parseColor } from "../../../../../core/color/parseColor.js";
 import Renderable from "../../../../ecs/components/Renderable.js";
 import { makeHelperSphereGeometry } from "../../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
 import TopDownCameraController from "../../../ecs/camera/topdown/TopDownCameraController.js";

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

@@ -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/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/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";