@d5techs/3dgs-lib 1.4.74 → 1.4.75

package/dist/3dgs-lib.js

@@ -809,6 +809,7 @@ const _OrbitControls = class _OrbitControls {
   onKeyDown(e) {
     var _a2;
     if (!this.enabled) return;
+    if (e.ctrlKey || e.metaKey || e.altKey) return;
     const tag = (_a2 = e.target) == null ? void 0 : _a2.tagName;
     if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT") return;
     const key = e.key.toLowerCase();
@@ -18245,52 +18246,49 @@ class SplatEditor {
     this.editHistory.add(editOp);
   }
   /**
-   * 球选择：以点击处最近 splat 为中心，拖拽半径定义世界空间球体
+   * 球选择：在屏幕空间判断 splat 是否在圆形区域内
    */
   selectBySphere(op, centerPx, radiusPx) {
-    const pick = this.pickWorldPosition(centerPx.x, centerPx.y);
-    if (!pick) return;
-    const worldRadius = radiusPx * pick.pixelToWorld;
-    const cpuPos = this.gsRenderer.getCPUPositions();
-    if (!cpuPos) return;
-    const modelMat = this.gsRenderer.getModelMatrix();
-    const cx = pick.worldX, cy = pick.worldY, cz = pick.worldZ;
-    const r2 = worldRadius * worldRadius;
+    this.ensureProjection();
+    const proj = this.projectedPositions;
+    if (!proj) return;
+    const w = this.container.clientWidth;
+    const h = this.container.clientHeight;
+    const cx = centerPx.x / w;
+    const cy = centerPx.y / h;
+    const rx = radiusPx / w;
+    const ry = radiusPx / h;
+    const rx2 = rx * rx;
+    const ry2 = ry * ry;
     const editOp = new SelectOp(this.splatState, op, (i) => {
-      if (this.splatState.data[i] & (State.hidden | State.deleted)) return false;
-      const i3 = i * 3;
-      const lx = cpuPos[i3], ly = cpuPos[i3 + 1], lz = cpuPos[i3 + 2];
-      const wx = modelMat[0] * lx + modelMat[4] * ly + modelMat[8] * lz + modelMat[12];
-      const wy = modelMat[1] * lx + modelMat[5] * ly + modelMat[9] * lz + modelMat[13];
-      const wz = modelMat[2] * lx + modelMat[6] * ly + modelMat[10] * lz + modelMat[14];
-      const dx = wx - cx, dy = wy - cy, dz = wz - cz;
-      return dx * dx + dy * dy + dz * dz < r2;
+      const b = i * 3;
+      const sx = proj[b], sy = proj[b + 1], sz = proj[b + 2];
+      if (sz <= 0 || sz >= 1) return false;
+      const dx = sx - cx, dy = sy - cy;
+      return dx * dx / rx2 + dy * dy / ry2 <= 1;
     });
     this.editHistory.add(editOp);
   }
   /**
-   * 盒选择：以点击处最近 splat 为中心，拖拽定义世界空间 AABB
-   * X/Y 半宽由屏幕拖拽距离转换，Z 半深度取 max(halfW, halfH)
+   * 盒选择：在屏幕空间判断 splat 是否在矩形区域内
    */
   selectByBox(op, centerPx, halfWPx, halfHPx) {
-    const pick = this.pickWorldPosition(centerPx.x, centerPx.y);
-    if (!pick) return;
-    const s = pick.pixelToWorld;
-    const hx = halfWPx * s;
-    const hy = halfHPx * s;
-    const hz = Math.max(hx, hy);
-    const cpuPos = this.gsRenderer.getCPUPositions();
-    if (!cpuPos) return;
-    const modelMat = this.gsRenderer.getModelMatrix();
-    const cx = pick.worldX, cy = pick.worldY, cz = pick.worldZ;
+    this.ensureProjection();
+    const proj = this.projectedPositions;
+    if (!proj) return;
+    const w = this.container.clientWidth;
+    const h = this.container.clientHeight;
+    const cx = centerPx.x / w;
+    const cy = centerPx.y / h;
+    const hw = halfWPx / w;
+    const hh = halfHPx / h;
+    const left = cx - hw, right = cx + hw;
+    const top = cy - hh, bottom = cy + hh;
     const editOp = new SelectOp(this.splatState, op, (i) => {
-      if (this.splatState.data[i] & (State.hidden | State.deleted)) return false;
-      const i3 = i * 3;
-      const lx = cpuPos[i3], ly = cpuPos[i3 + 1], lz = cpuPos[i3 + 2];
-      const wx = modelMat[0] * lx + modelMat[4] * ly + modelMat[8] * lz + modelMat[12];
-      const wy = modelMat[1] * lx + modelMat[5] * ly + modelMat[9] * lz + modelMat[13];
-      const wz = modelMat[2] * lx + modelMat[6] * ly + modelMat[10] * lz + modelMat[14];
-      return Math.abs(wx - cx) < hx && Math.abs(wy - cy) < hy && Math.abs(wz - cz) < hz;
+      const b = i * 3;
+      const sx = proj[b], sy = proj[b + 1], sz = proj[b + 2];
+      if (sz <= 0 || sz >= 1) return false;
+      return sx >= left && sx <= right && sy >= top && sy <= bottom;
     });
     this.editHistory.add(editOp);
   }