@woosh/meep-engine 2.56.1 → 2.57.0

package/src/engine/reference/v2/Reference.js

@@ -13,7 +13,7 @@ export class Reference {
     #onReleased = new Signal();
 
     /**
-     *
+     * Actual value being held
      * @type {T}
      * @private
      */
@@ -27,7 +27,7 @@ export class Reference {
      */
     #is_bound = false;
 
-    get bound(){
+    get bound() {
         return this.#is_bound;
     }
 
@@ -65,6 +65,10 @@ export class Reference {
         return this.#value;
     }
 
+    /**
+     * Release value being referenced. After this the held value is set to null
+     * This method is idempotent, calling it multiple times is safe
+     */
     release() {
         if (!this.#is_bound) {
             // not bound

package/src/engine/sound/ecs/emitter/SoundEmitter.js

@@ -21,7 +21,7 @@ import { computeStringHash } from "../../../../core/primitives/strings/computeSt
 import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
 import { compareStrings } from "../../../../core/primitives/strings/compareStrings.js";
-import { compareNumbers } from "../../../../core/primitives/numbers/compareNumbers.js";
+import { number_compare_ascending } from "../../../../core/primitives/numbers/number_compare_ascending.js";
 
 /**
  * Convert decibel to percentage volume
@@ -159,36 +159,36 @@ export class SoundEmitter {
             return channel;
         }
 
-        const distanceMin = compareNumbers(this.__distanceMin, other.__distanceMin);
+        const distanceMin = number_compare_ascending(this.__distanceMin, other.__distanceMin);
 
         if (distanceMin !== 0) {
             return distanceMin;
         }
-        const distanceMax = compareNumbers(this.__distanceMax, other.__distanceMax);
+        const distanceMax = number_compare_ascending(this.__distanceMax, other.__distanceMax);
 
         if (distanceMax !== 0) {
             return distanceMax;
         }
 
-        const panningModel = compareNumbers(this.panningModel, other.panningModel);
+        const panningModel = number_compare_ascending(this.panningModel, other.panningModel);
 
         if (panningModel !== 0) {
             return panningModel;
         }
 
-        const attenuation = compareNumbers(this.attenuation, other.attenuation);
+        const attenuation = number_compare_ascending(this.attenuation, other.attenuation);
 
         if (attenuation !== 0) {
             return attenuation;
         }
 
-        const flags = compareNumbers(this.flags, other.flags);
+        const flags = number_compare_ascending(this.flags, other.flags);
 
         if (flags !== 0) {
             return flags;
         }
 
-        const volume = compareNumbers(this.volume.getValue(), other.volume.getValue());
+        const volume = number_compare_ascending(this.volume.getValue(), other.volume.getValue());
 
         if (volume !== 0) {
             return volume;

package/src/engine/sound/ecs/emitter/SoundTrack.js

@@ -5,7 +5,7 @@ import { computeStringHash } from "../../../../core/primitives/strings/computeSt
 import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
 import { compareStrings } from "../../../../core/primitives/strings/compareStrings.js";
-import { compareNumbers } from "../../../../core/primitives/numbers/compareNumbers.js";
+import { number_compare_ascending } from "../../../../core/primitives/numbers/number_compare_ascending.js";
 
 const DEFAULT_FLAGS = SoundTrackFlags.StartWhenReady;
 
@@ -120,8 +120,8 @@ export class SoundTrack {
         // Make the sound source use the buffer and start playing it.
         nodes.source.buffer = this.#buffer;
 
-        nodes.source.onended = ()=> {
-            if(!looping){
+        nodes.source.onended = () => {
+            if (!looping) {
                 this.clearFlag(SoundTrackFlags.Playing);
                 this.on.ended.send1(this);
             }
@@ -167,7 +167,7 @@ export class SoundTrack {
             return url;
         }
 
-        const time = compareNumbers(this.time, other.time);
+        const time = number_compare_ascending(this.time, other.time);
 
         if (time !== 0) {
             return time;
@@ -179,13 +179,13 @@ export class SoundTrack {
             return channel;
         }
 
-        const volume = compareNumbers(this.__volume, other.__volume);
+        const volume = number_compare_ascending(this.__volume, other.__volume);
 
         if (volume !== 0) {
             return volume;
         }
 
-        const flags = compareNumbers(this.flags, other.flags);
+        const flags = number_compare_ascending(this.flags, other.flags);
 
         if (flags !== 0) {
             return flags;

package/src/generation/filtering/numeric/complex/CellFilterAngleToNormal.js

@@ -1,7 +1,7 @@
 import { CellFilter } from "../../CellFilter.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 import { assert } from "../../../../core/assert.js";
-import { v3_angle_between } from "../../../../core/geom/v3_angle_between.js";
+import { v3_angle_between } from "../../../../core/geom/vec3/v3_angle_between.js";
 
 /**
  * Distance from the reference point where support points will be sampled to compute derivative

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

@@ -1,5 +1,3 @@
-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 TaskGroup from "../../../../core/process/task/TaskGroup.js";
@@ -24,6 +22,7 @@ import { MirGridLayers } from "../../../../../samples/generation/grid/MirGridLay
 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";
+import { remap } from "../../../../core/math/remap.js";
 
 const NODE_TYPE_ROAD_CONNECTOR = 'Road Connector';
 
@@ -427,8 +426,7 @@ function drawPath(path, actions, traversable, grid) {
     for (let i = 0; i < n; i++) {
         const index = pathIndices[i];
 
-        const f = inverseLerp(0, n, i);
-        const thickness = lerp(sourceThickness, targetThickness, f);
+        const thickness = remap(0, n, sourceThickness, targetThickness, i);
 
         const thickness_0 = Math.floor(thickness / 2);
         const thickness_1 = Math.ceil(thickness / 2);

package/src/generation/placement/action/random/weighted/CellActionSelectWeightedRandom.js

@@ -1,8 +1,8 @@
 import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
 import { GridCellAction } from "../../GridCellAction.js";
-import { compareNumbers } from "../../../../../core/primitives/numbers/compareNumbers.js";
 import { assert } from "../../../../../core/assert.js";
 import { binarySearchHighIndex } from "../../../../../core/collection/array/binarySearchHighIndex.js";
+import { number_compare_ascending } from "../../../../../core/primitives/numbers/number_compare_ascending.js";
 
 /**
  *
@@ -111,7 +111,7 @@ export class CellActionSelectWeightedRandom extends GridCellAction {
 
         const targetWeight = this.__random() * totalWeight;
 
-        const index = binarySearchHighIndex(evaluatedWeights, targetWeight, compareNumbers, 0, n - 1);
+        const index = binarySearchHighIndex(evaluatedWeights, targetWeight, number_compare_ascending, 0, n - 1);
 
         const targetElement = elements[index];
 

package/src/generation/theme/ThemeEngine.js

@@ -5,7 +5,6 @@ import { TerrainLayerRuleAggregator } from "./TerrainLayerRuleAggregator.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";
-import { compareNumbers } from "../../core/primitives/numbers/compareNumbers.js";
 import TaskGroup from "../../core/process/task/TaskGroup.js";
 import Future from "../../core/process/Future.js";
 import { optimizeIndividualMeshesEntitiesToInstances } from "../../engine/ecs/foliage/ecs/InstancedMeshUtils.js";
@@ -20,6 +19,7 @@ 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";
+import { number_compare_ascending } from "../../core/primitives/numbers/number_compare_ascending.js";
 
 /**
  *
@@ -431,7 +431,7 @@ export class ThemeEngine {
             //select a theme
             const t = randomFloatBetween(random, 0, influenceSum);
 
-            const themeIndex = binarySearchLowIndex(themeInfluence, t, compareNumbers);
+            const themeIndex = binarySearchLowIndex(themeInfluence, t, number_compare_ascending);
 
             const themeArea = themeAreas[themeIndex];
 

package/src/generation/theme/ThemeEngine.spec.js

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

package/src/view/View.js

@@ -10,7 +10,8 @@ import Signal from "../core/events/signal/Signal.js";
 import { SignalBinding } from "../core/events/signal/SignalBinding.js";
 import { assert } from "../core/assert.js";
 import Vector1 from "../core/geom/Vector1.js";
-import { m3_cm_compose_transform } from "./m3_cm_compose_transform.js";
+
+import { m3_cm_compose_transform } from "../core/geom/mat3/m3_cm_compose_transform.js";
 
 
 const scratch_m3_0 = new Float32Array(9);
@@ -362,10 +363,10 @@ class View {
      * @returns {View}
      */
     addChild(child) {
-        assert.notEqual(child, undefined, 'child is undefined');
-        assert.notEqual(child, null, 'child is null');
-        assert.ok(typeof child, 'object', `child must be an object, isntead was '${typeof child}'`);
-        assert.ok(child instanceof View, 'child is not an instance of View');
+        assert.defined(child, 'child');
+        assert.notNull(child, 'child');
+        assert.isInstanceOf(child, View, 'child');
+        assert.equal(child.isLinked, false, 'child is already linked somewhere');
 
         child.parent = this;
 
@@ -425,18 +426,25 @@ class View {
     /**
      *
      * @param {View} child
+     * @returns {boolean}
      */
     removeChild(child) {
-        const i = this.children.indexOf(child);
-        if (i !== -1) {
-            this.children.splice(i, 1);
-            this.el.removeChild(child.el);
-            child.unlink();
+        const children = this.children;
 
-            child.parent = null;
-        } else {
-            console.warn('Child not found. this:', this, 'child:', child);
+        const i = children.indexOf(child);
+
+        if (i === -1) {
+            //console.warn('Child not found. this:', this, 'child:', child);
+            return false;
         }
+
+        children.splice(i, 1);
+        this.el.removeChild(child.el);
+        child.unlink();
+
+        child.parent = null;
+
+        return true;
     }
 
     /**

package/src/view/elements/ColorPickerView.js

@@ -2,8 +2,8 @@ import GuiControl from "../controller/controls/GuiControl.js";
 import { GaugeView } from "../../../editor/view/ecs/components/color/GaugeView.js";
 import Vector1 from "../../core/geom/Vector1.js";
 import { drawCheckers } from "../../../editor/view/ecs/components/particles/ColorParameterLUTController.js";
-import { hsv2rgb } from "../../core/color/hsv2rgb.js";
-import { rgb2hsv } from "../../core/color/rgb2hsv.js";
+import { hsv2rgb } from "../../core/color/hsv/hsv2rgb.js";
+import { rgb2hsv } from "../../core/color/hsv/rgb2hsv.js";
 
 
 export class ColorPickerView extends GuiControl {

package/src/view/minimap/gl/MarkerGL.js

@@ -1,4 +1,5 @@
 import { MarkerGLAttributes } from "./MarkerGLAttributes.js";
+import { Reference } from "../../../engine/reference/v2/Reference.js";
 
 function logPatchLoadError(e) {
     console.error('Failed to load patch:', e);
@@ -24,21 +25,23 @@ export function MarkerGL(marker, transform, entity, id, manager) {
 
     this.id = id;
 
-    this.patch = null;
+    /**
+     *
+     * @type {Reference<AtlasPatch>}
+     */
+    this.patch = Reference.NULL;
 
     this.manager = manager;
     this.particles = manager.particles;
 
     this.active = false;
 
-    const self = this;
-
-    this.updatePosition = function () {
+    this.updatePosition = () => {
 
         const position = transform.position;
 
-        self.particles.executeOperationWriteAttribute_Vector3(
-            self.id,
+        this.particles.executeOperationWriteAttribute_Vector3(
+            this.id,
             MarkerGLAttributes.AttributePosition,
             position.x,
             1,
@@ -48,26 +51,27 @@ export function MarkerGL(marker, transform, entity, id, manager) {
         manager.needsRender = true;
     };
 
-    this.updateIcon = function (newURL, oldURL) {
+    this.updateIcon = (newURL, oldURL) => {
         const atlasManager = manager.atlasManager;
 
-        if (oldURL !== null) {
-            atlasManager.release(oldURL);
-        }
+        this.patch.release();
 
         atlasManager
             .acquire(newURL)
-            .then(function (patch) {
+            .then((patch) => {
+                this.patch = patch;
+
                 //check if marker is still active
-                if (!self.active) {
+                if (!this.active) {
                     //marker is dead
                     return;
                 }
 
-                const patchUv = patch.uv;
 
-                self.particles.executeOperationWriteAttribute_Vector4(
-                    self.id,
+                const patchUv = patch.getValue().uv;
+
+                this.particles.executeOperationWriteAttribute_Vector4(
+                    this.id,
                     MarkerGLAttributes.AttributePatch,
                     patchUv.position.x,
                     patchUv.position.y,
@@ -76,8 +80,6 @@ export function MarkerGL(marker, transform, entity, id, manager) {
                 );
 
                 manager.needsRender = true;
-
-                self.patch = patch;
             }, logPatchLoadError);
     };
 }
@@ -110,5 +112,5 @@ MarkerGL.prototype.shutdown = function () {
     this.marker.iconURL.onChanged.remove(this.updateIcon);
 
     //release reference to icon
-    this.manager.atlasManager.release(this.marker.iconURL.getValue());
+    this.patch.release();
 };

package/src/view/minimap/gl/MinimapMarkersGL.js

@@ -225,7 +225,8 @@ export class MinimapMarkersGL extends MinimapWorldLayer {
     updateSprites() {
 
         this.markers.forEach((marker) => {
-            const patch = marker.patch;
+            const patch = marker.patch.getValue();
+
             if (patch !== null) {
                 /**
                  * @type {Rectangle}

package/editor/tools/FoliagePaintTool.js

@@ -1,168 +0,0 @@
-import Tool from "./engine/Tool.js";
-import Vector1 from "../../src/core/geom/Vector1.js";
-import ObservedValue from "../../src/core/model/ObservedValue.js";
-import Vector4 from "../../src/core/geom/Vector4.js";
-import loadSampler2D from "../../src/engine/graphics/texture/sampler/loadSampler2D.js";
-import convertSampler2D2Canvas from "../../src/engine/graphics/texture/sampler/Sampler2D2Canvas.js";
-import { InstancedMeshComponent } from "../../src/engine/ecs/foliage/ecs/InstancedMeshComponent.js";
-import { hex2rgb } from "../../src/core/color/hex2rgb.js";
-import { obtainTerrain } from "../../src/engine/ecs/terrain/util/obtainTerrain.js";
-
-class FoliagePaintTool extends Tool {
-    constructor() {
-        super();
-        this.name = "foliage_paint";
-
-        this.settings.layer = new Vector1(0);
-        this.settings.value = new Vector1(1);
-        this.settings.alphaMultiplier = new Vector1(1);
-        this.settings.color = new ObservedValue("#FFFFFF");
-
-        this.settings.baseColor = new ObservedValue("#000000");
-        this.settings.baseColorAlpha = new Vector1(0.6);
-
-        const self = this;
-
-    }
-
-    updateSelection() {
-        self.paint();
-    }
-
-    buildColor() {
-
-        const color = new Vector4();
-        const baseColor = hex2rgb(this.settings.color.get());
-        color.set(baseColor.r, baseColor.g, baseColor.b, 0);
-        color.multiplyScalar(1 / 255);
-
-        return color;
-    }
-
-    buildBaseColor() {
-
-        const color = new Vector4();
-        const baseColor = hex2rgb(this.settings.baseColor.get());
-        color.set(baseColor.r, baseColor.g, baseColor.b, 0);
-        color.multiplyScalar(1 / 255);
-
-        color.w = this.settings.baseColorAlpha.getValue();
-
-        return color;
-    }
-
-    initialize() {
-        super.initialize();
-
-        const engine = this.engine;
-        const editor = this.editor;
-
-        this.terrain = obtainTerrain(engine.entityManager.dataset, function (t, entity) {
-            self.terrainEntity = entity;
-        });
-
-        this.terrain.overlay.push();
-
-        this.terrain.overlay.borderWidth.set(0);
-
-        this.paint();
-
-        editor.selection.on.added.add(this.updateSelection);
-        editor.selection.on.removed.add(this.updateSelection);
-    }
-
-    shutdown() {
-        this.terrain.overlay.pop();
-
-        this.editor.selection.on.added.remove(this.updateSelection);
-        this.editor.selection.on.removed.remove(this.updateSelection);
-
-        this.settings.value.onChanged.remove(this.updateSelection);
-        this.settings.alphaMultiplier.onChanged.remove(this.updateSelection);
-        this.settings.color.onChanged.remove(this.updateSelection);
-
-        super.shutdown();
-    }
-
-    paint() {
-
-        const alphaMultiplier = this.settings.alphaMultiplier.getValue();
-        const overlay = this.terrain.overlay;
-        overlay.clear();
-
-        const layer = this.settings.layer.getValue();
-
-        const color = this.buildColor();
-
-        const baseColor = this.buildBaseColor();
-
-        const engine = this.engine;
-
-        /**
-         *
-         * @param {InstancedMeshComponent} foliage
-         * @param {Number} entity
-         */
-        function visit(foliage, entity) {
-            const foliageLayer = foliage.layers.get(layer);
-            loadSampler2D(foliageLayer.densityMap.get(), engine.assetManager).then(function (sampler) {
-
-                overlay.size.set(sampler.width, sampler.height);
-                overlay.clear();
-
-                const v4c = new Vector4(0, 0, 0, 0);
-
-                function mappingFunction(index, array, x, y) {
-                    const address = index;
-                    const alpha = sampler.data[address / 4] * alphaMultiplier;
-                    color.w = alpha;
-
-                    Vector4.lerp(color, baseColor, (1 - alpha), v4c);
-
-                    //scale to unsigned byte value
-                    v4c.multiplyScalar(255);
-
-
-                    array[address] = v4c.x;
-                    array[address + 1] = v4c.y;
-                    array[address + 2] = v4c.z;
-                    //alpha
-                    array[address + 3] = v4c.w;
-                }
-
-                convertSampler2D2Canvas(sampler, 1, 0, overlay.canvas, mappingFunction);
-
-                overlay.update();
-            });
-        }
-
-        //initialize overlay
-        this.traverse(visit);
-    }
-
-    traverse(callback) {
-        /**
-         * @type {EntityManager}
-         */
-        const entityManger = this.engine.entityManager;
-        this.editor.selection.forEach(function (entity) {
-
-            /**
-             *
-             * @type {InstancedMeshComponent}
-             */
-            const foliage = entityManger.getComponent(entity, InstancedMeshComponent);
-
-
-            if (foliage === null) {
-                //do nothing
-                return;
-            }
-
-            callback(foliage, entity);
-        });
-    }
-}
-
-
-export default FoliagePaintTool;

package/editor/tools/engine/ToolStateMachine.js

@@ -1,53 +0,0 @@
-import { SimpleStateMachineDescription } from "../../../src/core/fsm/simple/SimpleStateMachineDescription.js";
-import { ToolState } from "./ToolState.js";
-import { StateMachine } from "../../../src/core/fsm/StateMachine.js";
-
-const smd = new SimpleStateMachineDescription();
-
-smd.createState(ToolState.Initial);
-smd.createState(ToolState.Ready);
-smd.createState(ToolState.Running);
-
-smd.createEdge(ToolState.Initial, ToolState.Ready);
-smd.createEdge(ToolState.Ready, ToolState.Initial);
-smd.createEdge(ToolState.Ready, ToolState.Running);
-smd.createEdge(ToolState.Running, ToolState.Ready);
-
-
-/**
- * @param {Tool} tool
- * @returns {StateMachine}
- */
-export function buildToolStateMachine(tool) {
-    const sm = new StateMachine(smd);
-
-    sm.addState(ToolState.Initial);
-    sm.addState(ToolState.Ready);
-    sm.addState(ToolState.Running);
-
-
-    sm.createTransition(ToolState.Initial, ToolState.Ready, () => {
-        tool.initialize();
-        return Promise.resolve();
-    });
-
-    sm.createTransition(ToolState.Ready, ToolState.Initial, () => {
-        tool.shutdown();
-        return Promise.resolve();
-    });
-
-    sm.createTransition(ToolState.Ready, ToolState.Running, () => {
-        tool.start();
-        return Promise.resolve();
-    });
-
-    sm.createTransition(ToolState.Running, ToolState.Ready, () => {
-        tool.stop();
-        return Promise.resolve();
-    });
-
-    sm.setState(ToolState.Initial);
-
-
-    return sm;
-}

package/src/core/NumberFormat.js

@@ -1,4 +0,0 @@
-/**
- * Created by Alex on 08/08/2016.
- * @copyright Alex Goldring 2016
- */

package/src/core/color/rgb2hsv.js

@@ -1,47 +0,0 @@
-/**
- *
- * @param {number} r 0 to 255
- * @param {number} g 0 to 255
- * @param {number} b 0 to 255
- * @returns {{h: number, s: number, v: number}}
- */
-export function rgb2hsv(r, g, b) {
-
-    r /= 255;
-    g /= 255;
-    b /= 255;
-
-
-    const max = Math.max(r, g, b);
-    const min = Math.min(r, g, b);
-
-    var h, s, v = max;
-
-    var d = max - min;
-
-    s = max === 0 ? 0 : d / max;
-
-    if (max === min) {
-        h = 0; // achromatic
-    } else {
-        switch (max) {
-            case r:
-                h = (g - b) / d + (g < b ? 6 : 0);
-                break;
-            case g:
-                h = (b - r) / d + 2;
-                break;
-            case b:
-                h = (r - g) / d + 4;
-                break;
-        }
-
-        h /= 6;
-    }
-
-    return {
-        h,
-        s,
-        v
-    };
-}

package/src/core/color/rgb_to_YCbCr_uint24.js

@@ -1,16 +0,0 @@
-import { rgb2uint24 } from "./rgb2uint24.js";
-
-export function rgb_to_YCbCr_uint24(r, g, b) {
-    const Y = 0.299 * r + 0.587 * g + 0.114 * b;
-    const Cb = -0.169 * r - 0.331 * g + 0.499 * b + 128;
-    const Cr = 0.499 * g - 0.418 * g - 0.0813 * b + 128;
-    /**
-     *
-     * @see https://en.wikipedia.org/wiki/YUV
-     * @param {number} r
-     * @param {number} g
-     * @param {number} b
-     * @returns {number}
-     */
-    return rgb2uint24(Y,Cb,Cr);
-}