@onerjs/core 8.50.1 → 8.50.2

package/Meshes/GaussianSplatting/gaussianSplattingMeshBase.js

@@ -157,7 +157,34 @@ var PLYValue;
     PLYValue[PLYValue["SH_42"] = 82] = "SH_42";
     PLYValue[PLYValue["SH_43"] = 83] = "SH_43";
     PLYValue[PLYValue["SH_44"] = 84] = "SH_44";
-    PLYValue[PLYValue["UNDEFINED"] = 85] = "UNDEFINED";
+    PLYValue[PLYValue["SH_45"] = 85] = "SH_45";
+    PLYValue[PLYValue["SH_46"] = 86] = "SH_46";
+    PLYValue[PLYValue["SH_47"] = 87] = "SH_47";
+    PLYValue[PLYValue["SH_48"] = 88] = "SH_48";
+    PLYValue[PLYValue["SH_49"] = 89] = "SH_49";
+    PLYValue[PLYValue["SH_50"] = 90] = "SH_50";
+    PLYValue[PLYValue["SH_51"] = 91] = "SH_51";
+    PLYValue[PLYValue["SH_52"] = 92] = "SH_52";
+    PLYValue[PLYValue["SH_53"] = 93] = "SH_53";
+    PLYValue[PLYValue["SH_54"] = 94] = "SH_54";
+    PLYValue[PLYValue["SH_55"] = 95] = "SH_55";
+    PLYValue[PLYValue["SH_56"] = 96] = "SH_56";
+    PLYValue[PLYValue["SH_57"] = 97] = "SH_57";
+    PLYValue[PLYValue["SH_58"] = 98] = "SH_58";
+    PLYValue[PLYValue["SH_59"] = 99] = "SH_59";
+    PLYValue[PLYValue["SH_60"] = 100] = "SH_60";
+    PLYValue[PLYValue["SH_61"] = 101] = "SH_61";
+    PLYValue[PLYValue["SH_62"] = 102] = "SH_62";
+    PLYValue[PLYValue["SH_63"] = 103] = "SH_63";
+    PLYValue[PLYValue["SH_64"] = 104] = "SH_64";
+    PLYValue[PLYValue["SH_65"] = 105] = "SH_65";
+    PLYValue[PLYValue["SH_66"] = 106] = "SH_66";
+    PLYValue[PLYValue["SH_67"] = 107] = "SH_67";
+    PLYValue[PLYValue["SH_68"] = 108] = "SH_68";
+    PLYValue[PLYValue["SH_69"] = 109] = "SH_69";
+    PLYValue[PLYValue["SH_70"] = 110] = "SH_70";
+    PLYValue[PLYValue["SH_71"] = 111] = "SH_71";
+    PLYValue[PLYValue["UNDEFINED"] = 112] = "UNDEFINED";
 })(PLYValue || (PLYValue = {}));
 /**
  * Base class for Gaussian Splatting meshes. Contains all single-cloud rendering logic.
@@ -197,7 +224,7 @@ export class GaussianSplattingMeshBase extends Mesh {
         return this._shDegree;
     }
     set shDegree(value) {
-        const maxDegree = this._shTextures?.length ?? 0;
+        const maxDegree = this._maxShDegree;
         const clamped = Math.max(0, Math.min(Math.round(value), maxDegree));
         if (this._shDegree === clamped) {
             return;
@@ -209,7 +236,7 @@ export class GaussianSplattingMeshBase extends Mesh {
      * Maximum SH degree available from the loaded data.
      */
     get maxShDegree() {
-        return this._shTextures?.length ?? 0;
+        return this._maxShDegree;
     }
     /**
      * Number of splats in the mesh
@@ -352,6 +379,7 @@ export class GaussianSplattingMeshBase extends Mesh {
         this._cachedBoundingMax = null;
         /** @internal */
         this._shDegree = 0;
+        this._maxShDegree = 0;
         this._cameraViewInfos = new Map();
         /**
          * Cosine value of the angle threshold to update view dependent splat sorting. Default is 0.0001.
@@ -775,8 +803,62 @@ export class GaussianSplattingMeshBase extends Mesh {
                 return 83 /* PLYValue.SH_43 */;
             case "f_rest_44":
                 return 84 /* PLYValue.SH_44 */;
-        }
-        return 85 /* PLYValue.UNDEFINED */;
+            case "f_rest_45":
+                return 85 /* PLYValue.SH_45 */;
+            case "f_rest_46":
+                return 86 /* PLYValue.SH_46 */;
+            case "f_rest_47":
+                return 87 /* PLYValue.SH_47 */;
+            case "f_rest_48":
+                return 88 /* PLYValue.SH_48 */;
+            case "f_rest_49":
+                return 89 /* PLYValue.SH_49 */;
+            case "f_rest_50":
+                return 90 /* PLYValue.SH_50 */;
+            case "f_rest_51":
+                return 91 /* PLYValue.SH_51 */;
+            case "f_rest_52":
+                return 92 /* PLYValue.SH_52 */;
+            case "f_rest_53":
+                return 93 /* PLYValue.SH_53 */;
+            case "f_rest_54":
+                return 94 /* PLYValue.SH_54 */;
+            case "f_rest_55":
+                return 95 /* PLYValue.SH_55 */;
+            case "f_rest_56":
+                return 96 /* PLYValue.SH_56 */;
+            case "f_rest_57":
+                return 97 /* PLYValue.SH_57 */;
+            case "f_rest_58":
+                return 98 /* PLYValue.SH_58 */;
+            case "f_rest_59":
+                return 99 /* PLYValue.SH_59 */;
+            case "f_rest_60":
+                return 100 /* PLYValue.SH_60 */;
+            case "f_rest_61":
+                return 101 /* PLYValue.SH_61 */;
+            case "f_rest_62":
+                return 102 /* PLYValue.SH_62 */;
+            case "f_rest_63":
+                return 103 /* PLYValue.SH_63 */;
+            case "f_rest_64":
+                return 104 /* PLYValue.SH_64 */;
+            case "f_rest_65":
+                return 105 /* PLYValue.SH_65 */;
+            case "f_rest_66":
+                return 106 /* PLYValue.SH_66 */;
+            case "f_rest_67":
+                return 107 /* PLYValue.SH_67 */;
+            case "f_rest_68":
+                return 108 /* PLYValue.SH_68 */;
+            case "f_rest_69":
+                return 109 /* PLYValue.SH_69 */;
+            case "f_rest_70":
+                return 110 /* PLYValue.SH_70 */;
+            case "f_rest_71":
+                return 111 /* PLYValue.SH_71 */;
+        }
+        return 112 /* PLYValue.UNDEFINED */;
     }
     /**
      * Parse a PLY file header and returns metas infos on splats and chunks
@@ -826,12 +908,15 @@ export class GaussianSplattingMeshBase extends Mesh {
             if (prop.startsWith("property ")) {
                 const [, typeName, name] = prop.split(" ");
                 const value = GaussianSplattingMeshBase._ValueNameToEnum(name);
-                if (value != 85 /* PLYValue.UNDEFINED */) {
-                    // SH degree 1,2 or 3 for 9, 24 or 45 values
-                    if (value >= 84 /* PLYValue.SH_44 */) {
-                        shDegree = 3;
+                if (value != 112 /* PLYValue.UNDEFINED */) {
+                    // SH degree 1,2,3 or 4 for 9, 24, 45 or 72 values
+                    if (value >= 111 /* PLYValue.SH_71 */) {
+                        shDegree = 4;
+                    }
+                    else if (value >= 84 /* PLYValue.SH_44 */) {
+                        shDegree = Math.max(shDegree, 3);
                     }
-                    else if (value >= 64 /* PLYValue.SH_24 */) {
+                    else if (value >= 63 /* PLYValue.SH_23 */) {
                         shDegree = Math.max(shDegree, 2);
                     }
                     else if (value >= 48 /* PLYValue.SH_8 */) {
@@ -1115,7 +1200,7 @@ export class GaussianSplattingMeshBase extends Mesh {
                     r3 = value;
                     break;
             }
-            if (sh && property.value >= 40 /* PLYValue.SH_0 */ && property.value <= 84 /* PLYValue.SH_44 */) {
+            if (sh && property.value >= 40 /* PLYValue.SH_0 */ && property.value <= 111 /* PLYValue.SH_71 */) {
                 const shIndex = property.value - 40 /* PLYValue.SH_0 */;
                 if (property.type == 4 /* PLYType.UCHAR */ && header.chunkCount) {
                     // compressed ply. dataView points to beginning of vertex
@@ -1131,7 +1216,7 @@ export class GaussianSplattingMeshBase extends Mesh {
             }
         }
         if (sh) {
-            const shDim = header.shDegree == 1 ? 3 : header.shDegree == 2 ? 8 : 15;
+            const shDim = header.shDegree == 1 ? 3 : header.shDegree == 2 ? 8 : header.shDegree == 3 ? 15 : 24;
             for (let j = 0; j < shDim; j++) {
                 sh[j * 3 + 0] = plySH[j];
                 sh[j * 3 + 1] = plySH[j + shDim];
@@ -1196,7 +1281,7 @@ export class GaussianSplattingMeshBase extends Mesh {
                 }
             }
         }
-        return { buffer: header.buffer, sh: sh };
+        return { buffer: header.buffer, sh: sh, shDegree: header.shDegree };
     }
     /**
      * Converts a .ply data array buffer to splat
@@ -1527,7 +1612,7 @@ export class GaussianSplattingMeshBase extends Mesh {
         }
         this._sortIsDirty = true;
     }
-    *_updateData(data, isAsync, sh, partIndices, { flipY = false, previousVertexCount = 0 } = {}) {
+    *_updateData(data, isAsync, sh, partIndices, { flipY = false, previousVertexCount = 0 } = {}, shDegree) {
         if (!this._covariancesATexture) {
             this._readyToDisplay = false;
         }
@@ -1551,8 +1636,8 @@ export class GaussianSplattingMeshBase extends Mesh {
             this._updateSplatIndexBuffer(vertexCount);
         }
         this._vertexCount = vertexCount;
-        // degree == 1 for 1 texture (3 terms), 2 for 2 textures (8 terms) and 3 for 3 textures (15 terms)
-        this._shDegree = sh ? sh.length : 0;
+        this._maxShDegree = sh ? (shDegree ?? 0) : 0;
+        this._shDegree = this._maxShDegree;
         const textureSize = this._getTextureSize(vertexCount);
         const textureLength = textureSize.x * textureSize.y;
         const lineCountUpdate = GaussianSplattingMeshBase.ProgressiveUpdateAmount ?? textureSize.y;
@@ -1657,10 +1742,11 @@ export class GaussianSplattingMeshBase extends Mesh {
      * @param data array buffer containing center, color, orientation and scale of splats
      * @param sh optional array of uint8 array for SH data
      * @param partIndices optional array of uint8 for rig node indices
+     * @param shDegree optional SH degree of the data
      * @returns a promise
      */
-    async updateDataAsync(data, sh, partIndices) {
-        return await runCoroutineAsync(this._updateData(data, true, sh, partIndices), createYieldingScheduler());
+    async updateDataAsync(data, sh, partIndices, shDegree) {
+        return await runCoroutineAsync(this._updateData(data, true, sh, partIndices, undefined, shDegree), createYieldingScheduler());
     }
     /**
      * @experimental
@@ -1669,9 +1755,10 @@ export class GaussianSplattingMeshBase extends Mesh {
      * @param sh optional array of uint8 array for SH data
      * @param options optional informations on how to treat data (needs to be 3rd for backward compatibility)
      * @param partIndices optional array of uint8 for rig node indices
+     * @param shDegree optional SH degree of the data
      */
-    updateData(data, sh, options = { flipY: true }, partIndices) {
-        runCoroutineSync(this._updateData(data, false, sh, partIndices, options));
+    updateData(data, sh, options = { flipY: true }, partIndices, shDegree) {
+        runCoroutineSync(this._updateData(data, false, sh, partIndices, options, shDegree));
     }
     /**
      * Refreshes the bounding info, taking into account all the thin instances defined