@woosh/meep-engine 3.11.3 → 3.12.0

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

@@ -1,129 +1,129 @@
-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;
-}
+import TopDownCameraControllerSystem from "../../../graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
+import { CameraSystem } from "../../../graphics3/CameraSystem.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(CameraSystem).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/graphics/ecs/camera/camera_find_active.d.ts

@@ -1,7 +1,7 @@
 /**
  * The camera entity the frame is drawn from, or an entity of `-1` when the dataset has none.
  *
- * **The first active one wins**, which is the rule `CameraSystem3` settles on when it elects the
+ * **The first active one wins**, which is the rule `CameraSystem` settles on when it elects the
  * camera it copies onto the renderer's. Two entities both claiming to be active therefore resolve
  * the same way here as they do there; the predecessor of this function took the last one and could
  * name a camera nothing was drawing from.

package/src/engine/graphics/ecs/camera/camera_find_active.js

@@ -1,28 +1,28 @@
-import { camera_traverse_active } from "./camera_traverse_active.js";
-
-/**
- * The camera entity the frame is drawn from, or an entity of `-1` when the dataset has none.
- *
- * **The first active one wins**, which is the rule `CameraSystem3` settles on when it elects the
- * camera it copies onto the renderer's. Two entities both claiming to be active therefore resolve
- * the same way here as they do there; the predecessor of this function took the last one and could
- * name a camera nothing was drawing from.
- *
- * @param {EntityComponentDataset} ecd
- * @returns {{component: (Camera|undefined), entity: number}}
- */
-export function camera_find_active(ecd) {
-    const result = {
-        entity: -1,
-        component: undefined
-    };
-
-    camera_traverse_active(ecd, (camera, entity) => {
-        if (result.entity === -1) {
-            result.entity = entity;
-            result.component = camera;
-        }
-    });
-
-    return result;
-}
+import { camera_traverse_active } from "./camera_traverse_active.js";
+
+/**
+ * The camera entity the frame is drawn from, or an entity of `-1` when the dataset has none.
+ *
+ * **The first active one wins**, which is the rule `CameraSystem` settles on when it elects the
+ * camera it copies onto the renderer's. Two entities both claiming to be active therefore resolve
+ * the same way here as they do there; the predecessor of this function took the last one and could
+ * name a camera nothing was drawing from.
+ *
+ * @param {EntityComponentDataset} ecd
+ * @returns {{component: (Camera|undefined), entity: number}}
+ */
+export function camera_find_active(ecd) {
+    const result = {
+        entity: -1,
+        component: undefined
+    };
+
+    camera_traverse_active(ecd, (camera, entity) => {
+        if (result.entity === -1) {
+            result.entity = entity;
+            result.component = camera;
+        }
+    });
+
+    return result;
+}

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.d.ts

@@ -44,7 +44,7 @@ export class ShadedGeometry {
      * The row a renderer put this primitive in, or `null` while it is in none.
      *
      * **Written by whichever system placed it, and read by whoever needs to know where it ended
-     * up** — `MeshSystem3` combining the bounds of an expanded model, for one. Same arrangement v1
+     * up** — `MeshSystem` combining the bounds of an expanded model, for one. Same arrangement v1
      * made with `Mesh.mesh`: a component that carries the renderer's own geometry may as well carry
      * the renderer's own handle to it, and one renderer runs at a time.
      *