@woosh/meep-engine 2.42.7 → 2.43.0

package/engine/graphics/texture/sprite/prototypeSpriteCutoutGeometry.js

@@ -0,0 +1,212 @@
+import { EngineHarness } from "../../../EngineHarness.js";
+import GUIElementSystem from "../../../ecs/gui/GUIElementSystem.js";
+import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
+import EmptyView from "../../../../view/elements/EmptyView.js";
+import EntityBuilder from "../../../ecs/EntityBuilder.js";
+import GUIElement from "../../../ecs/gui/GUIElement.js";
+import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
+import { CanvasView } from "../../../../view/elements/CanvasView.js";
+import sampler2D2Canvas from "../sampler/Sampler2D2Canvas.js";
+import ViewportPosition from "../../../ecs/gui/position/ViewportPosition.js";
+import Vector2 from "../../../../core/geom/Vector2.js";
+import { convex_hull_jarvis_2d } from "../../../../core/geom/2d/convex-hull/convex_hull_jarvis_2d.js";
+import { Sampler2D } from "../sampler/Sampler2D.js";
+import { compute_polygon_area_2d } from "../../../../core/geom/2d/compute_polygon_area_2d.js";
+import { sampler2d_find_pixels } from "../sampler/search/sampler2d_find_pixels.js";
+import { make_edge_condition_channel_threshold } from "../sampler/search/make_edge_condition_channel_threshold.js";
+import { fixed_convex_hull_humus } from "../../../../core/geom/2d/convex-hull/fixed_convex_hull_humus.js";
+
+const edge_condition_alpha0 = make_edge_condition_channel_threshold(3, 0);
+
+
+function sampler_as_view(sampler) {
+
+    const vSpriteSource = new CanvasView();
+    vSpriteSource.css({
+        position: 'absolute',
+        left: 0,
+        top: 0
+    })
+
+    sampler2D2Canvas(sampler, 1, 0, vSpriteSource.el);
+
+    return vSpriteSource;
+}
+
+/**
+ *
+ * @param {number[]} vertices
+ * @param {CanvasRenderingContext2D} ctx
+ * @param [fillColor]
+ * @param [strokeColor]
+ * @param [highlight_vertices]
+ * @param [vertex_draw_size]
+ * @param {number} [offset] in pixels
+ */
+function drawPath({
+                      vertices,
+                      ctx,
+                      fillColor = 'transparent',
+                      strokeColor = 'red',
+                      highlight_vertices = true,
+                      vertex_draw_size = 8,
+                      offset = [0, 0]
+                  }) {
+
+    function draw_point(x, y) {
+        ctx.fillStyle = 'rgba(255,255,255,0.8)';
+        ctx.strokeStyle = 'black';
+        ctx.lineWidth = "1px";
+
+        const x1 = x - vertex_draw_size / 2 + offset[0];
+        const y1 = y - vertex_draw_size / 2 + offset[1];
+
+        ctx.fillRect(x1, y1, vertex_draw_size, vertex_draw_size);
+
+        ctx.strokeRect(x1, y1, vertex_draw_size, vertex_draw_size);
+    }
+
+    if (highlight_vertices) {
+        for (let i = 0; i < vertices.length / 2; i++) {
+            draw_point(vertices[i * 2], vertices[i * 2 + 1]);
+        }
+    }
+
+    ctx.fillStyle = fillColor;
+    ctx.strokeStyle = strokeColor;
+    ctx.lineWidth = "1px";
+
+    ctx.beginPath();
+
+    ctx.moveTo(vertices[0] + offset[0], vertices[1] + offset[1]);
+    // drawPoint(jarvis_vertices[0].x, jarvis_vertices[0].y, jarvis_vertices[0].z, 'red');
+
+    for (let i = 1; i < vertices.length / 2; i++) {
+
+        ctx.lineTo(vertices[i * 2] + offset[0], vertices[i * 2 + 1] + offset[1]);
+
+        // drawPoint(last.x, last.y, last.z, 'red');
+    }
+
+    ctx.closePath();
+    ctx.stroke();
+    ctx.fill();
+
+}
+
+/**
+ *
+ * @param {Engine} engine
+ * @returns {Promise<void>}
+ */
+async function main(engine) {
+
+    // const path = "data/textures/particle/UETools/Bones_01.png";
+    // const path = "data/textures/particle/UETools/x64/Bones_01.png";
+    // const path = "data/textures/particle/KriptoFX/x256/SmokeTile2.png";
+    const path = "data/textures/particle/KriptoFX/CloudMask.png";
+    // const path = "data/textures/particle/travnik/arrow_2_64.png";
+    // const path = "data/textures/particle/travnik/leaf_01.png";
+    // const path = "data/textures/particle/travnik/portal_2_blue_64.png";
+    // const path = "data/textures/particle/travnik/flake.png";
+
+    const asset = await engine.assetManager.promise(path, 'image')
+
+    const sampler = asset.create();
+
+    const input_sprite_area = sampler.width * sampler.height;
+
+    const edge_pixels = sampler2d_find_pixels(sampler, make_edge_condition_channel_threshold(3, 10));
+    console.log(`Edge pixels: ${edge_pixels.length * 0.5} (${(edge_pixels.length * 0.5 * 100 / (sampler.width * sampler.height)).toFixed(2)}% of the image)`);
+
+    const sampler_edge_pixels = Sampler2D.uint8(4, sampler.width, sampler.height);
+
+
+    for (let i = 0; i < edge_pixels.length; i += 2) {
+        sampler_edge_pixels.set(edge_pixels[i], edge_pixels[i + 1], [0, 255, 0, 100]);
+    }
+
+    const convex_hull_indices = convex_hull_jarvis_2d(edge_pixels);
+
+    const convex_hull_point_count = convex_hull_indices.length;
+
+    const convex_hull_vertices = convex_hull_indices.map(i => [edge_pixels[i * 2], edge_pixels[i * 2 + 1]]).flat();
+
+    const convex_hull_area = compute_polygon_area_2d(convex_hull_vertices, convex_hull_point_count);
+
+    console.log(`Convex hull has ${convex_hull_point_count} points, area ${(convex_hull_area * 100 / input_sprite_area).toFixed(2)}% of original`);
+
+    const vContainer = new EmptyView();
+
+    const vHull = new CanvasView();
+    vHull.css({
+        position: 'absolute',
+        left: "-16px",
+        top: "-16px"
+    })
+    // we make it a bit larger to fit markers drawn at the edges of the image
+    vHull.size.set(sampler.width + 32, sampler.height + 32);
+
+    drawPath({
+        vertices: convex_hull_vertices,
+        ctx: vHull.context2d,
+        offset: [16, 16]
+    });
+
+    const vSprite = sampler_as_view(sampler);
+
+    vSprite.css({
+        border: "1px solid red"
+    });
+
+    vContainer.addChild(vSprite);
+
+    vContainer.addChild(sampler_as_view(sampler_edge_pixels));
+
+    // vContainer.addChild(vHull);
+
+    console.time('optimal poly');
+    const optimal_poly_points = 8;
+    const optimal_poly = new Float32Array(optimal_poly_points * 2);
+    // fixed_convex_hull_relaxation(optimal_poly, 0, optimal_poly_points, convex_hull_vertices, convex_hull_point_count);
+    fixed_convex_hull_humus(optimal_poly, 0, optimal_poly_points, convex_hull_vertices, convex_hull_point_count);
+    console.timeEnd('optimal poly');
+
+    console.log(`optimal poly: ${Array.from(optimal_poly).join(', ')}`);
+    console.log(`Optimal poly area ${((compute_polygon_area_2d(optimal_poly, optimal_poly_points) * 100 / input_sprite_area).toFixed(2))}%`);
+
+    const vOptimalPoly = new CanvasView();
+    vOptimalPoly.css({
+        position: 'absolute',
+        top: '-50px',
+        left: '-50px'
+    });
+
+    vOptimalPoly.size.set(sampler.width + 100, sampler.height + 100);
+
+    drawPath({
+        vertices: optimal_poly,
+        ctx: vOptimalPoly.context2d,
+        strokeColor: '#30c0ff',
+        offset: [50, 50]
+    });
+
+    vContainer.addChild(vOptimalPoly);
+
+    new EntityBuilder()
+        .add(GUIElement.fromView(vContainer))
+        .add(new ViewportPosition({
+            offset: new Vector2(100, 100)
+        }))
+        .build(engine.entityManager.dataset);
+
+}
+
+new EngineHarness().initialize({
+    configuration(config, engine) {
+        config.addSystem(new GUIElementSystem(engine.gui.view, engine));
+        config.addSystem(new ViewportPositionSystem(engine.gui.view.size));
+
+        config.addLoader('image', new ImageRGBADataLoader());
+    }
+}).then(main);

package/engine/knowledge/database/StaticKnowledgeDataTable.js

@@ -1,9 +1,9 @@
 import { noop } from "../../../core/function/Functions.js";
-import { countTask } from "../../../core/process/task/TaskUtils.js";
 import Task from "../../../core/process/task/Task.js";
 import { assert } from "../../../core/assert.js";
 import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
 import { DATABASE_SERIALIZATION_IGNORE_PROPERTY } from "./DATABASE_SERIALIZATION_IGNORE_PROPERTY.js";
+import { countTask } from "../../../core/process/task/util/countTask.js";
 
 let id_seed = 0;
 

package/engine/navigation/grid/AStar.js

@@ -213,7 +213,7 @@ export function gridAStarSearch(field, width, height, start, goal, crossingPenal
                     open.push(neighbor);
                 } else {
                     // Already seen the node, but since it has been rescored we need to reorder it in the heap
-                    open.rescoreElement(neighbor);
+                    open.updateElementScore(neighbor);
                 }
             }
         }

package/engine/plugin/EnginePluginManager.js

@@ -4,7 +4,6 @@ import { EnginePlugin } from "./EnginePlugin.js";
 import { PluginReferenceContext } from "./PluginReferenceContext.js";
 import { isSubclassOf } from "./isSubclassOf.js";
 import { assert } from "../../core/assert.js";
-import { IllegalStateException } from "../../core/fsm/exceptions/IllegalStateException.js";
 
 export class EnginePluginManager extends BaseProcess {
     constructor() {
@@ -222,49 +221,51 @@ export class EnginePluginManager extends BaseProcess {
         }
 
         let ctx = this.__plugins.get(PluginClass);
+        let reference;
 
-        if (ctx !== undefined) {
-            return ctx.getReference();
-        }
+        if (ctx === undefined) {
 
-        this.__version++;
+            this.__version++;
 
-        // context not found, create it
+            // context not found, create it
 
-        const instance = new PluginClass();
+            const instance = new PluginClass();
 
-        ctx = new PluginReferenceContext(instance, PluginClass);
+            ctx = new PluginReferenceContext(instance, PluginClass);
 
-        // monitor the context
-        ctx.on.lastReleased.add(this.__handle_last_plugin_reference_release, this);
+            // monitor the context
+            ctx.on.lastReleased.add(this.__handle_last_plugin_reference_release, this);
 
-        // get reference to make sure that the context doesn't come up as having no references
-        const reference = ctx.getReference();
+            // all dependencies acquired, register the plugin
+            this.__plugins.set(PluginClass, ctx);
 
-        // TODO address cyclic dependencies, these can cause a deadlock
-        // acquire dependencies
-        const dependency_refs = await this.acquireMany(instance.dependencies);
+            // get reference to make sure that the context doesn't come up as having no references
+            reference = ctx.getReference();
 
-        ctx.dependency_references.addAll(dependency_refs);
+            // TODO address cyclic dependencies, these can cause a deadlock
+            // acquire dependencies
+            const dependency_refs = await this.acquireMany(instance.dependencies);
+
+            ctx.dependency_references.addAll(dependency_refs);
 
-        // Sanity check
-        if (this.__plugins.has(PluginClass)) {
-            throw new IllegalStateException('Plugin was already instantiated during acquisition');
-        }
 
-        // all dependencies acquired, register the plugin
-        this.__plugins.set(PluginClass, ctx);
+            const manager_state_object = this.getState();
 
-        const manager_state_object = this.getState();
 
+            const manager_state_value = manager_state_object.getValue();
 
-        const manager_state_value = manager_state_object.getValue();
+            // bring the plugin into proper state
 
-        // bring the plugin into proper state
+            const engine = this.engine;
 
-        const engine = this.engine;
+            await ctx.transition(manager_state_value, engine);
+
+        } else {
+            reference = ctx.getReference();
+
+            await ctx.synchronize();
+        }
 
-        await ctx.transition(manager_state_value, engine);
 
         return reference;
 

package/engine/plugin/PluginReferenceContext.js

@@ -141,6 +141,15 @@ export class PluginReferenceContext {
         this.__transition = Promise.resolve();
     }
 
+    /**
+     * Returns promise to the latest transition, useful to synchronization
+     * @example await ctx.synchronize();
+     * @returns {Promise<void>}
+     */
+    synchronize() {
+        return this.__transition;
+    }
+
     /**
      *
      * @param {ProcessState} target_state

package/engine/scene/Scene.js

@@ -4,9 +4,9 @@
 
 
 import { EntityComponentDataset } from "../ecs/EntityComponentDataset.js";
-import { promiseTask } from "../../core/process/task/TaskUtils.js";
 import ObservedBoolean from "../../core/model/ObservedBoolean.js";
 import List from "../../core/collection/list/List.js";
+import { promiseTask } from "../../core/process/task/util/promiseTask.js";
 
 class Scene {
     /**

package/engine/scene/SerializedScene.js

@@ -1,9 +1,9 @@
 import { GameAssetType } from "../asset/GameAssetType.js";
 import BinaryBufferDeSerializer from "../ecs/storage/BinaryBufferDeSerializer.js";
 import { EncodingBinaryBuffer } from "../../core/binary/EncodingBinaryBuffer.js";
-import { emptyTask } from "../../core/process/task/TaskUtils.js";
 import { assert } from "../../core/assert.js";
 import { MirScene } from "../../../model/game/scenes/MirScene.js";
+import { emptyTask } from "../../core/process/task/util/emptyTask.js";
 
 /**
  *

package/engine/scene/transitionToScene.js

@@ -1,4 +1,3 @@
-import { actionTask, delayTask, wrapTaskIgnoreFailure } from "../../core/process/task/TaskUtils.js";
 import TaskGroup from "../../core/process/task/TaskGroup.js";
 import Task from "../../core/process/task/Task.js";
 import TaskState from "../../core/process/task/TaskState.js";
@@ -7,6 +6,9 @@ import { compileAllMaterials } from "../graphics/ecs/compileAllMaterials.js";
 import { createTaskWaitForMeshesToLoad } from "../graphics/ecs/mesh/createTaskWaitForMeshesToLoad.js";
 import { loadVisibleTerrainTiles } from "../ecs/terrain/util/loadVisibleTerrainTiles.js";
 import { TaskLoadingScreen } from "../../view/task/TaskLoadingScreen.js";
+import { actionTask } from "../../core/process/task/util/actionTask.js";
+import { delayTask } from "../../core/process/task/util/delayTask.js";
+import { wrapTaskIgnoreFailure } from "../../core/process/task/util/wrapTaskIgnoreFailure.js";
 
 
 /**

package/generation/example/main.js

@@ -16,7 +16,6 @@ import { computeStringHash } from "../../core/primitives/strings/computeStringHa
 import { ThemeEngine } from "../theme/ThemeEngine.js";
 import { AreaTheme } from "../theme/AreaTheme.js";
 import TaskGroup from "../../core/process/task/TaskGroup.js";
-import { actionTask } from "../../core/process/task/TaskUtils.js";
 import { generateTerrainPreview } from "../../../../generator/generator/generateTerrainPreview.js";
 import { SampleTheme0 } from "./themes/SampleTheme0.js";
 import { SampleGenerator0 } from "./SampleGenerator0.js";
@@ -29,6 +28,7 @@ import TopDownCameraControllerSystem from "../../engine/graphics/ecs/camera/topd
 import { TopDownCameraLanderSystem } from "../../engine/graphics/ecs/camera/topdown/TopDownCameraLanderSystem.js";
 import LightSystem from "../../engine/graphics/ecs/light/LightSystem.js";
 import { TaskLoadingScreen } from "../../view/task/TaskLoadingScreen.js";
+import { actionTask } from "../../core/process/task/util/actionTask.js";
 
 function makeEngineConfig(engine) {
     const config = new EngineConfiguration();

package/generation/grid/generation/GridTaskApplyActionToCells.js

@@ -1,9 +1,9 @@
 import { GridTaskGenerator } from "../GridTaskGenerator.js";
 import { assert } from "../../../core/assert.js";
-import { actionTask } from "../../../core/process/task/TaskUtils.js";
 import TaskGroup from "../../../core/process/task/TaskGroup.js";
 import Task from "../../../core/process/task/Task.js";
 import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
+import { actionTask } from "../../../core/process/task/util/actionTask.js";
 
 export class GridTaskApplyActionToCells extends GridTaskGenerator {
     constructor() {

package/generation/grid/generation/GridTaskDensityMarkerDistribution.js

@@ -9,9 +9,9 @@ import { MarkerNodeMatcherAny } from "../../markers/matcher/MarkerNodeMatcherAny
 import { assert } from "../../../core/assert.js";
 import { computeStatisticalMean } from "../../../core/math/statistics/computeStatisticalMean.js";
 import TaskGroup from "../../../core/process/task/TaskGroup.js";
-import { actionTask } from "../../../core/process/task/TaskUtils.js";
 import { ArrayIteratorRandom } from "../../../core/collection/array/ArrayIteratorRandom.js";
 import { clamp01 } from "../../../core/math/clamp01.js";
+import { actionTask } from "../../../core/process/task/util/actionTask.js";
 
 
 /**

package/generation/grid/generation/GridTaskExecuteRuleTimes.js

@@ -4,9 +4,9 @@ import Task from "../../../core/process/task/Task.js";
 import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
 import { BitSet } from "../../../core/binary/BitSet.js";
 import { PI_HALF } from "../../../core/math/MathUtils.js";
-import { actionTask } from "../../../core/process/task/TaskUtils.js";
 import TaskGroup from "../../../core/process/task/TaskGroup.js";
 import { randomIntegerBetween } from "../../../core/math/random/randomIntegerBetween.js";
+import { actionTask } from "../../../core/process/task/util/actionTask.js";
 
 export class GridTaskExecuteRuleTimes extends GridTaskGenerator {
     constructor() {

package/generation/grid/generation/NoopGridTaskGenerator.js

@@ -1,5 +1,5 @@
 import { GridTaskGenerator } from "../GridTaskGenerator.js";
-import { emptyTask } from "../../../core/process/task/TaskUtils.js";
+import { emptyTask } from "../../../core/process/task/util/emptyTask.js";
 
 export class NoopGridTaskGenerator extends GridTaskGenerator {
     build(grid, ecd, seed) {

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

@@ -1,10 +1,11 @@
 import { seededRandom } from "../../../../core/math/random/seededRandom.js";
 import { GridTaskGenerator } from "../../GridTaskGenerator.js";
 import { CaveGeneratorCellularAutomata } from "../../../automata/CaveGeneratorCellularAutomata.js";
-import { actionTask, countTask } from "../../../../core/process/task/TaskUtils.js";
 import { Sampler2D } from "../../../../engine/graphics/texture/sampler/Sampler2D.js";
 import TaskGroup from "../../../../core/process/task/TaskGroup.js";
 import { assert } from "../../../../core/assert.js";
+import { actionTask } from "../../../../core/process/task/util/actionTask.js";
+import { countTask } from "../../../../core/process/task/util/countTask.js";
 
 export class GridTaskCellularAutomata extends GridTaskGenerator {
     constructor() {

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

@@ -13,8 +13,8 @@ import { drawSamplerHTML } from "../../../../engine/graphics/texture/sampler/uti
 import { matcher_tag_unoccupied } from "../../../example/rules/matcher_tag_unoccupied.js";
 import { buildDistanceMapToObjective } from "../util/buildDistanceMapToObjective.js";
 import { buildPathFromDistanceMap } from "../util/buildPathFromDistanceMap.js";
-import { actionTask } from "../../../../core/process/task/TaskUtils.js";
 import { assert } from "../../../../core/assert.js";
+import { actionTask } from "../../../../core/process/task/util/actionTask.js";
 
 const ESTIMATED_TILES_PER_ROOM = 900;
 

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

@@ -1,4 +1,3 @@
-import { actionTask, countTask } from "../../../../../core/process/task/TaskUtils.js";
 import Task from "../../../../../core/process/task/Task.js";
 import { BitSet } from "../../../../../core/binary/BitSet.js";
 import TaskGroup from "../../../../../core/process/task/TaskGroup.js";
@@ -6,6 +5,8 @@ import { TaskSignal } from "../../../../../core/process/task/TaskSignal.js";
 import BinaryHeap from "../../../../../core/collection/heap/FastBinaryHeap.js";
 import { GridTaskGenerator } from "../../../GridTaskGenerator.js";
 import { assert } from "../../../../../core/assert.js";
+import { actionTask } from "../../../../../core/process/task/util/actionTask.js";
+import { countTask } from "../../../../../core/process/task/util/countTask.js";
 
 /**
  * Build a map of distances across the grid, using 2 concepts: source cells and passable cells. Source cells are where the distance is 0, and passable cells are those that can be travelled through
@@ -164,7 +165,7 @@ export class GridTaskBuildSourceDistanceMap extends GridTaskGenerator {
                 open.push(iNeighbor);
             } else if (distance < target[iNeighbor]) {
                 target[iNeighbor] = distance;
-                open.rescoreElement(iNeighbor);
+                open.updateElementScore(iNeighbor);
             }
         }
 

package/generation/grid/generation/discrete/layer/GridTaskDistanceToMarkers.js

@@ -1,6 +1,6 @@
 import { GridTaskGenerator } from "../../../GridTaskGenerator.js";
-import { actionTask } from "../../../../../core/process/task/TaskUtils.js";
 import BinaryHeap from "../../../../../core/collection/heap/FastBinaryHeap.js";
+import { actionTask } from "../../../../../core/process/task/util/actionTask.js";
 
 export class GridTaskDistanceToMarkers extends GridTaskGenerator {
     constructor() {

package/generation/grid/generation/grid/GridTaskAddNodesFixed.js

@@ -1,7 +1,7 @@
 import { GridTaskGenerator } from "../../GridTaskGenerator.js";
-import { actionTask } from "../../../../core/process/task/TaskUtils.js";
 import { MarkerNodeConsumerBuffer } from "../../../markers/emitter/MarkerNodeConsumerBuffer.js";
 import { assert } from "../../../../core/assert.js";
+import { actionTask } from "../../../../core/process/task/util/actionTask.js";
 
 export class GridTaskAddNodesFixed extends GridTaskGenerator {
     constructor() {

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

@@ -2,7 +2,6 @@ import { inverseLerp } from "../../../../core/math/inverseLerp.js";
 import { lerp } from "../../../../core/math/lerp.js";
 import { seededRandom } from "../../../../core/math/random/seededRandom.js";
 import { GridTaskGenerator } from "../../GridTaskGenerator.js";
-import { actionTask, countTask } from "../../../../core/process/task/TaskUtils.js";
 import TaskGroup from "../../../../core/process/task/TaskGroup.js";
 import Graph from "../../../../core/graph/Graph.js";
 import BinaryHeap from "../../../../core/collection/heap/FastBinaryHeap.js";
@@ -23,6 +22,8 @@ import { buildUnsignedDistanceField } from "../util/buildUnsignedDistanceField.j
 import { CellMatcherNot } from "../../../rules/logic/CellMatcherNot.js";
 import { RoadConnectionNetwork } from "./RoadConnectionNetwork.js";
 import { MirGridLayers } from "../../../example/grid/MirGridLayers.js";
+import { actionTask } from "../../../../core/process/task/util/actionTask.js";
+import { countTask } from "../../../../core/process/task/util/countTask.js";
 
 const NODE_TYPE_ROAD_CONNECTOR = 'Road Connector';
 
@@ -301,7 +302,7 @@ function buildPaths(
                 } else if (distance < distances[neighbour_index]) {
 
                     distances[neighbour_index] = distances;
-                    open.rescoreElement(neighbour_index);
+                    open.updateElementScore(neighbour_index);
 
                 }
 

package/generation/grid/generation/util/buildDistanceMapToObjective.js

@@ -94,7 +94,7 @@ export function buildDistanceMapToObjective(
             } else if (distance < distances[neighbour_index]) {
 
                 distances[neighbour_index] = distances;
-                open.rescoreElement(neighbour_index);
+                open.updateElementScore(neighbour_index);
 
             }
 

package/generation/markers/GridActionRuleSet.js

@@ -1,11 +1,12 @@
 import { PI_HALF } from "../../core/math/MathUtils.js";
 import { assert } from "../../core/assert.js";
 import { seededRandom } from "../../core/math/random/seededRandom.js";
-import { countTask, randomCountTask } from "../../core/process/task/TaskUtils.js";
 import { RuleSelectionPolicyType } from "./RuleSelectionPolicyType.js";
 import { ArrayIteratorSequential } from "../../core/collection/array/ArrayIteratorSequential.js";
 import { ArrayIteratorRandom } from "../../core/collection/array/ArrayIteratorRandom.js";
 import TaskGroup from "../../core/process/task/TaskGroup.js";
+import { randomCountTask } from "../../core/process/task/util/randomCountTask.js";
+import { countTask } from "../../core/process/task/util/countTask.js";
 
 
 /**

package/generation/placement/GridCellActionTransformNearbyMarkers.js

@@ -1,6 +1,7 @@
 import { GridCellAction } from "./action/GridCellAction.js";
 import { MarkerNodeMatcherAny } from "../markers/matcher/MarkerNodeMatcherAny.js";
 import { assert } from "../../core/assert.js";
+import { qt_match_data_by_circle } from "../../core/geom/2d/quad-tree/qt_match_data_by_circle.js";
 
 export class GridCellActionTransformNearbyMarkers extends GridCellAction {
     constructor() {
@@ -91,10 +92,7 @@ export class GridCellActionTransformNearbyMarkers extends GridCellAction {
 
         const transformer = this.transformer;
 
-        // reset cursor
-        this.__leaf_cursor = 0;
-
-        data.markers.traverseCircleIntersections(x, y, this.radius, this.__visitMarker, this);
+        this.__leaf_cursor = qt_match_data_by_circle(this.__leaves, 0, data.markers, x, y, this.radius, this.matcher.match, this.matcher);
 
         const match_count = this.__leaf_cursor;
         const leaves = this.__leaves;

package/generation/theme/ThemeEngine.js

@@ -2,7 +2,6 @@ import { QuadTreeNode } from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
 import { assert } from "../../core/assert.js";
 import { seededRandom } from "../../core/math/random/seededRandom.js";
 import { TerrainLayerRuleAggregator } from "./TerrainLayerRuleAggregator.js";
-import { actionTask, countTask, emptyTask, futureTask } from "../../core/process/task/TaskUtils.js";
 import { Sampler2D } from "../../engine/graphics/texture/sampler/Sampler2D.js";
 import Task from "../../core/process/task/Task.js";
 import { TaskSignal } from "../../core/process/task/TaskSignal.js";
@@ -17,6 +16,10 @@ import { TerrainFlags } from "../../engine/ecs/terrain/ecs/TerrainFlags.js";
 import { binarySearchLowIndex } from "../../core/collection/array/binarySearchLowIndex.js";
 import { randomFloatBetween } from "../../core/math/random/randomFloatBetween.js";
 import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.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";
 
 /**
  *

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.42.7",
+  "version": "2.43.0",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",

package/view/asset/AssetLoaderStatusView.js

@@ -56,19 +56,19 @@ export class AssetLoaderStatusView extends View {
 
         self.pendingAssetCount.set(0);
 
-        this.assetManager.requestMap.forEach(function (key, value) {
+        this.assetManager.request_map.forEach(function (key, value) {
             self.__handlerAssetAdded(key, value);
         });
 
-        this.assetManager.requestMap.on.set.add(this.__handlerAssetAdded);
-        this.assetManager.requestMap.on.deleted.add(this.__handlerAssetRemoved);
+        this.assetManager.request_map.on.set.add(this.__handlerAssetAdded);
+        this.assetManager.request_map.on.deleted.add(this.__handlerAssetRemoved);
     }
 
     unlink() {
         super.unlink();
 
 
-        this.assetManager.requestMap.on.set.remove(this.__handlerAssetAdded);
-        this.assetManager.requestMap.on.deleted.remove(this.__handlerAssetRemoved);
+        this.assetManager.request_map.on.set.remove(this.__handlerAssetAdded);
+        this.assetManager.request_map.on.deleted.remove(this.__handlerAssetRemoved);
     }
 }