@woosh/meep-engine 2.50.1 → 2.50.3

package/src/engine/ecs/{EntityFactory.js → storage/json/EntityFactory.js}

@@ -1,7 +1,7 @@
 /**
  * Created by Alex on 25/08/2015.
  */
-import { FunctionCompiler } from "../../core/function/FunctionCompiler.js";
+import { FunctionCompiler } from "../../../../core/function/FunctionCompiler.js";
 
 
 function ComponentSpec(options) {

package/src/engine/ecs/storage/{JSONDeSerializer.js → json/JSONDeSerializer.js}

@@ -3,10 +3,10 @@
  */
 
 
-import Blueprint from '../Blueprint.js';
-import { assert } from "../../../core/assert.js";
-import { countTask } from "../../../core/process/task/util/countTask.js";
-import { emptyTask } from "../../../core/process/task/util/emptyTask.js";
+import Blueprint from './Blueprint.js';
+import { assert } from "../../../../core/assert.js";
+import { countTask } from "../../../../core/process/task/util/countTask.js";
+import { emptyTask } from "../../../../core/process/task/util/emptyTask.js";
 
 /**
  *

package/src/engine/ecs/storage/json/README.md

@@ -0,0 +1,5 @@
+This is a framework for json serialization/deserialization of `EntityComponentDataset`s
+
+Meep has been using binary format for datasets since ~2017
+
+This is largely obsolete.

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.spec.js

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

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/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/view/common/VirtualListView.js

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

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);