@woosh/meep-engine 3.11.3 → 3.12.0

package/src/view/minimap/Minimap.js

@@ -1,225 +1,225 @@
-import Rectangle from "../../core/geom/2d/Rectangle.js";
-import Vector2 from "../../core/geom/Vector2.js";
-import { EntityObserver } from "../../engine/ecs/EntityObserver.js";
-import Terrain from "../../engine/ecs/terrain/ecs/Terrain.js";
-import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
-import { Transform } from "../../engine/ecs/transform/Transform.js";
-import { Camera } from "../../engine/graphics/ecs/camera/Camera.js";
-import TopDownCameraController from "../../engine/graphics/ecs/camera/topdown/TopDownCameraController.js";
-import { PointerDevice } from "../../engine/input/devices/PointerDevice.js";
-import domify from "../DOM.js";
-import EmptyView from "../elements/EmptyView.js";
-import View from "../View.js";
-import { MinimapCameraView } from "./dom/MinimapCameraView.js";
-import { MinimapCanvasView } from "./MinimapCanvasView.js";
-
-
-class MinimapView extends View {
-    el = domify('div').addClass('ui-minimap-view').el;
-
-    /**
-     *
-     * @constructor
-     * @param {EntityComponentDataset} entityDataset
-     * @param {AssetManager} assetManager
-     * @param {GraphicsEngine|GraphicsEngine3} graphics what the camera frames trace their ray with
-     */
-    constructor(entityDataset, assetManager, graphics) {
-        super(entityDataset, assetManager);
-
-        /**
-         *
-         * @type {EntityComponentDataset}
-         */
-        this.entityDataset = entityDataset;
-
-        const vWorld = new EmptyView({ classList: ['world'] });
-        this.addChild(vWorld);
-
-        /**
-         * What part of the world is on screen. The map decides it from the explored area, and the
-         * camera frames and the click-to-focus arithmetic below read it.
-         *
-         * @type {Rectangle}
-         */
-        const world = this.world = new Rectangle(0, 0, 0, 0);
-
-        const worldScale = new Vector2(1, 1);
-
-        const vMap = new MinimapCanvasView({
-            dataset: entityDataset,
-            assets: assetManager,
-            focus_area: world
-        });
-
-        vMap.followSize({ size: this.size });
-
-        // first, so that the camera frames added below stay above it
-        vWorld.addChild(vMap);
-
-        this.__worldView = vWorld;
-
-        /**
-         *
-         * @type {MinimapCameraView[]}
-         */
-        const cameraViews = this.__cameraViews = [];
-
-        const self = this;
-
-        function cameraAdded(camera, transform, entity) {
-            const cameraView = new MinimapCameraView({ camera, transform, entity, world, worldScale, graphics });
-
-            const terrain = obtainTerrain(entityDataset);
-
-            cameraView.terrain.set(terrain);
-
-            self.__cameraViews.push(cameraView);
-            self.__worldView.addChild(cameraView);
-        }
-
-        function cameraRemoved(camera, transform, entity) {
-            const cameraView = self.__cameraViews.find(v => v.entity === entity);
-
-            if (cameraView === undefined) {
-                //do nothing
-                console.warn('Camera view not found', camera, transform, entity);
-                return;
-            }
-
-            const i = self.__cameraViews.indexOf(cameraView);
-
-            self.__cameraViews.splice(i, 1);
-
-            self.__worldView.removeChild(cameraView);
-        }
-
-        this.cameraObserver = new EntityObserver([Camera, Transform], cameraAdded, cameraRemoved);
-
-        function updateWorldScale() {
-            let worldSizeX = world.size.x;
-            let worldSizeY = world.size.y;
-
-            let scaleX;
-
-            if (worldSizeX === 0) {
-                scaleX = 0;
-            } else {
-                scaleX = self.size.x / worldSizeX;
-            }
-
-            let scaleY;
-
-            if (worldSizeY === 0) {
-                scaleY = 0;
-            } else {
-                scaleY = self.size.y / worldSizeY;
-            }
-
-            worldScale.set(scaleX, scaleY);
-        }
-
-        world.size.onChanged.add(updateWorldScale);
-
-        this.size.onChanged.add(function (x, y) {
-            updateWorldScale();
-        });
-
-        const pointer = this.pointer = new PointerDevice(vWorld.el);
-
-        function focus(x, y) {
-            const worldX = (x / worldScale.x) + world.position.x;
-            const worldZ = (y / worldScale.y) + world.position.y;
-
-            //find active camera
-            const v = cameraViews.find(function (v) {
-                /**
-                 * @type {Camera}
-                 */
-                const camera = v.camera;
-                return camera.active.getValue();
-            });
-
-            if (v === undefined) {
-                console.warn(`No camera present. Focusing attempt failed, (x=${x}, y=${y})`);
-            } else {
-
-                /**
-                 *
-                 * @type {TopDownCameraController}
-                 */
-                const controller = entityDataset.getComponent(v.entity, TopDownCameraController);
-
-                if (controller !== null) {
-                    controller.target.set(worldX, controller.target.y, worldZ);
-                }
-
-            }
-        }
-
-        pointer.on.down.add(function (position, event) {
-            focus(event.layerX, event.layerY);
-        });
-
-        pointer.on.drag.add(function (position, origin, lastDragPosition, event) {
-            focus(event.layerX, event.layerY);
-        });
-    }
-
-    /**
-     * Detaches every camera view and forgets it.
-     *
-     * Called from {@link unlink}, where the observer teardown has usually
-     * emptied the list already, but it is also the only way for a caller to
-     * reset the view: leaving the entries behind would let a later camera
-     * removal detach a child that is no longer attached.
-     */
-    clear() {
-        const views = this.__cameraViews;
-
-        // this used to call addChild, which attached each camera view a second
-        // time rather than removing it
-        for (let i = 0, l = views.length; i < l; i++) {
-            this.__worldView.removeChild(views[i]);
-        }
-
-        views.length = 0;
-    }
-
-    link() {
-        super.link();
-
-        const entityDataset = this.entityDataset;
-
-        const self = this;
-
-        /**
-         *
-         * @param {Terrain} t
-         */
-        function visitTerrain(t) {
-            self.__cameraViews.forEach(c => c.terrain.set(t));
-        }
-
-        entityDataset.traverseComponents(Terrain, visitTerrain);
-
-        entityDataset.addObserver(this.cameraObserver, true);
-
-        this.pointer.start();
-    }
-
-    unlink() {
-        super.unlink();
-
-        this.pointer.stop();
-
-        //clear out all camera views
-        this.entityDataset.removeObserver(this.cameraObserver, true);
-
-        //remove all exiting markers
-        this.clear();
-    }
-}
-
-
-export default MinimapView;
+import Rectangle from "../../core/geom/2d/Rectangle.js";
+import Vector2 from "../../core/geom/Vector2.js";
+import { EntityObserver } from "../../engine/ecs/EntityObserver.js";
+import Terrain from "../../engine/ecs/terrain/ecs/Terrain.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
+import { Transform } from "../../engine/ecs/transform/Transform.js";
+import { Camera } from "../../engine/graphics/ecs/camera/Camera.js";
+import TopDownCameraController from "../../engine/graphics/ecs/camera/topdown/TopDownCameraController.js";
+import { PointerDevice } from "../../engine/input/devices/PointerDevice.js";
+import domify from "../DOM.js";
+import EmptyView from "../elements/EmptyView.js";
+import View from "../View.js";
+import { MinimapCameraView } from "./dom/MinimapCameraView.js";
+import { MinimapCanvasView } from "./MinimapCanvasView.js";
+
+
+class MinimapView extends View {
+    el = domify('div').addClass('ui-minimap-view').el;
+
+    /**
+     *
+     * @constructor
+     * @param {EntityComponentDataset} entityDataset
+     * @param {AssetManager} assetManager
+     * @param {GraphicsEngine|GraphicsEngine} graphics what the camera frames trace their ray with
+     */
+    constructor(entityDataset, assetManager, graphics) {
+        super(entityDataset, assetManager);
+
+        /**
+         *
+         * @type {EntityComponentDataset}
+         */
+        this.entityDataset = entityDataset;
+
+        const vWorld = new EmptyView({ classList: ['world'] });
+        this.addChild(vWorld);
+
+        /**
+         * What part of the world is on screen. The map decides it from the explored area, and the
+         * camera frames and the click-to-focus arithmetic below read it.
+         *
+         * @type {Rectangle}
+         */
+        const world = this.world = new Rectangle(0, 0, 0, 0);
+
+        const worldScale = new Vector2(1, 1);
+
+        const vMap = new MinimapCanvasView({
+            dataset: entityDataset,
+            assets: assetManager,
+            focus_area: world
+        });
+
+        vMap.followSize({ size: this.size });
+
+        // first, so that the camera frames added below stay above it
+        vWorld.addChild(vMap);
+
+        this.__worldView = vWorld;
+
+        /**
+         *
+         * @type {MinimapCameraView[]}
+         */
+        const cameraViews = this.__cameraViews = [];
+
+        const self = this;
+
+        function cameraAdded(camera, transform, entity) {
+            const cameraView = new MinimapCameraView({ camera, transform, entity, world, worldScale, graphics });
+
+            const terrain = obtainTerrain(entityDataset);
+
+            cameraView.terrain.set(terrain);
+
+            self.__cameraViews.push(cameraView);
+            self.__worldView.addChild(cameraView);
+        }
+
+        function cameraRemoved(camera, transform, entity) {
+            const cameraView = self.__cameraViews.find(v => v.entity === entity);
+
+            if (cameraView === undefined) {
+                //do nothing
+                console.warn('Camera view not found', camera, transform, entity);
+                return;
+            }
+
+            const i = self.__cameraViews.indexOf(cameraView);
+
+            self.__cameraViews.splice(i, 1);
+
+            self.__worldView.removeChild(cameraView);
+        }
+
+        this.cameraObserver = new EntityObserver([Camera, Transform], cameraAdded, cameraRemoved);
+
+        function updateWorldScale() {
+            let worldSizeX = world.size.x;
+            let worldSizeY = world.size.y;
+
+            let scaleX;
+
+            if (worldSizeX === 0) {
+                scaleX = 0;
+            } else {
+                scaleX = self.size.x / worldSizeX;
+            }
+
+            let scaleY;
+
+            if (worldSizeY === 0) {
+                scaleY = 0;
+            } else {
+                scaleY = self.size.y / worldSizeY;
+            }
+
+            worldScale.set(scaleX, scaleY);
+        }
+
+        world.size.onChanged.add(updateWorldScale);
+
+        this.size.onChanged.add(function (x, y) {
+            updateWorldScale();
+        });
+
+        const pointer = this.pointer = new PointerDevice(vWorld.el);
+
+        function focus(x, y) {
+            const worldX = (x / worldScale.x) + world.position.x;
+            const worldZ = (y / worldScale.y) + world.position.y;
+
+            //find active camera
+            const v = cameraViews.find(function (v) {
+                /**
+                 * @type {Camera}
+                 */
+                const camera = v.camera;
+                return camera.active.getValue();
+            });
+
+            if (v === undefined) {
+                console.warn(`No camera present. Focusing attempt failed, (x=${x}, y=${y})`);
+            } else {
+
+                /**
+                 *
+                 * @type {TopDownCameraController}
+                 */
+                const controller = entityDataset.getComponent(v.entity, TopDownCameraController);
+
+                if (controller !== null) {
+                    controller.target.set(worldX, controller.target.y, worldZ);
+                }
+
+            }
+        }
+
+        pointer.on.down.add(function (position, event) {
+            focus(event.layerX, event.layerY);
+        });
+
+        pointer.on.drag.add(function (position, origin, lastDragPosition, event) {
+            focus(event.layerX, event.layerY);
+        });
+    }
+
+    /**
+     * Detaches every camera view and forgets it.
+     *
+     * Called from {@link unlink}, where the observer teardown has usually
+     * emptied the list already, but it is also the only way for a caller to
+     * reset the view: leaving the entries behind would let a later camera
+     * removal detach a child that is no longer attached.
+     */
+    clear() {
+        const views = this.__cameraViews;
+
+        // this used to call addChild, which attached each camera view a second
+        // time rather than removing it
+        for (let i = 0, l = views.length; i < l; i++) {
+            this.__worldView.removeChild(views[i]);
+        }
+
+        views.length = 0;
+    }
+
+    link() {
+        super.link();
+
+        const entityDataset = this.entityDataset;
+
+        const self = this;
+
+        /**
+         *
+         * @param {Terrain} t
+         */
+        function visitTerrain(t) {
+            self.__cameraViews.forEach(c => c.terrain.set(t));
+        }
+
+        entityDataset.traverseComponents(Terrain, visitTerrain);
+
+        entityDataset.addObserver(this.cameraObserver, true);
+
+        this.pointer.start();
+    }
+
+    unlink() {
+        super.unlink();
+
+        this.pointer.stop();
+
+        //clear out all camera views
+        this.entityDataset.removeObserver(this.cameraObserver, true);
+
+        //remove all exiting markers
+        this.clear();
+    }
+}
+
+
+export default MinimapView;

package/src/view/minimap/dom/MinimapCameraView.d.ts

@@ -5,7 +5,7 @@ export class MinimapCameraView extends View {
      * @param entity
      * @param {Rectangle} world
      * @param {Vector2} worldScale
-     * @param {GraphicsEngine|GraphicsEngine3} graphics asked for the ray the frame is traced with
+     * @param {GraphicsEngine|GraphicsEngine} graphics asked for the ray the frame is traced with
      * @constructor
      */
     constructor({ camera, transform, entity, world, worldScale, graphics }: Camera);
@@ -31,9 +31,9 @@ export class MinimapCameraView extends View {
      * It therefore traces the view the player has rather than this entity's camera. The two are
      * the same wherever the game has one camera, which is everywhere it has a minimap.
      *
-     * @type {GraphicsEngine|GraphicsEngine3}
+     * @type {GraphicsEngine|GraphicsEngine}
      */
-    graphics: GraphicsEngine | GraphicsEngine3;
+    graphics: GraphicsEngine | GraphicsEngine;
     /**
      *
      * @type {Transform}

package/src/view/minimap/dom/MinimapCameraView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MinimapCameraView.d.ts","sourceRoot":"","sources":["../../../../../src/view/minimap/dom/MinimapCameraView.js"],"names":[],"mappings":"AAUA;IACI;;;;;;;;OAQG;IACH,gFAuEC;IApEG,YAAkC;IAIlC;;;;OAIG;IACH,qBAAgD;IAIhD;;;OAGG;IACH,eAAoB;IAEpB;;;;;;;;;;;OAWG;IACH,UAFU,gCAA8B,CAEhB;IACxB;;;OAGG;IACH,qBAA0B;IAE1B,eAAoB;IAEpB;;;;OAIG;IACH,gBAAoB;IAEpB;;;;OAIG;IACH,sBAA+B;IAE/B;;;OAGG;IACH,aAAsC;IAY1C;;;;;;;;;OASG;IACH,uBARW,OAAO,WACP,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,QAsChB;IAED;;;;;OAKG;IACH,YAJW,MAAM,KACN,MAAM,GACJ,OAAO,CA+BnB;IAED,iBAQC;CAgBJ;iBA1MgB,eAAe;oBACZ,+BAA+B"}
+{"version":3,"file":"MinimapCameraView.d.ts","sourceRoot":"","sources":["../../../../../src/view/minimap/dom/MinimapCameraView.js"],"names":[],"mappings":"AAUA;IACI;;;;;;;;OAQG;IACH,gFAuEC;IApEG,YAAkC;IAIlC;;;;OAIG;IACH,qBAAgD;IAIhD;;;OAGG;IACH,eAAoB;IAEpB;;;;;;;;;;;OAWG;IACH,UAFU,+BAA6B,CAEf;IACxB;;;OAGG;IACH,qBAA0B;IAE1B,eAAoB;IAEpB;;;;OAIG;IACH,gBAAoB;IAEpB;;;;OAIG;IACH,sBAA+B;IAE/B;;;OAGG;IACH,aAAsC;IAY1C;;;;;;;;;OASG;IACH,uBARW,OAAO,WACP,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,QAsChB;IAED;;;;;OAKG;IACH,YAJW,MAAM,KACN,MAAM,GACJ,OAAO,CA+BnB;IAED,iBAQC;CAgBJ;iBA1MgB,eAAe;oBACZ,+BAA+B"}