@woosh/meep-engine 2.47.32 → 2.47.34

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

@@ -3,43 +3,34 @@ import { HashMap } from "../../../../../../core/collection/HashMap.js";
 import { InstancedMeshGroup } from "../../../../geometry/instancing/InstancedMeshGroup.js";
 import { ShadedGeometryFlags } from "../../ShadedGeometryFlags.js";
 import { StreamDrawUsage } from "three";
+import { SGCacheKey } from "./SGCacheKey.js";
 
 const INSTANCED_EQUALITY_FLAGS = ShadedGeometryFlags.CastShadow
     | ShadedGeometryFlags.ReceiveShadow
 ;
 
+/**
+ * @readonly
+ * @type {SGCacheKey}
+ */
+const scratch_key = new SGCacheKey();
+
 export class InstancedRendererAdapter extends AbstractRenderAdapter {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {HashMap<ShadedGeometry, InstancedMeshGroup>}
-         * @private
-         */
-        this.__instanced_meshes = new HashMap({
-            keyHashFunction(sg) {
-                return sg.geometry.id
-                    ^ sg.material.id
-                    ^ sg.mode
-                    ;
-            },
-            keyEqualityFunction(a, b) {
-                return a.material.id === b.material.id
-                    && a.geometry.id === b.geometry.id
-                    && a.mode === b.mode
-                    && (a.flags & INSTANCED_EQUALITY_FLAGS) === (b.flags & INSTANCED_EQUALITY_FLAGS)
-                    ;
-            }
-        });
 
-        /**
-         *
-         * @type {Set<InstancedMeshGroup>}
-         * @private
-         */
-        this.__active_meshes = new Set();
-    }
+    /**
+     *
+     * @type {HashMap<SGCacheKey, InstancedMeshGroup>}
+     * @private
+     */
+    __instanced_meshes = new HashMap();
+
+    /**
+     *
+     * @type {Set<InstancedMeshGroup>}
+     * @private
+     */
+    __active_meshes = new Set();
+
 
     score(geometry, material, instance_count) {
         if (instance_count > 16) {
@@ -58,7 +49,12 @@ export class InstancedRendererAdapter extends AbstractRenderAdapter {
      * @private
      */
     __get_instanced_mesh(sg) {
-        let im = this.__instanced_meshes.get(sg);
+        scratch_key.fromSG(sg);
+
+        // mask out some flags
+        scratch_key.flags &= INSTANCED_EQUALITY_FLAGS
+
+        let im = this.__instanced_meshes.get(scratch_key);
 
 
         if (im !== undefined) {
@@ -79,7 +75,7 @@ export class InstancedRendererAdapter extends AbstractRenderAdapter {
             im.mesh.castShadow = sg.getFlag(ShadedGeometryFlags.CastShadow);
             im.mesh.receiveShadow = sg.getFlag(ShadedGeometryFlags.ReceiveShadow);
 
-            this.__instanced_meshes.set(sg, im);
+            this.__instanced_meshes.set(scratch_key.clone(), im);
 
             return im;
 
@@ -131,8 +127,8 @@ export class InstancedRendererAdapter extends AbstractRenderAdapter {
 
         const meshes = this.__active_meshes;
 
-        for (const activeMesh of meshes) {
-            activeMesh.setCount(0);
+        for (const mesh of meshes) {
+            mesh.setCount(0);
         }
 
         meshes.clear();

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

@@ -0,0 +1,59 @@
+import { DrawMode } from "../../DrawMode.js";
+
+export class SGCacheKey {
+    geometry = -1;
+    material = -1;
+    /**
+     *
+     * @type {DrawMode}
+     */
+    mode = DrawMode.Triangles;
+
+    flags = 0;
+
+    hash(){
+        return this.geometry ^ this.material;
+    }
+
+    /**
+     *
+     * @param {SGCacheKey} other
+     * @returns {boolean}
+     */
+    equals(other){
+        return this.geometry === other.geometry
+        && this.material === other.material
+        && this.mode === other.mode
+        && this.flags === other.flags;
+    }
+
+    /**
+     *
+     * @param {SGCacheKey} other
+     */
+    copy(other){
+        this.geometry = other.geometry;
+        this.material = other.material;
+        this.mode = other.mode;
+        this.flags = other.flags;
+    }
+
+    clone(){
+        const r = new SGCacheKey();
+
+        r.copy(this);
+        
+        return r;
+    }
+
+    /**
+     *
+     * @param {ShadedGeometry} sg
+     */
+    fromSG(sg){
+        this.geometry = sg.geometry.id;
+        this.material = sg.material.id;
+        this.mode = sg.mode;
+        this.flags = sg.flags;
+    }
+}