@woosh/meep-engine 2.34.21 → 2.34.23

package/core/binary/BitSet.js

@@ -509,6 +509,26 @@ BitSet.prototype.getAndClear = function (index) {
     return v;
 };
 
+/**
+ *
+ * @param {number} distance
+ * @param {number} start_index
+ * @param {number} end_index
+ */
+BitSet.prototype.shift = function (distance, start_index, end_index) {
+    if (distance > 0) {
+        for (let i = end_index; i >= start_index; i--) {
+            const v = this.get(i);
+            this.set(i + distance, v);
+        }
+    } else {
+        for (let i = start_index; i <= end_index; i++) {
+            const v = this.get(i);
+            this.set(i + distance, v);
+        }
+    }
+};
+
 /**
  * Sets all of the bits in this BitSet to false.
  */

package/core/collection/list/List.js

@@ -919,4 +919,34 @@ List.prototype.equals = function (other) {
     return true;
 };
 
+/**
+ *
+ * @param {List<T>} other
+ * @returns {number}
+ */
+List.prototype.compare = function (other) {
+    const l = this.length;
+
+    const other_length = other.length;
+    if (l !== other_length) {
+        return l - other_length;
+    }
+
+    for (let i = 0; i < l; i++) {
+        const a = this.get(i);
+
+        const b = other.get(i);
+
+        const delta = a.compare(b);
+
+        if (delta !== 0) {
+            return delta;
+        }
+
+    }
+
+    // same
+    return 0;
+};
+
 export default List;

package/core/model/object/invokeObjectClone.js

@@ -6,3 +6,5 @@
 export function invokeObjectClone(object) {
     return object.clone();
 }
+
+

package/core/model/object/invokeObjectCompare.js

@@ -0,0 +1,9 @@
+/**
+ * @template {{compare:function(T):number}} T
+ * @param {T} a
+ * @param {T} b
+ * @return {number}
+ */
+export function invokeObjectCompare(a, b) {
+    return a.compare(b);
+}

package/engine/graphics/render/forward_plus/LightManager.js

@@ -42,6 +42,9 @@ import { Decal } from "./model/Decal.js";
 import { ReferencedTextureAtlas } from "../../texture/atlas/ReferencedTextureAtlas.js";
 import { v3_morton_encode_transformed } from "../../../../core/geom/3d/morton/v3_morton_encode_transformed.js";
 import { v3_distance } from "../../../../core/geom/v3_distance.js";
+import { array_copy } from "../../../../core/collection/array/copyArray.js";
+import { arrayQuickSort } from "../../../../core/collection/array/arrayQuickSort.js";
+import { invokeObjectCompare } from "../../../../core/model/object/invokeObjectCompare.js";
 
 const LOOKUP_CACHE_SIZE = 1024; // must be power of two
 
@@ -227,7 +230,13 @@ export class LightManager {
          * @readonly
          * @private
          */
-        this.__visible_lights = new IncrementalDeltaSet();
+        this.__visible_lights = new IncrementalDeltaSet(invokeObjectCompare);
+        /**
+         *
+         * @type {PointLightData[]}
+         * @private
+         */
+        this.__sorted_visible_lights = [];
 
         /**
          *
@@ -520,10 +529,18 @@ export class LightManager {
      * @private
      */
     __sort_visible_light() {
-        this.__visible_lights.sort(
-            this.__sort_visible_light_score,
-            this
-        );
+        const sorted_lights = this.__sorted_visible_lights;
+        const visible_light_set = this.__visible_lights;
+        const visible_light_count = visible_light_set.size;
+
+        if (sorted_lights.length > visible_light_count) {
+            // crop array if it's too big
+            sorted_lights.splice(visible_light_count, sorted_lights.length - visible_light_count)
+        }
+
+        array_copy(visible_light_set.elements, 0, sorted_lights, 0, visible_light_count);
+
+        arrayQuickSort(sorted_lights, this.__sort_visible_light_score, this, 0, visible_light_count - 1);
     }
 
     __update_visible_bvh() {
@@ -615,7 +632,7 @@ export class LightManager {
          *
          * @type {PointLightData[]}
          */
-        const visible_lights = this.__visible_lights.elements;
+        const visible_lights = this.__sorted_visible_lights;
 
         // write light data into texture
         const visible_light_count = visible_lights.length;

package/engine/graphics/render/forward_plus/PointLightData.js

@@ -21,6 +21,15 @@ export class PointLightData {
         this.bvh_leaf_main = new LeafNode(this, 0, 0, 0, 0, 0, 0);
     }
 
+    /**
+     *
+     * @param {PointLightData} other
+     * @returns {number}
+     */
+    compare(other) {
+        return this.light.compare(other.light);
+    }
+
     update() {
 
         const leaf = this.bvh_leaf_main;

package/engine/graphics/render/forward_plus/model/AbstractLight.js

@@ -1,4 +1,9 @@
+let id_counter = 0;
+
 export class AbstractLight {
+    constructor() {
+        this.id = id_counter++;
+    }
 
     /**
      *
@@ -47,4 +52,15 @@ export class AbstractLight {
     toArray(destination, address) {
         throw new Error('Not Implemented');
     }
+
+    /**
+     *
+     * @param {AbstractLight} other
+     * @returns {number}
+     */
+    compare(other) {
+        return this.id - other.id;
+    }
 }
+
+AbstractLight.prototype.type = 'Abstract';

package/engine/graphics/render/layers/RenderLayer.js

@@ -12,6 +12,7 @@ import { ThreeFrustumsIntersectionBVHVisitor } from "../../../../core/bvh2/trave
 import { traverseBinaryNodeUsingVisitor } from "../../../../core/bvh2/traversal/traverseBinaryNodeUsingVisitor.js";
 import { ThreeClippingPlaneComputingBVHVisitor } from "../../../../core/bvh2/traversal/ThreeClippingPlaneComputingBVHVisitor.js";
 import { RenderLayerState } from "./RenderLayerState.js";
+import { compare_three_objects } from "../../three/compare_three_objects.js";
 
 
 class VisibleLeafCollector extends BVHVisitor {
@@ -109,9 +110,9 @@ export class RenderLayer {
 
         /**
          * Contains visible elements across all views, if element is in at least one view - it will be here
-         * @type {IncrementalDeltaSet<Object3D>}
+         * @type {IncrementalDeltaSet<THREE.Object3D>}
          */
-        this.visibleSet = new IncrementalDeltaSet();
+        this.visibleSet = new IncrementalDeltaSet(compare_three_objects);
 
         /**
          *

package/engine/graphics/render/view/CameraView.js

@@ -5,6 +5,7 @@ import { frustumFromCamera } from "../../ecs/camera/CameraSystem.js";
 import { Frustum } from "three";
 import { read_frustum_planes_to_array } from "../forward_plus/cluster/read_frustum_planes_to_array.js";
 import Signal from "../../../../core/events/signal/Signal.js";
+import { compare_three_objects } from "../../three/compare_three_objects.js";
 
 const DEFAULT_FLAGS = CameraViewFlags.Active
     | CameraViewFlags.AdaptivePlaneNear
@@ -52,7 +53,7 @@ export class CameraView {
          *
          * @type {IncrementalDeltaSet<THREE.Object3D>}
          */
-        this.visible_objects = new IncrementalDeltaSet();
+        this.visible_objects = new IncrementalDeltaSet(compare_three_objects);
 
         /**
          *

package/engine/graphics/render/visibility/IncrementalDeltaSet.d.ts

@@ -3,6 +3,8 @@ export class IncrementalDeltaSet<T> {
     version: number
     size: number
 
+    constructor(compare: (a: T, b: T) => number)
+
     contains(element: T): boolean
 
     push(element: T): void
@@ -14,6 +16,4 @@ export class IncrementalDeltaSet<T> {
     initializeUpdate(): void
 
     finalizeUpdate(): void
-
-    sort(f: (T) => number, ctx?: any): void
 }

package/engine/graphics/render/visibility/IncrementalDeltaSet.js

@@ -2,7 +2,7 @@ import { BitSet } from "../../../../core/binary/BitSet.js";
 import Signal from "../../../../core/events/signal/Signal.js";
 import { assert } from "../../../../core/assert.js";
 import { IllegalStateException } from "../../../../core/fsm/exceptions/IllegalStateException.js";
-import { arrayQuickSort } from "../../../../core/collection/array/arrayQuickSort.js";
+import { binarySearchHighIndex } from "../../../../core/collection/array/binarySearchHighIndex.js";
 
 /**
  * @readonly
@@ -16,15 +16,30 @@ const IncrementalDeltaSetState = {
 
 /**
  * accelerated Set data structure optimized for incremental re-building
+ * Always sorted
  * @template V
  */
 export class IncrementalDeltaSet {
-    constructor() {
+    /**
+     *
+     * @param {function(V,V):number} compare stable comparator
+     */
+    constructor(compare) {
+        assert.isFunction(compare, 'compare');
+
         /**
          *
          * @type {V[]}
+         * @private
          */
-        this.elements = [];
+        this.__elements = [];
+
+        /**
+         *
+         * @type {function(V, V): number}
+         * @private
+         */
+        this.__compare = compare;
 
         /**
          * Current version of the state, each time the set is updated - version changes
@@ -69,15 +84,39 @@ export class IncrementalDeltaSet {
         this.state = IncrementalDeltaSetState.Clear;
     }
 
+    /**
+     *
+     * @return {V[]}
+     */
+    get elements() {
+        return this.__elements;
+    }
 
     /**
      *
+     * @param {(V)=>any} visitor
+     * @param {*} [visitorContext]
+     */
+    forEach(visitor, visitorContext) {
+        const n = this.size;
+        const elements = this.__elements;
+
+        for (let i = 0; i < n; i++) {
+            const el = elements[i];
+
+            visitor.call(visitorContext, el);
+        }
+    }
+
+
+    /**
+     * @deprecated
      * @param {function(T):number} score_function
      * @param {*} [score_context]
      * @returns {void}
      */
     sort(score_function, score_context) {
-        arrayQuickSort(this.elements, score_function, score_context, 0, this.size - 1);
+        throw new Error('Deprecated, the set is always sorted');
     }
 
     /**
@@ -86,7 +125,33 @@ export class IncrementalDeltaSet {
      * @returns {boolean}
      */
     contains(element) {
-        return this.elements.indexOf(element) !== -1;
+        return this.__indexOf(element) !== -1;
+    }
+
+    /**
+     *
+     * @param {V} element
+     * @return {number}
+     * @private
+     */
+    __indexOf(element) {
+        const i = this.__indexExpected(element);
+
+        if (this.__elements[i] === element) {
+            return i;
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     *
+     * @param {V} element
+     * @return {number}
+     * @private
+     */
+    __indexExpected(element) {
+        return binarySearchHighIndex(this.__elements, element, this.__compare, 0, this.size - 1);
     }
 
     /**
@@ -99,10 +164,10 @@ export class IncrementalDeltaSet {
             throw new IllegalStateException("Cannot remove during build");
         }
 
-        const i = this.elements.indexOf(element, 0);
+        const i = this.__indexOf(element);
 
         if (i !== -1) {
-            this.elements.splice(i, 1);
+            this.__elements.splice(i, 1);
             this.size--;
 
             this.version++;
@@ -119,7 +184,7 @@ export class IncrementalDeltaSet {
             return;
         }
 
-        this.elements.splice(0, this.size);
+        this.__elements.splice(0, this.size);
         this.size = 0;
         this.flags.reset();
 
@@ -153,14 +218,17 @@ export class IncrementalDeltaSet {
         let deletions = 0;
 
         //go through all dirty flags and remove corresponding elements
+        const flags = this.flags;
+        const elements = this.__elements;
+
         for (
-            let i = this.flags.nextSetBit(0);
+            let i = flags.nextSetBit(0);
             i !== -1;
-            i = this.flags.nextSetBit(i + 1)
+            i = flags.nextSetBit(i + 1)
         ) {
             const index = i - deletions;
 
-            const removed = this.elements.splice(index, 1);
+            const removed = elements.splice(index, 1);
 
             this.onRemoved.send1(removed[0]);
 
@@ -170,7 +238,7 @@ export class IncrementalDeltaSet {
         //update size
         this.size -= deletions;
 
-        this.flags.reset();
+        flags.reset();
 
         this.state = IncrementalDeltaSetState.Ready;
 
@@ -184,19 +252,26 @@ export class IncrementalDeltaSet {
      */
     push(element) {
         //check if element is already in the set
-        const elements = this.elements;
-        const i = elements.indexOf(element); //TODO this can probably be done faster. Maybe use a bloom filter? or some kind of a hash
+        const index = this.__indexExpected(element);
 
-        if (i === -1) {
-            elements.push(element);
+        const elements = this.__elements;
+
+        if (elements[index] !== element) {
+            // element is not in the set
+
+            // shift flags to make space for it
+            this.flags.shift(1, index, this.size);
+
+            // insert
+            elements.splice(index, 0, element);
             this.size++;
 
             this.onAdded.send1(element);
-        } else {
-            //Existing element. We're keeping it. clear dirty flag
-            this.flags.clear(i);
         }
 
+        // clear flag for inserted element
+        this.flags.clear(index);
+
     }
 
     /**
@@ -204,7 +279,7 @@ export class IncrementalDeltaSet {
      * @param {IncrementalDeltaSet<V>} other
      */
     pushOther(other) {
-        const elements = other.elements;
+        const elements = other.__elements;
         const n = other.size;
         for (let i = 0; i < n; i++) {
             const el = elements[i];

package/engine/graphics/render/visibility/IncrementalDeltaSet.spec.js

@@ -0,0 +1,46 @@
+import { IncrementalDeltaSet } from "./IncrementalDeltaSet.js";
+import { compareNumbersAscending } from "../../../../core/function/Functions.js";
+
+test('set is sorted after insert, push 1,2', () => {
+    const set = new IncrementalDeltaSet(compareNumbersAscending);
+
+    set.push(1);
+    set.push(2);
+
+    expect(set.elements[0]).toBe(1);
+    expect(set.elements[1]).toBe(2);
+});
+
+test('set is sorted after insert, push 2,1', () => {
+    const set = new IncrementalDeltaSet(compareNumbersAscending);
+
+    set.push(2);
+    set.push(1);
+
+    expect(set.elements[0]).toBe(1);
+    expect(set.elements[1]).toBe(2);
+});
+
+test('set is sorted after insert, push 1,2,3', () => {
+    const set = new IncrementalDeltaSet(compareNumbersAscending);
+
+    set.push(1);
+    set.push(2);
+    set.push(3);
+
+    expect(set.elements[0]).toBe(1);
+    expect(set.elements[1]).toBe(2);
+    expect(set.elements[2]).toBe(3);
+});
+
+test('set is sorted after insert, push 3,2,1', () => {
+    const set = new IncrementalDeltaSet(compareNumbersAscending);
+
+    set.push(3);
+    set.push(2);
+    set.push(1);
+
+    expect(set.elements[0]).toBe(1);
+    expect(set.elements[1]).toBe(2);
+    expect(set.elements[2]).toBe(3);
+});

package/engine/graphics/three/compare_three_objects.js

@@ -0,0 +1,8 @@
+/**
+ *
+ * @param {THREE.Object3D} a
+ * @param {THREE.Object3D} b
+ */
+export function compare_three_objects(a, b) {
+    return a.id - b.id;
+}

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

@@ -16,6 +16,8 @@ import { objectKeyByValue } from "../../../../core/model/object/objectKeyByValue
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
+import { compareStrings } from "../../../../core/primitives/strings/compareStrings.js";
+import { compareNumbers } from "../../../../core/primitives/numbers/compareNumbers.js";
 
 /**
  * Convert decibel to percentage volume
@@ -127,6 +129,63 @@ export class SoundEmitter {
 
     }
 
+    /**
+     *
+     * @param {SoundEmitter} other
+     * @returns number
+     */
+    compare(other) {
+        const tracks = this.tracks.compare(other.tracks);
+
+        if (tracks !== 0) {
+            return tracks;
+        }
+
+        const channel = compareStrings(this.channel, other.channel);
+
+        if (channel !== 0) {
+            return channel;
+        }
+
+        const distanceMin = compareNumbers(this.__distanceMin, other.__distanceMin);
+
+        if (distanceMin !== 0) {
+            return distanceMin;
+        }
+        const distanceMax = compareNumbers(this.__distanceMax, other.__distanceMax);
+
+        if (distanceMax !== 0) {
+            return distanceMax;
+        }
+
+        const panningModel = compareNumbers(this.panningModel, other.panningModel);
+
+        if (panningModel !== 0) {
+            return panningModel;
+        }
+
+        const attenuation = compareNumbers(this.attenuation, other.attenuation);
+
+        if (attenuation !== 0) {
+            return attenuation;
+        }
+
+        const flags = compareNumbers(this.flags, other.flags);
+
+        if (flags !== 0) {
+            return flags;
+        }
+
+        const volume = compareNumbers(this.volume.getValue(), other.volume.getValue());
+
+        if (volume !== 0) {
+            return volume;
+        }
+
+
+        return 0;
+    }
+
 
     /**
      *

package/engine/sound/ecs/emitter/SoundEmitterComponentContext.js

@@ -45,6 +45,14 @@ export class SoundEmitterComponentContext {
         this.__isConnected = false;
     }
 
+    /**
+     *
+     * @param {SoundEmitterComponentContext} other
+     */
+    compare(other) {
+        return this.emitter.compare(other.emitter);
+    }
+
     update() {
 
         const position = this.transform.position;

package/engine/sound/ecs/emitter/SoundEmitterSystem.js

@@ -18,6 +18,7 @@ import { tryRotateSingleNode } from "../../../../core/bvh2/transform/RotationOpt
 import { SoundEmitterComponentContext } from "./SoundEmitterComponentContext.js";
 import { SoundEmitterFlags } from "./SoundEmitterFlags.js";
 import { SoundEmitterChannel } from "./SoundEmitterChannel.js";
+import { invokeObjectCompare } from "../../../../core/model/object/invokeObjectCompare.js";
 
 /**
  * @readonly
@@ -96,7 +97,7 @@ export class SoundEmitterSystem extends System {
          *
          * @type {IncrementalDeltaSet<SoundEmitterComponentContext>}
          */
-        this.activeSet = new IncrementalDeltaSet();
+        this.activeSet = new IncrementalDeltaSet(invokeObjectCompare);
 
         /**
          * Spatial index

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

@@ -4,6 +4,8 @@ import { assert } from "../../../../core/assert.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
+import { compareStrings } from "../../../../core/primitives/strings/compareStrings.js";
+import { compareNumbers } from "../../../../core/primitives/numbers/compareNumbers.js";
 
 const DEFAULT_FLAGS = SoundTrackFlags.StartWhenReady;
 
@@ -55,6 +57,45 @@ export class SoundTrack {
         this.nodes = null;
     }
 
+    /**
+     *
+     * @param {SoundTrack} other
+     * @returns number
+     */
+    compare(other) {
+        const url = compareStrings(this.url, other.url);
+
+        if (url !== 0) {
+            return url;
+        }
+
+        const time = compareNumbers(this.time, other.time);
+
+        if (time !== 0) {
+            return time;
+        }
+
+        const channel = compareStrings(this.channel, other.channel);
+
+        if (channel !== 0) {
+            return channel;
+        }
+
+        const volume = compareNumbers(this.__volume, other.__volume);
+
+        if (volume !== 0) {
+            return volume;
+        }
+
+        const flags = compareNumbers(this.flags, other.flags);
+
+        if (flags !== 0) {
+            return flags;
+        }
+
+        return 0;
+    }
+
     /**
      *
      * @param {number|SoundEmitterFlags} flag

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.34.21",
+  "version": "2.34.23",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",