@woosh/meep-engine 2.37.7 → 2.37.10

package/core/collection/map/CachedAsyncMap.js

@@ -20,6 +20,8 @@ export class CachedAsyncMap extends AbstractAsyncMap {
             return volatile_value;
         }
 
+        // TODO re-insert into volatile if persisted has a hit
+
         return await this.__persisted.get(key);
     }
 

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

@@ -68,15 +68,6 @@ export class ShadedGeometry {
          */
         this.__c_transform = null;
 
-        /**
-         * Transform matrix
-         * Transient, assigned in the system
-         * @type {number[]|null}
-         * @readonly
-         * @private
-         */
-        this.__transform = allocate_transform_m4();
-
         /**
          *
          * @type {DrawMode|number}

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

@@ -8,13 +8,14 @@ import { ShadedGeometryFlags } from "../ShadedGeometryFlags.js";
 import { SGMeshEvents } from "./SGMeshEvents.js";
 import { ParentEntity } from "../../../../ecs/parent/ParentEntity.js";
 import { EntityNode } from "../../../../ecs/parent/EntityNode.js";
+import { min2 } from "../../../../../core/math/min2.js";
 
 
 /**
  * @readonly
  * @type {number}
  */
-const CYCLE_COUNT = 128;
+const MAX_CYCLE_COUNT = 128;
 
 export class SGMeshSystem extends System {
     /**
@@ -98,31 +99,23 @@ export class SGMeshSystem extends System {
 
         mesh.__node = entity_node;
 
-        entity_node.transform.copy(transform);
-
-        entity_node.build(ecd);
-
-        function update_position() {
-            entity_node.transform.position.copy(transform.position);
+        function copy_transform() {
+            entity_node.transform.copy(transform);
         }
 
-        function update_rotation() {
-            entity_node.transform.rotation.copy(transform.rotation);
-        }
+        copy_transform();
 
-        function update_scale() {
-            entity_node.transform.scale.copy(transform.scale);
-        }
+        entity_node.build(ecd);
 
-        transform.position.onChanged.add(update_position);
-        transform.rotation.onChanged.add(update_rotation);
-        transform.scale.onChanged.add(update_scale);
+        transform.position.onChanged.add(copy_transform);
+        transform.rotation.onChanged.add(copy_transform);
+        transform.scale.onChanged.add(copy_transform);
 
         entity_node.on.destroyed.addOne(() => {
 
-            transform.position.onChanged.remove(update_position);
-            transform.rotation.onChanged.remove(update_rotation);
-            transform.scale.onChanged.remove(update_scale);
+            transform.position.onChanged.remove(copy_transform);
+            transform.rotation.onChanged.remove(copy_transform);
+            transform.scale.onChanged.remove(copy_transform);
 
         });
 
@@ -183,6 +176,13 @@ export class SGMeshSystem extends System {
 
     update(time_delta) {
 
+        const entityManager = this.entityManager;
+        const dataset = entityManager.dataset;
+
+        if (dataset === null) {
+            return;
+        }
+
         const waiting = this.__wait_queue;
 
         let l = waiting.length;
@@ -191,17 +191,20 @@ export class SGMeshSystem extends System {
 
             let pointer = this.__wait_queue_process_index;
 
-            const dataset = this.entityManager.dataset;
 
-            for (let i = 0; i < CYCLE_COUNT; i++) {
+            let pointer_limit = pointer + min2(l, MAX_CYCLE_COUNT);
+
+            while (pointer < pointer_limit) {
 
                 const index = pointer % l;
+                pointer++;
 
                 const entity = waiting[index];
 
                 const mesh = dataset.getComponent(entity, SGMesh);
 
                 if (mesh.url === null) {
+                    // no URL yet
                     continue;
                 }
 
@@ -209,10 +212,8 @@ export class SGMeshSystem extends System {
 
                 this.process(entity, mesh, transform);
 
-                waiting.splice(i, 1);
+                waiting.splice(index, 1);
 
-                i--;
-                l--;
             }
 
             this.__wait_queue_process_index = pointer;

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

@@ -15,6 +15,8 @@ import { MeshSystem } from "../../mesh/MeshSystem.js";
 import { SGMeshHighlightSystem } from "./SGMeshHighlightSystem.js";
 import Highlight from "../../highlight/Highlight.js";
 import { ShadedGeometryHighlightSystem } from "../../highlight/system/ShadedGeometryHighlightSystem.js";
+import Quaternion from "../../../../../core/geom/Quaternion.js";
+import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
 
 new EngineHarness().initialize({
     configuration(config, engine) {
@@ -71,5 +73,26 @@ function main(engine) {
                 }
             });
         })
-        .build(ecd);
+    // .build(ecd);
+    const r = seededRandom(1);
+
+    for (let i = 0; i < 10; i++) {
+        for (let j = 0; j < 10; j++) {
+            const quaternion = new Quaternion();
+
+            quaternion.__setFromEuler(0, r() * Math.PI, 0);
+
+            new EntityBuilder()
+                .add(SGMesh.fromURL("data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf"))
+                .add(Transform.fromJSON({
+                    position: {
+                        x: i * 8,
+                        y: 0,
+                        z: j * 8
+                    },
+                    rotation: quaternion
+                }))
+                .build(ecd);
+        }
+    }
 }

package/engine/graphics/micron/plugin/MicronRenderPlugin.js

@@ -49,7 +49,7 @@ export class MicronRenderPlugin extends EnginePlugin {
 
         /**
          *
-         * @type {AsyncRemoteHashMap}
+         * @type {AsyncRemoteHashMap<THREE.BufferGeometry, MicronGeometry>}
          * @private
          */
         this.__persisted_geometry = new AsyncRemoteHashMap({
@@ -60,6 +60,7 @@ export class MicronRenderPlugin extends EnginePlugin {
             storageKeyPrefix: STORAGE_KEY,
 
         });
+
         /**
          *
          * @type {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>}
@@ -109,7 +110,7 @@ export class MicronRenderPlugin extends EnginePlugin {
         const sg_system = system;
 
         sg_system.register_render_adapter(2, () => {
-            const adapter = new MicronShadedGeometryRenderAdapter();
+            const adapter = new MicronShadedGeometryRenderAdapter(this.__cache);
 
             adapter.ctx = this.__vgtr.ctx;
 

package/engine/graphics/micron/plugin/shaded_geometry/MicronShadedGeometryRenderAdapter.js

@@ -1,6 +1,5 @@
 import { AbstractRenderAdapter } from "../../../ecs/mesh-v2/render/adapters/AbstractRenderAdapter.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
-import { buildMicronGeometryFromBufferGeometry } from "../../build/buildMicronGeometryFromBufferGeometry.js";
 import { ShadedGeometryFlags } from "../../../ecs/mesh-v2/ShadedGeometryFlags.js";
 import { MaterialVertexSpec, MaterialVertexSpecFlags } from "../../render/v1/MaterialVertexSpec.js";
 import { compute_geometry_polycount } from "../../../geometry/compute_geometry_polycount.js";
@@ -26,7 +25,11 @@ const MICRON_POLYCOUNT_THRESHOLD_MAX = 10000;
 
 export class MicronShadedGeometryRenderAdapter extends AbstractRenderAdapter {
 
-    constructor() {
+    /**
+     *
+     * @param {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>} cache
+     */
+    constructor(cache) {
         super();
 
         /**
@@ -48,6 +51,13 @@ export class MicronShadedGeometryRenderAdapter extends AbstractRenderAdapter {
          * @private
          */
         this.__geometry_building_promises = new Map();
+
+        /**
+         *
+         * @type {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>}
+         * @private
+         */
+        this.__cache = cache;
     }
 
     score(geometry, material, instance_count) {
@@ -72,9 +82,10 @@ export class MicronShadedGeometryRenderAdapter extends AbstractRenderAdapter {
             return micron_geometry;
 
         } else {
+
             // no micron geometry
             if (!this.__geometry_building_promises.has(geometry_id)) {
-                const p = buildMicronGeometryFromBufferGeometry(sg.geometry);
+                const p = this.__cache.get(sg.geometry);
 
                 this.__geometry_building_promises.set(geometry_id, p);
 

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