@woosh/meep-engine 2.69.0 → 2.71.0

package/src/core/geom/Vector2.js

@@ -546,11 +546,7 @@ class Vector2 {
         const x = computeHashFloat(this.x);
         const y = computeHashFloat(this.y);
 
-        let hash = ((x << 5) - x) + y;
-
-        hash |= 0; //convert to 32bit int
-
-        return hash;
+        return ((x << 5) - x) + y;
     }
 
     /**
@@ -561,8 +557,11 @@ class Vector2 {
         const sin = Math.sin(angle);
         const cos = Math.cos(angle);
 
-        const x = this.x * cos - this.y * sin
-        const y = this.x * sin + this.y * cos;
+        const _x = this.x;
+        const _y = this.y;
+
+        const x = _x * cos - _y * sin
+        const y = _x * sin + _y * cos;
 
         this.set(x, y);
     }

package/src/core/geom/Vector3.js

@@ -5,17 +5,19 @@
 
 import { assert } from "../assert.js";
 import Signal from "../events/signal/Signal.js";
+import { EPSILON } from "../math/EPSILON.js";
+import { epsilonEquals } from "../math/epsilonEquals.js";
 import { lerp } from "../math/lerp.js";
 import { sign } from "../math/sign.js";
+import { computeHashFloat } from "../primitives/numbers/computeHashFloat.js";
+import { v3_angle_between } from "./vec3/v3_angle_between.js";
+import { v3_binary_equality_decode } from "./vec3/v3_binary_equality_decode.js";
+import { v3_binary_equality_encode } from "./vec3/v3_binary_equality_encode.js";
 import { v3_dot } from "./vec3/v3_dot.js";
-import { v3_length_sqr } from "./vec3/v3_length_sqr.js";
 import { v3_length } from "./vec3/v3_length.js";
-import { v3_angle_between } from "./vec3/v3_angle_between.js";
+import { v3_length_sqr } from "./vec3/v3_length_sqr.js";
 import { v3_lerp } from "./vec3/v3_lerp.js";
 import { v3_slerp } from "./vec3/v3_slerp.js";
-import { computeHashFloat } from "../primitives/numbers/computeHashFloat.js";
-import { epsilonEquals } from "../math/epsilonEquals.js";
-import { EPSILON } from "../math/EPSILON.js";
 
 class Vector3 {
     /**
@@ -856,100 +858,31 @@ class Vector3 {
     /**
      *
      * @param {BinaryBuffer} buffer
+     * @deprecated use dedicated method directly instead
      */
     toBinaryBufferFloat32_EqualityEncoded(buffer) {
         const x = this.x;
         const y = this.y;
         const z = this.z;
 
-        let header = 0;
-
-        if (x === y) {
-            header |= 1;
-        }
-
-        if (y === z) {
-            header |= 2;
-        }
-
-        if (x === z) {
-            header |= 4;
-        }
-
-        buffer.writeUint8(header);
-
-        if ((header & 7) === 7) {
-            //all components are the same
-            buffer.writeFloat32(x);
-        } else if (header === 1) {
-            //X and Y are the same, Z is different
-            buffer.writeFloat32(x);
-            buffer.writeFloat32(z);
-        } else if (header === 2) {
-            //Y and Z are the same, X is different
-            buffer.writeFloat32(x);
-            buffer.writeFloat32(y);
-        } else if (header === 4) {
-            //X and Z are the same, Y is different
-            buffer.writeFloat32(x);
-            buffer.writeFloat32(y);
-        } else {
-            //scale components are different
-            buffer.writeFloat32(x);
-            buffer.writeFloat32(y);
-            buffer.writeFloat32(z);
-        }
+        v3_binary_equality_encode(buffer, x, y, z);
     }
 
     /**
      * Uses an extra byte for a header. Only writes unique components. Useful for things like scale where all components usually have the same value
      * @param {BinaryBuffer} buffer
+     * @deprecated use dedicated method directly instead
      */
     fromBinaryBufferFloat32_EqualityEncoded(buffer) {
-        const header = buffer.readUint8();
-
-        let x = 0;
-        let y = 0;
-        let z = 0;
-
-        if ((header & 7) === 7) {
-            //all scale components are the same
-            x = buffer.readFloat32();
-            y = x;
-            z = x;
-        } else if ((header & 1) === 1) {
-            //X and Y are the same, Z is different
-            x = buffer.readFloat32();
-            y = x;
-            z = buffer.readFloat32();
-        } else if ((header & 2) === 2) {
-            //Y and Z are the same, X is different
-            x = buffer.readFloat32();
-            y = buffer.readFloat32();
-            z = y;
-        } else if ((header & 4) === 4) {
-            //X and Z are the same, Y is different
-            x = buffer.readFloat32();
-            y = buffer.readFloat32();
-            z = x;
-        } else {
-            //scale components are different
-            x = buffer.readFloat32();
-            y = buffer.readFloat32();
-            z = buffer.readFloat32();
-        }
-
-        this.set(x, y, z);
+        v3_binary_equality_decode(buffer, this, 0);
     }
 
     hash() {
-        let hash = computeHashFloat(this.x);
-
-        hash = ((hash << 5) - hash) + computeHashFloat(this.y);
-
-        hash = ((hash << 5) - hash) + computeHashFloat(this.z);
+        const x = computeHashFloat(this.x);
+        const y = computeHashFloat(this.y);
+        const z = computeHashFloat(this.z);
 
-        return hash;
+        return x ^ (y << 1) ^ (z << 2);
     }
 
 

package/src/core/geom/vec3/v3_binary_equality_decode.js

@@ -0,0 +1,44 @@
+/**
+ *
+ * @param {BinaryBuffer} buffer
+ * @param {number[]} result
+ * @param {number} result_offset
+ */
+export function v3_binary_equality_decode(buffer, result, result_offset) {
+    const header = buffer.readUint8();
+
+    let x = 0;
+    let y = 0;
+    let z = 0;
+
+    if ((header & 7) === 7) {
+        //all scale components are the same
+        x = buffer.readFloat32();
+        y = x;
+        z = x;
+    } else if ((header & 1) === 1) {
+        //X and Y are the same, Z is different
+        x = buffer.readFloat32();
+        y = x;
+        z = buffer.readFloat32();
+    } else if ((header & 2) === 2) {
+        //Y and Z are the same, X is different
+        x = buffer.readFloat32();
+        y = buffer.readFloat32();
+        z = y;
+    } else if ((header & 4) === 4) {
+        //X and Z are the same, Y is different
+        x = buffer.readFloat32();
+        y = buffer.readFloat32();
+        z = x;
+    } else {
+        //scale components are different
+        x = buffer.readFloat32();
+        y = buffer.readFloat32();
+        z = buffer.readFloat32();
+    }
+
+    result[result_offset] = x;
+    result[result_offset + 1] = y;
+    result[result_offset + 2] = z;
+}

package/src/core/geom/vec3/v3_binary_equality_encode.js

@@ -0,0 +1,47 @@
+/**
+ *
+ * @param {BinaryBuffer} buffer
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ */
+export function v3_binary_equality_encode(buffer, x, y, z){
+
+    let header = 0;
+
+    if (x === y) {
+        header |= 1;
+    }
+
+    if (y === z) {
+        header |= 2;
+    }
+
+    if (x === z) {
+        header |= 4;
+    }
+
+    buffer.writeUint8(header);
+
+    if ((header & 7) === 7) {
+        //all components are the same
+        buffer.writeFloat32(x);
+    } else if (header === 1) {
+        //X and Y are the same, Z is different
+        buffer.writeFloat32(x);
+        buffer.writeFloat32(z);
+    } else if (header === 2) {
+        //Y and Z are the same, X is different
+        buffer.writeFloat32(x);
+        buffer.writeFloat32(y);
+    } else if (header === 4) {
+        //X and Z are the same, Y is different
+        buffer.writeFloat32(x);
+        buffer.writeFloat32(y);
+    } else {
+        //scale components are different
+        buffer.writeFloat32(x);
+        buffer.writeFloat32(y);
+        buffer.writeFloat32(z);
+    }
+}

package/src/core/math/remap.js

@@ -11,7 +11,11 @@ import { lerp } from "./lerp.js";
  * @param {number} value
  * @return {number}
  */
-export function remap(source_first, source_second, target_first, target_second, value) {
+export function remap(
+    source_first, source_second,
+    target_first, target_second,
+    value
+) {
 
     const relative = inverseLerp(source_first, source_second, value);
 

package/src/core/math/statistics/computeStatisticalPartialMedian.js

@@ -18,7 +18,7 @@ export function computeStatisticalPartialMedian(values, start, end) {
 
     const range = end - start;
 
-    const position = (start + range / 2) | 0;
+    const position = (start + range) >> 1;
 
     return copy[position];
 }

package/src/core/primitives/numbers/computeHashFloat.js

@@ -5,10 +5,10 @@
  */
 export function computeHashFloat(v) {
     //we break the number up into fractional and whole parts
-    const fraction = v % 1;
-
     const whole = v | 0;
 
+    const fraction = v - whole;
+
     //fractional part is scaled up into int32 range, this inexact method, as it will produce 0 hash for values below a certain threshold
     const fractionHash = fraction * 1367130550;
 

package/src/core/process/task/Task.js

@@ -4,14 +4,51 @@
 
 
 import { assert } from "../../assert.js";
+import { array_push_if_unique } from "../../collection/array/array_push_if_unique.js";
 import Signal from "../../events/signal/Signal.js";
 import { noop } from "../../function/Functions.js";
 import ObservedInteger from "../../model/ObservedInteger.js";
 import { TaskSignal } from "./TaskSignal.js";
 import TaskState from "./TaskState.js";
 
+/**
+ *
+ * @type {number}
+ */
+let id_counter = 0;
 
 class Task {
+    /**
+     * @readonly
+     * @type {number}
+     */
+    id = id_counter++;
+
+    on = {
+        started: new Signal(),
+        completed: new Signal(),
+        failed: new Signal()
+    };
+
+    /**
+     *
+     * @type {ObservedInteger}
+     */
+    state = new ObservedInteger(TaskState.INITIAL);
+
+    /**
+     * amount of time spent running this task in milliseconds
+     * @type {number}
+     * @public
+     */
+    __executedCpuTime = 0;
+    /**
+     * number of time task's cycle function was executed
+     * @type {number}
+     * @public
+     */
+    __executedCycleCount = 0;
+
     /**
      *
      * @param {string} [name] useful for identifying the task later on, for various UI and debug purposes
@@ -36,9 +73,16 @@ class Task {
         assert.isFunction(cycleFunction, 'cycleFunction');
         assert.isNumber(estimatedDuration, 'estimatedDuration');
 
-
+        /**
+         *
+         * @type {Task[]}
+         */
         this.dependencies = dependencies;
 
+        /**
+         *
+         * @type {number}
+         */
         this.estimatedDuration = estimatedDuration;
 
         /**
@@ -66,30 +110,6 @@ class Task {
 
         }
 
-        this.on = {
-            started: new Signal(),
-            completed: new Signal(),
-            failed: new Signal()
-        };
-
-        /**
-         *
-         * @type {ObservedInteger}
-         */
-        this.state = new ObservedInteger(TaskState.INITIAL);
-
-        /**
-         * amount of time spent running this task in milliseconds
-         * @type {number}
-         * @public
-         */
-        this.__executedCpuTime = 0;
-        /**
-         * number of time task's cycle function was executed
-         * @type {number}
-         * @public
-         */
-        this.__executedCycleCount = 0;
     }
 
     computeProgress() {
@@ -134,11 +154,7 @@ class Task {
         } else if (task.isTask) {
 
             //check that the dependency is not registered yet
-            if (this.dependencies.indexOf(task) === -1) {
-
-                this.dependencies.push(task);
-
-            }
+            array_push_if_unique(this.dependencies, task);
 
         } else {
             throw new Error('Expected a Task or a TaskGroup, got something else');
@@ -152,11 +168,14 @@ class Task {
      * @param {Array<(Task|TaskGroup)>} tasks
      */
     addDependencies(tasks) {
-        if (!Array.isArray(tasks)) {
-            throw new Error(`argument 'tasks' is not an Array`);
-        }
+        assert.isArray(tasks, 'tasks');
 
-        tasks.forEach(t => this.addDependency(t));
+        const task_count = tasks.length;
+
+        for (let i = 0; i < task_count; i++) {
+            const task = tasks[i];
+            this.addDependency(task);
+        }
     }
 
     toString() {

package/src/engine/achievements/AchievementManager.js

@@ -1,31 +1,31 @@
-import { GameAssetType } from "../asset/GameAssetType.js";
-import { Achievement } from "./Achievement.js";
+import { assert } from "../../core/assert.js";
+import Vector2 from "../../core/geom/Vector2.js";
+import { makeCubicCurve } from "../../core/math/spline/makeCubicCurve.js";
+import ObservedBoolean from "../../core/model/ObservedBoolean.js";
 import { ReactiveAnd } from "../../core/model/reactive/model/logic/ReactiveAnd.js";
 import { ReactiveReference } from "../../core/model/reactive/model/terminal/ReactiveReference.js";
-import ObservedBoolean from "../../core/model/ObservedBoolean.js";
 import { AchievementNotificationView } from "../../view/game/achievements/AchievementNotificationView.js";
-import ViewportPosition from "../ecs/gui/position/ViewportPosition.js";
-import Vector2 from "../../core/geom/Vector2.js";
-import Entity from "../ecs/Entity.js";
-import GUIElement from "../ecs/gui/GUIElement.js";
 import AnimationTrack from "../animation/keyed2/AnimationTrack.js";
+import AnimationTrackPlayback from "../animation/keyed2/AnimationTrackPlayback.js";
+import { AnimationBehavior } from "../animation/keyed2/behavior/AnimationBehavior.js";
 import TransitionFunctions from "../animation/TransitionFunctions.js";
+import { GameAssetType } from "../asset/GameAssetType.js";
+import { SerializationMetadata } from "../ecs/components/SerializationMetadata.js";
+import Entity from "../ecs/Entity.js";
+import GUIElement from "../ecs/gui/GUIElement.js";
+import ViewportPosition from "../ecs/gui/position/ViewportPosition.js";
+import { Transform } from "../ecs/transform/Transform.js";
 import { SequenceBehavior } from "../intelligence/behavior/composite/SequenceBehavior.js";
-import { ActionBehavior } from "../intelligence/behavior/primitive/ActionBehavior.js";
-import { AnimationBehavior } from "../animation/keyed2/behavior/AnimationBehavior.js";
-import AnimationTrackPlayback from "../animation/keyed2/AnimationTrackPlayback.js";
 import { BehaviorComponent } from "../intelligence/behavior/ecs/BehaviorComponent.js";
-import { SoundEmitter } from "../sound/ecs/emitter/SoundEmitter.js";
-import { SoundEmitterChannels } from "../sound/ecs/emitter/SoundEmitterSystem.js";
-import { Transform } from "../ecs/transform/Transform.js";
-import { SerializationMetadata } from "../ecs/components/SerializationMetadata.js";
+import { ClockChannelType } from "../intelligence/behavior/ecs/ClockChannelType.js";
+import { ActionBehavior } from "../intelligence/behavior/primitive/ActionBehavior.js";
+import { logger } from "../logging/GlobalLogger.js";
 import { globalMetrics } from "../metrics/GlobalMetrics.js";
 import { MetricsCategory } from "../metrics/MetricsCategory.js";
-import { ClockChannelType } from "../intelligence/behavior/ecs/ClockChannelType.js";
 import { EnginePlugin } from "../plugin/EnginePlugin.js";
-import { makeCubicCurve } from "../../core/math/spline/makeCubicCurve.js";
-import { logger } from "../logging/GlobalLogger.js";
-import { assert } from "../../core/assert.js";
+import { SoundEmitter } from "../sound/ecs/emitter/SoundEmitter.js";
+import { SoundEmitterChannels } from "../sound/ecs/emitter/SoundEmitterSystem.js";
+import { Achievement } from "./Achievement.js";
 
 
 const SLOW_CUBIC = makeCubicCurve(0.04, 0.4, 0.9, 0.99);
@@ -291,7 +291,7 @@ export class AchievementManager extends EnginePlugin {
         achievementView.size.x = 460;
         achievementView.size.y = 58;
 
-        const viewportPosition = new ViewportPosition({
+        const viewportPosition = ViewportPosition.fromJSON({
             position: new Vector2(0.5, 0)
         });
 

package/src/engine/animation/curve/compression/prototypeCurveCompression.js

@@ -1,12 +1,12 @@
+import GUIElementSystem from "../../../ecs/gui/GUIElementSystem.js";
+import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
+import { EngineConfiguration } from "../../../EngineConfiguration.js";
 import { EngineHarness } from "../../../EngineHarness.js";
 import { AnimationCurve } from "../AnimationCurve.js";
+import { build_plot_entity_from_array } from "../draw/build_plot_entity_from_array.js";
 import { Keyframe } from "../Keyframe.js";
-import { EngineConfiguration } from "../../../EngineConfiguration.js";
-import GUIElementSystem from "../../../ecs/gui/GUIElementSystem.js";
-import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
-import { sample_animation_curve_to_float_array } from "./sample_animation_curve_to_float_array.js";
 import { downsample_float_array_curve_by_error } from "./downsample_float_array_curve_by_error.js";
-import { build_plot_entity_from_array } from "../draw/build_plot_entity_from_array.js";
+import { sample_animation_curve_to_float_array } from "./sample_animation_curve_to_float_array.js";
 
 const eh = new EngineHarness();
 
@@ -134,7 +134,7 @@ async function main(engine) {
         return curve;
     }
 
-    const curve = sample_curve_4();
+    const curve = sample_curve_0();
 
     curve.smoothAllTangents();
 

package/src/engine/animation/curve/draw/build_plot_entity_from_array.js

@@ -1,10 +1,10 @@
+import Vector2 from "../../../../core/geom/Vector2.js";
 import { CanvasView } from "../../../../view/elements/CanvasView.js";
-import { plot_data } from "./plot_data.js";
-import { draw_label } from "./draw_label.js";
 import Entity from "../../../ecs/Entity.js";
-import ViewportPosition from "../../../ecs/gui/position/ViewportPosition.js";
 import GUIElement from "../../../ecs/gui/GUIElement.js";
-import Vector2 from "../../../../core/geom/Vector2.js";
+import ViewportPosition from "../../../ecs/gui/position/ViewportPosition.js";
+import { draw_label } from "./draw_label.js";
+import { plot_data } from "./plot_data.js";
 
 /**
  *
@@ -22,12 +22,17 @@ export function build_plot_entity_from_array({
                                                  x, y,
                                                  width = 600,
                                                  height = 200,
-                                                 margin = new Vector2(10,10),
+                                                 margin = new Vector2(10, 10),
                                                  label = ''
                                              }) {
 
     const canvasView = new CanvasView();
     canvasView.size.set(width, height);
+    canvasView.css({
+        position: "absolute",
+        left: "0",
+        top: "0"
+    });
     const ctx = canvasView.context2d;
 
     plot_data({ ctx, data, width, height, margin });
@@ -36,7 +41,7 @@ export function build_plot_entity_from_array({
     draw_label(ctx, text, margin.x, height - (20));
 
     if (typeof label === "string" && label.length > 0) {
-        draw_label(ctx, label, 0, 0)
+        draw_label(ctx, label, width - margin.x - 50 , 20)
     }
 
     return new Entity()

package/src/engine/ecs/dynamic_actions/DynamicActor.js

@@ -1,15 +1,10 @@
 export class DynamicActor {
 
-    constructor() {
-
-
-        /**
-         * Entities who's blackboards should be included into evaluation context
-         * @type {number[]}
-         */
-        this.context = [];
-
-    }
+    /**
+     * Entities whose blackboards should be included into evaluation context
+     * @type {number[]}
+     */
+    context = [];
 }
 
 /**