@woosh/meep-engine 2.156.0 → 2.157.0

package/src/generation/grid/generation/discrete/GridTaskCellularAutomata.js

@@ -3,7 +3,6 @@ import { seededRandom } from "../../../../core/math/random/seededRandom.js";
 import TaskGroup from "../../../../core/process/task/TaskGroup.js";
 import { actionTask } from "../../../../core/process/task/util/actionTask.js";
 import { countTask } from "../../../../core/process/task/util/countTask.js";
-import { Sampler2D } from "../../../../engine/graphics/texture/sampler/Sampler2D.js";
 import { CaveGeneratorCellularAutomata } from "../../../automata/CaveGeneratorCellularAutomata.js";
 import { GridTaskGenerator } from "../../GridTaskGenerator.js";
 
@@ -70,7 +69,13 @@ export class GridTaskCellularAutomata extends GridTaskGenerator {
     build(grid, ecd, seed) {
 
         const width = grid.width;
-        const field = Sampler2D.uint8(1, width, grid.height);
+        const height = grid.height;
+
+        const cell_count = width * height;
+
+        // automata state is double-buffered, `front` always holds the current generation
+        let front = new Uint8Array(cell_count);
+        let back = new Uint8Array(cell_count);
 
         const automata = new CaveGeneratorCellularAutomata();
 
@@ -78,7 +83,7 @@ export class GridTaskCellularAutomata extends GridTaskGenerator {
         const mask_y0 = this.marginTop;
 
         const mask_x1 = width - this.marginRight;
-        const mask_y1 = grid.height - this.marginBottom;
+        const mask_y1 = height - this.marginBottom;
 
         const mask_width = mask_x1 - mask_x0;
         const mask_height = mask_y1 - mask_y0;
@@ -96,11 +101,15 @@ export class GridTaskCellularAutomata extends GridTaskGenerator {
 
             const field_index = y * width + x;
 
-            field.data[field_index] = (random() < threshold) ? 1 : 0;
+            front[field_index] = (random() < threshold) ? 1 : 0;
         });
 
         const tAutomata = countTask(0, this.steps, index => {
-            automata.step(field.data, field.width, field.height)
+            automata.step(front, back, width, height);
+
+            const swap = front;
+            front = back;
+            back = swap;
         });
 
         tAutomata.addDependency(tSeed);
@@ -112,8 +121,8 @@ export class GridTaskCellularAutomata extends GridTaskGenerator {
             action.initialize(grid, seed);
         });
 
-        const tWriteTags = countTask(0, width * grid.height, index => {
-            const cellValue = field.data[index];
+        const tWriteTags = countTask(0, cell_count, index => {
+            const cellValue = front[index];
 
             const x = index % width;
             const y = (index / width) | 0;

package/src/generation/grid/generation/discrete/GridTaskConnectRooms.d.ts

@@ -10,14 +10,16 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
     /**
      *
      * @param name
-     * @param {CellMatcher} matcher
+     * @param {CellMatcher} matcher Matches a room tile
+     * @param {CellMatcher} modifiable Matches tiles that can be tunneled through
      * @param {GridCellAction} action
      * @param {number} thickness
      * @returns {GridTaskConnectRooms}
      */
-    static from({ name, matcher, action, thickness }: {
+    static from({ name, matcher, modifiable, action, thickness }: {
         name?: string;
         matcher: any;
+        modifiable: any;
         action: any;
         thickness?: number;
     }): GridTaskConnectRooms;
@@ -55,7 +57,7 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
      */
     findEmptyTile(grid: GridData, result: Vector2): Task;
     /**
-     *
+     * Flood-fill of matcher-matching cells starting at (x,y), marking them in `connected`
      * @param {number} x
      * @param {number} y
      * @param {GridData} grid

package/src/generation/grid/generation/discrete/GridTaskConnectRooms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskConnectRooms.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/discrete/GridTaskConnectRooms.js"],"names":[],"mappings":"AAqBA;;;;;;;GAOG;AACH;IAqDI;;;;;;;OAOG;IACH;;;;;QAFa,oBAAoB,CAiBhC;IA1ED;;;OAGG;IACH,qBAAe;IAEf;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,yBAFU,MAAM,EAAE,CAShB;IAEF;;;OAGG;IACH,uBAFU,MAAM,EAAE,CAahB;IAEF,kBAAc;IAEd;;;OAGG;IACH,uBAAa;IA4Bb;;;;;OAKG;IACH,sCAHW,OAAO,GACL,IAAI,CAqChB;IAED;;;;;;OAMG;IACH,qBALW,MAAM,KACN,MAAM,6BAEN,MAAM,QA8DhB;IAED;;;;;;;OAOG;IACH,mCANW,OAAO,aACP,WAAW,6BAEX,MAAM,GACJ,OAAO,CAwFnB;IAED;;;;;;;;OAQG;IACH,gBAPW,MAAM,KACN,MAAM,aACN,MAAM,6BAEN,WAAW,aACX,MAAM,QAuEhB;IAED;;;;;;;OAOG;IACH,mCALW,MAAM,EAAE,aACR,MAAM,aACN,MAAM,EAAE,GACN,SAAS,CAyBrB;IAED;;;;;;;OAOG;IACH,0BANW,MAAM,0BAEN,MAAM,EAAE,aACR,MAAM,aACN,MAAM,EAAE,QAWlB;IAED,iDAuEC;CACJ;kCAxfiC,4BAA4B;oBAT1C,kCAAkC;iBAErC,uCAAuC;uBANjC,mCAAmC;0BAUhC,0DAA0D;sBAH9D,4CAA4C"}
+{"version":3,"file":"GridTaskConnectRooms.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/discrete/GridTaskConnectRooms.js"],"names":[],"mappings":"AAiBA;;;;;;;GAOG;AACH;IAqDI;;;;;;;;OAQG;IACH;;;;;;QAFa,oBAAoB,CAoBhC;IA9ED;;;OAGG;IACH,qBAAe;IAEf;;;OAGG;IACH,wBAAkB;IAElB;;;OAGG;IACH,yBAFU,MAAM,EAAE,CAShB;IAEF;;;OAGG;IACH,uBAFU,MAAM,EAAE,CAahB;IAEF,kBAAc;IAEd;;;OAGG;IACH,uBAAa;IAgCb;;;;;OAKG;IACH,sCAHW,OAAO,GACL,IAAI,CAqChB;IAED;;;;;;OAMG;IACH,qBALW,MAAM,KACN,MAAM,6BAEN,MAAM,QA8DhB;IAED;;;;;;;OAOG;IACH,mCANW,OAAO,aACP,WAAW,6BAEX,MAAM,GACJ,OAAO,CAwFnB;IAED;;;;;;;;OAQG;IACH,gBAPW,MAAM,KACN,MAAM,aACN,MAAM,6BAEN,WAAW,aACX,MAAM,QAuEhB;IAED;;;;;;;OAOG;IACH,mCALW,MAAM,EAAE,aACR,MAAM,aACN,MAAM,EAAE,GACN,SAAS,CAyBrB;IAED;;;;;;;OAOG;IACH,0BANW,MAAM,0BAEN,MAAM,EAAE,aACR,MAAM,aACN,MAAM,EAAE,QAclB;IAED,iDAuEC;CACJ;kCA/fiC,4BAA4B;oBAR1C,kCAAkC;iBAErC,uCAAuC;uBAJjC,mCAAmC;0BAQhC,0DAA0D;sBAH9D,4CAA4C"}

package/src/generation/grid/generation/discrete/GridTaskConnectRooms.js

@@ -1,9 +1,6 @@
-import { matcher_tag_unoccupied } from "../../../../../samples/generation/rules/matcher_tag_unoccupied.js";
 import { assert } from "../../../../core/assert.js";
 import { BitSet } from "../../../../core/binary/BitSet.js";
-import BinaryHeap from "../../../../core/collection/heap/BinaryHeap.js";
 import { Uint32Heap } from "../../../../core/collection/heap/Uint32Heap.js";
-import { passThrough } from "../../../../core/function/passThrough.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
 import { min2 } from "../../../../core/math/min2.js";
 import Task from "../../../../core/process/task/Task.js";
@@ -12,7 +9,6 @@ import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
 import { actionTask } from "../../../../core/process/task/util/actionTask.js";
 import { Sampler2D } from "../../../../engine/graphics/texture/sampler/Sampler2D.js";
 import { bitSet2Sampler2D } from "../../../../engine/graphics/texture/sampler/util/bitSet2Sampler2D.js";
-import { drawSamplerHTML } from "../../../../engine/graphics/texture/sampler/util/drawSamplerHTML.js";
 import { GridTaskGenerator } from "../../GridTaskGenerator.js";
 import { buildDistanceMapToObjective } from "../util/buildDistanceMapToObjective.js";
 import { buildPathFromDistanceMap } from "../util/buildPathFromDistanceMap.js";
@@ -39,7 +35,7 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
      * Matches tiles that can be tunneled through
      * @type {CellMatcher}
      */
-    modifiable = matcher_tag_unoccupied;
+    modifiable = null;
 
     /**
      *
@@ -83,13 +79,16 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
     /**
      *
      * @param name
-     * @param {CellMatcher} matcher
+     * @param {CellMatcher} matcher Matches a room tile
+     * @param {CellMatcher} modifiable Matches tiles that can be tunneled through
      * @param {GridCellAction} action
      * @param {number} thickness
      * @returns {GridTaskConnectRooms}
      */
-    static from({ name = 'connect rooms', matcher, action, thickness = 3 }) {
+    static from({ name = 'connect rooms', matcher, modifiable, action, thickness = 3 }) {
         assert.equal(matcher.isCellMatcher, true, 'matcher.isCellMatcher !== true');
+        assert.defined(modifiable, 'modifiable');
+        assert.equal(modifiable.isCellMatcher, true, 'modifiable.isCellMatcher !== true');
         assert.equal(action.isGridCellAction, true, 'action.isGridCellAction !== true');
         assert.isNumber(thickness, 'thickness');
         assert.greaterThanOrEqual(thickness, 1, 'thickness');
@@ -97,6 +96,7 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
         const r = new GridTaskConnectRooms();
 
         r.matcher = matcher;
+        r.modifiable = modifiable;
         r.action = action;
         r.thickness = thickness;
 
@@ -149,31 +149,33 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
     }
 
     /**
-     *
+     * Flood-fill of matcher-matching cells starting at (x,y), marking them in `connected`
      * @param {number} x
      * @param {number} y
      * @param {GridData} grid
      * @param {BitSet} connected
      */
     fillConnectedArea(x, y, grid, connected) {
-        const open = new BinaryHeap(passThrough);
-
         const width = grid.width;
         const initialIndex = x + y * width;
 
-        open.push(initialIndex);
+        /**
+         * cells already queued or visited, marked on push
+         * @type {BitSet}
+         */
+        const closed = new BitSet();
+
+        const open = [initialIndex];
+
+        closed.set(initialIndex, true);
 
         const neighbourhoodMask = this.neighbourhoodSearchMask;
         const neighbourhoodMaskSize = neighbourhoodMask.length;
 
-        const closed = new BitSet();
-
-        while (open.size() > 0) {
+        while (open.length > 0) {
 
             const current = open.pop();
 
-            closed.set(current, true);
-
             connected.set(current, true);
 
             const c_x = current % width;
@@ -208,11 +210,9 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
                     continue;
                 }
 
-                const isInOpen = open.contains(neighbour_index);
+                closed.set(neighbour_index, true);
 
-                if (!isInOpen) {
-                    open.push(neighbour_index);
-                }
+                open.push(neighbour_index);
             }
         }
     }
@@ -438,10 +438,13 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
 
         const d = this.debugState(grid, points, connected, distances);
 
-        const y = (iteration / 4) | 0;
-        const x = iteration % 4;
+        // imported lazily so that headless use of this class does not pull in DOM-dependent code
+        import("../../../../engine/graphics/texture/sampler/util/drawSamplerHTML.js").then(({ drawSamplerHTML }) => {
+            const y = (iteration / 4) | 0;
+            const x = iteration % 4;
 
-        drawSamplerHTML(document.body, d, x * 260 + 5, y * 260 + 5, 1, 0, 256);
+            drawSamplerHTML(document.body, d, x * 260 + 5, y * 260 + 5, 1, 0, 256);
+        });
 
     }
 

package/src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskBuildSourceDistanceMap.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.js"],"names":[],"mappings":"AAUA;;GAEG;AACH;IA0BI;;;;;;;OAOG;IACH;;;;;;uCAgBC;IAhDD;;;OAGG;IACH,2BAAqB;IAErB;;;OAGG;IACH,yBAAmB;IAEnB;;;OAGG;IACH,cAAa;IAEb;;;OAGG;IACH,SAFU,MAAM,CAEA;IA4BhB,iDA8IC;CACJ;kCAxMiC,+BAA+B;sBAJ3C,+CAA+C"}
+{"version":3,"file":"GridTaskBuildSourceDistanceMap.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.js"],"names":[],"mappings":"AAUA;;GAEG;AACH;IA0BI;;;;;;;OAOG;IACH;;;;;;uCAgBC;IAhDD;;;OAGG;IACH,2BAAqB;IAErB;;;OAGG;IACH,yBAAmB;IAEnB;;;OAGG;IACH,cAAa;IAEb;;;OAGG;IACH,SAFU,MAAM,CAEA;IA4BhB,iDAuJC;CACJ;kCAjNiC,+BAA+B;sBAJ3C,+CAA+C"}

package/src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.js

@@ -100,6 +100,12 @@ export class GridTaskBuildSourceDistanceMap extends GridTaskGenerator {
          */
         const closed = new BitSet();
 
+        /**
+         * membership mirror of the open heap, O(1) replacement for linear heap.contains scans
+         * @type {BitSet}
+         */
+        const inOpen = new BitSet();
+
         const width = grid.width;
         const height = grid.height;
 
@@ -122,6 +128,7 @@ export class GridTaskBuildSourceDistanceMap extends GridTaskGenerator {
 
             if (match) {
                 open.push(index);
+                inOpen.set(index, true);
 
                 //initialize target value
                 target[index] = 0;
@@ -155,11 +162,12 @@ export class GridTaskBuildSourceDistanceMap extends GridTaskGenerator {
 
             const distance = target[iCurrent] + 1;
 
-            const notInOpen = !open.contains(iNeighbor);
+            const notInOpen = !inOpen.get(iNeighbor);
 
             if (notInOpen) {
                 target[iNeighbor] = distance;
                 open.push(iNeighbor);
+                inOpen.set(iNeighbor, true);
             } else if (distance < target[iNeighbor]) {
                 target[iNeighbor] = distance;
                 open.updateElementScore(iNeighbor);
@@ -175,6 +183,7 @@ export class GridTaskBuildSourceDistanceMap extends GridTaskGenerator {
 
                 const currentIndex = open.pop();
 
+                inOpen.clear(currentIndex);
                 closed.set(currentIndex, true);
 
                 //find neighbors

package/src/generation/grid/generation/grid/select/CellSupplierBestN.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellSupplierBestN.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/grid/generation/grid/select/CellSupplierBestN.js"],"names":[],"mappings":"AAyBA;IAsCI;;;;;OAKG;IACH,0FAqBC;IA/DD;;;OAGG;IACH,SAFU,aAAW,IAAI,CAEV;IAEf;;;OAGG;IACH,QAFU,MAAM,CAEL;IAEX;;;OAGG;IACH,UAFU;QAAC,CAAC,EAAC,MAAM,CAAC;QAAC,CAAC,EAAC,MAAM,CAAC;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAC,EAAE,CAEnC;IAEd;;;OAGG;IACH,WAFU,cAAY,IAAI,CAET;IAEjB;;;OAGG;IACH,OAFU,MAAM,CAEN;IAEV;;;OAGG;IACH,gBAFU,OAAO,CAEM;IA+BvB,uCA8EC;CAgBJ;6BAvL4B,mBAAmB"}
+{"version":3,"file":"CellSupplierBestN.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/grid/generation/grid/select/CellSupplierBestN.js"],"names":[],"mappings":"AAyBA;IAsCI;;;;;OAKG;IACH,0FAqBC;IA/DD;;;OAGG;IACH,SAFU,aAAW,IAAI,CAEV;IAEf;;;OAGG;IACH,QAFU,MAAM,CAEL;IAEX;;;OAGG;IACH,UAFU;QAAC,CAAC,EAAC,MAAM,CAAC;QAAC,CAAC,EAAC,MAAM,CAAC;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAC,EAAE,CAEnC;IAEd;;;OAGG;IACH,WAFU,cAAY,IAAI,CAET;IAEjB;;;OAGG;IACH,OAFU,MAAM,CAEN;IAEV;;;OAGG;IACH,gBAFU,OAAO,CAEM;IA+BvB,uCA8EC;CAoBJ;6BA3L4B,mBAAmB"}

package/src/generation/grid/generation/grid/select/CellSupplierBestN.js

@@ -170,6 +170,10 @@ export class CellSupplierBestN extends CellSupplier {
 
     }
 
+    count() {
+        return this.elements.length;
+    }
+
     next() {
         const cursor = this.cursor;
         const elements = this.elements;

package/src/generation/grid/generation/road/GridTaskGenerateRoads.d.ts

@@ -1,9 +1,22 @@
 export class GridTaskGenerateRoads extends GridTaskGenerator {
     /**
-     * Vertices are things that are to be connected
+     *
+     * @param {string} [name]
+     * @param {CellMatcher} traversable Cells that roads are allowed to pass through
+     * @param {GridCellAction[]} actions Actions to perform on created road cells
+     * @returns {GridTaskGenerateRoads}
+     */
+    static from({ name, traversable, actions }?: string): GridTaskGenerateRoads;
+    /**
+     * Cells that roads are allowed to pass through
      * @type {CellMatcher}
      */
-    vertex: CellMatcher;
+    traversable: CellMatcher;
+    /**
+     * Actions to perform on created roads
+     * @type {GridCellAction[]}
+     */
+    actions: GridCellAction[];
     /**
      *
      * @type {number[]}
@@ -14,17 +27,11 @@ export class GridTaskGenerateRoads extends GridTaskGenerator {
      * @type {number[]}
      */
     neighbourhoodDrawMask: number[];
-    /**
-     * Actions to perform on created roads
-     * @type {GridCellAction[]}
-     */
-    actions: GridCellAction[];
     /**
      * TODO add post-processing step to merge various paths
      */
     build(grid: any, ecd: any, seed: any): TaskGroup;
 }
 import { GridTaskGenerator } from "../../GridTaskGenerator.js";
-import { CellMatcher } from "../../../rules/CellMatcher.js";
 import TaskGroup from "../../../../core/process/task/TaskGroup.js";
 //# sourceMappingURL=GridTaskGenerateRoads.d.ts.map

package/src/generation/grid/generation/road/GridTaskGenerateRoads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskGenerateRoads.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/road/GridTaskGenerateRoads.js"],"names":[],"mappings":"AAocA;IAIQ;;;OAGG;IACH,QAFU,WAAW,CAEH;IAElB;;;OAGG;IACH,yBAFU,MAAM,EAAE,CASjB;IAED;;;OAGG;IACH,uBAFU,MAAM,EAAE,CAajB;IAED;;;OAGG;IACH,SAFU,gBAAgB,CAIzB;IAGL;;OAEG;IACH,iDA0GC;CACJ;kCAllBiC,4BAA4B;4BAFlC,+BAA+B;sBAJrC,4CAA4C"}
+{"version":3,"file":"GridTaskGenerateRoads.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/road/GridTaskGenerateRoads.js"],"names":[],"mappings":"AAqbA;IA4CI;;;;;;OAMG;IACH,6CALW,MAAM,GAGJ,qBAAqB,CAqBjC;IApED;;;OAGG;IACH,yBAAmB;IAEnB;;;OAGG;IACH,SAFU,gBAAgB,CAEb;IAEb;;;OAGG;IACH,yBAFU,MAAM,EAAE,CAShB;IAEF;;;OAGG;IACH,uBAFU,MAAM,EAAE,CAahB;IA8BF;;OAEG;IACH,iDA+FC;CACJ;kCArlBiC,4BAA4B;sBAJxC,4CAA4C"}

package/src/generation/grid/generation/road/GridTaskGenerateRoads.js

@@ -1,19 +1,13 @@
-import { GridTags } from "../../../../../samples/generation/grid/GridTags.js";
-import { MirGridLayers } from "../../../../../samples/generation/grid/MirGridLayers.js";
-import { matcher_tag_traversable } from "../../../../../samples/generation/rules/matcher_tag_traversable.js";
+import { assert } from "../../../../core/assert.js";
 import { BitSet } from "../../../../core/binary/BitSet.js";
 import { array_group_by } from "../../../../core/collection/array/array_group_by.js";
 import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import BinaryHeap from "../../../../core/collection/heap/BinaryHeap.js";
 import { QuadTreeNode } from "../../../../core/geom/2d/quad-tree/QuadTreeNode.js";
-import { Graph } from "../../../../core/graph/v2/Graph.js";
 import { seededRandom } from "../../../../core/math/random/seededRandom.js";
-import { remap } from "../../../../core/math/remap.js";
 import TaskGroup from "../../../../core/process/task/TaskGroup.js";
 import { actionTask } from "../../../../core/process/task/util/actionTask.js";
 import { countTask } from "../../../../core/process/task/util/countTask.js";
-import { GridCellActionPlaceTags } from "../../../placement/action/GridCellActionPlaceTags.js";
-import { CellMatcher } from "../../../rules/CellMatcher.js";
 import { CellMatcherNot } from "../../../rules/logic/CellMatcherNot.js";
 import { GridTaskGenerator } from "../../GridTaskGenerator.js";
 import { buildPathFromDistanceMap } from "../util/buildPathFromDistanceMap.js";
@@ -128,6 +122,12 @@ function buildPaths(
 
     const closed = new BitSet();
 
+    /**
+     * membership mirror of the open heap, O(1) replacement for linear heap.contains scans
+     * @type {BitSet}
+     */
+    const inOpen = new BitSet();
+
 
     /**
      *
@@ -201,6 +201,7 @@ function buildPaths(
 
         open.clear();
         closed.reset();
+        inOpen.reset();
 
         //populate the open set with all connectors from the group
         for (let j = 0; j < groupSize; j++) {
@@ -214,9 +215,13 @@ function buildPaths(
                 continue;
             }
 
+            assert.isNonNegativeInteger(x, 'connector position x');
+            assert.isNonNegativeInteger(y, 'connector position y');
+
             const index = x + y * width;
 
             open.push(index);
+            inOpen.set(index, true);
 
             distances[index] = 0;
         }
@@ -238,6 +243,7 @@ function buildPaths(
 
             const current = open.pop();
 
+            inOpen.clear(current);
             closed.set(current, true);
 
             const c_x = current % width;
@@ -275,16 +281,17 @@ function buildPaths(
 
                 const distance = distances[current] + 1;
 
-                const isInOpen = open.contains(neighbour_index);
+                const isInOpen = inOpen.get(neighbour_index);
 
                 if (!isInOpen) {
 
                     open.push(neighbour_index);
+                    inOpen.set(neighbour_index, true);
                     distances[neighbour_index] = distance;
 
                 } else if (distance < distances[neighbour_index]) {
 
-                    distances[neighbour_index] = distances;
+                    distances[neighbour_index] = distance;
                     open.updateElementScore(neighbour_index);
 
                 }
@@ -352,6 +359,11 @@ function buildPaths(
 
                     const targetGroupId = readMarkerNodeGroupId(targetNode);
 
+                    if (targetGroupId === groupId) {
+                        // own group, not a valid connection target
+                        continue;
+                    }
+
                     if (pathNetwork.directGroupConnectionExists(groupId, targetGroupId)) {
                         continue;
                     }
@@ -397,106 +409,102 @@ function buildPaths(
  */
 function drawPath(path, actions, traversable, grid) {
     const width = grid.width;
-    const height = grid.height;
 
     const pathIndices = path.indices;
     const n = pathIndices.length;
 
-    const sourceThickness = 1;
-    const targetThickness = 1;
-
     const actionCount = actions.length;
 
     for (let i = 0; i < n; i++) {
         const index = pathIndices[i];
 
-        const thickness = remap(0, n, sourceThickness, targetThickness, i);
-
-        const thickness_0 = Math.floor(thickness / 2);
-        const thickness_1 = Math.ceil(thickness / 2);
-
         const c_x = index % width;
         const c_y = (index / width) | 0;
 
-        //paint a section of tunnel
-        for (let _y = -thickness_0; _y < thickness_1; _y++) {
-            const t_y = c_y + _y;
+        //check if we can actually dig through
+        if (!traversable.match(grid, c_x, c_y, 0)) {
+            continue;
+        }
 
-            if (t_y < 0 || t_y >= height) {
-                continue;
-            }
+        for (let action_index = 0; action_index < actionCount; action_index++) {
+            const action = actions[action_index];
 
-            for (let _x = -thickness_0; _x < thickness_1; _x++) {
-                const t_x = c_x + _x;
+            action.execute(grid, c_x, c_y, 0);
+        }
 
-                if (t_x < 0 || t_x >= width) {
-                    continue;
-                }
+    }
+}
 
+export class GridTaskGenerateRoads extends GridTaskGenerator {
 
-                //check if we can actually dig through
-                if (!traversable.match(grid, t_x, t_y, 0)) {
-                    continue;
-                }
+    /**
+     * Cells that roads are allowed to pass through
+     * @type {CellMatcher}
+     */
+    traversable = null;
 
-                for (let action_index = 0; action_index < actionCount; action_index++) {
-                    const action = actions[action_index];
+    /**
+     * Actions to perform on created roads
+     * @type {GridCellAction[]}
+     */
+    actions = [];
 
-                    action.execute(grid, t_x, t_y, 0);
-                }
-            }
-        }
+    /**
+     *
+     * @type {number[]}
+     */
+    neighbourhoodSearchMask = [
+        0, -1,
 
-    }
-}
+        -1, 0,
+        1, 0,
 
-export class GridTaskGenerateRoads extends GridTaskGenerator {
-    constructor() {
-        super();
+        0, 1
+    ];
 
-        /**
-         * Vertices are things that are to be connected
-         * @type {CellMatcher}
-         */
-        this.vertex = null;
+    /**
+     *
+     * @type {number[]}
+     */
+    neighbourhoodDrawMask = [
+        -1, -1,
+        1, -1,
+        0, -1,
 
-        /**
-         *
-         * @type {number[]}
-         */
-        this.neighbourhoodSearchMask = [
-            0, -1,
+        -1, 0,
+        1, 0,
+
+        0, 1,
+        -1, 1,
+        1, 1
+    ];
+
+    /**
+     *
+     * @param {string} [name]
+     * @param {CellMatcher} traversable Cells that roads are allowed to pass through
+     * @param {GridCellAction[]} actions Actions to perform on created road cells
+     * @returns {GridTaskGenerateRoads}
+     */
+    static from({ name = 'generate roads', traversable, actions }) {
+        assert.defined(traversable, 'traversable');
+        assert.equal(traversable.isCellMatcher, true, 'traversable.isCellMatcher !== true');
 
-            -1, 0,
-            1, 0,
+        assert.isArray(actions, 'actions');
+        assert.greaterThan(actions.length, 0, 'actions must not be empty');
 
-            0, 1
-        ];
+        for (let i = 0; i < actions.length; i++) {
+            assert.equal(actions[i].isGridCellAction, true, `actions[${i}].isGridCellAction !== true`);
+        }
 
-        /**
-         *
-         * @type {number[]}
-         */
-        this.neighbourhoodDrawMask = [
-            -1, -1,
-            1, -1,
-            0, -1,
+        const r = new GridTaskGenerateRoads();
 
-            -1, 0,
-            1, 0,
+        r.traversable = traversable;
+        r.actions = actions;
 
-            0, 1,
-            -1, 1,
-            1, 1
-        ];
+        r.name = name;
 
-        /**
-         * Actions to perform on created roads
-         * @type {GridCellAction[]}
-         */
-        this.actions = [
-            GridCellActionPlaceTags.from(GridTags.Road, MirGridLayers.Tags)
-        ];
+        return r;
     }
 
     /**
@@ -509,12 +517,6 @@ export class GridTaskGenerateRoads extends GridTaskGenerator {
          */
         const connectorNodes = [];
 
-        /**
-         *
-         * @type {Graph<MarkerNode>}
-         */
-        const graph = new Graph();
-
         const width = grid.width;
         const height = grid.height;
 
@@ -523,7 +525,7 @@ export class GridTaskGenerateRoads extends GridTaskGenerator {
 
         const distanceField = new Uint8ClampedArray(gridSize);
 
-        const traversable = matcher_tag_traversable;
+        const traversable = this.traversable;
 
         const random = seededRandom(seed);
 
@@ -557,8 +559,6 @@ export class GridTaskGenerateRoads extends GridTaskGenerator {
                     }
 
                     connectorNodes.push(node);
-
-                    graph.addNode(node);
                 }
             });
         });
@@ -578,7 +578,6 @@ export class GridTaskGenerateRoads extends GridTaskGenerator {
             result: paths,
             nodes: connectorNodes,
             distances,
-            weightMap: distanceField,
             neighbourhoodMask: this.neighbourhoodSearchMask,
             grid,
             heuristic: pathHeuristic,
@@ -592,8 +591,6 @@ export class GridTaskGenerateRoads extends GridTaskGenerator {
 
             const path = paths[i];
 
-            console.log(path);
-
             drawPath(path, this.actions, traversable, grid);
         });
 

package/src/generation/markers/GridActionRuleSet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridActionRuleSet.d.ts","sourceRoot":"","sources":["../../../../src/generation/markers/GridActionRuleSet.js"],"names":[],"mappings":"AAoBA;IA0BI;;;;;;;OAOG;IACH,4DANW,uBAAuB,GAIrB,iBAAiB,CAkB7B;IAhDD;;;OAGG;IACH,UAFU,uBAAuB,CAEnB;IAEd;;;OAGG;IACH,QAFU,uBAAuB,GAAC,MAAM,CAEI;IAE5C;;;OAGG;IACH,SAFU,MAAM,EAAE,CAED;IAEjB;;;OAGG;IACH,aAFU,OAAO,CAEE;IA4BnB;;;OAGG;IACH,uCAEC;IAED;;;;;;OAMG;IACH,8BAJW,MAAM,eACN,MAAM,QA6HhB;CACJ;wCA1MuC,8BAA8B"}
+{"version":3,"file":"GridActionRuleSet.d.ts","sourceRoot":"","sources":["../../../../src/generation/markers/GridActionRuleSet.js"],"names":[],"mappings":"AAoBA;IA0BI;;;;;;;OAOG;IACH,4DANW,uBAAuB,GAIrB,iBAAiB,CAkB7B;IAhDD;;;OAGG;IACH,UAFU,uBAAuB,CAEnB;IAEd;;;OAGG;IACH,QAFU,uBAAuB,GAAC,MAAM,CAEI;IAE5C;;;OAGG;IACH,SAFU,MAAM,EAAE,CAED;IAEjB;;;OAGG;IACH,aAFU,OAAO,CAEE;IA4BnB;;;OAGG;IACH,uCAEC;IAED;;;;;;OAMG;IACH,8BAJW,MAAM,eACN,MAAM,QAqIhB;CACJ;wCAlNuC,8BAA8B"}