@woosh/meep-engine 2.36.25 → 2.36.28

package/engine/graphics/ecs/highlight/renderer/OutlineRenderer.js

@@ -82,8 +82,6 @@ function makeIdMaterialStatic() {
     });
 }
 
-const material_id_unskinned = makeIdMaterialStatic();
-
 /**
  *
  * @type {WeakMap<Object3D, Object3D>}
@@ -185,13 +183,6 @@ export class OutlineRenderer {
          */
         this.scene = null;
 
-        /**
-         *
-         * @type {HighlightRenderGroup}
-         * @private
-         */
-        this.__current_group = null;
-
         /**
          *
          * @type {HashMap<HighlightDefinition>}
@@ -585,10 +576,10 @@ export class OutlineRenderer {
 
         const color = definition.color;
 
-        data[offset + 0] = color.r * 255;
-        data[offset + 1] = color.g * 255;
-        data[offset + 2] = color.b * 255;
-        data[offset + 3] = definition.opacity * 255;
+        data[offset + 0] = Math.round(color.r * 255);
+        data[offset + 1] = Math.round(color.g * 255);
+        data[offset + 2] = Math.round(color.b * 255);
+        data[offset + 3] = Math.round(definition.opacity * 255);
 
         texture.needsUpdate = true;
     }

package/engine/graphics/ecs/light/LightSystem.js

@@ -183,11 +183,10 @@ class LightSystem extends AbstractContextSystem {
     /**
      *
      * @param {Light} light
-     * @param {Transform} transform
      * @param {number} lightEntity
      * @private
      */
-    __visit_entity_to_update_shadow(light, transform, lightEntity) {
+    __visit_entity_to_update_shadow(light, lightEntity) {
         /**
          *
          1) Calculate the 8 corners of the view frustum in world space. This can be done by using the inverse view-projection matrix to transform the 8 corners of the NDC cube (which in OpenGL is [‒1, 1] along each axis).
@@ -250,7 +249,7 @@ class LightSystem extends AbstractContextSystem {
             return false;
         }
 
-        dataset.traverseEntities([Light, Transform], this.__visit_entity_to_update_shadow, this);
+        dataset.traverseComponents(Light, this.__visit_entity_to_update_shadow, this);
 
         //stop further traversal
         return false;

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

@@ -92,7 +92,6 @@ export class ShadedGeometrySystem extends System {
             name: 'ShadedGeometry Draw Method optimizer',
             initializer: () => {
                 optimizer.__system = this;
-                optimizer.__ecd = this.entityManager.dataset
             },
             cycleFunction() {
                 if (optimizer.step()) {

package/engine/graphics/ecs/mesh-v2/render/adapters/AbstractRenderAdapter.js

@@ -27,6 +27,15 @@ export class AbstractRenderAdapter {
         return 0;
     }
 
+    /**
+     * Express intent to draw
+     * @param {ShadedGeometry} sg
+     * @returns {boolean} true if able to draw immediately, false otherwise
+     */
+    intend_draw(sg) {
+        return true;
+    }
+
     /**
      *
      * @param {ShadedGeometry} sg

package/engine/graphics/ecs/mesh-v2/render/adapters/InstancedRendererAdapter.js

@@ -70,7 +70,7 @@ export class InstancedRendererAdapter extends AbstractRenderAdapter {
     }
 
     score(geometry, material, instance_count) {
-        if (instance_count > 64) {
+        if (instance_count > 16) {
             return 1;
         } else if (instance_count < 4) {
             return -1;

package/engine/graphics/ecs/mesh-v2/render/optimization/RuntimeDrawMethodOptimizer.js

@@ -2,12 +2,6 @@ import { ShadedGeometry } from "../../ShadedGeometry.js";
 
 export class RuntimeDrawMethodOptimizer {
     constructor() {
-        /**
-         *
-         * @type {EntityComponentDataset|null}
-         * @private
-         */
-        this.__ecd = null;
 
         /**
          *
@@ -29,7 +23,13 @@ export class RuntimeDrawMethodOptimizer {
      * @returns {boolean} true if a change was made, false otherwise
      */
     step() {
-        const ecd = this.__ecd;
+        const system = this.__system;
+
+        if (system === null) {
+            return false;
+        }
+
+        const ecd = system.entityManager.dataset;
 
         if (ecd === null) {
             // no dataset attached
@@ -64,13 +64,13 @@ export class RuntimeDrawMethodOptimizer {
             return false;
         }
 
-        const use_count = this.__system.getGeometryUsageCounters().get(sg.geometry.id);
+        const use_count = system.getGeometryUsageCounters().get(sg.geometry.id);
 
         /**
          *
          * @type {ShadedGeometryRendererContext|undefined}
          */
-        const first_context = this.__system.__view_contexts.values().next().value;
+        const first_context = system.__view_contexts.values().next().value;
 
         if (first_context === undefined) {
             return false;
@@ -102,6 +102,11 @@ export class RuntimeDrawMethodOptimizer {
             return false;
         }
 
+        if (!adapters[best_adapter].intend_draw(sg)) {
+            // unable to draw, don't do anything
+            return false;
+        }
+
         sg.draw_method = best_adapter;
 
         return true;

package/engine/graphics/ecs/mesh-v2/sample/load_gltf.js

@@ -7,6 +7,7 @@ import { three_object_to_entity_composition } from "../three_object_to_entity_co
 import { AttachmentSystem } from "../../../../ecs/attachment/AttachmentSystem.js";
 import { TransformAttachmentSystem } from "../../../../ecs/transform-attachment/TransformAttachmentSystem.js";
 import { Camera } from "../../camera/Camera.js";
+import { MicronRenderPlugin } from "../../../micron/plugin/MicronRenderPlugin.js";
 
 const eh = new EngineHarness();
 
@@ -25,6 +26,8 @@ async function init(harness) {
     config.addSystem(new TransformAttachmentSystem());
     config.addLoader(GameAssetType.ModelGLTF_JSON, new GLTFAssetLoader());
 
+    config.addPlugin( MicronRenderPlugin);
+
     await config.apply(engine);
 
     eh.initialize().then(main);

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

@@ -37,13 +37,6 @@ export class MicronRenderPlugin extends EnginePlugin {
         layer.managed = true;
         layer.renderPass = RenderPassType.Opaque;
 
-        /**
-         *
-         * @type {RenderLayer|null}
-         * @private
-         */
-        this.__micron_render_layer = layer;
-
         this.__vgtr.on.contextAdded.add(ctx => {
             const visibleSet = layer.visibleSet;
 
@@ -54,8 +47,6 @@ export class MicronRenderPlugin extends EnginePlugin {
 
         });
 
-        this.__view_observers = new Map();
-
         /**
          *
          * @type {AsyncRemoteHashMap}
@@ -97,55 +88,6 @@ export class MicronRenderPlugin extends EnginePlugin {
         this.__sg_system = null;
     }
 
-    /**
-     *
-     * @param {THREE.WebGLRenderer} renderer
-     * @param {THREE.Camera} camera
-     * @param {THREE.Object3D[]} elements
-     * @param element_count
-     */
-    render(renderer, camera, elements, element_count = elements.length) {
-        const vgtr = this.__vgtr;
-
-        vgtr.clear();
-
-        vgtr.attachMany(elements, element_count);
-
-        vgtr.update(renderer, camera);
-        vgtr.render();
-    }
-
-    /**
-     *
-     * @param {CameraView} view
-     * @private
-     */
-    __handle_view_added(view) {
-        const observer = () => {
-            const ge = this.engine.graphics;
-
-            this.render(ge.renderer, view.camera, view.visible_objects.elements, view.visible_objects.size);
-        };
-
-        this.__view_observers.set(view, observer);
-
-
-        view.on.preRender.add(observer);
-    }
-
-    /**
-     *
-     * @param {CameraView} view
-     * @private
-     */
-    __handle_view_removed(view) {
-        const observer = this.__view_observers.get(view);
-
-        this.__view_observers.delete(view);
-
-        view.on.preRender.remove(observer);
-    }
-
     /**
      *
      * @param {System} system
@@ -214,20 +156,6 @@ export class MicronRenderPlugin extends EnginePlugin {
         am.registerTransformer("model/gltf", this.__asset_transformer);
         am.registerTransformer("model/gltf+json", this.__asset_transformer);
 
-        /**
-         *
-         * @type {GraphicsEngine}
-         */
-        const ge = engine.graphics;
-
-        ge.layers.add(this.__micron_render_layer);
-
-        ge.views.elements.on.added.add(this.__handle_view_added, this);
-        ge.views.elements.on.removed.add(this.__handle_view_removed, this);
-
-        // link all views
-        ge.views.elements.forEach(this.__handle_view_added, this);
-
         this.__persisted_geometry.attach_storage(engine.storage);
 
         engine.entityManager.on.systemAdded.add(this.__handle_system_added, this);
@@ -250,16 +178,6 @@ export class MicronRenderPlugin extends EnginePlugin {
 
         this.__asset_transformer.assetManager = null;
 
-        const ge = engine.graphics;
-
-        ge.layers.remove(this.__micron_render_layer);
-
-        ge.views.elements.on.added.remove(this.__handle_view_added, this);
-        ge.views.elements.on.removed.remove(this.__handle_view_removed, this);
-
-        // clear all observer
-        ge.views.elements.forEach(this.__handle_view_removed, this);
-
         engine.entityManager.on.systemAdded.remove(this.__handle_system_added, this);
         engine.entityManager.on.systemRemoved.remove(this.__handle_system_removed, this);
 

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

@@ -56,13 +56,22 @@ export class MicronShadedGeometryRenderAdapter extends AbstractRenderAdapter {
         return inverseLerp(MICRON_POLYCOUNT_THRESHOLD_MIN, MICRON_POLYCOUNT_THRESHOLD_MAX, polycount);
     }
 
-    add(sg) {
-
+    /**
+     *
+     * @param {ShadedGeometry} sg
+     * @returns {MicronGeometry}
+     * @private
+     */
+    __obtain_micron_geometry(sg) {
         const geometry_id = sg.geometry.id;
 
         const micron_geometry = this.__geometry_map.get(geometry_id);
 
-        if (micron_geometry === undefined) {
+        if (micron_geometry !== undefined) {
+
+            return micron_geometry;
+
+        } else {
             // no micron geometry
             if (!this.__geometry_building_promises.has(geometry_id)) {
                 const p = buildMicronGeometryFromBufferGeometry(sg.geometry);
@@ -71,6 +80,20 @@ export class MicronShadedGeometryRenderAdapter extends AbstractRenderAdapter {
 
                 p.then(mg => this.__geometry_map.set(geometry_id, mg));
             }
+            return undefined;
+        }
+
+    }
+
+    intend_draw(sg) {
+        return this.__obtain_micron_geometry(sg) !== undefined;
+    }
+
+    add(sg) {
+        const micron_geometry = this.__obtain_micron_geometry(sg);
+
+        if (micron_geometry === undefined) {
+            // no micron geometry
             return;
         }
 
@@ -94,6 +117,8 @@ export class MicronShadedGeometryRenderAdapter extends AbstractRenderAdapter {
      * @param {CameraView} view
      */
     build_start(renderer, view) {
+        this.__object_count = 0;
+
         const resolution = new Vector2();
         let pixelRatio = 1;
 

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