@woosh/meep-engine 2.36.12 → 2.36.15

package/core/binary/BitSet.js

@@ -510,6 +510,36 @@ BitSet.prototype.getAndClear = function (index) {
     return v;
 };
 
+/**
+ *
+ * @param {number} distance
+ * @param {number} start_index
+ * @param {number} end_index
+ */
+BitSet.prototype.shift_right = function (distance, start_index, end_index) {
+    assert.isNonNegativeInteger(distance, 'distance');
+
+    for (let i = end_index; i >= start_index; i--) {
+        const v = this.get(i);
+        this.set(i + distance, v);
+    }
+}
+
+/**
+ *
+ * @param {number} distance
+ * @param {number} start_index
+ * @param {number} end_index
+ */
+BitSet.prototype.shift_left = function (distance, start_index, end_index) {
+    assert.isNonNegativeInteger(distance, 'distance');
+
+    for (let i = start_index; i <= end_index; i++) {
+        const v = this.get(i);
+        this.set(i - distance, v);
+    }
+}
+
 /**
  *
  * @param {number} distance
@@ -518,15 +548,9 @@ BitSet.prototype.getAndClear = function (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);
-        }
+        this.shift_right(distance, start_index, end_index);
     } else {
-        for (let i = start_index; i <= end_index; i++) {
-            const v = this.get(i);
-            this.set(i + distance, v);
-        }
+        this.shift_right(-distance, start_index, end_index);
     }
 };
 

package/core/binary/BitSet.spec.js

@@ -452,3 +452,15 @@ test('performance, next clear from 0', () => {
         const v = s.nextClearBit(0);
     }
 });
+
+
+test('shift right by 1', () => {
+    const s = new BitSet();
+
+    s.set(0, true);
+
+    s.shift_right(1, 0, 1);
+
+    expect(s.get(0)).toBe(true);
+    expect(s.get(1)).toBe(true);
+});

package/engine/graphics/ecs/highlight/Highlight.d.ts

@@ -11,4 +11,6 @@ export default class Highlight {
     fromJSON(j: any): void
 
     toJSON(): any
+
+    static fromOne(r: number, g: number, b: number, a?: number): Highlight
 }

package/engine/graphics/ecs/mesh-v2/aggregate/SGMeshHighlightSystem.d.ts

@@ -0,0 +1,7 @@
+import {System} from "../../../../ecs/System";
+import {SGMesh} from "./SGMesh";
+import Highlight from "../../highlight/Highlight";
+
+export class SGMeshHighlightSystem extends System<SGMesh, Highlight> {
+    constructor()
+}

package/engine/graphics/ecs/mesh-v2/aggregate/SGMeshHighlightSystem.js

@@ -0,0 +1,81 @@
+import { System } from "../../../../ecs/System.js";
+import { SGMesh } from "./SGMesh.js";
+import Highlight from "../../highlight/Highlight.js";
+import { SGMeshEvents } from "./SGMeshEvents.js";
+
+export class SGMeshHighlightSystem extends System {
+    constructor() {
+        super();
+
+        this.dependencies = [Highlight, SGMesh];
+    }
+
+    /**
+     *
+     * @param event
+     * @param {number} entity
+     * @private
+     */
+    __apply_highlight( event, entity) {
+        const ecd = this.entityManager.dataset;
+
+        const sg_mesh = ecd.getComponent(entity, SGMesh);
+        const highlight = ecd.getComponent(entity, Highlight);
+
+        const node = sg_mesh.__node;
+
+        node.traverse(t => {
+            t.entity.add(highlight);
+        });
+    }
+
+    /**
+     *
+     * @param event
+     * @param {number} entity
+     * @private
+     */
+    __remove_highlight( event, entity) {
+
+        const ecd = this.entityManager.dataset;
+
+        const sg_mesh = ecd.getComponent(entity, SGMesh);
+
+        const node = sg_mesh.__node;
+
+        node.traverse(t => {
+            t.entity.removeComponent(Highlight);
+        });
+    }
+
+    /**
+     *
+     * @param {Highlight} highlight
+     * @param {SGMesh} mesh
+     * @param {number} entity
+     */
+    link(highlight, mesh, entity) {
+        if (mesh.__node !== null) {
+            this.__apply_highlight(undefined,  entity);
+        }
+
+        const ecd = this.entityManager.dataset;
+
+        ecd.addEntityEventListener(entity, SGMeshEvents.AssetLoaded, this.__apply_highlight, this);
+    }
+
+    /**
+     *
+     * @param {Highlight} highlight
+     * @param {SGMesh} mesh
+     * @param {number} entity
+     */
+    unlink(highlight, mesh, entity) {
+        const ecd = this.entityManager.dataset;
+        ecd.removeEntityEventListener(entity, SGMeshEvents.AssetLoaded, this.__apply_highlight, this);
+
+        if (mesh.__node !== null) {
+            this.__remove_highlight(undefined, entity);
+        }
+    }
+}

package/engine/graphics/ecs/mesh-v2/aggregate/SGMeshSystem.js

@@ -6,6 +6,7 @@ import { three_object_to_entity_composition } from "../three_object_to_entity_co
 import { ShadedGeometry } from "../ShadedGeometry.js";
 import { ShadedGeometryFlags } from "../ShadedGeometryFlags.js";
 import { SGMeshEvents } from "./SGMeshEvents.js";
+import { ParentEntity } from "../../../../ecs/parent/ParentEntity.js";
 
 
 /**
@@ -77,6 +78,9 @@ export class SGMeshSystem extends System {
 
         const entity_node = three_object_to_entity_composition(asset.create());
 
+        // attach parent entity to link hierarchy to this entity
+        entity_node.entity.add(ParentEntity.from(entity));
+
         mesh.__node = entity_node;
 
         entity_node.transform.copy(transform);

package/engine/graphics/ecs/mesh-v2/aggregate/prototypeSGMesh.js

@@ -12,6 +12,9 @@ import { TransformAttachmentSystem } from "../../../../ecs/transform-attachment/
 import { SGMeshEvents } from "./SGMeshEvents.js";
 import { ShadedGeometry } from "../ShadedGeometry.js";
 import { MeshSystem } from "../../mesh/MeshSystem.js";
+import { SGMeshHighlightSystem } from "./SGMeshHighlightSystem.js";
+import Highlight from "../../highlight/Highlight.js";
+import { ShadedGeometryHighlightSystem } from "../../highlight/system/ShadedGeometryHighlightSystem.js";
 
 new EngineHarness().initialize({
     configuration(config, engine) {
@@ -20,7 +23,9 @@ new EngineHarness().initialize({
             new SGMeshSystem(engine),
             new BehaviorSystem(engine),
             new MeshSystem(engine),
-            new TransformAttachmentSystem()
+            new TransformAttachmentSystem(),
+            new SGMeshHighlightSystem(),
+            new ShadedGeometryHighlightSystem(engine)
         );
 
         config.addLoader(GameAssetType.ModelGLTF_JSON, new GLTFAssetLoader());
@@ -46,12 +51,13 @@ function main(engine) {
         .add(Transform.fromJSON({
             position: new Vector3(10, 0, 10)
         }))
+        .add(Highlight.fromOne(1, 0, 0, 1))
         .add(mesh)
-     /*   .add(BehaviorComponent.fromOne(OrbitingBehavior.from({
-            center: new Vector3(10, 0, 10),
-            radius: 5,
-            rate: 2
-        })))*/
+        /*   .add(BehaviorComponent.fromOne(OrbitingBehavior.from({
+               center: new Vector3(10, 0, 10),
+               radius: 5,
+               rate: 2
+           })))*/
         .addEventListener(SGMeshEvents.AssetLoaded, () => {
             mesh.__node.traverse(n => {
                 /**

package/engine/graphics/ecs/mesh-v2/three_object_to_entity_composition.js

@@ -10,7 +10,12 @@ import { ShadedGeometry } from "./ShadedGeometry.js";
 export function three_object_to_entity_composition(root) {
     const node = new EntityNode();
 
-    node.transform.fromMatrix4(root.matrix.elements);
+    const node_transform = node.transform;
+
+    // copy object transform
+    node_transform.position.copy(root.position);
+    node_transform.scale.copy(root.scale);
+    node_transform.rotation.copy(root.quaternion);
 
     const entity = node.entity;
 

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

@@ -265,7 +265,7 @@ export class IncrementalDeltaSet {
             // element is not in the set
 
             // shift flags to make space for it
-            flags.shift(1, index, existing_size);
+            flags.shift_right(1, index, existing_size);
 
             // insert
             elements.splice(index, 0, element);

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.36.12",
+  "version": "2.36.15",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",