@woosh/meep-engine 3.0.0 → 3.0.2

package/src/engine/ecs/terrain/ecs/Terrain.js

@@ -5,7 +5,6 @@ import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
 import { IllegalStateException } from "../../../../core/fsm/exceptions/IllegalStateException.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import Vector2 from '../../../../core/geom/Vector2.js';
-import { GameAssetType } from "../../../asset/GameAssetType.js";
 import { Sampler2D } from '../../../graphics/texture/sampler/Sampler2D.js';
 import { WHITE_PIXEL_DATA_URL } from "../../../graphics/WHITE_PIXEL_DATA_URL.js";
 import { TerrainOverlay } from '../overlay/TerrainOverlay.js';
@@ -170,8 +169,6 @@ class Terrain {
         });
 
         this.__tiles.maxTileSize.set(TILE_SIZE, TILE_SIZE);
-
-        this.initialize();
     }
 
     /**
@@ -259,31 +256,6 @@ class Terrain {
         }
     }
 
-    initialize() {
-        this.overlay.tileImage.onChanged.add(this.updateTileImage, this);
-    }
-
-    /**
-     * Fetch the overlay's tile sprite so it is in the asset cache by the time the terrain is drawn.
-     *
-     * The pixels are not kept here: `TerrainSystem3` loads the sprite it draws with off
-     * `overlay.baseTileImage` itself, because the sprite is a GPU resource of the pass rather than
-     * a field of the component.
-     *
-     * @returns {Promise<void>}
-     */
-    async updateTileImage() {
-        const tileImageURL = this.overlay.tileImage.getValue();
-
-        const assetManager = this.__assetManager;
-
-        if (assetManager === null) {
-            return;
-        }
-
-        await assetManager.promise(tileImageURL, GameAssetType.Texture);
-    }
-
     update(timeDelta) {
         this.clouds.update(timeDelta);
     }
@@ -678,8 +650,6 @@ class Terrain {
 
         this.__tiles.initialize();
 
-        this.updateTileImage();
-
         this.setFlag(TerrainFlags.Built);
     }
 

package/src/engine/ecs/terrain/ecs/TerrainSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/ecs/TerrainSystem.js"],"names":[],"mappings":";AA+BA;IAiJI;;;;;OAKG;IACH,kEAHW,OAAO,oEACiD,IAAI,QAuCtE;IAzKD;;;;;OAKG;IACH,kEAkBC;IA1CD,iCAAyB;IAEzB,mBAAe;IACf,mBAAe;IAEf;;;;OAIG;IACH,qBAAiB;IAEjB;;;OAGG;IACH,KAFU,GAAG,CAEG;IAuBZ,yBAAwB;IAExB,2BAAgC;IAGpC,kDAMC;IAED,2CAQC;IAED;;;;OAIG;IACH,gBAHW,OAAO,qBAqBjB;IAED;;;;OAIG;IACH,kBAHW,OAAO,qBAKjB;IAED,6BAaC;IAED;;;;;OAKG;IACH,gCAwBC;CA+CJ;uBAhNsB,iBAAiB;oBAEpB,cAAc;oBAbd,mCAAmC"}
+{"version":3,"file":"TerrainSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/ecs/TerrainSystem.js"],"names":[],"mappings":";AA6BA;IAgJI;;;;;OAKG;IACH,kEAHW,OAAO,oEACiD,IAAI,QA2BtE;IA5JD;;;;;OAKG;IACH,kEAkBC;IA1CD,iCAAyB;IAEzB,mBAAe;IACf,mBAAe;IAEf;;;;OAIG;IACH,qBAAiB;IAEjB;;;OAGG;IACH,KAFU,GAAG,CAEG;IAuBZ,yBAAwB;IAExB,2BAAgC;IAGpC,kDAMC;IAED,2CAOC;IAED;;;;OAIG;IACH,gBAHW,OAAO,qBAqBjB;IAED;;;;OAIG;IACH,kBAHW,OAAO,qBAKjB;IAED,6BAaC;IAED;;;;;OAKG;IACH,gCAwBC;CAmCJ;uBAnMsB,iBAAiB;oBAEpB,cAAc;oBAXd,mCAAmC"}

package/src/engine/ecs/terrain/ecs/TerrainSystem.js

@@ -5,11 +5,9 @@ import {
 } from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_intersects_frustum.js";
 
 import { noop } from "../../../../core/function/noop.js";
-import { frustum3_planes_to_flat_from_three } from "../../../../core/geom/3d/frustum/frustum3_planes_to_flat_from_three.js";
 import { M4_IDENTITY } from "../../../../core/geom/3d/mat4/M4_IDENTITY.js";
 import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
-import { TextureAssetLoader } from "../../../asset/loaders/texture/TextureAssetLoader.js";
-import { CameraSystem } from '../../../graphics/ecs/camera/CameraSystem.js';
+import { camera_active_frustum } from '../../../graphics/ecs/camera/camera_active_frustum.js';
 import { System } from '../../System.js';
 import { Transform } from "../../transform/Transform.js";
 import Terrain from './Terrain.js';
@@ -88,7 +86,6 @@ class TerrainSystem extends System {
         const am = this.assetManager;
 
         await am.tryRegisterLoader('image', new ImageRGBADataLoader());
-        await am.tryRegisterLoader('texture', new TextureAssetLoader());
 
     }
 
@@ -186,36 +183,24 @@ class TerrainSystem extends System {
 
         const tileManager = terrain.__tiles;
 
-        const tiles = [];
-        const set = new Set();
-        let tile_count = 0;
-
-        const frustum = new Float32Array(24);
-
-        if (tileManager !== undefined) {
-            CameraSystem.getActiveFrustums(ecd, function (frustums) {
-                let found_tiles = 0;
-
-                for (let i = 0; i < frustums.length; i++) {
-
-                    frustum3_planes_to_flat_from_three(frustums[i].planes, frustum);
-
-                    found_tiles += bvh_query_user_data_intersects_frustum(tiles, tile_count, tileManager.bvh, frustum);
-                }
+        if (tileManager === undefined) {
+            return;
+        }
 
-                for (let i = 0; i < found_tiles; i++) {
-                    const tile_index = tiles[i];
+        const frustum = camera_active_frustum(ecd);
 
-                    if (!set.has(tile_index)) {
-                        const tile = tileManager.tiles[tile_index];
+        if (frustum === null) {
+            // nothing has drawn a frame, so there is no answer to what is on screen; visiting every
+            // tile would be one, and it is the wrong one
+            return;
+        }
 
-                        callback(tile, tileManager);
-                    }
+        const tiles = [];
 
-                    set.add(tile_index);
-                }
+        const found_tiles = bvh_query_user_data_intersects_frustum(tiles, 0, tileManager.bvh, frustum);
 
-            });
+        for (let i = 0; i < found_tiles; i++) {
+            callback(tileManager.tiles[tiles[i]], tileManager);
         }
     }
 }

package/src/engine/ecs/terrain/util/loadVisibleTerrainTiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadVisibleTerrainTiles.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/util/loadVisibleTerrainTiles.js"],"names":[],"mappings":"AAUA;;;;;;GAMG;AACH,8EAFa,IAAI,CA8GhB;iBAxHgB,uCAAuC"}
+{"version":3,"file":"loadVisibleTerrainTiles.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/util/loadVisibleTerrainTiles.js"],"names":[],"mappings":"AAUA;;;;;;GAMG;AACH,8EAFa,IAAI,CAiHhB;iBA3HgB,uCAAuC"}

package/src/engine/ecs/terrain/util/loadVisibleTerrainTiles.js

@@ -1,126 +1,129 @@
-import TopDownCameraControllerSystem from "../../../graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
-import { Camera } from "../../../graphics/ecs/camera/Camera.js";
-import { obtainTerrain } from "./obtainTerrain.js";
-import { assert } from "../../../../core/assert.js";
-import TerrainSystem from "../ecs/TerrainSystem.js";
-import Task from "../../../../core/process/task/Task.js";
-import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
-import { max2 } from "../../../../core/math/max2.js";
-import { clamp01 } from "../../../../core/math/clamp01.js";
-
-/**
- *
- * @param {EntityManager} em
- * @param {EntityComponentDataset} ecd
- * @param {number} [timeout] in seconds
- * @returns {Task}
- */
-export function loadVisibleTerrainTiles({
-                                            em,
-                                            ecd,
-                                            timeout = 10
-                                        }) {
-
-    let totalTiles = 0;
-    let loadedTiles = 0;
-    let failedTiles = 0;
-
-    let attempt = 0;
-
-    let failureFlag = false;
-
-    const timeout_milliseconds = timeout * 1000;
-
-    let start_time = 0;
-
-    function init() {
-
-        start_time = Date.now();
-
-        const attemptId = attempt;
-
-        //force update by camera controller, to ensure correct focus is set
-        em.getSystem(TopDownCameraControllerSystem).update(0);
-
-        ecd.traverseComponents(Camera, function (c) {
-            c.updateMatrices();
-        });
-
-        const tiles = [];
-
-        const terrain = obtainTerrain(ecd);
-
-        assert.notEqual(terrain, null, 'terrain not found');
-
-        TerrainSystem.traverseVisibleTiles(ecd, terrain, function (tile) {
-            tiles.push(tile);
-        });
-
-        totalTiles = tiles.length;
-        const tileManager = terrain.__tiles;
-
-        function handleObtainedTile(t) {
-            if (attemptId !== attempt) {
-                return;
-            }
-
-            loadedTiles++;
-        }
-
-        function handleFailedTile(t) {
-            if (attemptId !== attempt) {
-                return;
-            }
-
-            attempt++;
-
-            failedTiles++;
-
-            if (attempt < 10) {
-                init();
-            } else {
-                failureFlag = true;
-            }
-        }
-
-        if (totalTiles !== 0) {
-            tiles.forEach(function (tile) {
-                tileManager.obtain(tile.gridPosition.x, tile.gridPosition.y).then(handleObtainedTile, handleFailedTile);
-            });
-        }
-    }
-
-    const task = new Task({
-        name: "Building visible terrain tiles",
-
-        initializer: init,
-
-        cycleFunction() {
-            if (Date.now() > start_time + timeout_milliseconds) {
-                // timed out
-                return TaskSignal.EndFailure;
-            }
-
-            if (failureFlag) {
-                return TaskSignal.EndFailure;
-            }
-
-            if (loadedTiles >= totalTiles) {
-                return TaskSignal.EndSuccess;
-            } else {
-                return TaskSignal.Yield;
-            }
-        },
-
-        computeProgress() {
-
-            const loaded_fraction = totalTiles === 0 ? 0 : loadedTiles / totalTiles;
-
-            const timeout_fraction = (Date.now() - start_time) / timeout_milliseconds;
-
-            return clamp01(max2(loaded_fraction, timeout_fraction));
-        }
-    });
-
-    return task;
-}
+import TopDownCameraControllerSystem from "../../../graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
+import { CameraSystem3 } from "../../../graphics3/CameraSystem3.js";
+import { obtainTerrain } from "./obtainTerrain.js";
+import { assert } from "../../../../core/assert.js";
+import TerrainSystem from "../ecs/TerrainSystem.js";
+import Task from "../../../../core/process/task/Task.js";
+import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
+import { max2 } from "../../../../core/math/max2.js";
+import { clamp01 } from "../../../../core/math/clamp01.js";
+
+/**
+ *
+ * @param {EntityManager} em
+ * @param {EntityComponentDataset} ecd
+ * @param {number} [timeout] in seconds
+ * @returns {Task}
+ */
+export function loadVisibleTerrainTiles({
+                                            em,
+                                            ecd,
+                                            timeout = 10
+                                        }) {
+
+    let totalTiles = 0;
+    let loadedTiles = 0;
+    let failedTiles = 0;
+
+    let attempt = 0;
+
+    let failureFlag = false;
+
+    const timeout_milliseconds = timeout * 1000;
+
+    let start_time = 0;
+
+    function init() {
+
+        start_time = Date.now();
+
+        const attemptId = attempt;
+
+        //force update by camera controller, to ensure correct focus is set
+        em.getSystem(TopDownCameraControllerSystem).update(0);
+
+        /*
+         And push that pose through to the renderer's camera, which is where the frustum the tile
+         query reads is computed. Without it the tiles waited for are the ones the previous scene
+         could see.
+        */
+        em.getSystem(CameraSystem3).update(0);
+
+        const tiles = [];
+
+        const terrain = obtainTerrain(ecd);
+
+        assert.notEqual(terrain, null, 'terrain not found');
+
+        TerrainSystem.traverseVisibleTiles(ecd, terrain, function (tile) {
+            tiles.push(tile);
+        });
+
+        totalTiles = tiles.length;
+        const tileManager = terrain.__tiles;
+
+        function handleObtainedTile(t) {
+            if (attemptId !== attempt) {
+                return;
+            }
+
+            loadedTiles++;
+        }
+
+        function handleFailedTile(t) {
+            if (attemptId !== attempt) {
+                return;
+            }
+
+            attempt++;
+
+            failedTiles++;
+
+            if (attempt < 10) {
+                init();
+            } else {
+                failureFlag = true;
+            }
+        }
+
+        if (totalTiles !== 0) {
+            tiles.forEach(function (tile) {
+                tileManager.obtain(tile.gridPosition.x, tile.gridPosition.y).then(handleObtainedTile, handleFailedTile);
+            });
+        }
+    }
+
+    const task = new Task({
+        name: "Building visible terrain tiles",
+
+        initializer: init,
+
+        cycleFunction() {
+            if (Date.now() > start_time + timeout_milliseconds) {
+                // timed out
+                return TaskSignal.EndFailure;
+            }
+
+            if (failureFlag) {
+                return TaskSignal.EndFailure;
+            }
+
+            if (loadedTiles >= totalTiles) {
+                return TaskSignal.EndSuccess;
+            } else {
+                return TaskSignal.Yield;
+            }
+        },
+
+        computeProgress() {
+
+            const loaded_fraction = totalTiles === 0 ? 0 : loadedTiles / totalTiles;
+
+            const timeout_fraction = (Date.now() - start_time) / timeout_milliseconds;
+
+            return clamp01(max2(loaded_fraction, timeout_fraction));
+        }
+    });
+
+    return task;
+}

package/src/engine/ecs/transform/copy_three_transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copy_three_transform.d.ts","sourceRoot":"","sources":["../../../../../src/engine/ecs/transform/copy_three_transform.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,yEAFW,MAAM,QAAQ,QAWxB"}
+{"version":3,"file":"copy_three_transform.d.ts","sourceRoot":"","sources":["../../../../../src/engine/ecs/transform/copy_three_transform.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,+FASC"}

package/src/engine/graphics/ecs/animation/animator/graph/AnimationState.d.ts

@@ -16,9 +16,9 @@ export class AnimationState {
     outEdges: AnimationTransition[];
     /**
      *
-     * @type {AnimationGraph}
+     * @type {AnimationGraphController}
      */
-    graph: AnimationGraph;
+    graph: AnimationGraphController;
     /**
      *
      * @type {BlendStateMatrix}

package/src/engine/graphics/ecs/animation/animator/graph/AnimationState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnimationState.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/ecs/animation/animator/graph/AnimationState.js"],"names":[],"mappings":"AAGA;IACI;;;OAGG;IACH,8BAAW;IAEX;;;OAGG;IACH,SAFU,qBAAqB,CAElB;IAEb;;;OAGG;IACH,UAFU,qBAAqB,CAEjB;IAEd;;;OAGG;IACH,sBAAa;IAEb;;;OAGG;IACH,YAFU,gBAAgB,CAER;IAElB;;;OAGG;IACH,MAFU,MAAM,CAEP;IAET;;;OAGG;IACH,WAFU,MAAM,CAEF;IAEd;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAQnB;IAED;;;OAGG;IACH,QAFY,MAAM,CAIjB;IAED,mBAeC;IAED,yBA0BC;IAED;;;OAGG;IACH,gBAFW,MAAM,QA4ChB;IAED;;;;OAIG;IACH,iBAHW,MAAM,qCAoBhB;IAED;;;;OAIG;IACH,mBAHW,MAAM,qCAmBhB;CACJ;iCA9MgC,iCAAiC"}
+{"version":3,"file":"AnimationState.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/ecs/animation/animator/graph/AnimationState.js"],"names":[],"mappings":"AAGA;IACI;;;OAGG;IACH,8BAAW;IAEX;;;OAGG;IACH,SAFU,qBAAqB,CAElB;IAEb;;;OAGG;IACH,UAFU,qBAAqB,CAEjB;IAEd;;;OAGG;IACH,gCAAa;IAEb;;;OAGG;IACH,YAFU,gBAAgB,CAER;IAElB;;;OAGG;IACH,MAFU,MAAM,CAEP;IAET;;;OAGG;IACH,WAFU,MAAM,CAEF;IAEd;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAQnB;IAED;;;OAGG;IACH,QAFY,MAAM,CAIjB;IAED,mBAeC;IAED,yBA0BC;IAED;;;OAGG;IACH,gBAFW,MAAM,QA4ChB;IAED;;;;OAIG;IACH,iBAHW,MAAM,qCAoBhB;IAED;;;;OAIG;IACH,mBAHW,MAAM,qCAmBhB;CACJ;iCA9MgC,iCAAiC"}