@onerjs/core 8.32.8 → 8.33.1

package/Meshes/GaussianSplatting/gaussianSplattingMesh.d.ts

@@ -197,7 +197,6 @@ export declare class GaussianSplattingMesh extends Mesh {
     private _splatIndex;
     private _shTextures;
     private _splatsData;
-    private _sh;
     private readonly _keepInRam;
     private _delayedTextureUpdate;
     private _useRGBACovariants;
@@ -264,6 +263,7 @@ export declare class GaussianSplattingMesh extends Mesh {
      * Get the compensation state
      */
     get compensation(): boolean;
+    private _loadingPromise;
     /**
      * set rendering material
      */
@@ -281,6 +281,11 @@ export declare class GaussianSplattingMesh extends Mesh {
      * @param keepInRam keep datas in ram for editing purpose
      */
     constructor(name: string, url?: Nullable<string>, scene?: Nullable<Scene>, keepInRam?: boolean);
+    /**
+     * Get the loading promise when loading the mesh from a URL in the constructor
+     * @returns constructor loading promise or null if no URL was provided
+     */
+    getLoadingPromise(): Promise<void> | null;
     /**
      * Returns the class name
      * @returns "GaussianSplattingMesh"

package/Meshes/GaussianSplatting/gaussianSplattingMesh.js

@@ -289,7 +289,6 @@ export class GaussianSplattingMesh extends Mesh {
         this._splatIndex = null;
         this._shTextures = null;
         this._splatsData = null;
-        this._sh = null;
         this._keepInRam = false;
         this._delayedTextureUpdate = null;
         this._useRGBACovariants = false;
@@ -298,6 +297,7 @@ export class GaussianSplattingMesh extends Mesh {
         this._sortIsDirty = false;
         this._shDegree = 0;
         this._cameraViewInfos = new Map();
+        this._loadingPromise = null;
         this.subMeshes = [];
         new SubMesh(0, 0, 4 * GaussianSplattingMesh._BatchSize, 0, 6 * GaussianSplattingMesh._BatchSize, this);
         this.setEnabled(false);
@@ -305,8 +305,7 @@ export class GaussianSplattingMesh extends Mesh {
         this._useRGBACovariants = !this.getEngine().isWebGPU && this.getEngine().version === 1.0;
         this._keepInRam = keepInRam;
         if (url) {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            this.loadFileAsync(url);
+            this._loadingPromise = this.loadFileAsync(url);
         }
         const gaussianSplattingMaterial = new GaussianSplattingMaterial(this.name + "_material", this._scene);
         gaussianSplattingMaterial.setSourceMesh(this);
@@ -322,6 +321,13 @@ export class GaussianSplattingMesh extends Mesh {
             }
         });
     }
+    /**
+     * Get the loading promise when loading the mesh from a URL in the constructor
+     * @returns constructor loading promise or null if no URL was provided
+     */
+    getLoadingPromise() {
+        return this._loadingPromise;
+    }
     /**
      * Returns the class name
      * @returns "GaussianSplattingMesh"
@@ -355,11 +361,11 @@ export class GaussianSplattingMesh extends Mesh {
     _getCameraDirection(camera) {
         const cameraMatrix = camera.getViewMatrix();
         this.getWorldMatrix().multiplyToRef(cameraMatrix, this._modelViewMatrix);
-        cameraMatrix.invertToRef(TmpVectors.Matrix[0]);
-        this.getWorldMatrix().multiplyToRef(TmpVectors.Matrix[0], TmpVectors.Matrix[1]);
-        Vector3.TransformNormalToRef(Vector3.Forward(this._scene.useRightHandedSystem), TmpVectors.Matrix[1], TmpVectors.Vector3[2]);
-        TmpVectors.Vector3[2].normalize();
-        return TmpVectors.Vector3[2];
+        // return vector used to compute distance to camera
+        const localDirection = TmpVectors.Vector3[1];
+        localDirection.set(this._modelViewMatrix.m[2], this._modelViewMatrix.m[6], this._modelViewMatrix.m[10]);
+        localDirection.normalize();
+        return localDirection;
     }
     /** @internal */
     _postToWorker(forced = false) {
@@ -692,10 +698,10 @@ export class GaussianSplattingMesh extends Mesh {
                         shDegree = 3;
                     }
                     else if (value >= 64 /* PLYValue.SH_24 */) {
-                        shDegree = 2;
+                        shDegree = Math.max(shDegree, 2);
                     }
                     else if (value >= 48 /* PLYValue.SH_8 */) {
-                        shDegree = 1;
+                        shDegree = Math.max(shDegree, 1);
                     }
                 }
                 const type = GaussianSplattingMesh._TypeNameToEnum(typeName);
@@ -1280,9 +1286,7 @@ export class GaussianSplattingMesh extends Mesh {
         const fBuffer = new Float32Array(uBuffer.buffer);
         if (this._keepInRam) {
             this._splatsData = data;
-            if (sh) {
-                this._sh = sh;
-            }
+            // keep sh in ram too ?
         }
         const vertexCount = uBuffer.length / GaussianSplattingMesh._RowOutputLength;
         if (vertexCount != this._vertexCount) {
@@ -1404,7 +1408,7 @@ export class GaussianSplattingMesh extends Mesh {
         if (sh) {
             for (let i = 0; i < sh.length; i++) {
                 const componentCount = 4;
-                const shView = new Uint8Array(this._sh[i].buffer, texelStart * componentCount, texelCount * componentCount);
+                const shView = new Uint32Array(sh[i].buffer, texelStart * componentCount * 4, texelCount * componentCount);
                 updateTextureFromData(this._shTextures[i], shView, textureSize.x, lineStart, lineCount);
             }
         }
@@ -1422,7 +1426,7 @@ export class GaussianSplattingMesh extends Mesh {
         const vertexCountPadded = (this._vertexCount + 15) & ~0xf;
         this._depthMix = new BigInt64Array(vertexCountPadded);
         const positions = Float32Array.from(this._splatPositions);
-        this._worker.postMessage({ positions, vertexCountPadded }, [positions.buffer]);
+        this._worker.postMessage({ positions }, [positions.buffer]);
         this._worker.onmessage = (e) => {
             this._depthMix = e.data.depthMix;
             const cameraId = e.data.cameraId;
@@ -1491,7 +1495,6 @@ GaussianSplattingMesh._BatchSize = 16; // 16 splats per instance
  */
 GaussianSplattingMesh.ProgressiveUpdateAmount = 0;
 GaussianSplattingMesh._CreateWorker = function (self) {
-    let vertexCountPadded = 0;
     let positions;
     let depthMix;
     let indices;
@@ -1500,12 +1503,12 @@ GaussianSplattingMesh._CreateWorker = function (self) {
         // updated on init
         if (e.data.positions) {
             positions = e.data.positions;
-            vertexCountPadded = e.data.vertexCountPadded;
         }
         // udpate on view changed
         else {
             const cameraId = e.data.cameraId;
             const viewProj = e.data.view;
+            const vertexCountPadded = (positions.length + 15) & ~0xf;
             if (!positions || !viewProj) {
                 // Sanity check, it shouldn't happen!
                 throw new Error("positions or view is not defined!");