@openheart/tavio-renderer 2.3.23-with-wasm → 2.3.25-with-wasm

package/build/esm/index.js

@@ -38616,6 +38616,8 @@ class TavioMesh extends EventEmitter {
   // 現在のパース済み 3DGS のデータ
   gaussianIndexMap;
   // 3DGS のソート後のインデックス
+  latestIndexMap;
+  // 重複更新を避けるため直前の設定内容を保持
   sortMap;
   // ソート処理中かどうかのフラグ
   defaultRenderViewSymbol;
@@ -38788,6 +38790,7 @@ class TavioMesh extends EventEmitter {
     this.maxDistance = 0;
     this.mainProperties = null;
     this.gaussianIndexMap = /* @__PURE__ */ new Map();
+    this.latestIndexMap = /* @__PURE__ */ new Map();
     this.sortMap = /* @__PURE__ */ new Map();
     const defineValue = material?.defines[SPHERICAL_HARMONICS_DEGREES_DEFINE];
     this.currentDegrees = defineValue ?? 3;
@@ -38854,7 +38857,7 @@ class TavioMesh extends EventEmitter {
       let currentProperty = 0;
       let chunkHeader = [];
       let inProgress = false;
-      let progressCallback;
+      let hasPending = false;
       const index = this.sourceProperty.length;
       const isFirst = index === 0;
       if (isFirst !== true) {
@@ -39300,12 +39303,11 @@ class TavioMesh extends EventEmitter {
                 break;
             }
             ++currentProperty;
-            if (currentProperty === chunkHeader[currentChunk].propertyCount - 1) {
+            if (currentProperty === chunkHeader[currentChunk].propertyCount) {
+              ++currentChunk;
               this.worker.postMessage({
                 properties: mainProperties
               });
-            } else if (currentProperty === chunkHeader[currentChunk].propertyCount) {
-              ++currentChunk;
               this.worker.postMessage({
                 shProperty: mainProperties.shN
               });
@@ -39323,10 +39325,11 @@ class TavioMesh extends EventEmitter {
               throw new Error("invalid binary of background");
             }
             const createJpeg = (buffer, start, length, previewImage = false) => {
-              return new Promise((resolve2) => {
+              return new Promise((resolve2, reject2) => {
                 const uint = new Uint8Array(buffer, start, length);
                 const blob2 = new Blob([uint], { type: "image/jpeg" });
                 const img = new Image();
+                const url2 = URL.createObjectURL(blob2);
                 img.addEventListener(
                   "load",
                   () => {
@@ -39337,11 +39340,20 @@ class TavioMesh extends EventEmitter {
                       img.style.top = "20px";
                       document.body.appendChild(img);
                     }
+                    URL.revokeObjectURL(url2);
                     resolve2(img);
                   },
                   false
                 );
-                img.src = URL.createObjectURL(blob2);
+                img.addEventListener(
+                  "error",
+                  (e) => {
+                    URL.revokeObjectURL(url2);
+                    reject2(e);
+                  },
+                  false
+                );
+                img.src = url2;
               });
             };
             const flipImage = (img) => {
@@ -39369,17 +39381,6 @@ class TavioMesh extends EventEmitter {
             ++currentChunk;
           }
         }
-        if (progressCallback != null) {
-          setTimeout(() => {
-            if (progressCallback != null) {
-              progressCallback();
-            }
-            progressCallback = null;
-            inProgress = false;
-          }, 0);
-        } else {
-          inProgress = false;
-        }
       };
       const loader = new StreamLoader();
       loader.on("getcontentbytelength", (byte) => {
@@ -39394,25 +39395,33 @@ class TavioMesh extends EventEmitter {
         currentLength += data.length;
         this.emit("read", { length: currentLength });
         if (inProgress === true) {
-          progressCallback = /* @__PURE__ */ ((readLength) => {
-            return () => {
-              onRead(readLength);
-            };
-          })(currentLength);
-        } else {
-          inProgress = true;
-          await onRead(currentLength);
+          hasPending = true;
+          return;
+        }
+        inProgress = true;
+        try {
+          while (true) {
+            hasPending = false;
+            await onRead(currentLength);
+            if (hasPending === false) {
+              break;
+            }
+          }
+          inProgress = false;
+        } catch (e) {
+          inProgress = false;
+          reject(e);
         }
       });
       loader.on("load", (data) => {
         this.emit("load", currentLength, data);
       });
-      await loader.load(url);
       const listener = () => {
         this.sourceProperty[index].ready = true;
         resolve();
       };
       this.once("finallyupdate", listener);
+      await loader.load(url);
     });
   }
   /**
@@ -41242,8 +41251,12 @@ class TavioMesh extends EventEmitter {
       return;
     }
     const att = this.gaussianIndexMap.get(name);
-    this.indexAttribute.set(att);
-    this.indexAttribute.needsUpdate = true;
+    const latest = this.latestIndexMap.get(name);
+    if (att !== latest) {
+      this.indexAttribute.set(att);
+      this.indexAttribute.needsUpdate = true;
+      this.latestIndexMap.set(name, att);
+    }
   }
   /**
    * インデックスを指定して座標変換を設定する
@@ -41448,6 +41461,7 @@ class TavioMesh extends EventEmitter {
         if (this.gaussianIndexMap.has(renderView.name) !== true) {
           const indexBuffer = new Uint32Array(this.currentVertexCount);
           this.gaussianIndexMap.set(renderView.name, indexBuffer);
+          this.latestIndexMap.set(renderView.name, null);
         }
         const index = this.gaussianIndexMap.get(renderView.name);
         const activeCount = this.wasmSortInstance.sort(
@@ -41488,6 +41502,7 @@ class TavioMesh extends EventEmitter {
     this.gaussianTransformData = null;
     this.sphericalHarmonicsData = null;
     this.gaussianIndexMap = null;
+    this.latestIndexMap = null;
     this.sortMap = null;
     this.wasmSortInstance = null;
     this.worker.postMessage({

package/build/esm/types/src/viewer/tavioMesh.d.ts

@@ -45,6 +45,7 @@ export declare class TavioMesh extends EventEmitter {
     private gaussianCountInChunk;
     private gaussianData;
     private gaussianIndexMap;
+    private latestIndexMap;
     private sortMap;
     private defaultRenderViewSymbol;
     private gaussianOrderData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openheart/tavio-renderer",
-  "version": "2.3.23-with-wasm",
+  "version": "2.3.25-with-wasm",
   "author": "OpenHeart Inc.",
   "license": "UNLICENSED",
   "description": "Rendering Engine for Tavio Format 3D data",