@woosh/meep-engine 2.33.33 → 2.33.34

package/core/geom/Vector2.d.ts

@@ -20,6 +20,14 @@ export default class Vector2 {
 
     _sub(x: number, y: number): void
 
+    abs(): void
+
+    round(): void
+
+    floor(): void
+
+    ceil(): void
+
     copy(other: Vector2): void
 
     distanceTo(other: Vector2): number

package/core/geom/Vector3.d.ts

@@ -31,6 +31,14 @@ export default class Vector3 implements Vector3Like {
 
     _sub(x: number, y: number, z: number): void
 
+    abs(): void
+
+    round(): void
+
+    floor(): void
+
+    ceil(): void
+
     _multiply(x: number, y: number, z: number): void
 
     multiply(other: Vector3Like): void

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

@@ -1,6 +1,6 @@
 import { ThreeInstancedAdapter } from "../instanced/ThreeInstancedAdapter.js";
 import { composeCompile } from "../../../material/composeCompile.js";
-import { Mesh, MeshDepthMaterial, MeshNormalMaterial, RGBADepthPacking } from "three";
+import { Material, Mesh, MeshDepthMaterial, MeshNormalMaterial, RGBADepthPacking } from "three";
 import { VIRTUAL_MESH_FLAG } from "../VIRTUAL_MESH_FLAG.js";
 
 const MATERIAL_FLAG = '@micron_instanced_rewritten';
@@ -9,7 +9,7 @@ const MATERIAL_VERTEX_DISPLACED = '@meep/vertex-displaced';
 export class MaterialContext {
     /**
      *
-     * @param {MicronVertexDataSpec} spec
+     * @param {VertexDataSpec} spec
      * @param {Material} material
      */
     constructor(spec, material) {
@@ -19,6 +19,13 @@ export class MaterialContext {
          */
         this.adapter = new ThreeInstancedAdapter(spec);
 
+        /**
+         *
+         * @type {VertexDataSpec}
+         * @private
+         */
+        this.__vertex_spec = spec;
+
         /**
          *
          * @type {Material}
@@ -56,6 +63,7 @@ export class MaterialContext {
         this.__patch_count = 0;
     }
 
+
     /**
      *
      * @param {MicronGeometryPatchOccurrence} occurrence
@@ -65,6 +73,29 @@ export class MaterialContext {
         return this.instances.has(occurrence.instance_id);
     }
 
+    /**
+     * Generate a new custom cache key for three.js internal shader compilation
+     * @param {Material} material
+     * @returns {function()}
+     * @private
+     */
+    __make_custom_cache_key(material) {
+        let existingKeyMaker = material.customProgramCacheKey;
+
+        return () => {
+            let v = '';
+            const attributes = this.__vertex_spec.attributes;
+            const attribute_count = attributes.length;
+
+            for (let i = 0; i < attribute_count; i++) {
+                const a = attributes[i];
+                v += `${a.name}:${a.type}:${a.itemSize}:${a.normalized ? 1 : 0}`;
+            }
+
+            return existingKeyMaker.call(material) + v;
+        }
+    }
+
     init(gl) {
         this.adapter.__gl_context = gl;
 
@@ -74,6 +105,8 @@ export class MaterialContext {
 
         if (material[MATERIAL_FLAG] === undefined) {
             material.onBeforeCompile = composeCompile(this.material.onBeforeCompile, rewrite_material);
+            material.customProgramCacheKey = this.__make_custom_cache_key(this.material);
+
             material[MATERIAL_FLAG] = true;
             material[MATERIAL_VERTEX_DISPLACED] = true;
         } else {

package/package.json

@@ -4,15 +4,15 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.33",
+  "version": "2.33.34",
   "dependencies": {
     "fast-levenshtein": "2.0.6",
     "opentype.js": "1.3.3",
     "simplex-noise": "2.4.0",
-    "three": "^0.132.2"
+    "three": "^0.135.0"
   },
   "devDependencies": {
     "babel-jest": "^26.6.3",
-    "@types/three": "^0.132.2"
+    "@types/three": "^0.135.0"
   }
 }