@d5techs/3dgs-lib 1.4.1 → 1.4.3

package/dist/3dgs-lib.js

@@ -4263,6 +4263,52 @@ class OBJLoader {
     }
   }
 }
+function transformSHCoeffsYZSwap$1(sh, base, perChannel) {
+  const SQRT3_2 = Math.sqrt(3) / 2;
+  if (perChannel >= 3) {
+    for (let ch = 0; ch < 3; ch++) {
+      const a = sh[base + ch];
+      const b = sh[base + 3 + ch];
+      sh[base + ch] = -b;
+      sh[base + 3 + ch] = -a;
+    }
+  }
+  if (perChannel >= 8) {
+    for (let ch = 0; ch < 3; ch++) {
+      const g0 = sh[base + 9 + ch];
+      const g1 = sh[base + 12 + ch];
+      const g2 = sh[base + 15 + ch];
+      const g3 = sh[base + 18 + ch];
+      const g4 = sh[base + 21 + ch];
+      sh[base + 9 + ch] = -g3;
+      sh[base + 12 + ch] = g1;
+      sh[base + 15 + ch] = -0.5 * g2 - SQRT3_2 * g4;
+      sh[base + 18 + ch] = -g0;
+      sh[base + 21 + ch] = -SQRT3_2 * g2 + 0.5 * g4;
+    }
+  }
+  if (perChannel >= 15) {
+    const A = Math.sqrt(10) / 4;
+    const B = Math.sqrt(6) / 4;
+    const P = Math.sqrt(15) / 4;
+    for (let ch = 0; ch < 3; ch++) {
+      const g0 = sh[base + 24 + ch];
+      const g1 = sh[base + 27 + ch];
+      const g2 = sh[base + 30 + ch];
+      const g3 = sh[base + 33 + ch];
+      const g4 = sh[base + 36 + ch];
+      const g5 = sh[base + 39 + ch];
+      const g6 = sh[base + 42 + ch];
+      sh[base + 24 + ch] = A * g3 - B * g5;
+      sh[base + 27 + ch] = g1;
+      sh[base + 30 + ch] = B * g3 + A * g5;
+      sh[base + 33 + ch] = A * g0 + B * g2;
+      sh[base + 36 + ch] = -0.25 * g4 - P * g6;
+      sh[base + 39 + ch] = -B * g0 + A * g2;
+      sh[base + 42 + ch] = -P * g4 + 0.25 * g6;
+    }
+  }
+}
 const TYPE_SIZES$1 = {
   char: 1,
   uchar: 1,
@@ -4489,6 +4535,9 @@ async function loadPLY(url, options = {}) {
       shRest[dstBase + 1] = srcG < shRestProps.length ? readProperty$1(dataView, base, shRestProps[srcG], littleEndian) : 0;
       shRest[dstBase + 2] = srcB < shRestProps.length ? readProperty$1(dataView, base, shRestProps[srcB], littleEndian) : 0;
     }
+    if (swapYZ) {
+      transformSHCoeffsYZSwap$1(shRestBuffer, shOffset, perChannel);
+    }
     splats[i] = {
       mean: swapYZ ? [x, z, y] : [x, y, z],
       scale: swapYZ ? [scale_0, scale_2, scale_1] : [scale_0, scale_1, scale_2],
@@ -4528,6 +4577,52 @@ const TYPE_SIZES = {
   double: 8,
   float64: 8
 };
+function transformSHCoeffsYZSwap(sh, base, perChannel) {
+  const SQRT3_2 = Math.sqrt(3) / 2;
+  if (perChannel >= 3) {
+    for (let ch = 0; ch < 3; ch++) {
+      const a = sh[base + ch];
+      const b = sh[base + 3 + ch];
+      sh[base + ch] = -b;
+      sh[base + 3 + ch] = -a;
+    }
+  }
+  if (perChannel >= 8) {
+    for (let ch = 0; ch < 3; ch++) {
+      const g0 = sh[base + 9 + ch];
+      const g1 = sh[base + 12 + ch];
+      const g2 = sh[base + 15 + ch];
+      const g3 = sh[base + 18 + ch];
+      const g4 = sh[base + 21 + ch];
+      sh[base + 9 + ch] = -g3;
+      sh[base + 12 + ch] = g1;
+      sh[base + 15 + ch] = -0.5 * g2 - SQRT3_2 * g4;
+      sh[base + 18 + ch] = -g0;
+      sh[base + 21 + ch] = -SQRT3_2 * g2 + 0.5 * g4;
+    }
+  }
+  if (perChannel >= 15) {
+    const A = Math.sqrt(10) / 4;
+    const B = Math.sqrt(6) / 4;
+    const P = Math.sqrt(15) / 4;
+    for (let ch = 0; ch < 3; ch++) {
+      const g0 = sh[base + 24 + ch];
+      const g1 = sh[base + 27 + ch];
+      const g2 = sh[base + 30 + ch];
+      const g3 = sh[base + 33 + ch];
+      const g4 = sh[base + 36 + ch];
+      const g5 = sh[base + 39 + ch];
+      const g6 = sh[base + 42 + ch];
+      sh[base + 24 + ch] = A * g3 - B * g5;
+      sh[base + 27 + ch] = g1;
+      sh[base + 30 + ch] = B * g3 + A * g5;
+      sh[base + 33 + ch] = A * g0 + B * g2;
+      sh[base + 36 + ch] = -0.25 * g4 - P * g6;
+      sh[base + 39 + ch] = -B * g0 + A * g2;
+      sh[base + 42 + ch] = -P * g4 + 0.25 * g6;
+    }
+  }
+}
 function validatePLYMagic(buffer) {
   const bytes = new Uint8Array(buffer, 0, Math.min(buffer.byteLength, 10));
   const decoder = new TextDecoder("ascii");
@@ -4868,6 +4963,9 @@ async function parsePLYBuffer(buffer, options = {}) {
           shCoeffs[shBase + dstBase + 2] = readProperty(dataView, base + prop.byteOffset, prop.type, littleEndian);
         }
       }
+      if (swapYZ) {
+        transformSHCoeffsYZSwap(shCoeffs, shBase, perChannel);
+      }
     }
     outputIdx++;
     if (onProgress) {
@@ -4952,7 +5050,8 @@ const PLYLoaderMobile = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
   __proto__: null,
   compactDataToGPUBuffer,
   loadPLYMobile,
-  parsePLYBuffer
+  parsePLYBuffer,
+  transformSHCoeffsYZSwap
 }, Symbol.toStringTag, { value: "Module" }));
 const SPLAT_SIZE = 32;
 const MIN_FILE_SIZE = SPLAT_SIZE;
@@ -14264,6 +14363,7 @@ class HotspotManager {
     if (info.billboard === enabled) return true;
     info.billboard = enabled;
     if (!enabled) {
+      info._lastBillboardMeshPos = void 0;
       this.restoreHotspotOrientation(info);
     }
     return true;
@@ -14401,6 +14501,19 @@ class HotspotManager {
     const camPos = this.camera.position;
     for (const info of this.hotspots) {
       if (!info.billboard) continue;
+      if (info._lastBillboardMeshPos) {
+        const firstMesh = this.meshRenderer.getOverlayMeshByIndex(info.meshStartIndex);
+        if (firstMesh) {
+          const dx = firstMesh.position[0] - info._lastBillboardMeshPos[0];
+          const dy = firstMesh.position[1] - info._lastBillboardMeshPos[1];
+          const dz = firstMesh.position[2] - info._lastBillboardMeshPos[2];
+          if (Math.abs(dx) > 1e-6 || Math.abs(dy) > 1e-6 || Math.abs(dz) > 1e-6) {
+            info.position[0] += dx;
+            info.position[1] += dy;
+            info.position[2] += dz;
+          }
+        }
+      }
       const {
         position,
         normal,
@@ -14452,6 +14565,10 @@ class HotspotManager {
       const owx = (rx * lcx + fx * lcy + zx * lcz) * s;
       const owy = (ry * lcx + fy * lcy + zy * lcz) * s;
       const owz = (rz * lcx + fz * lcy + zz * lcz) * s;
+      const finalMeshX = wx - owx;
+      const finalMeshY = wy - owy;
+      const finalMeshZ = wz - owz;
+      info._lastBillboardMeshPos = [finalMeshX, finalMeshY, finalMeshZ];
       for (let i = 0; i < info.meshCount; i++) {
         const mesh = this.meshRenderer.getOverlayMeshByIndex(
           info.meshStartIndex + i
@@ -16283,7 +16400,7 @@ class App {
         }
       });
       if (coordinateSystem === "blender") {
-        const { positions, scales, rotations, count } = compactData;
+        const { positions, scales, rotations, count, shCoeffs } = compactData;
         for (let i = 0; i < count; i++) {
           const i3 = i * 3, i4 = i * 4;
           const py = positions[i3 + 1], pz = positions[i3 + 2];
@@ -16296,6 +16413,9 @@ class App {
           rotations[i4] = -rw;
           rotations[i4 + 2] = rz;
           rotations[i4 + 3] = ry;
+          if (shCoeffs) {
+            transformSHCoeffsYZSwap(shCoeffs, i * 45, 15);
+          }
         }
       }
       if (onProgress) onProgress(90, "upload");