@woosh/meep-engine 2.35.9 → 2.35.13

package/engine/graphics/micron/render/v1/VGThreeRenderer.js

@@ -1,11 +1,8 @@
-import { VirtualGeometryBuilder } from "../VirtualGeometryBuilder.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
-import { VirtualGeometry } from "../../format/VirtualGeometry.js";
 import { MaterialContext } from "./MaterialContext.js";
-import { MaterialVertexSpec } from "./MaterialVertexSpec.js";
-import { HashMap } from "../../../../../core/collection/HashMap.js";
-import Signal from "../../../../../core/events/signal/Signal.js";
 import { array_copy } from "../../../../../core/collection/array/copyArray.js";
+import { MicronRenderContext } from "./MicronRenderContext.js";
+import { MaterialVertexSpec, MaterialVertexSpecFlags } from "./MaterialVertexSpec.js";
 
 /**
  *
@@ -15,23 +12,6 @@ const scratch_mvc = new MaterialVertexSpec();
 
 export class VGThreeRenderer {
     constructor() {
-        this.geometry = new VirtualGeometry();
-
-        this.builder = new VirtualGeometryBuilder();
-
-        /**
-         *
-         * @type {Map<MaterialVertexSpec, MaterialContext>}
-         */
-        this.material_contexts = new HashMap();
-
-        /**
-         *
-         * @type {MaterialContext[]}
-         * @private
-         */
-        this.__contexts_array = [];
-
         /**
          *
          * @type {Object3D[]}
@@ -39,82 +19,51 @@ export class VGThreeRenderer {
          */
         this.__inputs = [];
 
+        this.ctx = new MicronRenderContext();
+
         this.on = {
             /**
              * @type {Signal<MaterialContext>}
              */
-            contextAdded: new Signal()
+            contextAdded: this.ctx.on.contextAdded
         };
     }
 
+    get geometry() {
+        return this.ctx.geometry;
+    }
+
     /**
      * Enable/disable wireframe rendering
      * @param {boolean} x
      */
     set wireframe(x) {
-        this.material_contexts.forEach((ctx, mv) => {
-
-
-            ctx.compiled_material.wireframe = x;
-
-        });
+        this.ctx.wireframe = x;
     }
 
-    /**
-     *
-     * @param {VertexDataSpec} spec
-     * @param {Material} m
-     * @returns {MaterialContext}
-     * @private
-     */
-    __obtain_material(spec, m) {
-        scratch_mvc.material = m;
-        scratch_mvc.spec = spec;
-
-        const existing = this.material_contexts.get(scratch_mvc);
-
-        if (existing !== undefined) {
-            return existing;
-        }
-
-        // create a separate instance to be stored alongside the context
-        const key = scratch_mvc.clone();
-
-        const ctx = new MaterialContext(spec, m);
-
-        ctx.init();
-
-        this.material_contexts.set(key, ctx);
-        this.__contexts_array.push(ctx);
-
-        this.on.contextAdded.send1(ctx);
-
-        return ctx;
-    }
-
-
     /**
      *
      * @param {THREE.Scene} scene
      */
     attach(scene) {
         this.__inputs.push(scene);
-        this.builder.appendToScene([scene]);
+        this.ctx.builder.appendToScene([scene]);
     }
 
     attachMany(objects) {
         array_copy(objects, 0, this.__inputs, this.__inputs.length, objects.length);
-        this.builder.appendToScene(objects);
+        this.ctx.builder.appendToScene(objects);
     }
 
     clear() {
         this.__inputs = [];
-        this.builder.clearScene();
+        this.ctx.builder.clearScene();
     }
 
     __prepare_contexts() {
         // clear contexts
-        const contexts = this.__contexts_array;
+        const render_context = this.ctx;
+        const contexts = render_context.__contexts_array;
         const context_count = contexts.length;
 
         for (let i = 0; i < context_count; i++) {
@@ -131,7 +80,12 @@ export class VGThreeRenderer {
                  */
                 const m = o;
 
-                const ctx = this.__obtain_material(m.geometry.vertex_spec, m.material);
+                scratch_mvc.material = m.material;
+                scratch_mvc.spec = m.geometry.vertex_spec;
+                scratch_mvc.writeFlag(MaterialVertexSpecFlags.CastShadow, m.castShadow);
+                scratch_mvc.writeFlag(MaterialVertexSpecFlags.ReceiveShadow, m.receiveShadow);
+
+                const ctx = render_context.obtain_material(scratch_mvc);
 
                 ctx.instances.add(o.instance_id);
             }
@@ -149,54 +103,7 @@ export class VGThreeRenderer {
     }
 
     render() {
-        const contexts = this.__contexts_array;
-        const context_count = contexts.length;
-
-        /**
-         *
-         * @type {Map<number, MaterialContext>}
-         */
-        const instance_to_ctx = new Map();
-
-        for (let i = 0; i < context_count; i++) {
-            const ctx = contexts[i];
-            ctx.__patch_count = 0;
-
-            for (const instance of ctx.instances) {
-                instance_to_ctx.set(instance, ctx);
-            }
-        }
-
-        // sort patches into relevant contexts
-        const geometry = this.geometry;
-        const patch_count = geometry.patch_count;
-        const patches = geometry.patches;
-
-        for (let i = 0; i < patch_count; i++) {
-            const i3 = i * 3;
-
-            const instance_id = patches[i3];
-            const geometry_id = patches[i3 + 1];
-            const patch_id = patches[i3 + 2];
-
-            const ctx = instance_to_ctx.get(instance_id);
-
-            const target_address = ctx.__patch_count * 3;
-            ctx.__patch_count++;
-
-            const ctx_patches = ctx.__patches;
-
-            ctx_patches[target_address] = instance_id;
-            ctx_patches[target_address + 1] = geometry_id;
-            ctx_patches[target_address + 2] = patch_id;
-        }
-
-        // build each context
-        for (let i = 0; i < context_count; i++) {
-            const ctx = contexts[i];
-
-            ctx.build(this.geometry);
-        }
+        this.ctx.render();
     }
 
 
@@ -224,11 +131,11 @@ export class VGThreeRenderer {
             pixelRatio = renderer.getPixelRatio();
         }
 
-        const vg_builder = this.builder;
+        const vg_builder = this.ctx.builder;
 
         vg_builder.resolution.set(resolution.x * pixelRatio, resolution.y * pixelRatio);
         vg_builder.setMatricesFromCamera(camera);
-        vg_builder.setOutput(this.geometry);
+        vg_builder.setOutput(this.ctx.geometry);
 
         vg_builder.build();
     }

package/engine/navigation/ecs/components/Path.js

@@ -436,7 +436,7 @@ class Path {
      */
     sample_linear(result, offset) {
 
-        const found = this.__find_index_and_normalized_distance(scratch_array_0, offset);
+        const found = this.find_index_and_normalized_distance(scratch_array_0, offset);
 
         if (!found) {
             return false;
@@ -466,9 +466,8 @@ class Path {
      * @param {number[]} result
      * @param {number} absolute_distance absolute distance along the path
      * @returns {boolean}
-     * @private
      */
-    __find_index_and_normalized_distance(result, absolute_distance) {
+    find_index_and_normalized_distance(result, absolute_distance) {
         const pointCount = this.getPointCount();
 
         if (pointCount === 0) {
@@ -495,10 +494,10 @@ class Path {
                 // we found v1
                 const local_offset = absolute_distance - cursor;
 
-                const local_normalize_offset = local_offset / distance;
+                const local_normalized_offset = local_offset / distance;
 
                 result[0] = i - 1;
-                result[1] = local_normalize_offset;
+                result[1] = local_normalized_offset;
                 return true;
             }
 
@@ -525,7 +524,7 @@ class Path {
      * @returns {boolean}
      */
     sample_catmull_rom(result, offset) {
-        const found = this.__find_index_and_normalized_distance(scratch_array_0, offset);
+        const found = this.find_index_and_normalized_distance(scratch_array_0, offset);
 
         if (!found) {
             return false;

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