@woosh/meep-engine 2.43.1 → 2.43.3

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

@@ -1,8 +1,8 @@
 import { assert } from "../../../assert.js";
-import { isArrayEqual } from "../../../collection/ArrayUtils.js";
 import List from "../../../collection/list/List.js";
 import { NodeInstancePortReference } from "./NodeInstancePortReference.js";
 import { PortDirection } from "./PortDirection.js";
+import { isArrayEqual } from "../../../collection/array/isArrayEqual.js";
 
 export class NodeInstance {
     constructor() {
@@ -27,14 +27,14 @@ export class NodeInstance {
 
         /**
          * Internal instance data
-         * @type {[]}
+         * @type {Array}
          */
         this.parameters = [];
 
 
         /**
          * @transient
-         * @type {[]}
+         * @type {Array}
          */
         this.outputsValues = [];
 

package/core/primitives/strings/prefixTree/PrefixTreeLeaf.js

@@ -6,7 +6,7 @@ export class PrefixTreeLeaf extends PrefixTreeNode {
 
         /**
          * Values associated with the word
-         * @type {[]}
+         * @type {Array}
          */
         this.values = [];
 

package/core/process/task/util/randomCountTask.js

@@ -1,7 +1,7 @@
 import { seededRandom } from "../../../math/random/seededRandom.js";
 import { TaskSignal } from "../TaskSignal.js";
 import Task from "../Task.js";
-import { randomizeArrayElementOrder } from "../../../collection/ArrayUtils.js";
+import { randomizeArrayElementOrder } from "../../../collection/array/randomizeArrayElementOrder.js";
 
 /**
  *

package/editor/ecs/component/editors/primitive/ArrayEditor.js

@@ -13,7 +13,7 @@ export class ArrayEditor extends TypeEditor {
     build(parent, field, registry) {
 
         /**
-         * @type {[]}
+         * @type {Array}
          */
         const array = field.adapter.read(parent, field.name);
 

package/editor/tools/v2/BlenderCameraOrientationGizmo.js

@@ -315,6 +315,12 @@ export class BlenderCameraOrientationGizmo extends CanvasView {
         this.__try_update();
 
         if (this.selectedAxis !== null) {
+
+            if (this.on.axisSelected.hasHandlers()) {
+                // axis selection will be handled, stop propagation
+                evt.stopPropagation();
+            }
+
             this.on.axisSelected.send2(
                 this.selectedAxis.axis,
                 this.selectedAxis.direction.clone()

package/editor/view/ecs/components/common/AutoCanvasView.js

@@ -1,54 +1,42 @@
-import View from "../../../../../view/View.js";
 import { DomSizeObserver } from "../../../../../view/util/DomSizeObserver.js";
+import { CanvasView } from "../../../../../view/elements/CanvasView.js";
 
 /**
+ * Automatically tracks size on the screen, including that computed from CSS and - re-renders content when size changes
  * @extends View
  */
-export class AutoCanvasView extends View {
+export class AutoCanvasView extends CanvasView {
     constructor({ classList = [] } = {}) {
         super();
 
-        this.el = document.createElement('canvas');
-        classList.forEach(c => this.addClass(c));
-
-        /**
-         *
-         * @type {CanvasRenderingContext2D}
-         */
-        this.context2d = this.el.getContext('2d');
+        this.addClasses(classList);
 
         const sizeObserver = new DomSizeObserver();
+        this.__sizeObserver = sizeObserver;
 
         const size = sizeObserver.dimensions.size;
-        size.onChanged.add(() => {
-            this.render();
-        });
-
-        sizeObserver.attach(this.el);
 
-        this.sizeObserver = sizeObserver;
+        // subscribe to visual dimension changes
+        size.onChanged.add(this.render, this);
 
-        this.on.linked.add(() => {
-            sizeObserver.start();
-            this.render();
-        });
-        this.on.unlinked.add(() => sizeObserver.stop());
+        sizeObserver.watchView(this);
+        this.on.linked.add(this.render,this);
     }
 
     render() {
-        const dimensions = this.sizeObserver.dimensions;
+        const dimensions = this.__sizeObserver.dimensions;
         const size = dimensions.size;
 
         const width = size.x;
         const height = size.y;
 
-        if (width < 0 || height < 0) {
+        if (width <= 0 || height <= 0) {
             //canvas too small
             return;
         }
 
-        this.el.width = width;
-        this.el.height = height;
+        // resize canvas as necessary
+        this.size.set(width, height);
 
         this.draw(this.context2d, width, height);
     }

package/engine/asset/AssetManager.d.ts

@@ -4,6 +4,10 @@ import {CrossOriginConfig} from "./CORS/CrossOriginConfig";
 import {AssetTransformer} from "./AssetTransformer";
 import Engine from "../Engine";
 
+interface PromiseOptions {
+    skip_queue: boolean
+}
+
 export class AssetManager {
     constructor(engine: Engine)
 
@@ -11,7 +15,7 @@ export class AssetManager {
 
     load_concurrency: number
 
-    promise<T>(path: string, type: string): Promise<Asset<T>>
+    promise<T>(path: string, type: string, options?: PromiseOptions): Promise<Asset<T>>
 
     remove(path: string, type: string): boolean
 

package/engine/asset/AssetManager.js

@@ -16,7 +16,7 @@ import { noop } from "../../core/function/Functions.js";
 import { Deque } from "../../core/collection/queue/Deque.js";
 import Task from "../../core/process/task/Task.js";
 import { TaskSignal } from "../../core/process/task/TaskSignal.js";
-import { AssetRequest } from "./AssetRequest.js";
+import { AssetRequest, AssetRequestFlags } from "./AssetRequest.js";
 import FastBinaryHeap from "../../core/collection/heap/FastBinaryHeap.js";
 
 /**
@@ -38,12 +38,18 @@ class PendingAsset {
      * @constructor
      */
     constructor(description) {
+        /**
+         *
+         * @type {AssetDescription}
+         */
         this.description = description;
+
         /**
          *
          * @type {AssetRequest[]}
          */
         this.requests = [];
+
         /**
          *
          * @type {BoundedValue}
@@ -297,9 +303,10 @@ export class AssetManager {
     /**
      * @param {String} path
      * @param {String} type
+     * @param {boolean} [skip_queue] if true will skip the queue and dispatch request immediately
      * @returns {Promise<Asset>}
      */
-    promise(path, type) {
+    promise(path, type, { skip_queue = false } = {}) {
         return new Promise((resolve, reject) => {
             this.get(path, type, resolve, reject);
         });
@@ -312,8 +319,9 @@ export class AssetManager {
      * @param {function(asset:Asset<T>)} callback
      * @param {function(*)} [failure]
      * @param {function(loaded:number, total:number)} [progress]
+     * @param {boolean} [skip_queue]
      */
-    get(path, type, callback, failure = console.error, progress = noop) {
+    get(path, type, callback, failure = console.error, progress = noop, skip_queue = false) {
         if (typeof path !== "string") {
             throw new Error("Path must be string. Path = " + JSON.stringify(path));
         }
@@ -327,6 +335,9 @@ export class AssetManager {
         } else {
             //create request object
             const assetRequest = new AssetRequest(callback, failure, progress);
+
+            assetRequest.writeFlag(AssetRequestFlags.SkipQueue, skip_queue);
+
             //submit request
             this.submitRequest(assetDescription, assetRequest);
         }
@@ -387,6 +398,25 @@ export class AssetManager {
         }
     }
 
+    /**
+     * Force load of the asset
+     * @param {PendingAsset} asset
+     * @private
+     */
+    __force_load(asset) {
+        // check if the asset is already being loaded
+        if (this.__pending_asset_active_load_set.has(asset)) {
+            return;
+        }
+
+        // remove from queue
+        this.__pending_asset_wait_queue.delete(asset);
+
+        // dispatch
+        this.__dispatch_pending_asset(asset);
+
+    }
+
     /**
      * Asset has been loaded successfully, failed, or aborted
      * @param {PendingAsset} pending_asset
@@ -584,28 +614,33 @@ export class AssetManager {
     submitRequest(assetDescription, request) {
         const requestMap = this.request_map;
 
+        let shouldSchedule = false;
         let pendingAsset = requestMap.get(assetDescription);
-        if (pendingAsset !== undefined) {
-            //already loading
-            pendingAsset.requests.push(request);
 
-            // update priority queue if necessary
-            this.__pending_asset_wait_queue.updateElementScore(pendingAsset);
+        if (pendingAsset === undefined) {
+            pendingAsset = new PendingAsset(assetDescription);
+            requestMap.set(assetDescription, pendingAsset);
 
-            return;
+            shouldSchedule = true;
         }
 
-        // not loading yet, lets create a load container and schedule it
-        pendingAsset = new PendingAsset(assetDescription);
+        pendingAsset.requests.push(request);
 
-        requestMap.set(assetDescription, pendingAsset);
+        if (shouldSchedule) {
+            // not loading yet, lets create a load container and schedule it
+            this.__schedule_load(pendingAsset);
+        } else {
+            // update priority queue if necessary
+            this.__pending_asset_wait_queue.updateElementScore(pendingAsset);
+        }
 
-        const requests = pendingAsset.requests;
-        requests.push(request);
 
-        this.__schedule_load(pendingAsset);
+        if (request.getFlag(AssetRequestFlags.SkipQueue)) {
+            this.__force_load(pendingAsset);
+        }
     }
 
+
     /**
      *
      * @param {string} type

package/engine/asset/AssetManager.spec.js

@@ -1,19 +1,25 @@
 import { Asset } from "./Asset.js";
 import { AssetManager } from "./AssetManager.js";
+import { AssetLoader } from "./loaders/AssetLoader.js";
+
+/**
+ *
+ * @return {Engine}
+ */
+function dummyEngine() {
+    return {};
+}
 
-function succeedingLoader(path, success, failure, progress) {
-    success(new Asset(
-        function () {
-            return 1;
-        },
-        0
-    ));
+class DummyLoader extends AssetLoader {
+    load(path, success, failure, progress) {
+        success(new Asset(() => 1));
+    }
 }
 
 test('successful get', () => {
-    const am = new AssetManager();
+    const am = new AssetManager(dummyEngine());
 
-    am.registerLoader('a', succeedingLoader);
+    am.registerLoader('a', new DummyLoader());
 
 
     return new Promise(function (resolve, reject) {
@@ -22,9 +28,9 @@ test('successful get', () => {
 });
 
 test('tryGet loaded resource', async () => {
-    const am = new AssetManager();
+    const am = new AssetManager(dummyEngine());
 
-    am.registerLoader('a', succeedingLoader);
+    am.registerLoader('a', new DummyLoader());
 
     await am.promise('bla', 'a');
 

package/engine/asset/AssetRequest.js

@@ -1,3 +1,14 @@
+/**
+ *
+ * @enum {number}
+ */
+export const AssetRequestFlags = {
+    /**
+     * Will always skip the wait queue
+     */
+    SkipQueue: 1
+};
+
 export class AssetRequest {
     /**
      *
@@ -28,5 +39,51 @@ export class AssetRequest {
          * @type {number}
          */
         this.priority = 0;
+
+        /**
+         *
+         * @type {number}
+         */
+        this.flags = 0;
+    }
+
+    /**
+     *
+     * @param {number|AssetRequestFlags} flag
+     * @returns {void}
+     */
+    setFlag(flag) {
+        this.flags |= flag;
+    }
+
+    /**
+     *
+     * @param {number|AssetRequestFlags} flag
+     * @returns {void}
+     */
+    clearFlag(flag) {
+        this.flags &= ~flag;
+    }
+
+    /**
+     *
+     * @param {number|AssetRequestFlags} flag
+     * @param {boolean} value
+     */
+    writeFlag(flag, value) {
+        if (value) {
+            this.setFlag(flag);
+        } else {
+            this.clearFlag(flag);
+        }
+    }
+
+    /**
+     *
+     * @param {number|AssetRequestFlags} flag
+     * @returns {boolean}
+     */
+    getFlag(flag) {
+        return (this.flags & flag) === flag;
     }
 }

package/engine/asset/loaders/ArrayBufferLoader.js

@@ -3,6 +3,23 @@ import { AssetLoader } from "./AssetLoader.js";
 import { CrossOriginKind } from "../CORS/CrossOriginKind.js";
 
 export class ArrayBufferLoader extends AssetLoader {
+    /**
+     *
+     * @param {"auto"|"low"|"high"} fetch_priority
+     */
+    constructor({
+                    fetch_priority = "auto"
+                } = {}) {
+        super();
+
+        /**
+         *
+         * @type {"auto"|"low"|"high"}
+         * @private
+         */
+        this.__fetch_priority = fetch_priority;
+    }
+
     load(path, success, failure, progress) {
         const coc = this.assetManager.crossOriginConfig;
 
@@ -13,6 +30,11 @@ export class ArrayBufferLoader extends AssetLoader {
             headers: headers
         });
 
+        if (typeof request.priority !== "undefined") {
+            // priority API is present
+            request.priority = this.__fetch_priority;
+        }
+
         fetch(request)
             .then(handle_response)
             .then(response_to_asset)

package/engine/asset/loaders/AssetLoader.js

@@ -38,6 +38,6 @@ export class AssetLoader {
      * @param {function(current:number, total:number)} progress
      */
     load(path, success, failure, progress) {
-
+        failure('Not Implemented');
     }
 }

package/engine/ecs/System.js

@@ -34,7 +34,7 @@ class System {
         /**
          * Component types that are used internally by the system
          * Declaring this helps EntityManager to ensure that all relevant component types are properly registered for the system
-         * @type {[]}
+         * @type {Array}
          */
         this.components_used = [];
     }

package/engine/ecs/dynamic_actions/DynamicActorSystem.js

@@ -4,7 +4,6 @@ import { SystemEntityContext } from "../system/SystemEntityContext.js";
 import { DataScope } from "../../../../model/game/unit/actions/data/DataScope.js";
 import { Blackboard } from "../../intelligence/blackboard/Blackboard.js";
 import { compareNumbersDescending, returnTrue } from "../../../core/function/Functions.js";
-import { randomMultipleFromArray } from "../../../core/collection/ArrayUtils.js";
 import { EntityProxyScope } from "../binding/EntityProxyScope.js";
 import EntityBuilder, { EntityBuilderFlags } from "../EntityBuilder.js";
 import { BehaviorComponent } from "../../intelligence/behavior/ecs/BehaviorComponent.js";
@@ -20,6 +19,7 @@ import { computeContextualDynamicRuleDebugString } from "./rules/computeContextu
 import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
 import { randomFromArray } from "../../../core/math/random/randomFromArray.js";
 import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween.js";
+import { randomMultipleFromArray } from "../../../core/collection/array/randomMultipleFromArray.js";
 
 /**
  * In seconds

package/engine/graphics/FrameRunner.js

@@ -41,22 +41,18 @@ export class FrameRunner {
 
         this.running = true;
 
-        const self = this;
-
-        const action = this.action;
-
-        function cycle() {
-            if (!self.running) {
+        const cycle = () => {
+            if (!this.running) {
                 //not supposed to be running, bail
                 return;
             }
 
-            action();
+            this.action();
 
-            self.animationFrameId = requestAnimationFrame(cycle);
+            this.animationFrameId = requestAnimationFrame(cycle);
         }
 
-        self.animationFrameId = requestAnimationFrame(cycle);
+        this.animationFrameId = requestAnimationFrame(cycle);
 
         return true;
     }

package/engine/graphics/ecs/animation/animator/AnimationClipDefinition.js

@@ -1,8 +1,8 @@
-import { isArrayEqual } from "../../../../../core/collection/ArrayUtils.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
 import { invokeObjectHash } from "../../../../../core/model/object/invokeObjectHash.js";
 import { computeHashArray } from "../../../../../core/collection/array/computeHashArray.js";
 import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
+import { isArrayEqual } from "../../../../../core/collection/array/isArrayEqual.js";
 
 /**
  *

package/engine/graphics/ecs/animation/animator/graph/definition/AnimationGraphDefinition.js

@@ -3,10 +3,10 @@ import { BlendStateMatrix } from "../../blending/BlendStateMatrix.js";
 import { AnimationStateDefinition } from "./AnimationStateDefinition.js";
 import { AnimationClipDefinition } from "../../AnimationClipDefinition.js";
 import { AnimationClip } from "../../AnimationClip.js";
-import { isArrayEqual } from "../../../../../../../core/collection/ArrayUtils.js";
 import { invokeObjectHash } from "../../../../../../../core/model/object/invokeObjectHash.js";
 import { computeHashArray } from "../../../../../../../core/collection/array/computeHashArray.js";
 import { computeHashIntegerArray } from "../../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { isArrayEqual } from "../../../../../../../core/collection/array/isArrayEqual.js";
 
 export class AnimationGraphDefinition {
     constructor() {

package/engine/graphics/ecs/camera/Camera.js

@@ -13,16 +13,7 @@ import Vector3 from "../../../../core/geom/Vector3.js";
 import { frustum_from_camera } from "./frustum_from_camera.js";
 import { invertQuaternionOrientation } from "./InvertQuaternionOrientation.js";
 import { v3_distance_above_plane } from "../../../../core/geom/v3_distance_above_plane.js";
-
-/**
- *
- * @enum {String}
- * @readonly
- */
-export const ProjectionType = {
-    Perspective: "perspective",
-    Orthographic: "orthographic"
-};
+import { ProjectionType } from "./ProjectionType.js";
 
 /**
  * @class

package/engine/graphics/ecs/camera/CameraSystem.js

@@ -142,12 +142,13 @@ export class CameraSystem extends System {
         const position = transform.position;
         const rotation = transform.rotation;
 
-        const bPosition = new SignalBinding(position.onChanged, synchronizePosition);
-        const bRotation = new SignalBinding(rotation.onChanged, synchronizeRotation);
-        const bProjection = new SignalBinding(camera.projectionType.onChanged, rebuild);
-        const bActive = new SignalBinding(camera.active.onChanged, synchronizeActiveState);
-
-        const signalBindings = [bPosition, bRotation, bProjection, bActive];
+        const signalBindings = [
+            new SignalBinding(position.onChanged, synchronizePosition),
+            new SignalBinding(rotation.onChanged, synchronizeRotation),
+            new SignalBinding(camera.projectionType.onChanged, rebuild),
+            new SignalBinding(camera.active.onChanged, synchronizeActiveState),
+            new SignalBinding(camera.fov.onChanged, rebuild)
+        ];
 
         signalBindings.forEach(b => b.link());
 
@@ -158,7 +159,6 @@ export class CameraSystem extends System {
         synchronizeRotation(rotation.x, rotation.y, rotation.z, rotation.w);
         synchronizeActiveState(camera.active.getValue());
 
-
         assert.notEqual(camera.object, null, 'Camera object must not be null (invariant)');
     }
 
@@ -212,7 +212,7 @@ export class CameraSystem extends System {
                     return;
                 }
 
-                if(c.object.updateProjectionMatrix !== undefined) {
+                if (c.object.updateProjectionMatrix !== undefined) {
                     c.object.updateProjectionMatrix();
                     c.object.updateMatrix();
                     c.object.updateMatrixWorld(true);

package/engine/graphics/ecs/camera/ProjectionType.js

@@ -0,0 +1,9 @@
+/**
+ *
+ * @enum {String}
+ * @readonly
+ */
+export const ProjectionType = {
+    Perspective: "perspective",
+    Orthographic: "orthographic"
+};

package/engine/graphics/ecs/camera/build_three_camera_object.js

@@ -1,5 +1,5 @@
-import { Camera } from "./Camera.js";
 import { OrthographicCamera as ThreeOrthographicCamera, PerspectiveCamera as ThreePerspectiveCamera } from "three";
+import { ProjectionType } from "./ProjectionType.js";
 
 /**
  *
@@ -13,10 +13,10 @@ export function build_three_camera_object(component) {
         default:
             console.error(`Unsupported camera projection type "${component.projectionType.getValue()}", defaulting to perspective projection`);
         //fallthrough
-        case Camera.ProjectionType.Perspective:
+        case ProjectionType.Perspective:
             result = new ThreePerspectiveCamera(component.fov.getValue(), 1, 1, 50);
             break;
-        case Camera.ProjectionType.Orthographic:
+        case ProjectionType.Orthographic:
             result = new ThreeOrthographicCamera(-10, 10, 20, -20, 1, 1);
             break;
     }