@woosh/meep-engine 2.50.0 → 2.50.2

package/src/engine/graphics/render/forward_plus/computeFrustumCorners.js

@@ -1,6 +1,6 @@
 import {
-    plane_three_computeConvex3PlaneIntersection
-} from "../../../../core/geom/3d/plane/plane_three_compute_convex3_plane_intersection.js";
+    plane3_three_compute_convex_3_plane_intersection
+} from "../../../../core/geom/3d/plane/plane3_three_compute_convex_3_plane_intersection.js";
 
 /**
  * Get frustum corners from a set of planes
@@ -13,7 +13,7 @@ export function computeFrustumCorners(result, planes) {
     const plane_y0 = planes[2];
     const plane_z0 = planes[4];
 
-    plane_three_computeConvex3PlaneIntersection(result, 0,
+    plane3_three_compute_convex_3_plane_intersection(result, 0,
         plane_x0,
         plane_y0,
         plane_z0
@@ -21,7 +21,7 @@ export function computeFrustumCorners(result, planes) {
 
     const plane_z1 = planes[5];
 
-    plane_three_computeConvex3PlaneIntersection(result, 3,
+    plane3_three_compute_convex_3_plane_intersection(result, 3,
         plane_x0,
         plane_y0,
         plane_z1
@@ -29,13 +29,13 @@ export function computeFrustumCorners(result, planes) {
 
     const plane_y1 = planes[3];
 
-    plane_three_computeConvex3PlaneIntersection(result, 6,
+    plane3_three_compute_convex_3_plane_intersection(result, 6,
         plane_x0,
         plane_y1,
         plane_z0
     );
 
-    plane_three_computeConvex3PlaneIntersection(result, 9,
+    plane3_three_compute_convex_3_plane_intersection(result, 9,
         plane_x0,
         plane_y1,
         plane_z1
@@ -43,25 +43,25 @@ export function computeFrustumCorners(result, planes) {
 
     const plane_x1 = planes[1];
 
-    plane_three_computeConvex3PlaneIntersection(result, 12,
+    plane3_three_compute_convex_3_plane_intersection(result, 12,
         plane_x1,
         plane_y0,
         plane_z0
     );
 
-    plane_three_computeConvex3PlaneIntersection(result, 15,
+    plane3_three_compute_convex_3_plane_intersection(result, 15,
         plane_x1,
         plane_y0,
         plane_z1
     );
 
-    plane_three_computeConvex3PlaneIntersection(result, 18,
+    plane3_three_compute_convex_3_plane_intersection(result, 18,
         plane_x1,
         plane_y1,
         plane_z0
     );
 
-    plane_three_computeConvex3PlaneIntersection(result, 21,
+    plane3_three_compute_convex_3_plane_intersection(result, 21,
         plane_x1,
         plane_y1,
         plane_z1

package/src/engine/graphics/render/layers/RenderLayerUtils.js

@@ -1,7 +1,7 @@
 import { v3_distance_above_plane } from "../../../../core/geom/v3_distance_above_plane.js";
 import {
-    plane_three_computeConvex3PlaneIntersection
-} from "../../../../core/geom/3d/plane/plane_three_compute_convex3_plane_intersection.js";
+    plane3_three_compute_convex_3_plane_intersection
+} from "../../../../core/geom/3d/plane/plane3_three_compute_convex_3_plane_intersection.js";
 
 /**
  *
@@ -43,7 +43,7 @@ export function buildPlanarRenderLayerClipPlaneComputationMethod(traversePlanes,
             const p0 = pair[0];
             const p1 = pair[1];
 
-            const planeIntersection = plane_three_computeConvex3PlaneIntersection(p, 0, p0, p1, objectPlane);
+            const planeIntersection = plane3_three_compute_convex_3_plane_intersection(p, 0, p0, p1, objectPlane);
 
             if (!planeIntersection) {
                 //no intersection

package/src/engine/intelligence/behavior/Behavior.d.ts

@@ -1,8 +1,13 @@
 import {BehaviorStatus} from "./BehaviorStatus";
+import Signal from "../../../core/events/signal/Signal";
 
 export class Behavior<CTX> {
     context: CTX | null
 
+    readonly onInitialized: Signal<this, CTX>
+
+    readonly onFinalized: Signal<this>
+
     tick(timeDeltaSeconds: number): BehaviorStatus
 
     initialize(context: CTX): void

package/src/engine/intelligence/behavior/Behavior.js

@@ -1,4 +1,5 @@
 import { BehaviorStatus } from "./BehaviorStatus.js";
+import Signal from "../../../core/events/signal/Signal.js";
 
 /**
  * Base class of behavior tree implementation
@@ -15,6 +16,20 @@ export class Behavior {
      */
     context = null;
 
+    /**
+     * Dispatched after initialization is complete
+     * @readonly
+     * @type {Signal<this,CTX>}
+     */
+    onInitialized = new Signal();
+
+    /**
+     * Dispatched after finalization is complete
+     * @readonly
+     * @type {Signal<this>}
+     */
+    onFinalized = new Signal();
+
     /**
      * Main update function. Every behavior executes some logic, some behaviors are long-running and some are instantaneous
      * @param {number} timeDelta time step in seconds
@@ -27,18 +42,22 @@ export class Behavior {
     /**
      * Called before behavior gets executed via {@link #tick} for the first time
      * Used to prepare the behavior for execution
+     * You can think of it as "start"
      * @param {CTX} [context]
      */
     initialize(context) {
         this.context = context;
+        this.onInitialized.send2(this, context);
     }
 
     /**
      * Called when behavior is finished, or interrupted
      * Used to clean up any resources
+     * You can think of it as "stop"
      */
     finalize() {
         // extend in subclasses as necessary
+        this.onFinalized.send1(this);
     }
 }
 

package/src/engine/intelligence/behavior/SelectorBehavior.js

@@ -78,11 +78,11 @@ export class SelectorBehavior extends CompositeBehavior {
             this.__currentBehaviour.finalize();
             this.__currentBehaviour = null;
         }
+
+        super.finalize();
     }
 
     initialize(context) {
-        super.initialize(context);
-
         const children = this.__children;
 
         if (children.length > 0) {
@@ -99,5 +99,7 @@ export class SelectorBehavior extends CompositeBehavior {
             this.__currentBehaviour = null;
 
         }
+
+        super.initialize(context);
     }
 }

package/src/engine/intelligence/behavior/composite/ParallelBehavior.js

@@ -218,6 +218,8 @@ export class ParallelBehavior extends CompositeBehavior {
         //finalize remaining active behaviours
 
         this.__finalizeActiveChildren();
+
+        super.finalize();
     }
 
     /**

package/src/engine/intelligence/behavior/composite/SequenceBehavior.js

@@ -34,7 +34,6 @@ export class SequenceBehavior extends CompositeBehavior {
 
     initialize(context) {
         // console.log('+ SequenceBehavior');
-        super.initialize(context);
 
         this.__currentBehaviourIndex = 0;
         this.__currentBehaviour = this.__children[0];
@@ -43,6 +42,8 @@ export class SequenceBehavior extends CompositeBehavior {
         this.__currentBehaviour.initialize(context);
 
         this.__currentBehaviourState = BehaviorStatus.Running;
+
+        super.initialize(context);
     }
 
 
@@ -100,6 +101,7 @@ export class SequenceBehavior extends CompositeBehavior {
         this.__currentBehaviourIndex = child_count;
 
         // console.warn('- SequenceBehavior');
+        super.finalize();
     }
 
     /**

package/src/engine/intelligence/behavior/decorator/AbstractDecoratorBehavior.js

@@ -35,14 +35,13 @@ export class AbstractDecoratorBehavior extends Behavior {
     }
 
     initialize(context) {
-        super.initialize(context);
         this.__source.initialize(context);
+        super.initialize(context);
     }
 
     finalize() {
-        super.finalize();
-
         this.__source.finalize();
+        super.finalize();
     }
 }
 

package/src/engine/intelligence/behavior/decorator/RepeatBehavior.js

@@ -59,10 +59,10 @@ export class RepeatBehavior extends AbstractDecoratorBehavior {
     }
 
     initialize(context) {
-        super.initialize(context);
-
         // reset iterator
         this.__iterator = 0;
+
+        super.initialize(context);
     }
 
     tick(timeDelta) {

package/src/engine/intelligence/behavior/primitive/SucceedingBehavior.js

@@ -20,7 +20,7 @@ export class SucceedingBehavior extends Behavior {
     }
 
     /**
-     *
+     * @deprecated use static INSTANCE instead
      * @param {number} delayTicks
      * @return {SucceedingBehavior}
      */

package/src/engine/scene/SceneManager.spec.js

@@ -85,6 +85,7 @@ test("set active scene", () => {
     manager.set('x');
 
     expect(manager.current_scene).toBe(scene);
+    expect(scene.active.getValue()).toBe(true);
     expect(entityManager.dataset).toBe(scene.dataset);
 });
 
@@ -105,3 +106,26 @@ test("stack push/pop", () => {
 
     expect(manager.current_scene).toBe(scene_x);
 });
+
+test("clear on empty does nothing", () => {
+    const { manager } = makeSM();
+
+    manager.clear();
+
+    expect(manager.current_scene).toBeNull();
+});
+
+test("clear correctly clears active scene", () => {
+
+    const { manager, entityManager } = makeSM();
+
+    const scene = manager.create('x');
+
+    manager.set('x');
+
+    manager.clear();
+
+    expect(manager.current_scene).toBeNull();
+    expect(scene.active.getValue()).toBe(false);
+    expect(entityManager.dataset).toBe(null);
+});

package/src/generation/grid/GridData.js

@@ -3,7 +3,6 @@ import { QuadTreeNode } from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
 import { OffsetScaleTransform2D } from "../../engine/ecs/terrain/ecs/OffsetScaleTransform2D.js";
 import { max2 } from "../../core/math/max2.js";
 import { qt_collect_by_circle } from "../../core/geom/2d/quad-tree/qt_collect_by_circle.js";
-import { v2_length_sqr } from "../../core/geom/Vector2.js";
 
 /**
  *
@@ -122,7 +121,14 @@ export class GridData {
             const distance_limit_sqr = distance_limit * distance_limit;
 
             // check refined containment
-            if (v2_length_sqr(x - marker.position.x, y - marker.position.y) > distance_limit_sqr) {
+            const position = marker.position;
+
+            const dx = x - position.x;
+            const dy = y - position.y;
+
+            const distance_sqr = dx * dx + dy * dy;
+
+            if (distance_sqr > distance_limit_sqr) {
                 continue;
             }
 

package/src/generation/grid/GridData.spec.js

@@ -0,0 +1,5 @@
+import { GridData } from "./GridData.js";
+
+test("constructor does not throw", () => {
+    expect(() => new GridData()).not.toThrow()
+});

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

@@ -10,7 +10,7 @@ import TaskGroup from "../../../../core/process/task/TaskGroup.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 { matcher_tag_unoccupied } from "../../../example/rules/matcher_tag_unoccupied.js";
+import { matcher_tag_unoccupied } from "../../../../../samples/generation/rules/matcher_tag_unoccupied.js";
 import { buildDistanceMapToObjective } from "../util/buildDistanceMapToObjective.js";
 import { buildPathFromDistanceMap } from "../util/buildPathFromDistanceMap.js";
 import { assert } from "../../../../core/assert.js";

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

@@ -6,7 +6,7 @@ import TaskGroup from "../../../../core/process/task/TaskGroup.js";
 import Graph from "../../../../core/graph/Graph.js";
 import BinaryHeap from "../../../../core/collection/heap/FastBinaryHeap.js";
 import { BitSet } from "../../../../core/binary/BitSet.js";
-import { matcher_tag_traversable } from "../../../example/rules/matcher_tag_traversable.js";
+import { matcher_tag_traversable } from "../../../../../samples/generation/rules/matcher_tag_traversable.js";
 import { buildPathFromDistanceMap } from "../util/buildPathFromDistanceMap.js";
 import { GridCellActionPlaceTags } from "../../../placement/action/GridCellActionPlaceTags.js";
 import { GridTags } from "../../../GridTags.js";
@@ -20,7 +20,7 @@ import { readMarkerNodeGroupId } from "./readMarkerNodeGroupId.js";
 import { buildUnsignedDistanceField } from "../util/buildUnsignedDistanceField.js";
 import { CellMatcherNot } from "../../../rules/logic/CellMatcherNot.js";
 import { RoadConnectionNetwork } from "./RoadConnectionNetwork.js";
-import { MirGridLayers } from "../../../example/grid/MirGridLayers.js";
+import { MirGridLayers } from "../../../../../samples/generation/grid/MirGridLayers.js";
 import { actionTask } from "../../../../core/process/task/util/actionTask.js";
 import { countTask } from "../../../../core/process/task/util/countTask.js";
 import { groupArrayBy } from "../../../../core/collection/array/groupArrayBy.js";

package/src/generation/markers/actions/MarkerNodeActionEntityPlacement.js

@@ -64,7 +64,7 @@ export class MarkerNodeActionEntityPlacement extends MarkerNodeAction {
     execute(grid, ecd, node) {
         const blueprint = this.entity;
 
-        const entityBuilder = blueprint.buildEntityBuilder(node.properties);
+        const entityBuilder = blueprint.build(node.properties);
 
         // execute post-process step
         if (this.processor !== null) {

package/src/view/common/VirtualListView.js

@@ -16,6 +16,8 @@ export const AlignmentOption = {
     End: 'end'
 };
 
+const update_scratch = [];
+
 class VirtualListView extends View {
     /**
      * @template T

package/src/view/minimap/dom/MinimapCameraView.js

@@ -3,7 +3,7 @@ import Vector3 from "../../../core/geom/Vector3.js";
 import ObservedValue from "../../../core/model/ObservedValue.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import SVG from "../../SVG.js";
-import { computePlaneRayIntersection } from "../../../core/geom/3d/plane/computePlaneRayIntersection.js";
+import { plane3_compute_ray_intersection } from "../../../core/geom/3d/plane/plane3_compute_ray_intersection.js";
 
 
 const rayContact = new SurfacePoint3();
@@ -93,7 +93,7 @@ export class MinimapCameraView extends View {
         const JITTER = 0.00001;
 
         if (terrain === null) {
-            computePlaneRayIntersection(result, originX, originY, originZ, directionX, directionY, directionZ, 0, 1, 0, 0);
+            plane3_compute_ray_intersection(result, originX, originY, originZ, directionX, directionY, directionZ, 0, 1, 0, 0);
         } else {
 
             let oX = originX;
@@ -118,7 +118,7 @@ export class MinimapCameraView extends View {
 
             if (!foundHit) {
                 //no hit found, fall back to planar test
-                computePlaneRayIntersection(result, originX, originY, originZ, directionX, directionY, directionZ, 0, 1, 0, 0);
+                plane3_compute_ray_intersection(result, originX, originY, originZ, directionX, directionY, directionZ, 0, 1, 0, 0);
             }
 
         }

package/src/core/geom/3d/plane/computePlaneRayIntersection.js

@@ -1,55 +0,0 @@
-import { v3_dot } from "../../v3_dot.js";
-
-/**
- *
- * @param {Vector3} out Result will be written here
- * @param {number} originX Ray origin
- * @param {number} originY Ray origin
- * @param {number} originZ Ray origin
- * @param {number} directionX Ray direction
- * @param {number} directionY Ray direction
- * @param {number} directionZ Ray direction
- * @param {number} normalX Plane normal
- * @param {number} normalY Plane normal
- * @param {number} normalZ Plane normal
- * @param {number} dist Plane distance
- * @returns {boolean} true if intersection is found, false otherwise
- */
-export function computePlaneRayIntersection(out, originX, originY, originZ, directionX, directionY, directionZ, normalX, normalY, normalZ, dist) {
-    const denom = v3_dot(directionX, directionY, directionZ, normalX, normalY, normalZ);
-
-    const p = v3_dot(normalX, normalY, normalZ, originX, originY, originZ) + dist;
-
-    if (denom !== 0) {
-
-        const t = -p / denom;
-
-        if (t < 0) {
-            return false;
-        }
-
-        out.set(
-            directionX * t + originX,
-            directionY * t + originY,
-            directionZ * t + originZ
-        );
-
-        return true;
-
-    } else {
-
-        if (p === 0) {
-
-            out.set(originX, originY, originZ);
-
-            return true;
-
-        } else {
-
-            //no intersection
-            return false;
-
-        }
-
-    }
-}

package/src/generation/example/filters/SampleNoise20_0.js

@@ -1,3 +0,0 @@
-import { CellFilterSimplexNoise } from "../../filtering/numeric/complex/CellFilterSimplexNoise.js";
-
-export const SampleNoise20_0 = CellFilterSimplexNoise.from(20, 20);

package/src/generation/example/generators/mir_generator_place_starting_point.js

@@ -1,52 +0,0 @@
-import { GridCellPlacementRule } from "../../placement/GridCellPlacementRule.js";
-import { matcher_tag_traversable_unoccupied } from "../rules/matcher_tag_traversable_unoccupied.js";
-import { CellMatcherNot } from "../../rules/logic/CellMatcherNot.js";
-import { GridCellActionPlaceTags } from "../../placement/action/GridCellActionPlaceTags.js";
-import { GridTags } from "../../GridTags.js";
-import { GridCellActionPlaceMarker } from "../../markers/GridCellActionPlaceMarker.js";
-import { GridTaskExecuteRuleTimes } from "../../grid/generation/GridTaskExecuteRuleTimes.js";
-import { CellMatcherLayerBitMaskTest } from "../../rules/CellMatcherLayerBitMaskTest.js";
-import { CellMatcherGridPattern } from "../../rules/cell/CellMatcherGridPattern.js";
-import { MirGridLayers } from "../grid/MirGridLayers.js";
-import { GridCellActionTransformNearbyMarkers } from "../../placement/GridCellActionTransformNearbyMarkers.js";
-import { MarkerNodeMatcherByType } from "../../markers/matcher/MarkerNodeMatcherByType.js";
-import { MarkerNodeTransformerRecordProperty } from "../../markers/transform/MarkerNodeTransformerRecordProperty.js";
-import { CellFilterLiteralFloat } from "../../filtering/numeric/CellFilterLiteralFloat.js";
-import { MirMarkerTypes } from "../../../../../generator/MirMarkerTypes.js";
-import { MarkerNodeTransformerRemoveTag } from "../../markers/transform/MarkerNodeTransformerRemoveTag.js";
-import { MirMarkerTags } from "../../../../../generator/MirMarkerTags.js";
-import { MarkerNodeTransformerSequence } from "../../markers/transform/MarkerNodeTransformerSequence.js";
-import { GridCellActionSequence } from "../../placement/action/util/GridCellActionSequence.js";
-
-const MATCH_STARTING_POINT = CellMatcherLayerBitMaskTest.from(GridTags.StartingPoint, MirGridLayers.Tags);
-
-
-const pattern = new CellMatcherGridPattern();
-
-pattern.addRule(0, 0, matcher_tag_traversable_unoccupied);
-pattern.addRule(0, 0, CellMatcherNot.from(MATCH_STARTING_POINT));
-// NEXT TO A BASE
-pattern.addRule(0, -1, CellMatcherLayerBitMaskTest.from(GridTags.Base, MirGridLayers.Tags));
-
-const rule = GridCellPlacementRule.from(
-    {
-        matcher: pattern,
-        action: GridCellActionSequence.from([
-            GridCellActionPlaceTags.from(GridTags.StartingPoint | GridTags.Occupied, MirGridLayers.Tags),
-            GridCellActionPlaceMarker.from({ type: MirMarkerTypes.StartingPoint }),
-            // transfer ownership of any base within some distance to the player
-            GridCellActionTransformNearbyMarkers.from(
-                5,
-                MarkerNodeMatcherByType.from(MirMarkerTypes.Base),
-                MarkerNodeTransformerSequence.from([
-                    MarkerNodeTransformerRecordProperty.from('team', CellFilterLiteralFloat.from(0)),
-                    MarkerNodeTransformerRemoveTag.from(MirMarkerTags.Encounter)
-                ])
-            )
-        ])
-    }
-);
-
-rule.allowRotation = true;
-
-export const mir_generator_place_starting_point = () => GridTaskExecuteRuleTimes.from(rule, 1);

package/src/generation/example/rules/matcher_play_area.js

@@ -1,5 +0,0 @@
-import { CellMatcherLayerBitMaskTest } from "../../rules/CellMatcherLayerBitMaskTest.js";
-import { GridTags } from "../../GridTags.js";
-import { MirGridLayers } from "../grid/MirGridLayers.js";
-
-export const matcher_play_area = CellMatcherLayerBitMaskTest.from(GridTags.PlayArea, MirGridLayers.Tags);

package/src/generation/example/rules/matcher_tag_occupied.js

@@ -1,5 +0,0 @@
-import { CellMatcherLayerBitMaskTest } from "../../rules/CellMatcherLayerBitMaskTest.js";
-import { GridTags } from "../../GridTags.js";
-import { MirGridLayers } from "../grid/MirGridLayers.js";
-
-export const matcher_tag_occupied = CellMatcherLayerBitMaskTest.from(GridTags.Occupied, MirGridLayers.Tags);

package/src/generation/example/rules/matcher_tag_traversable.js

@@ -1,5 +0,0 @@
-import { CellMatcherLayerBitMaskTest } from "../../rules/CellMatcherLayerBitMaskTest.js";
-import { GridTags } from "../../GridTags.js";
-import { MirGridLayers } from "../grid/MirGridLayers.js";
-
-export const matcher_tag_traversable = CellMatcherLayerBitMaskTest.from(GridTags.Traversable, MirGridLayers.Tags);

package/src/generation/grid/MarkerMatchCounter.js

@@ -1,25 +0,0 @@
-export class MarkerMatchCounter {
-    /**
-     * @template T
-     */
-    constructor() {
-        /**
-         * Predicate
-         * @type {MarkerNodeMatcher|null}
-         */
-        this.matcher = null;
-        this.count = 0;
-    }
-
-    /**
-     *
-     * @param {QuadTreeDatum<MarkerNode>} node
-     */
-    exec(node) {
-        const marker = node.data;
-
-        if (this.matcher.match(marker)) {
-            this.count++;
-        }
-    }
-}