fix: adjust add items behavior

ThatOpen · Feb 13, 2024 · a93a7fb · a93a7fb
1 parent 040aa8a
commit a93a7fb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bim-fragment",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "description": "3D BIM Geometry API",
   "main": "src/index.js",
   "scripts": {

diff --git a/resources/fragment.js b/resources/fragment.js
@@ -4256,13 +4256,18 @@ let Fragment$1 = class Fragment {
         }
         const necessaryCapacity = this.mesh.count + size;
         if (necessaryCapacity > this.capacity) {
-            const newMesh = new FragmentMesh(this.mesh.geometry, this.mesh.material, necessaryCapacity + this.capacityOffset, this);
+            const newCapacity = necessaryCapacity + this.capacityOffset;
+            const newMesh = new FragmentMesh(this.mesh.geometry, this.mesh.material, newCapacity, this);
             newMesh.count = this.mesh.count;
-            this.capacity = size;
+            this.capacity = newCapacity;
             const oldMesh = this.mesh;
             (_a = oldMesh.parent) === null || _a === void 0 ? void 0 : _a.add(newMesh);
             oldMesh.removeFromParent();
             this.mesh = newMesh;
+            newMesh.instanceMatrix = oldMesh.instanceMatrix;
+            newMesh.instanceColor = oldMesh.instanceColor;
+            oldMesh.instanceMatrix = undefined;
+            oldMesh.instanceColor = null;
             oldMesh.dispose();
         }
         for (let i = 0; i < items.length; i++) {

diff --git a/src/fragment.ts b/src/fragment.ts
@@ -120,20 +120,27 @@ export class Fragment {
     const necessaryCapacity = this.mesh.count + size;
 
     if (necessaryCapacity > this.capacity) {
+      const newCapacity = necessaryCapacity + this.capacityOffset;
       const newMesh = new FragmentMesh(
         this.mesh.geometry,
         this.mesh.material,
-        necessaryCapacity + this.capacityOffset,
+        newCapacity,
         this
       );
 
       newMesh.count = this.mesh.count;
 
-      this.capacity = size;
+      this.capacity = newCapacity;
       const oldMesh = this.mesh;
       oldMesh.parent?.add(newMesh);
       oldMesh.removeFromParent();
       this.mesh = newMesh;
+
+      newMesh.instanceMatrix = oldMesh.instanceMatrix;
+      newMesh.instanceColor = oldMesh.instanceColor;
+
+      oldMesh.instanceMatrix = undefined as any;
+      oldMesh.instanceColor = null;
       oldMesh.dispose();
     }