@woosh/meep-engine 2.33.21 → 2.33.25

package/core/math/pingpong.js

@@ -0,0 +1,17 @@
+// compute euclidian modulo of m % n
+// https://en.wikipedia.org/wiki/Modulo_operation
+function euclideanModulo(n, m) {
+
+    return ((n % m) + m) % m;
+
+}
+
+/**
+ *
+ * @param {number} x
+ * @param {number} length
+ * @return {number}
+ */
+export function pingpong(x, length = 1) {
+    return length - Math.abs(euclideanModulo(x, length * 2) - length);
+}

package/core/math/random/makeRangedRandom.js

@@ -0,0 +1,19 @@
+/**
+ *
+ * @param {function():number} random returns a number between 0 and 1
+ * @param {number} min
+ * @param {number} max
+ * @returns {function():number} returns number between min and max
+ */
+export function makeRangedRandom(random, min, max) {
+
+    if (min === 0 && max === 1) {
+        //input already returns values in correct range
+        return random;
+    }
+
+    const scale = max - min;
+    return function () {
+        return random() * scale + min;
+    };
+}

package/core/math/random/randomFloatBetween.js

@@ -0,0 +1,14 @@
+/**
+ *
+ * @param {function} random
+ * @param {number} min
+ * @param {number} max
+ * @returns {number}
+ */
+export function randomFloatBetween(random, min, max) {
+    const span = max - min;
+
+    const roll = random();
+
+    return roll * span + min;
+}

package/core/math/random/randomFromArray.js

@@ -0,0 +1,19 @@
+import { assert } from "../../assert.js";
+import { min2 } from "../min2.js";
+
+/**
+ * @template T
+ * @param {function} random
+ * @param {T[]} array
+ * @returns {T}
+ */
+export function randomFromArray(random, array) {
+    assert.isArray(array, 'array');
+    assert.isFunction(random, 'random');
+
+    const length = array.length;
+
+    const i = min2(length - 1, Math.floor(random() * length));
+
+    return array[i];
+}

package/core/math/random/randomGaussian.js

@@ -0,0 +1,15 @@
+/**
+ * Returns a random number within a normal distribution (Bell/Gaussian curve)
+ * @param {int} [quality=6] controls number of "die rolls" used to approximate curve, more rolls - better approximation but higher cost of computation
+ * @param {function():number} random
+ * @returns {number} value between 0 and 1 with normal weight at 0.5
+ */
+export function randomGaussian(random, quality = 6) {
+    let s = 0;
+
+    for (let i = 0; i < quality; i++) {
+        s += random();
+    }
+
+    return s / quality;
+}

package/core/math/random/randomIntegerBetween.js

@@ -0,0 +1,14 @@
+/**
+ * Inclusive random between two boundaries, result is integer
+ * @param {function} random
+ * @param {number} min lower boundary, must be an integer
+ * @param {number} max upper boundary, must be an integer
+ * @returns {number}
+ */
+export function randomIntegerBetween(random, min, max) {
+    const span = max - min;
+
+    const roll = random();
+
+    return Math.round(roll * span) + min;
+}

package/core/math/random/roundFair.js

@@ -0,0 +1,15 @@
+/**
+ * Performs a probabilistic rounding where a fraction is rounded up or down with probability equal to the fraction
+ * @param {number} number
+ * @param {function} random
+ * @returns {int}
+ */
+export function roundFair(number, random) {
+    const mantissa = number % 1;
+    const roll = random();
+    if (roll < mantissa) {
+        return Math.ceil(number);
+    } else {
+        return Math.floor(number);
+    }
+}

package/core/math/separation1D.js

@@ -0,0 +1,21 @@
+import { assert } from "../assert.js";
+import { min2 } from "./min2.js";
+import { max2 } from "./max2.js";
+
+/**
+ * Returns a number representing overlap distance between two 1D line segments.
+ * Positive number indicates overlap, negative number indicates that segments do not overlap; 0 indicates that segments are touching.
+ * @param {Number} a0
+ * @param {Number} a1
+ * @param {Number} b0
+ * @param {Number} b1
+ * @returns {number}
+ */
+export function separation1D(a0, a1, b0, b1) {
+    assert.isNumber(a0, "a0");
+    assert.isNumber(a1, "a1");
+    assert.isNumber(b0, "b0");
+    assert.isNumber(b1, "b1");
+
+    return min2(a1, b1) - max2(a0, b0);
+}

package/core/math/solveQuadratic.js

@@ -0,0 +1,25 @@
+/**
+ * Return solutions for quadratic
+ * @param {number} a
+ * @param {number} b
+ * @param {number} c
+ * @returns {number[]|null}
+ */
+export function solveQuadratic(a, b, c) {
+    let sol = null;
+    if (Math.abs(a) < 1e-6) {
+        if (Math.abs(b) < 1e-6) {
+            sol = Math.abs(c) < 1e-6 ? [0, 0] : null;
+        } else {
+            sol = [-c / b, -c / b];
+        }
+    } else {
+        let disc = b * b - 4 * a * c;
+        if (disc >= 0) {
+            disc = Math.sqrt(disc);
+            a = 2 * a;
+            sol = [(-b - disc) / a, (-b + disc) / a];
+        }
+    }
+    return sol;
+}

package/core/model/BoundedValue.js

@@ -5,7 +5,7 @@
 
 import Signal from "../events/signal/Signal.js";
 import { inverseLerp } from "../math/inverseLerp.js";
-import { computeHashFloat } from "../math/MathUtils.js";
+import { computeHashFloat } from "../math/hash/computeHashFloat.js";
 
 /**
  *

package/core/model/node-graph/node/NodeInstancePortReference.js

@@ -1,5 +1,5 @@
 import { assert } from "../../../assert.js";
-import { computeHashIntegerArray } from "../../../math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../collection/array/computeHashIntegerArray.js";
 
 /**
  * Reference for a port of a node instance

package/core/model/node-graph/node/Port.js

@@ -1,6 +1,6 @@
-import { computeHashIntegerArray } from "../../../math/MathUtils.js";
 import { computeStringHash } from "../../../primitives/strings/computeStringHash.js";
 import { PortDirection } from "./PortDirection.js";
+import { computeHashIntegerArray } from "../../../collection/array/computeHashIntegerArray.js";
 
 export class Port {
     constructor() {

package/core/model/reactive/evaluation/MultiPredicateEvaluator.spec.js

@@ -1,4 +1,3 @@
-import { randomFloatBetween, randomFromArray, randomIntegerBetween } from "../../../math/MathUtils.js";
 import { seededRandom } from "../../../math/random/seededRandom.js";
 import DataType from "../../../parser/simple/DataType.js";
 import { ReactiveLiteralBoolean } from "../model/terminal/ReactiveLiteralBoolean.js";
@@ -7,6 +6,9 @@ import { ReactiveLiteralString } from "../model/terminal/ReactiveLiteralString.j
 import { ReactiveReference } from "../model/terminal/ReactiveReference.js";
 import { createRandomReactiveExpression } from "../model/util/createRandomReactiveExpression.js";
 import { MultiPredicateEvaluator } from "./MultiPredicateEvaluator.js";
+import { randomFromArray } from "../../../math/random/randomFromArray.js";
+import { randomFloatBetween } from "../../../math/random/randomFloatBetween.js";
+import { randomIntegerBetween } from "../../../math/random/randomIntegerBetween.js";
 
 test.skip('performance', () => {
     const random = seededRandom(12319);

package/core/model/reactive/model/ReactiveBinaryExpression.js

@@ -1,6 +1,6 @@
 import { assert } from "../../../assert.js";
-import { computeHashIntegerArray } from "../../../math/MathUtils.js";
 import { ReactiveExpression } from "./ReactiveExpression.js";
+import { computeHashIntegerArray } from "../../../collection/array/computeHashIntegerArray.js";
 
 /**
  * @extends {ReactiveExpression}

package/core/model/reactive/model/terminal/ReactiveLiteralNumber.js

@@ -1,8 +1,8 @@
 import { assert } from "../../../../assert.js";
 import Signal from "../../../../events/signal/Signal.js";
-import { computeHashFloat } from "../../../../math/MathUtils.js";
 import DataType from "../../../../parser/simple/DataType.js";
 import { ReactiveExpression } from "../ReactiveExpression.js";
+import { computeHashFloat } from "../../../../math/hash/computeHashFloat.js";
 
 const dummySignal = new Signal();
 

package/core/model/reactive/model/terminal/ReactiveReference.js

@@ -1,8 +1,8 @@
 import { assert } from "../../../../assert.js";
-import { computeHashIntegerArray } from "../../../../math/MathUtils.js";
 import DataType from "../../../../parser/simple/DataType.js";
 import { computeStringHash } from "../../../../primitives/strings/computeStringHash.js";
 import { ReactiveExpression } from "../ReactiveExpression.js";
+import { computeHashIntegerArray } from "../../../../collection/array/computeHashIntegerArray.js";
 
 
 /**

package/core/model/reactive/model/util/createRandomReactiveExpression.js

@@ -4,7 +4,6 @@
  * @param {ReactiveExpression} b
  * @returns {ReactiveExpression}
  */
-import { randomFromArray } from "../../../../math/MathUtils.js";
 import DataType from "../../../../parser/simple/DataType.js";
 import { ReactiveAdd } from "../arithmetic/ReactiveAdd.js";
 import { ReactiveDivide } from "../arithmetic/ReactiveDivide.js";
@@ -20,6 +19,7 @@ import { ReactiveAnd } from "../logic/ReactiveAnd.js";
 import { ReactiveOr } from "../logic/ReactiveOr.js";
 import { ReactiveLiteralNumber } from "../terminal/ReactiveLiteralNumber.js";
 import { ReactiveLiteralString } from "../terminal/ReactiveLiteralString.js";
+import { randomFromArray } from "../../../../math/random/randomFromArray.js";
 
 /**
  *

package/core/model/stat/LinearModifier.js

@@ -1,5 +1,5 @@
 import { assert } from "../../assert.js";
-import { computeHashFloat } from "../../math/MathUtils.js";
+import { computeHashFloat } from "../../math/hash/computeHashFloat.js";
 
 
 /**

package/core/primitives/array/computeIntegerArrayHash.js

@@ -7,7 +7,7 @@
 export function computeIntegerArrayHash(data, offset, length) {
     const end = offset + length;
 
-    let hash = 0;
+    let hash = length;
 
     for (let i = offset; i < end; i++) {
         const singleValue = data[i];

package/{engine/graphics/render/forward_plus/materials → core/primitives/strings}/insert_after.js

@@ -3,6 +3,7 @@
  * @param {string} source
  * @param {string} term
  * @param {string} extra
+ * @returns {string}
  */
 export function insert_after(source, term, extra) {
     const i = source.indexOf(term);
@@ -16,3 +17,5 @@ export function insert_after(source, term, extra) {
 
     return source.slice(0, end) + extra + source.slice(end);
 }
+
+

package/core/primitives/strings/insert_after_or_replace.js

@@ -0,0 +1,27 @@
+/**
+ *
+ * @param {string} source
+ * @param {string} insert_term
+ * @param {string} replace_term
+ * @param {string} value
+ * @returns {string}
+ */
+export function insert_after_or_replace(source, insert_term, replace_term, value) {
+    const insert_term_index = source.indexOf(insert_term);
+
+    if (insert_term_index !== -1) {
+        const end = insert_term_index + insert_term.length;
+        return source.slice(0, end) + value + source.slice(end);
+    }
+
+    const replace_term_index = source.indexOf(replace_term);
+
+    if (replace_term_index === -1) {
+        // not found
+        console.warn(`Neither insert term '${insert_term}', nor replacement term '${replace_term}' were found in the source`, source, value);
+        return source;
+    }
+
+
+    return source.slice(0, replace_term_index) + value + source.slice(replace_term_index + replace_term.length);
+}

package/editor/process/symbolic/makeHelperBoxGeometry.js

@@ -0,0 +1,44 @@
+import { BufferAttribute, BufferGeometry, Float32BufferAttribute } from "three";
+
+export function makeHelperBoxGeometry(sx = 1, sy = 1, sz = 1) {
+
+    const geometry = new BufferGeometry();
+
+    const dx = sx / 2;
+    const dy = sy / 2;
+    const dz = sz / 2;
+
+    const vertices = new Float32Array([
+        -dx, -dy, -dz,
+        dx, -dy, -dz,
+        dx, dy, -dz,
+        -dx, dy, -dz,
+
+        -dx, dy, dz,
+        dx, dy, dz,
+        dx, -dy, dz,
+        -dx, -dy, dz
+    ]);
+
+    geometry.setAttribute("position", new Float32BufferAttribute(vertices, 3));
+
+    geometry.setIndex(new BufferAttribute(new Uint8Array([
+        0, 1,
+        1, 2,
+        2, 3,
+        3, 0,
+
+        4, 5,
+        5, 6,
+        6, 7,
+        7, 4,
+
+
+        0, 7,
+        1, 6,
+        2, 5,
+        3, 4
+    ]), 1, false));
+
+    return geometry;
+}

package/editor/view/ecs/EntityEditor.js

@@ -38,7 +38,7 @@ import { HeadsUpDisplayController } from "./components/HeadsUpDisplayController.
 import { BlackboardController } from "./components/BlackboardController.js";
 import { GridObstacleController } from "./components/GridObstacleController.js";
 import { AttachmentSocketsController } from "./components/sockets/AttachmentSocketsController.js";
-import { ParticleEmitterSystem2 } from "../../../engine/graphics/particles/ecs/ParticleEmitterSystem2.js";
+import { ParticleEmitterSystem } from "../../../engine/graphics/particles/ecs/ParticleEmitterSystem.js";
 
 /**
  *
@@ -82,7 +82,7 @@ function prepareComponentFactory(factory, editor) {
         .register('ParticleEmitter', () => {
             const em = editor.engine.entityManager;
 
-            const particleEmitterSystem = em.getSystem(ParticleEmitterSystem2);
+            const particleEmitterSystem = em.getSystem(ParticleEmitterSystem);
 
             return new ParticleEmitterController(particleEmitterSystem);
         })

package/editor/view/ecs/components/particles/ParticleEmitterController.js

@@ -24,7 +24,7 @@ export function enumNameByValue(value, enumerable) {
 /**
  *
  * @param {ParticleEmitter} emitter
- * @param {ParticleEmitterSystem2} system
+ * @param {ParticleEmitterSystem} system
  * @param {function} op
  * @param {*} [arg0]
  */
@@ -61,7 +61,7 @@ function applyEmitterChanges(emitter, system, op, arg0) {
 export class ParticleEmitterController extends EmptyView {
     /**
      *
-     * @param {ParticleEmitterSystem2} particleEmitterSystem
+     * @param {ParticleEmitterSystem} particleEmitterSystem
      * @constructor
      */
     constructor(particleEmitterSystem) {

package/engine/EngineHarness.js

@@ -367,6 +367,7 @@ export class EngineHarness {
             sensitivity
         });
 
+        eb.add(Tag.fromJSON(['CameraController']));
         eb.add(SerializationMetadata.Transient);
 
         eb.build(ecd);

package/engine/animation/AnimationUtils.js

@@ -7,7 +7,7 @@ import { removeComponentsExcept } from "../ecs/util/removeComponentsExcept.js";
 import { createSound, createTimer } from "../EntityCreator.js";
 import Mesh from "../graphics/ecs/mesh/Mesh.js";
 import Trail2D, { Trail2DFlags } from "../graphics/ecs/trail2d/Trail2D.js";
-import { ParticleEmitterSystem2 } from "../graphics/particles/ecs/ParticleEmitterSystem2.js";
+import { ParticleEmitterSystem } from "../graphics/particles/ecs/ParticleEmitterSystem.js";
 import { ParticleEmitter } from "../graphics/particles/particular/engine/emitter/ParticleEmitter.js";
 import { ParticleEmitterFlag } from "../graphics/particles/particular/engine/emitter/ParticleEmitterFlag.js";
 import { distributeParticlesOnObject3D } from "../graphics/particles/particular/engine/utils/distributeParticlesOnObject3D.js";
@@ -137,9 +137,9 @@ export function removeEntityWithMeshParticlesEffect(
 
     /**
      *
-     * @type {ParticleEmitterSystem2}
+     * @type {ParticleEmitterSystem}
      */
-    const sPE = entityManager.getSystem(ParticleEmitterSystem2);
+    const sPE = entityManager.getSystem(ParticleEmitterSystem);
 
     /**
      *
@@ -214,9 +214,9 @@ export function removeEntityGenericEffect(
 
     /**
      *
-     * @type {ParticleEmitterSystem2}
+     * @type {ParticleEmitterSystem}
      */
-    const sPE = engine.entityManager.getSystem(ParticleEmitterSystem2);
+    const sPE = engine.entityManager.getSystem(ParticleEmitterSystem);
 
     /**
      *

package/engine/animation/curve/AnimationCurve.js

@@ -0,0 +1,72 @@
+import { inverseLerp } from "../../../core/math/inverseLerp.js";
+
+/**
+ *
+ * @param {number} t
+ * @param {Keyframe} keyframe0
+ * @param {Keyframe} keyframe1
+ * @return {number}
+ */
+function evaluate(t, keyframe0, keyframe1) {
+
+    const dt = keyframe1.time - keyframe0.time;
+
+    const m0 = keyframe0.outTangent * dt;
+    const m1 = keyframe1.inTangent * dt;
+
+    const t2 = t * t;
+    const t3 = t2 * t;
+
+    const a = 2 * t3 - 3 * t2 + 1;
+    const b = t3 - 2 * t2 + t;
+    const c = t3 - t2;
+    const d = -2 * t3 + 3 * t2;
+
+    return a * keyframe0.value + b * m0 + c * m1 + d * keyframe1.value;
+}
+
+/**
+ * Modelled on unity's AnimationCurve
+ * @see https://github.com/nothke/ThreadableCurve/blob/master/ThreadableCurve.cs
+ */
+export class AnimationCurve {
+    constructor() {
+        /**
+         *
+         * @type {Keyframe[]}
+         */
+        this.keys = [];
+    }
+
+    evaluate(t) {
+        const keys = this.keys;
+        const key_count = keys.length;
+        if (key_count === 0) {
+            return 0;
+        }
+
+        if (key_count === 1) {
+            return keys[0].value;
+        }
+
+        if (t < keys[0].time) {
+            // before start
+            return keys[0].value;
+        }
+
+        for (let i = 1; i < key_count; i++) {
+            const f1 = keys[i];
+
+            if (t < f1.time) {
+                const f0 = keys[i - 1];
+                const kt = inverseLerp(f0.time, f1.time, t);
+
+                return evaluate(kt, f0, f1);
+            }
+        }
+
+        // past end
+        return keys[key_count - 1].value;
+    }
+
+}

package/engine/animation/curve/Keyframe.js

@@ -0,0 +1,27 @@
+export class Keyframe {
+    constructor() {
+        /**
+         *
+         * @type {number}
+         */
+        this.value = 0;
+
+        /**
+         *
+         * @type {number}
+         */
+        this.time = 0;
+
+        /**
+         *
+         * @type {number}
+         */
+        this.inTangent = 0;
+
+        /**
+         *
+         * @type {number}
+         */
+        this.outTangent = 0;
+    }
+}

package/engine/animation/keyed2/AnimationTrack.js

@@ -19,18 +19,43 @@ function AnimationTrack(properties) {
      */
     this.propertyCount = properties.length;
 
+    /**
+     *
+     * @type {number[]}
+     */
     this.keyValues = [];
+
+    /**
+     *
+     * @type {number[]}
+     */
     this.keyTimes = [];
 
     this.timeStart = Number.POSITIVE_INFINITY;
     this.timeEnd = Number.NEGATIVE_INFINITY;
 
+    /**
+     * Indices of keys from which transition takes place
+     * @type {number[]}
+     */
     this.transitionKeys = [];
+
+    /**
+     * Transition function associated with a key
+     * @type {function[]}
+     */
     this.transitionFunctions = [];
 }
 
-AnimationTrack.prototype.initialize = function () {
-    const keysTyped = new Float64Array(this.keyValues.length);
+AnimationTrack.prototype.optimize = function () {
+    const key_value_count = this.keyValues.length;
+    const key_count = this.keyTimes.length;
+
+    // use a common buffer to get better cache locality
+    const buffer = new ArrayBuffer(key_count * 4 + key_value_count * 8);
+
+    const keyTimesTyped = new Float32Array(buffer, 0, key_count);
+    const keysTyped = new Float64Array(buffer, key_count * 4, key_value_count);
 
     //transfer original keys into typed array
     keysTyped.set(this.keyValues, 0);
@@ -38,7 +63,6 @@ AnimationTrack.prototype.initialize = function () {
     //overwrite the original array
     this.keyValues = keysTyped;
 
-    const keyTimesTyped = new Float32Array(this.keyTimes.length);
     keyTimesTyped.set(this.keyTimes, 0);
 
     this.keyTimes = keyTimesTyped;

package/engine/asset/Asset.js

@@ -4,9 +4,9 @@
  * @param {string} type
  * @constructor
  */
-import { computeHashIntegerArray } from "../../core/math/MathUtils.js";
 import { assert } from "../../core/assert.js";
 import { computeStringHash } from "../../core/primitives/strings/computeStringHash.js";
+import { computeHashIntegerArray } from "../../core/collection/array/computeHashIntegerArray.js";
 
 export class AssetDescription {
     /**

package/engine/asset/loaders/GLTFAssetLoader.d.ts

@@ -2,5 +2,5 @@ import {AssetLoader} from "./AssetLoader";
 import {Object3D} from "three";
 
 export class GLTFAssetLoader extends AssetLoader<Object3D> {
-
+    setDracoDecoderPath(path: string): void
 }

package/engine/asset/loaders/GLTFAssetLoader.js

@@ -127,6 +127,8 @@ export class GLTFAssetLoader extends AssetLoader {
 
         this.__dracoLoader = new DRACOLoader();
         this.__dracoLoader.setWorkerLimit(1);
+
+        // set default path
         this.__dracoLoader.setDecoderPath(buildDracoDecoderPath());
 
         const loader = new GLTFLoader();
@@ -156,6 +158,14 @@ export class GLTFAssetLoader extends AssetLoader {
         });
     }
 
+    /**
+     *
+     * @param {string} p
+     */
+    setDracoDecoderPath(p) {
+        this.__dracoLoader.setDecoderPath(p);
+    }
+
     /**
      *
      * @param {boolean} v