@woosh/meep-engine 2.85.18 → 2.85.20

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.85.18",
+  "version": "2.85.20",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/generation/theme/ThemeEngine.d.ts

@@ -16,6 +16,16 @@ export class ThemeEngine {
      */
     private __assetManager;
     set assetManager(arg: any);
+    /**
+     *
+     * @param {number} v
+     */
+    set seed(arg: number);
+    /**
+     *
+     * @returns {number}
+     */
+    get seed(): number;
     /**
      *
      * @param {AreaTheme} theme

package/src/generation/theme/ThemeEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeEngine.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/ThemeEngine.js"],"names":[],"mappings":"AAsDA;IAEI;;;OAGG;IACH,OAFU,uBAAuB,CAEN;IAE3B;;;OAGG;IACH,cAFqB,MAAM,CAEF;IAEzB;;;;OAIG;IACH,uBAAsB;IAEtB,2BAEC;IAED;;;OAGG;IACH,4BAUC;IAED;;;;;;OAMG;IACH,4BALW,WAAW,KACX,MAAM,KACN,MAAM,GACJ,MAAM,CA8BlB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,gDAGJ,IAAI,CAmChB;IAED;;;;;OAKG;IACH,sDAFa,SAAS,CAiLrB;IAED;;;;;;OAMG;IACH,+DAHW,MAAM,GACJ,IAAI,GAAC,SAAS,CAoG1B;IAED;;;;OAIG;IACH,kEAqCC;IAED;;;;OAIG;IACH,iCAFa,IAAI,CAIhB;IAED;;;;OAIG;IACH,uCAHa,SAAS,CAYrB;IAED;;;;;OAKG;IACH,oDAFa,SAAS,CAsErB;CACJ;6BA7lB0B,8CAA8C;iBAKxD,iCAAiC;sBAC5B,sCAAsC"}
+{"version":3,"file":"ThemeEngine.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/ThemeEngine.js"],"names":[],"mappings":"AAsFA;IAEI;;;OAGG;IACH,OAFU,uBAAuB,CAEN;IAE3B;;;OAGG;IACH,cAFqB,MAAM,CAEF;IAEzB;;;;OAIG;IACH,uBAAsB;IAEtB,2BAEC;IAED;;;OAGG;IACH,sBAEC;IAED;;;OAGG;IACH,mBAEC;IAED;;;OAGG;IACH,4BAUC;IAED;;;;;;OAMG;IACH,4BALW,WAAW,KACX,MAAM,KACN,MAAM,GACJ,MAAM,CA8BlB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,gDAGJ,IAAI,CAmChB;IAED;;;;;OAKG;IACH,sDAFa,SAAS,CAiLrB;IAED;;;;;;OAMG;IACH,+DAHW,MAAM,GACJ,IAAI,GAAC,SAAS,CAoG1B;IAED;;;;OAIG;IACH,kEAqCC;IAED;;;;OAIG;IACH,iCAFa,IAAI,CAIhB;IAED;;;;OAIG;IACH,uCAHa,SAAS,CAYrB;IAED;;;;;OAKG;IACH,oDAFa,SAAS,CA2DrB;CACJ;6BAloB4B,8CAA8C;iBAK1D,iCAAiC;sBAC5B,sCAAsC"}

package/src/generation/theme/ThemeEngine.js

@@ -1,23 +1,23 @@
-import {assert} from "../../core/assert.js";
-import {binarySearchLowIndex} from "../../core/collection/array/binarySearchLowIndex.js";
-import {HashMap} from "../../core/collection/map/HashMap.js";
-import {QuadTreeNode} from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
-import {randomFloatBetween} from "../../core/math/random/randomFloatBetween.js";
-import {seededRandom} from "../../core/math/random/seededRandom.js";
-import {number_compare_ascending} from "../../core/primitives/numbers/number_compare_ascending.js";
+import { assert } from "../../core/assert.js";
+import { binarySearchLowIndex } from "../../core/collection/array/binarySearchLowIndex.js";
+import { HashMap } from "../../core/collection/map/HashMap.js";
+import { QuadTreeNode } from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
+import { randomFloatBetween } from "../../core/math/random/randomFloatBetween.js";
+import { seededRandom } from "../../core/math/random/seededRandom.js";
+import { number_compare_ascending } from "../../core/primitives/numbers/number_compare_ascending.js";
 import Future from "../../core/process/Future.js";
 import Task from "../../core/process/task/Task.js";
 import TaskGroup from "../../core/process/task/TaskGroup.js";
-import {TaskSignal} from "../../core/process/task/TaskSignal.js";
-import {actionTask} from "../../core/process/task/util/actionTask.js";
-import {countTask} from "../../core/process/task/util/countTask.js";
-import {emptyTask} from "../../core/process/task/util/emptyTask.js";
-import {futureTask} from "../../core/process/task/util/futureTask.js";
-import {TerrainLayer} from "../../engine/ecs/terrain/ecs/layers/TerrainLayer.js";
-import {TerrainFlags} from "../../engine/ecs/terrain/ecs/TerrainFlags.js";
-import {obtainTerrain} from "../../engine/ecs/terrain/util/obtainTerrain.js";
-import {Sampler2D} from "../../engine/graphics/texture/sampler/Sampler2D.js";
-import {TerrainLayerRuleAggregator} from "./TerrainLayerRuleAggregator.js";
+import { TaskSignal } from "../../core/process/task/TaskSignal.js";
+import { actionTask } from "../../core/process/task/util/actionTask.js";
+import { countTask } from "../../core/process/task/util/countTask.js";
+import { emptyTask } from "../../core/process/task/util/emptyTask.js";
+import { futureTask } from "../../core/process/task/util/futureTask.js";
+import { TerrainLayer } from "../../engine/ecs/terrain/ecs/layers/TerrainLayer.js";
+import { TerrainFlags } from "../../engine/ecs/terrain/ecs/TerrainFlags.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
+import { Sampler2D } from "../../engine/graphics/texture/sampler/Sampler2D.js";
+import { TerrainLayerRuleAggregator } from "./TerrainLayerRuleAggregator.js";
 
 /**
  *
@@ -52,6 +52,38 @@ function prepare_terrain_for_themes(layer_mapping, themes) {
     return max;
 }
 
+/**
+ *
+ * @param {Terrain} terrain
+ * @returns {Task}
+ */
+function makeTaskEnsureAllTiles(terrain) {
+    return futureTask(new Future((resolve, reject) => {
+
+        const is_linked = terrain.getFlag(TerrainFlags.Linked);
+
+        if (!is_linked) {
+            terrain.startBuildService();
+        }
+
+        if (!terrain.getFlag(TerrainFlags.Built)) {
+            terrain.buildNonVisual();
+        }
+
+        terrain.__tiles.rebuild();
+
+        terrain.promiseAllTiles()
+            .then(resolve, reject)
+            .finally(() => {
+                if (!is_linked && !terrain.getFlag(TerrainFlags.Linked)) {
+                    // cleanup after ourselves
+                    terrain.stopBuildService();
+                }
+            });
+
+    }), 'Wait for terrain tiles to be built');
+}
+
 export class ThemeEngine {
 
     /**
@@ -77,6 +109,22 @@ export class ThemeEngine {
         this.__assetManager = v;
     }
 
+    /**
+     *
+     * @param {number} v
+     */
+    set seed(v) {
+        this.random.setCurrentSeed(v);
+    }
+
+    /**
+     *
+     * @returns {number}
+     */
+    get seed() {
+        return this.random.getCurrentSeed();
+    }
+
     /**
      *
      * @param {AreaTheme} theme
@@ -180,8 +228,8 @@ export class ThemeEngine {
      */
     applyTerrainThemes(grid, terrain) {
 
-
         assert.notNull(terrain);
+        assert.notNull(this.__assetManager, 'assetManager');
 
         const width = grid.width;
         const height = grid.height;
@@ -255,7 +303,7 @@ export class ThemeEngine {
             });
 
             terrain.clearFlag(TerrainFlags.Built);
-            terrain.build(engine.assetManager);
+            terrain.build(this.__assetManager);
 
             splatWeightData = splat.weightData;
         }, 'Initialize');
@@ -540,70 +588,59 @@ export class ThemeEngine {
     apply(grid, ecd) {
         const terrain = obtainTerrain(ecd);
 
-        // build terrain tiles
-        const tTerrainGeometry = futureTask(new Future((resolve, reject) => {
-
-            const is_linked = terrain.getFlag(TerrainFlags.Linked);
-
-            if (!is_linked) {
-                terrain.startBuildService();
-            }
-
-            if (!terrain.getFlag(TerrainFlags.Built)) {
-                terrain.buildNonVisual();
-            }
-
-            terrain.__tiles.rebuild();
-
-            terrain.promiseAllTiles()
-                .then(resolve, reject)
-                .finally(() => {
-                    if (!is_linked && !terrain.getFlag(TerrainFlags.Linked)) {
-                        // cleanup after ourselves
-                        terrain.stopBuildService();
-                    }
-                });
-
-        }), 'Wait for terrain tiles');
-
         const tInitializeThemes = this.initializeThemes(this.random(), ecd, grid);
 
-        const tTerrain = this.applyTerrainThemes(grid, terrain);
-
         const tNodes = this.applyNodes(grid, ecd);
 
         const tCells = this.applyCellRules(grid, ecd);
 
-        tTerrain.addDependency(tInitializeThemes);
-
         tNodes.addDependencies([
             tInitializeThemes,
-            tTerrainGeometry,
-            tTerrain
         ]);
 
         tCells.addDependency(tInitializeThemes);
-        tTerrainGeometry.addDependency(tCells);
 
         const tOptimize = this.optimize(ecd);
 
-        const tUpdateTerrain = this.updateTerrain(terrain);
-
-        tUpdateTerrain.addDependencies([
-            tTerrain,
-            tNodes,
-            tCells,
-            tTerrainGeometry
-        ]);
-
         tOptimize.addDependencies([
-            tUpdateTerrain,
-            tTerrain,
             tNodes,
             tCells,
             tInitializeThemes
         ]);
 
-        return new TaskGroup([tTerrainGeometry, tInitializeThemes, tTerrain, tNodes, tCells, tUpdateTerrain, tOptimize]);
+        const subtasks = [tInitializeThemes, tNodes, tCells, tOptimize];
+
+        if (terrain !== null) {
+            // build terrain tiles
+            const tTerrainGeometry = makeTaskEnsureAllTiles(terrain);
+            const tTerrain = this.applyTerrainThemes(grid, terrain);
+            tTerrain.addDependency(tInitializeThemes);
+
+            const tUpdateTerrain = this.updateTerrain(terrain);
+
+            tUpdateTerrain.addDependencies([
+                tTerrain,
+                tNodes,
+                tCells,
+                tTerrainGeometry
+            ]);
+
+            tNodes.addDependencies([
+                tTerrain,
+                tTerrainGeometry,
+            ]);
+            tTerrainGeometry.addDependency(tCells);
+
+            tOptimize.addDependencies([
+                tUpdateTerrain,
+                tTerrain,
+            ]);
+
+            subtasks.push(tTerrainGeometry, tTerrain, tUpdateTerrain);
+        } else {
+            console.warn(`No terrain present, skipping terrain theming`);
+        }
+
+        return new TaskGroup(subtasks);
     }
 }