@woosh/meep-engine 2.168.0 → 2.169.0

package/src/engine/Engine.js

@@ -11,6 +11,7 @@ import ObservedBoolean from "../core/model/ObservedBoolean.js";
 import ConcurrentExecutor from '../core/process/executor/ConcurrentExecutor.js';
 import EmptyView from "../view/elements/EmptyView.js";
 import { ViewStack } from "../view/elements/navigation/ViewStack.js";
+import { WebGLContextFailureView } from "../view/graphics/WebGLContextFailureView.js";
 
 import { AssetManager } from './asset/AssetManager.js';
 import { AssetPreloader } from "./asset/preloader/AssetPreloader.js";
@@ -44,9 +45,48 @@ const METRIC_ID_FRAME = 'frame_delay';
 const METRIC_ID_RENDER = 'render_time';
 const METRIC_ID_SIMULATION = 'simulation_time';
 
+/**
+ * How long a context loss is tolerated before the simulation is paused as well, in seconds. Most losses
+ * are resolved in well under a second, and stopping the world for those would be more disruptive than
+ * letting it run; a longer outage is worth pausing for, as the player cannot see what is happening.
+ * @type {number}
+ */
+const CONTEXT_LOSS_SIMULATION_PAUSE_DELAY = 2;
+
 class Engine {
     #last_frame_timestamp = 0;
 
+    /**
+     * Handle of the pending render-loop frame, `-1` when the loop is not running
+     * @type {number}
+     */
+    #animation_frame_handle = -1;
+
+    /**
+     * Handle of the pending "pause the simulation, this outage is taking a while" timer, `-1` when none
+     * @type {number}
+     */
+    #context_loss_pause_timer = -1;
+
+    /**
+     * Whether the simulation was paused because of a context loss, and therefore should be resumed once
+     * the context comes back
+     * @type {boolean}
+     */
+    #paused_by_context_loss = false;
+
+    /**
+     * Absent when the engine is constructed with `enableGraphics: false`.
+     * @type {GraphicsEngine|null}
+     */
+    graphics = null;
+
+    /**
+     * Absent when the engine is constructed with `enableAudio: false`.
+     * @type {SoundEngine|null}
+     */
+    sound = null;
+
     viewStack = new ViewStack();
 
     /**
@@ -257,6 +297,10 @@ class Engine {
                 logger.error(`Failed to start GraphicEngine: ${e}`);
             }
 
+            graphicsEngine.on.contextLost.add(this.#handle_context_lost, this);
+            graphicsEngine.on.contextRestored.add(this.#handle_context_restored, this);
+            graphicsEngine.on.contextFailed.add(this.#handle_context_failed, this);
+
         } else {
             logger.info('enableGraphics option is not set, no graphics engine will be created');
         }
@@ -316,9 +360,84 @@ class Engine {
         this.plugins.initialize(this);
     }
 
+    #clear_context_loss_pause_timer() {
+        if (this.#context_loss_pause_timer !== -1) {
+            clearTimeout(this.#context_loss_pause_timer);
+            this.#context_loss_pause_timer = -1;
+        }
+    }
+
+    /**
+     * Pauses the simulation, if it is running. {@link Ticker#pause} freezes the clock, so no simulation
+     * time accrues while we wait and the first step after resuming is a normal-sized one.
+     *
+     * A ticker that is already paused is left alone - somebody else owns that pause and it is not ours to
+     * undo when the context comes back.
+     */
+    #pause_simulation_for_context_loss() {
+        this.#context_loss_pause_timer = -1;
+
+        if (this.#paused_by_context_loss) {
+            return;
+        }
+
+        const ticker = this.ticker;
+
+        if (!ticker.is_active || ticker.is_paused) {
+            return;
+        }
+
+        this.#paused_by_context_loss = true;
+
+        logger.warn('Graphics context outage is taking a while, pausing simulation');
+
+        ticker.pause();
+    }
+
+    #handle_context_lost() {
+        logger.warn('Graphics context lost, waiting for recovery');
+
+        this.#clear_context_loss_pause_timer();
+
+        this.#context_loss_pause_timer = setTimeout(
+            () => this.#pause_simulation_for_context_loss(),
+            CONTEXT_LOSS_SIMULATION_PAUSE_DELAY * 1000
+        );
+    }
+
+    #handle_context_restored() {
+        this.#clear_context_loss_pause_timer();
+
+        if (this.#paused_by_context_loss) {
+            this.#paused_by_context_loss = false;
+
+            if (this.ticker.is_active) {
+                this.ticker.resume();
+            }
+        }
+
+        logger.info('Graphics context restored, rendering resumed');
+    }
+
+    /**
+     *
+     * @param {WebGLContextFailureReason} reason
+     */
+    #handle_context_failed(reason) {
+        logger.error(`Graphics context recovery abandoned (${reason}), no further rendering is possible`);
+
+        this.#clear_context_loss_pause_timer();
+
+        // nothing can be drawn any more, so let the simulation stop rather than burn cycles invisibly.
+        // Application state is left intact, which keeps a save-on-failure handler viable.
+        this.#pause_simulation_for_context_loss();
+
+        this.viewStack.addChild(new WebGLContextFailureView());
+    }
+
     #initialize_audio() {
         const sound = this.sound;
-        if (sound === undefined || sound === null) {
+        if (sound === null) {
             // no sound engine
             return;
         }
@@ -348,7 +467,7 @@ class Engine {
 
         this.viewStack.push(gameView, 'game-view');
 
-        if (this.graphics !== undefined) {
+        if (this.graphics !== null) {
 
             const viewport = this.graphics.viewport;
 
@@ -440,12 +559,17 @@ class Engine {
 
         const graphics = this.graphics;
 
+        if (graphics === null) {
+            // headless
+            return;
+        }
+
         if (graphics.autoDraw) {
             // request redraw
             graphics.needDraw = true;
         }
 
-        if (graphics && this.renderingEnabled && graphics.needDraw) {
+        if (this.renderingEnabled && graphics.needDraw) {
 
             const metrics = this.performance;
 
@@ -465,7 +589,7 @@ class Engine {
      * Startup
      * @returns {Promise}
      */
-    start() {
+    async start() {
         this.assetManager.startup();
 
         this.#initialize_audio();
@@ -479,9 +603,14 @@ class Engine {
 
         this.__performacne_monitor.start();
 
+        const sound = this.sound;
+
+        const soundStarted = sound === null
+            ? Promise.resolve()
+            : sound.start();
+
         return Promise.all([
-            this.sound.start()
-                .then(promiseEntityManager),
+            soundStarted.then(promiseEntityManager),
             this.staticKnowledge.load(this.assetManager, this.executor),
             this.gui.startup(this),
             this.plugins.startup()
@@ -492,7 +621,7 @@ class Engine {
             /**
              * Starting the engine
              */
-            requestAnimationFrame(this.#animation_frame);
+            this.#animation_frame_handle = requestAnimationFrame(this.#animation_frame);
 
             //start simulation
             this.ticker.start({ maxTimeout: 200 });
@@ -504,6 +633,10 @@ class Engine {
             logger.info('engine started');
         }, function (e) {
             logger.error(`Engine Failed to start: ${e}`);
+
+            // the caller awaits start() to know whether the engine came up;
+            // swallowing this reported success after a failed startup
+            throw e;
         });
 
 
@@ -516,7 +649,7 @@ class Engine {
 
         const t0 = this.#last_frame_timestamp;
         const t1 = performance.now();
-        requestAnimationFrame(this.#animation_frame);
+        this.#animation_frame_handle = requestAnimationFrame(this.#animation_frame);
         this.render();
 
         const frame_delay = (t1 - t0) / 1000;
@@ -534,8 +667,14 @@ class Engine {
     async stop() {
         this.__performacne_monitor.stop();
 
-        // stop the ticker
-        this.ticker.pause();
+        // stop the ticker. pause() throws when the loop is not currently
+        // running, which would abort the whole teardown below
+        this.ticker.stop();
+
+        // and the render loop, which re-requests itself every frame and would
+        // otherwise keep calling render() on a torn-down engine forever
+        cancelAnimationFrame(this.#animation_frame_handle);
+        this.#animation_frame_handle = -1;
 
         // shutdown entity manager
         if (!this.__using_external_entity_manager) {

package/src/engine/EngineHarness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EngineHarness.d.ts","sourceRoot":"","sources":["../../../src/engine/EngineHarness.js"],"names":[],"mappings":"AA6DA;IAmBI;;;;OAIG;IACH,8CAHmB,mBAAmB,UAAQ,MAAM,WACxC,QAAQ,MAAM,CAAC,CAM1B;IAED;;;OAGG;IACH,6BAFW,MAAM,QAYhB;IAkED;;;;;;;;;;;;;OAaG;IACH;QAZyB,MAAM,EAApB,MAAM;QACyB,GAAG;QAClB,MAAM,GAAtB,OAAO;QACQ,QAAQ,GAAvB,MAAM;QACS,KAAK,GAApB,MAAM;QACS,GAAG,GAAlB,MAAM;QACU,QAAQ,GAAxB,OAAO;QACQ,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACJ,MAAM,CA+DlB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH;QApB0B,MAAM,EAArB,MAAM;QACgC,KAAK,GAA3C;YAAC,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAA;SAAC;QACrB,SAAS;QACT,WAAW;QACF,KAAK,GAArB,MAAM;QACU,GAAG,GAAnB,MAAM;QACU,QAAQ,GAAxB,MAAM;QACwB,WAAW,GAAzC;YAAC,CAAC,EAAC,MAAM,CAAC;YAAC,CAAC,EAAC,MAAM,CAAA;SAAC;QACJ,iBAAiB,GAAjC,MAAM;QACW,WAAW,GAA5B,OAAO;QACU,aAAa,GAA9B,OAAO;QACU,YAAY,GAA7B,OAAO;QACU,aAAa,GAA9B,OAAO;QACS,iBAAiB,GAAjC,MAAM;QACU,iBAAiB,GAAjC,MAAM;QACW,gBAAgB,GAAjC,OAAO;QACU,cAAc,GAA/B,OAAO;QACS,mBAAmB,GAAnC,MAAM;QACW,OAAO,GAAxB,OAAO;sBA0EjB;IAGD;;;;;;;;;;;;OAYG;IACH;QAXyB,MAAM,EAApB,MAAM;QACyB,GAAG;QACnB,mBAAmB,GAAlC,MAAM;QACU,UAAU,GAA1B,OAAO;QACO,GAAG,GAAjB,KAAK;QACU,YAAY,GAA3B,MAAM;QACU,YAAY,GAA5B,OAAO;QACO,OAAO,GAArB,KAAK;QACU,gBAAgB,GAA/B,MAAM;QACS,iBAAiB,GAAhC,MAAM;sBAuDhB;IAED;;;;;;;OAOG;IACH;QAN0B,YAAY,GAA3B,MAAM;QACQ,MAAM,EAApB,MAAM;QACS,WAAW,GAA1B,MAAM;QACyB,GAAG;QAChC,QAAQ,MAAM,CAAC,CA2C3B;IAGD;;;;;;;;;;OAUG;IACH,sFATW,MAAM,GAOJ,OAAO,CAsDnB;IAjdG;;;OAGG;IACH,QAFU,MAAM,CAEiC;IAMjD;;;OAGG;IACH,YAFU,eAAQ,IAAI,CAET;IA8BjB;;;;;OAKG;IACH;iCAJmB,mBAAmB,UAAQ,MAAM;8BACzC,OAAO;QACL,QAAQ,MAAM,CAAC,CA0D3B;CAwWJ;;IAID;;;OAGG;IACH,uCAMC;;mBAhhBkB,aAAa;oCACI,0BAA0B;oBAX1C,yBAAyB;mBAK1B,iBAAiB;sBATd,wBAAwB;oBAW1B,8BAA8B"}
+{"version":3,"file":"EngineHarness.d.ts","sourceRoot":"","sources":["../../../src/engine/EngineHarness.js"],"names":[],"mappings":"AA8DA;IAmBI;;;;OAIG;IACH,8CAHmB,mBAAmB,UAAQ,MAAM,WACxC,QAAQ,MAAM,CAAC,CAM1B;IAED;;;OAGG;IACH,6BAFW,MAAM,QAYhB;IAkED;;;;;;;;;;;;;OAaG;IACH;QAZyB,MAAM,EAApB,MAAM;QACyB,GAAG;QAClB,MAAM,GAAtB,OAAO;QACQ,QAAQ,GAAvB,MAAM;QACS,KAAK,GAApB,MAAM;QACS,GAAG,GAAlB,MAAM;QACU,QAAQ,GAAxB,OAAO;QACQ,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACJ,MAAM,CA+DlB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH;QApB0B,MAAM,EAArB,MAAM;QACgC,KAAK,GAA3C;YAAC,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAA;SAAC;QACrB,SAAS;QACT,WAAW;QACF,KAAK,GAArB,MAAM;QACU,GAAG,GAAnB,MAAM;QACU,QAAQ,GAAxB,MAAM;QACwB,WAAW,GAAzC;YAAC,CAAC,EAAC,MAAM,CAAC;YAAC,CAAC,EAAC,MAAM,CAAA;SAAC;QACJ,iBAAiB,GAAjC,MAAM;QACW,WAAW,GAA5B,OAAO;QACU,aAAa,GAA9B,OAAO;QACU,YAAY,GAA7B,OAAO;QACU,aAAa,GAA9B,OAAO;QACS,iBAAiB,GAAjC,MAAM;QACU,iBAAiB,GAAjC,MAAM;QACW,gBAAgB,GAAjC,OAAO;QACU,cAAc,GAA/B,OAAO;QACS,mBAAmB,GAAnC,MAAM;QACW,OAAO,GAAxB,OAAO;sBA0EjB;IAGD;;;;;;;;;;;;OAYG;IACH;QAXyB,MAAM,EAApB,MAAM;QACyB,GAAG;QACnB,mBAAmB,GAAlC,MAAM;QACU,UAAU,GAA1B,OAAO;QACO,GAAG,GAAjB,KAAK;QACU,YAAY,GAA3B,MAAM;QACU,YAAY,GAA5B,OAAO;QACO,OAAO,GAArB,KAAK;QACU,gBAAgB,GAA/B,MAAM;QACS,iBAAiB,GAAhC,MAAM;sBAuDhB;IAED;;;;;;;OAOG;IACH;QAN0B,YAAY,GAA3B,MAAM;QACQ,MAAM,EAApB,MAAM;QACS,WAAW,GAA1B,MAAM;QACyB,GAAG;QAChC,QAAQ,MAAM,CAAC,CA6C3B;IAGD;;;;;;;;;;OAUG;IACH,sFATW,MAAM,GAOJ,OAAO,CAsDnB;IAndG;;;OAGG;IACH,QAFU,MAAM,CAEiC;IAMjD;;;OAGG;IACH,YAFU,eAAQ,IAAI,CAET;IA8BjB;;;;;OAKG;IACH;iCAJmB,mBAAmB,UAAQ,MAAM;8BACzC,OAAO;QACL,QAAQ,MAAM,CAAC,CA0D3B;CA0WJ;;IAID;;;OAGG;IACH,uCAMC;;mBAlhBkB,aAAa;oCACI,0BAA0B;oBAX1C,yBAAyB;mBAK1B,iBAAiB;sBATd,wBAAwB;oBAW1B,8BAA8B"}

package/src/engine/EngineHarness.js

@@ -1,4 +1,5 @@
 import Stats from "three/examples/jsm/libs/stats.module.js";
+import { assert } from "../core/assert.js";
 import { Color } from "../core/color/Color.js";
 
 import { noop } from "../core/function/noop.js";
@@ -327,7 +328,7 @@ export class EngineHarness {
         }
 
         if (cameraController) {
-            EngineHarness.buildOrbitalCameraController({
+            await EngineHarness.buildOrbitalCameraController({
                 engine,
                 cameraEntity: cameraEntity
             });
@@ -430,6 +431,8 @@ export class EngineHarness {
             cameraEntity = ecd.getAnyComponent(Camera).entity;
         }
 
+        assert.defined(cameraEntity, "cameraEntity");
+
         const em = engine.entityManager;
 
         if (em.getSystem(InputControllerSystem) === null) {

package/src/engine/asset/loaders/ArrayBufferLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArrayBufferLoader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/loaders/ArrayBufferLoader.js"],"names":[],"mappings":"AAyFA;IACI;;;OAGG;IACH,iCAFW,MAAM,GAAC,KAAK,GAAC,MAAM,EAa7B;IANG;;;;OAIG;IACH,yBAAsC;IAG1C;;;oDA0DC;CACJ;4BAlK2B,kBAAkB;qBAJzB,gCAAgC;sBAC/B,aAAa"}
+{"version":3,"file":"ArrayBufferLoader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/loaders/ArrayBufferLoader.js"],"names":[],"mappings":"AAgGA;IACI;;;OAGG;IACH,iCAFW,MAAM,GAAC,KAAK,GAAC,MAAM,EAa7B;IANG;;;;OAIG;IACH,yBAAsC;IAG1C;;;oDA0DC;CACJ;4BAzK2B,kBAAkB;qBAJzB,gCAAgC;sBAC/B,aAAa"}

package/src/engine/asset/loaders/ArrayBufferLoader.js

@@ -58,6 +58,13 @@ function observeResponseProgress(input, progress) {
 
                     pump();
 
+                }).catch(error => {
+                    // A stream failure mid-download -- or a throw out of the
+                    // caller's progress callback -- otherwise reaches nobody:
+                    // the stream never closes and the load never settles.
+                    // .catch rather than a second .then argument, so that
+                    // throws from the fulfilment path above are covered too.
+                    controller.error(error);
                 });
 
             }

package/src/engine/ecs/speaker/lines/sets/LineSetDescription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LineSetDescription.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/ecs/speaker/lines/sets/LineSetDescription.js"],"names":[],"mappings":"AAEA;IACI;;;OAGG;IACH,IAFU,MAAM,CAER;IACR;;;OAGG;IACH,OAFU,iBAAiB,CAEhB;IACX;;;OAGG;IACH,MAFU,kBAAkB,EAAE,CAEpB;IAEV;;;;OAIG;IACH,qBAHW,iBAAiB,sBACjB,MAAM,UA8ChB;CACJ"}
+{"version":3,"file":"LineSetDescription.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/ecs/speaker/lines/sets/LineSetDescription.js"],"names":[],"mappings":"AAEA;IACI;;;OAGG;IACH,IAFU,MAAM,CAER;IACR;;;OAGG;IACH,OAFU,iBAAiB,CAEhB;IACX;;;OAGG;IACH,MAFU,kBAAkB,EAAE,CAEpB;IAEV;;;;OAIG;IACH,qBAHW,iBAAiB,sBACjB,MAAM,UAgDhB;CACJ"}

package/src/engine/ecs/speaker/lines/sets/LineSetDescription.js

@@ -53,7 +53,9 @@ export class LineSetDescription {
                 added_line_count++;
             }
 
-            const sets = this.sets;
+            // the popped set's children, not the root's -- reading `this` here
+            // re-pushes the root's children on every iteration and never terminates
+            const sets = set.sets;
             const set_count = sets.length;
 
 

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":";AAgCA;IA0NI;;;;;OAKG;IACH,kEAHW,OAAO,uBAwCjB;IA5OD;;;;;OAKG;IACH,kEAeC;IA7CD,iCAAyB;IAEzB,mBAAe;IACf,mBAAe;IAEf;;;;OAIG;IACH,qBAAiB;IAEjB;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEP;IAEnB;;;OAGG;IACH,KAFU,GAAG,CAEG;IAoBZ,yBAAwB;IAExB,2BAAgC;IAGpC,kDAMC;IAED,2CA0EC;IAED,4CAEC;IAED;;;;OAIG;IACH,gBAHW,OAAO,qBAqBjB;IAED;;;;OAIG;IACH,kBAHW,OAAO,qBAKjB;IAED,6BAaC;IAED;;;;;OAKG;IACH,gCAwBC;CA+CJ;uBAzRsB,iBAAiB;oBAEpB,cAAc;oBAdd,mCAAmC"}
+{"version":3,"file":"TerrainSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/ecs/TerrainSystem.js"],"names":[],"mappings":";AAgCA;IA6NI;;;;;OAKG;IACH,kEAHW,OAAO,uBAwCjB;IA/OD;;;;;OAKG;IACH,kEAkBC;IAhDD,iCAAyB;IAEzB,mBAAe;IACf,mBAAe;IAEf;;;;OAIG;IACH,qBAAiB;IAEjB;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEP;IAEnB;;;OAGG;IACH,KAFU,GAAG,CAEG;IAuBZ,yBAAwB;IAExB,2BAAgC;IAGpC,kDAMC;IAED,2CA0EC;IAED,4CAEC;IAED;;;;OAIG;IACH,gBAHW,OAAO,qBAqBjB;IAED;;;;OAIG;IACH,kBAHW,OAAO,qBAKjB;IAED,6BAaC;IAED;;;;;OAKG;IACH,gCAwBC;CA+CJ;uBA5RsB,iBAAiB;oBAEpB,cAAc;oBAdd,mCAAmC"}

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

@@ -64,7 +64,10 @@ class TerrainSystem extends System {
     constructor(graphics, assetManager) {
         super();
 
-        if (graphics === undefined) {
+        // Engine.graphics is null, not undefined, when the engine runs headless,
+        // so an undefined-only check lets null straight through to fail later
+        // and further away
+        if (graphics === undefined || graphics === null) {
             throw new Error('No GraphicsEngine supplied');
         }
 

package/src/engine/ecs/terrain/tiles/TerrainTileManager.d.ts

@@ -124,6 +124,19 @@ declare class TerrainTileManager {
      * @returns {number}
      */
     computeTileIndex(x: number, y: number): number;
+    /**
+     * Number of tiles along X. A terrain whose size is not a whole multiple of
+     * the tile size ends in a partial tile, and that tile is real, so this
+     * rounds up. Every consumer must agree on this or edge tiles fall outside
+     * whatever grid the consumer imagined.
+     * @returns {number}
+     */
+    get gridWidth(): number;
+    /**
+     * Number of tiles along Y.
+     * @returns {number}
+     */
+    get gridHeight(): number;
     /**
      *
      * @param {number} x
@@ -174,6 +187,22 @@ declare class TerrainTileManager {
      * @param {TerrainTile} tile
      */
     stitchTile(x: number, y: number, tile: TerrainTile): void;
+    /**
+     * The eight tiles surrounding a grid cell, each undefined where the cell sits
+     * on the edge of the grid.
+     *
+     * Partial edge tiles are real tiles, so the neighbour grid must round up
+     * exactly as tile creation and getRaw do. Flooring it -- as this did until
+     * recently -- leaves the last row and column believing they have no
+     * neighbour on the outward side, so their seams are never stitched.
+     *
+     * @param {number} x Tile X coordinate
+     * @param {number} y Tile Y coordinate
+     * @returns {Object<string,TerrainTile|undefined>}
+     */
+    collectTileNeighbours(x: number, y: number): {
+        [x: string]: TerrainTile | undefined;
+    };
     /**
      *
      * @param {SurfacePoint3} result

package/src/engine/ecs/terrain/tiles/TerrainTileManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainTileManager.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/tiles/TerrainTileManager.js"],"names":[],"mappings":";AA6BA;IA6DI;;;;;;;;OAQG;IACH,uDAPW,OAAO,EA2CjB;IAzGD;;;OAGG;IACH,OAFU,WAAW,EAAE,CAEZ;IAEX;;;MAGE;IAEF;;;OAGG;IACH,UAFU,OAAO,CAEc;IAE/B;;;OAGG;IACH,WAFU,OAAO,CAEa;IAC9B;;;OAGG;IACH,YAFU,eAAe,CAEW;IAEpC;;;OAGG;IACH,OAFU,OAAO,CAES;IAG1B;;;;OAIG;IACH,oBAAmC;IAEnC;;;OAGG;IACH,cAFU,GAAG,CAEG;IAEhB;;;OAGG;IACH,aAFU,eAAe,CAEe;IAExC;;;OAGG;IACH,yBAFU,OAAO,CAEe;IAyB5B,wBAA2C;IAE3C;;;;;;OAMG;IACH,eAFU,WAAS,IAAI,CAEW;IAGlC;;;OAGG;IACH,yBAA8B;IAQlC,iCAWC;IAED,8BAEC;IAED;;;;OAIG;IACH,2BAHW,MAAM,cACN,MAAM,QAiChB;IAED,mBAIC;IAED;;;OAGG;IACH,yBAFW,WAAW,QAuBrB;IAED;;;;OAIG;IACH,6CASC;IAED,qBAqBC;IAED;;OAEG;IACH,gBAIC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAuBhB;IAGD;;;;;;;OAOG;IACH,oCANW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,WAAW,EAAE,CAgCzB;IAED,wBAgDC;IAED;;;;;OAKG;IACH,oBAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;OAKG;IACH,UAJW,MAAM,KACN,MAAM,GACJ,WAAW,GAAC,SAAS,CAiBjC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,KACN,MAAM,GACJ,WAAW,CAavB;IAED;;;;;OAKG;IACH,4BAJW,MAAM,KACN,MAAM,GACL,WAAW,GAAC,SAAS,CAahC;IAED;;;;;OAKG;IACH,+BAJW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CAYhC;IAED;;;;;;OAMG;IACH,UALW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CA4BhC;IAED;;;OAGG;IACH,cAFW,WAAW,QAcrB;IAED,gBASC;IAED;;;;;;OAMG;IACH,cAJW,MAAM,KACN,MAAM,QACN,WAAW,QAsCrB;IAED;;;;;;;;;;OAUG;IACH,yBATW,aAAa,WACb,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,GACJ,OAAO,CAuDnB;IAED;;;;;;OAMG;IACH,kCALW,aAAa,KACb,MAAM,KACN,MAAM,GACL,OAAO,CAOlB;IAED;;;;;;OAMG;IACH,SALW,MAAM,KACN,MAAM,mCAuFhB;CACJ;wBA9uBuB,kBAAkB;mBAVvB,0CAA0C;oBAGzC,kCAAkC;4BAG1B,2CAA2C;oBAVnD,mCAAmC;gCAQvB,mDAAmD;0BAGzD,yCAAyC;8BALrC,2CAA2C"}
+{"version":3,"file":"TerrainTileManager.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/tiles/TerrainTileManager.js"],"names":[],"mappings":";AA6BA;IA6DI;;;;;;;;OAQG;IACH,uDAPW,OAAO,EA2CjB;IAzGD;;;OAGG;IACH,OAFU,WAAW,EAAE,CAEZ;IAEX;;;MAGE;IAEF;;;OAGG;IACH,UAFU,OAAO,CAEc;IAE/B;;;OAGG;IACH,WAFU,OAAO,CAEa;IAC9B;;;OAGG;IACH,YAFU,eAAe,CAEW;IAEpC;;;OAGG;IACH,OAFU,OAAO,CAES;IAG1B;;;;OAIG;IACH,oBAAmC;IAEnC;;;OAGG;IACH,cAFU,GAAG,CAEG;IAEhB;;;OAGG;IACH,aAFU,eAAe,CAEe;IAExC;;;OAGG;IACH,yBAFU,OAAO,CAEe;IAyB5B,wBAA2C;IAE3C;;;;;;OAMG;IACH,eAFU,WAAS,IAAI,CAEW;IAGlC;;;OAGG;IACH,yBAA8B;IAQlC,iCAWC;IAED,8BAEC;IAED;;;;OAIG;IACH,2BAHW,MAAM,cACN,MAAM,QAiChB;IAED,mBAIC;IAED;;;OAGG;IACH,yBAFW,WAAW,QAuBrB;IAED;;;;OAIG;IACH,6CASC;IAED,qBAqBC;IAED;;OAEG;IACH,gBAIC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAuBhB;IAGD;;;;;;;OAOG;IACH,oCANW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,WAAW,EAAE,CAgCzB;IAED,wBAgDC;IAED;;;;;OAKG;IACH,oBAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;;OAMG;IACH,wBAEC;IAED;;;OAGG;IACH,yBAEC;IAED;;;;;OAKG;IACH,UAJW,MAAM,KACN,MAAM,GACJ,WAAW,GAAC,SAAS,CAiBjC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,KACN,MAAM,GACJ,WAAW,CAavB;IAED;;;;;OAKG;IACH,4BAJW,MAAM,KACN,MAAM,GACL,WAAW,GAAC,SAAS,CAoBhC;IAED;;;;;OAKG;IACH,+BAJW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CAYhC;IAED;;;;;;OAMG;IACH,UALW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CA4BhC;IAED;;;OAGG;IACH,cAFW,WAAW,QAcrB;IAED,gBASC;IAED;;;;;;OAMG;IACH,cAJW,MAAM,KACN,MAAM,QACN,WAAW,QAUrB;IAED;;;;;;;;;;;;OAYG;IACH,yBAJW,MAAM,KACN,MAAM;YACG,MAAM,GAAC,WAAW,GAAC,SAAS;MAkD/C;IAED;;;;;;;;;;OAUG;IACH,yBATW,aAAa,WACb,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,GACJ,OAAO,CAuDnB;IAED;;;;;;OAMG;IACH,kCALW,aAAa,KACb,MAAM,KACN,MAAM,GACL,OAAO,CAOlB;IAED;;;;;;OAMG;IACH,SALW,MAAM,KACN,MAAM,mCAuFhB;CACJ;wBA3yBuB,kBAAkB;mBAVvB,0CAA0C;oBAGzC,kCAAkC;4BAG1B,2CAA2C;oBAVnD,mCAAmC;gCAQvB,mDAAmD;0BAGzD,yCAAyC;8BALrC,2CAA2C"}

package/src/engine/ecs/terrain/tiles/TerrainTileManager.js

@@ -402,14 +402,33 @@ class TerrainTileManager {
         assert.isNonNegativeInteger(x, 'x');
         assert.isNonNegativeInteger(y, 'y');
 
-        const w = Math.ceil(this.totalSize.x / this.tileSize.x);
+        const w = this.gridWidth;
 
         assert.ok(x < w, `x(=${x}) must be less than than width(=${w})`);
-        assert.ok(y < Math.ceil(this.totalSize.y / this.tileSize.y), `y(=${y}) must be less than than height(=${Math.ceil(this.totalSize.y / this.tileSize.y)})`);
+        assert.ok(y < this.gridHeight, `y(=${y}) must be less than than height(=${this.gridHeight})`);
 
         return y * w + x;
     }
 
+    /**
+     * Number of tiles along X. A terrain whose size is not a whole multiple of
+     * the tile size ends in a partial tile, and that tile is real, so this
+     * rounds up. Every consumer must agree on this or edge tiles fall outside
+     * whatever grid the consumer imagined.
+     * @returns {number}
+     */
+    get gridWidth() {
+        return Math.ceil(this.totalSize.x / this.tileSize.x);
+    }
+
+    /**
+     * Number of tiles along Y.
+     * @returns {number}
+     */
+    get gridHeight() {
+        return Math.ceil(this.totalSize.y / this.tileSize.y);
+    }
+
     /**
      *
      * @param {number} x
@@ -419,7 +438,7 @@ class TerrainTileManager {
     getRaw(x, y) {
         if (
             x < 0
-            || x >= Math.ceil(this.totalSize.x / this.tileSize.x)
+            || x >= this.gridWidth
             || y < 0
         ) {
             return undefined;
@@ -468,7 +487,14 @@ class TerrainTileManager {
 
         v3_matrix4_multiply(v3, 0, v3, 0, world_inverse);
 
-        return this.getRawTileByPosition(v3[0], v3[1]);
+        // v3 was built as (x, 0, z): index 1 is the vertical axis, which is not
+        // a grid row. The top-down plane is X/Z.
+        //
+        // getRawTileByPosition takes *grid* coordinates, and `transform` does
+        // not carry the grid scale -- tiles apply it themselves (see
+        // assignTileScale). Divide it out here, matching Terrain's own
+        // mapPointWorld2Grid.
+        return this.getRawTileByPosition(v3[0] / this.scale.x, v3[2] / this.scale.y);
     }
 
     /**
@@ -561,40 +587,75 @@ class TerrainTileManager {
      */
     stitchTile(x, y, tile) {
 
-        const gridSize = this.totalSize.clone();
-        gridSize.divide(this.tileSize);
-        gridSize.floor();
+        const n = this.collectTileNeighbours(x, y);
 
-        const self = this;
-        //normal stitching
-        let top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight;
+        tile.stitchNormals(
+            n.top, n.bottom, n.left, n.right,
+            n.topLeft, n.topRight, n.bottomLeft, n.bottomRight
+        );
+    }
+
+    /**
+     * The eight tiles surrounding a grid cell, each undefined where the cell sits
+     * on the edge of the grid.
+     *
+     * Partial edge tiles are real tiles, so the neighbour grid must round up
+     * exactly as tile creation and getRaw do. Flooring it -- as this did until
+     * recently -- leaves the last row and column believing they have no
+     * neighbour on the outward side, so their seams are never stitched.
+     *
+     * @param {number} x Tile X coordinate
+     * @param {number} y Tile Y coordinate
+     * @returns {Object<string,TerrainTile|undefined>}
+     */
+    collectTileNeighbours(x, y) {
+        const gridWidth = this.gridWidth;
+        const gridHeight = this.gridHeight;
+
+        const result = {
+            top: undefined,
+            bottom: undefined,
+            left: undefined,
+            right: undefined,
+            topLeft: undefined,
+            topRight: undefined,
+            bottomLeft: undefined,
+            bottomRight: undefined
+        };
 
         if (y > 0) {
-            top = self.getRaw(x, y - 1);
+            result.top = this.getRaw(x, y - 1);
+
             if (x > 0) {
-                topLeft = self.getRaw(x - 1, y - 1);
+                result.topLeft = this.getRaw(x - 1, y - 1);
             }
-            if (x < gridSize.x - 1) {
-                topRight = self.getRaw(x + 1, y - 1);
+
+            if (x < gridWidth - 1) {
+                result.topRight = this.getRaw(x + 1, y - 1);
             }
         }
-        if (y < gridSize.y - 1) {
-            bottom = self.getRaw(x, y + 1);
+
+        if (y < gridHeight - 1) {
+            result.bottom = this.getRaw(x, y + 1);
+
             if (x > 0) {
-                bottomLeft = self.getRaw(x - 1, y + 1);
+                result.bottomLeft = this.getRaw(x - 1, y + 1);
             }
-            if (x < gridSize.x - 1) {
-                bottomRight = self.getRaw(x + 1, y + 1);
+
+            if (x < gridWidth - 1) {
+                result.bottomRight = this.getRaw(x + 1, y + 1);
             }
         }
+
         if (x > 0) {
-            left = self.getRaw(x - 1, y);
+            result.left = this.getRaw(x - 1, y);
         }
-        if (x < gridSize.x - 1) {
-            right = self.getRaw(x + 1, y);
+
+        if (x < gridWidth - 1) {
+            result.right = this.getRaw(x + 1, y);
         }
 
-        tile.stitchNormals(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight);
+        return result;
     }
 
     /**