@realsee/dnalogel 3.67.11-alpha.1 → 3.68.0

package/libs/Sculpt/Objects/Polygon/index.js

@@ -1,55 +1,56 @@
-var F = Object.defineProperty, I = Object.defineProperties;
-var L = Object.getOwnPropertyDescriptors;
-var A = Object.getOwnPropertySymbols;
-var N = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
-var E = (s, t, e) => t in s ? F(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, g = (s, t) => {
+var he = Object.defineProperty, pe = Object.defineProperties;
+var me = Object.getOwnPropertyDescriptors;
+var ee = Object.getOwnPropertySymbols;
+var ue = Object.prototype.hasOwnProperty, Pe = Object.prototype.propertyIsEnumerable;
+var j = Math.pow, Y = (s, t, e) => t in s ? he(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, x = (s, t) => {
   for (var e in t || (t = {}))
-    N.call(t, e) && E(s, e, t[e]);
-  if (A)
-    for (var e of A(t))
-      z.call(t, e) && E(s, e, t[e]);
+    ue.call(t, e) && Y(s, e, t[e]);
+  if (ee)
+    for (var e of ee(t))
+      Pe.call(t, e) && Y(s, e, t[e]);
   return s;
-}, O = (s, t) => I(s, L(t));
-var u = (s, t, e) => (E(s, typeof t != "symbol" ? t + "" : t, e), e);
-var H = (s, t, e) => new Promise((c, d) => {
-  var m = (i) => {
+}, A = (s, t) => pe(s, me(t));
+var H = (s, t, e) => (Y(s, typeof t != "symbol" ? t + "" : t, e), e);
+var te = (s, t, e) => new Promise((l, d) => {
+  var w = (h) => {
     try {
-      f(e.next(i));
-    } catch (l) {
-      d(l);
+      b(e.next(h));
+    } catch (a) {
+      d(a);
     }
-  }, r = (i) => {
+  }, r = (h) => {
     try {
-      f(e.throw(i));
-    } catch (l) {
-      d(l);
+      b(e.throw(h));
+    } catch (a) {
+      d(a);
     }
-  }, f = (i) => i.done ? c(i.value) : Promise.resolve(i.value).then(m, r);
-  f((e = e.apply(s, t)).next());
+  }, b = (h) => h.done ? l(h.value) : Promise.resolve(h.value).then(w, r);
+  b((e = e.apply(s, t)).next());
 });
-import { BaseObject as q } from "../Base/index.js";
-import * as p from "three";
-import { PolylineMesh as _ } from "../../Meshes/Polyline.js";
-import { AreaMesh as D } from "../../Meshes/Area.js";
-import { PolygonEditor as G } from "./Editor.js";
-import { vector3ToArray as J } from "../../../shared-utils/three/vector3ToArray.js";
-import { withResolvers as K } from "../../../shared-utils/promise/withResolvers.js";
-import { anyPositionToVector3 as Q } from "../../../shared-utils/positionToVector3.js";
-class ie extends q {
-  constructor(e, c) {
-    super(e, c);
-    u(this, "type", "Polygon");
-    u(this, "areaMesh");
-    u(this, "_editor");
-    u(this, "creatingObject");
-    e && (this.areaMesh = new D(g(g({}, e.style), e)), this.add(this.areaMesh));
+import { BaseObject as ce } from "../Base/index.js";
+import * as C from "three";
+import { PolylineMesh as se } from "../../Meshes/Polyline.js";
+import { AreaMesh as oe } from "../../Meshes/Area.js";
+import { PolygonEditor as ye } from "./Editor.js";
+import { vector3ToArray as fe } from "../../../shared-utils/three/vector3ToArray.js";
+import { withResolvers as we } from "../../../shared-utils/promise/withResolvers.js";
+import { anyPositionToVector3 as be } from "../../../shared-utils/positionToVector3.js";
+import { PointMesh as ve } from "../../Meshes/Point.js";
+class Ue extends ce {
+  constructor(e, l) {
+    super(e, l);
+    H(this, "type", "Polygon");
+    H(this, "areaMesh");
+    H(this, "_editor");
+    H(this, "creatingObject");
+    e && (this.areaMesh = new oe(x(x({}, e.style), e)), this.add(this.areaMesh));
   }
   get editor() {
-    return this._editor || (this._editor = new G(this)), this._editor;
+    return this._editor || (this._editor = new ye(this)), this._editor;
   }
   get data() {
-    return this.updateMatrixWorld(), O(g({}, this.baseData), {
-      points: J(this.applyObjectMatrixWorld(this.areaMesh.points)),
+    return this.updateMatrixWorld(), A(x({}, this.baseData), {
+      points: fe(this.applyObjectMatrixWorld(this.areaMesh.points)),
       style: {
         color: this.areaMesh.color.getHex(),
         lineColor: this.areaMesh.lineColor.getHex(),
@@ -58,7 +59,7 @@ class ie extends q {
     });
   }
   setData(e) {
-    e.points && this.areaMesh.setPoints(this.applyObjectReversalMatrixWorld(e.points.map(Q))), this.areaMesh.setStyle(e.style);
+    e.points && this.areaMesh.setPoints(this.applyObjectReversalMatrixWorld(e.points.map(be))), this.areaMesh.setStyle(e.style);
   }
   highlight() {
     var e;
@@ -69,79 +70,130 @@ class ie extends q {
     (e = this.areaMesh) == null || e.unhighlight();
   }
   canUndo() {
-    var e;
-    (e = this.creatingObject) == null || e.canUndo();
+    var e, l, d;
+    return (d = (l = (e = this.creatingObject) == null ? void 0 : e.canUndo) == null ? void 0 : l.call(e)) != null ? d : !1;
   }
   canRedo() {
-    var e;
-    (e = this.creatingObject) == null || e.canRedo();
+    var e, l, d;
+    return (d = (l = (e = this.creatingObject) == null ? void 0 : e.canRedo) == null ? void 0 : l.call(e)) != null ? d : !1;
   }
   undo() {
-    var e;
-    (e = this.creatingObject) == null || e.undo();
+    var e, l;
+    return (l = (e = this.creatingObject) == null ? void 0 : e.undo) == null ? void 0 : l.call(e);
   }
   redo() {
-    var e;
-    (e = this.creatingObject) == null || e.redo();
+    var e, l;
+    return (l = (e = this.creatingObject) == null ? void 0 : e.redo) == null ? void 0 : l.call(e);
   }
   create(e) {
-    return H(this, null, function* () {
-      this.children.forEach((d) => {
-        d.parent === this && this.remove(d);
+    return te(this, null, function* () {
+      var d;
+      this.children.forEach((w) => {
+        w.parent === this && this.remove(w);
       }), this.children.length = 0;
-      const c = new D(e);
-      this.areaMesh = c, this.add(this.areaMesh), this.creatingObject = X(this.areaMesh, this.pointSelector, e), yield this.creatingObject.finished, this.config.defaultAction && this.editor.enable();
+      const l = new oe(e);
+      this.areaMesh = l, this.add(this.areaMesh), this.creatingObject = xe(this.areaMesh, this.pointSelector, e), yield (d = this.creatingObject) == null ? void 0 : d.finished, this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function X(s, t, e) {
-  var U;
-  const { promise: c, resolve: d, reject: m } = K(), r = s.parent;
+function xe(s, t, e) {
+  var L, N, $, z, G, J, K, Q;
+  const { promise: l, resolve: d, reject: w } = we(), r = s.parent;
   if (!r) {
-    m(new Error("No container"));
+    w(new Error("No container"));
     return;
   }
-  const f = (U = e == null ? void 0 : e.limit) != null ? U : "none", i = new _(s.style);
-  r == null || r.add(i);
-  const l = new _(O(g({}, s.style), { dashed: !0, lengthEnable: !1 }));
-  r == null || r.add(l), t.enable();
-  const o = [];
-  let n, h, v = !1, C;
-  const y = [], x = () => o.length > 0, M = () => y.length > 0, k = () => {
-    x() && (y.push(o.pop()), w(C), t.pointSelectorHelper.magnifier.render());
-  }, B = () => {
-    M() && (o.push(y.pop()), w(C), t.pointSelectorHelper.magnifier.render());
-  }, R = (a) => {
-    y.length = 0;
-    const b = o.length === 0 ? a.point : n.clone();
-    o.push(b), s.setPoints(o, { closed: !1 }), v && (W(), d());
-  }, w = (a) => {
-    const b = () => {
-      i.setPoints([]), l.setPoints([]), s.setPoints(o), t.pointSelectorHelper.magnifier.render();
+  const b = (L = e == null ? void 0 : e.limit) != null ? L : "none", h = e == null ? void 0 : e.simpleMode, a = (J = (G = ($ = s.five) != null ? $ : (N = s.get) == null ? void 0 : N.call(s, "five")) != null ? G : (z = window.globalModules) == null ? void 0 : z.five) != null ? J : window.$five;
+  (K = e == null ? void 0 : e.autoClosePixelDistance) != null;
+  let O = 0;
+  h && a && a.model && a.model.bounding && typeof ((Q = a.model.bounding.max) == null ? void 0 : Q.y) == "number" && (O = a.model.bounding.max.y + 1);
+  const p = new se(s.style);
+  r == null || r.add(p);
+  const m = new se(A(x({}, s.style), { dashed: !0, lengthEnable: !1 }));
+  r == null || r.add(m);
+  let M = [];
+  function E() {
+    var P, c;
+    M.forEach((y) => {
+      var f;
+      return (f = y.parent) == null ? void 0 : f.remove(y);
+    });
+    const o = (c = (P = s.line) == null ? void 0 : P.style) != null ? c : s.style;
+    M = i.map((y, f) => {
+      var D;
+      const v = new ve(A(x({}, o), {
+        color: (D = o.pointColor) != null ? D : o.lineColor,
+        tip: void 0,
+        point: y
+      }));
+      return v.name = `PolygonPointMesh_${f}`, r == null || r.add(v), v;
+    });
+  }
+  function g() {
+    M.forEach((o) => {
+      var P;
+      return (P = o.parent) == null ? void 0 : P.remove(o);
+    }), M = [];
+  }
+  t.enable(), h && t.setAdherePoints([]);
+  const i = [];
+  let n, u, T = !1, V;
+  const R = [], k = () => i.length > 0, q = () => R.length > 0, ie = () => {
+    var o;
+    k() && (R.push(i.pop()), W(V), E(), (o = e == null ? void 0 : e.onUndo) == null || o.call(e), t.pointSelectorHelper && t.pointSelectorHelper.magnifier && t.pointSelectorHelper.magnifier.render());
+  }, ne = () => {
+    var o;
+    q() && (i.push(R.pop()), W(V), E(), (o = e == null ? void 0 : e.onRedo) == null || o.call(e), t.pointSelectorHelper && t.pointSelectorHelper.magnifier && t.pointSelectorHelper.magnifier.render());
+  }, B = (o) => {
+    var c;
+    R.length = 0;
+    let P = i.length === 0 ? o.point : n.clone();
+    h && (P = P.clone().setY(O)), i.push(P), s.setPoints(i, { closed: !1 }), E(), (c = e == null ? void 0 : e.onPointPlaced) == null || c.call(e, i), T && (F(), d());
+  }, W = (o) => {
+    const P = () => {
+      p.setPoints([]), m.setPoints([]), s.setPoints(i), t.pointSelectorHelper && t.pointSelectorHelper.magnifier && t.pointSelectorHelper.magnifier.render();
     };
-    if (!a || (C = a, !(o != null && o.length)))
-      return b();
-    const P = o.at(-1).clone();
-    if (o.length < 3 && (f === "none" ? (n = a.point, i.setPoints([P, n]), l.setPoints([])) : f === "xoz" ? (h = h != null ? h : new p.Plane().setFromNormalAndCoplanarPoint(new p.Vector3(0, 1, 0), o[0]), t.plane = h, n = h.projectPoint(a.point, new p.Vector3()), i.setPoints([P, n]), l.setPoints([n, a.point])) : f === "y" && (o.length === 1 ? (n = a.point, i.setPoints([P, n]), l.setPoints([])) : (h = h != null ? h : new p.Plane().setFromCoplanarPoints(o[0], o[1], new p.Vector3(0, 1, 0).add(o[0])), t.plane = h, n = h.projectPoint(a.point, new p.Vector3()), i.setPoints([P, n]), l.setPoints([n, a.point])))), o.length >= 3) {
-      n = s.projectPoint(a.point);
-      const j = o[0], V = 0.2;
-      j.distanceTo(n) < V || j.distanceTo(a.point) < V ? (n = j, a.point.copy(j), t.pointSelectorHelper.updateWithIntersect(a, { emitEvent: !1 }), v = !0) : v = !1, i.setPoints([P, n]), l.setPoints([n, a.point]);
+    if (!o) {
+      P(), E();
+      return;
+    }
+    if (V = o, !(i != null && i.length))
+      return P();
+    const c = i.at(-1).clone();
+    if (i.length < 3 && (h ? (n = o.point.clone().setY(O), p.setPoints([c, n]), m.setPoints([])) : b === "none" ? (n = o.point, p.setPoints([c, n]), m.setPoints([])) : b === "xoz" ? (u = u != null ? u : new C.Plane().setFromNormalAndCoplanarPoint(new C.Vector3(0, 1, 0), i[0]), t.plane = u, n = u.projectPoint(o.point, new C.Vector3()), p.setPoints([c, n]), m.setPoints([n, o.point])) : b === "y" && (i.length === 1 ? (n = o.point, p.setPoints([c, n]), m.setPoints([])) : (u = u != null ? u : new C.Plane().setFromCoplanarPoints(i[0], i[1], new C.Vector3(0, 1, 0).add(i[0])), t.plane = u, n = u.projectPoint(o.point, new C.Vector3()), p.setPoints([c, n]), m.setPoints([n, o.point])))), i.length >= 3) {
+      h ? n = o.point.clone().setY(O) : n = s.projectPoint(o.point);
+      const y = i[0];
+      let f = !1;
+      if (typeof (e == null ? void 0 : e.autoClosePixelDistance) == "number") {
+        if (a && a.camera && a.getElement) {
+          const v = a.getElement(), D = v.clientWidth, le = v.clientHeight, _ = (de) => {
+            const S = de.clone().project(a.camera);
+            return {
+              x: (S.x * 0.5 + 0.5) * D,
+              y: (1 - (S.y * 0.5 + 0.5)) * le
+            };
+          }, U = _(y), X = _(n), Z = _(o.point), re = Math.sqrt(j(U.x - X.x, 2) + j(U.y - X.y, 2)), ae = Math.sqrt(j(U.x - Z.x, 2) + j(U.y - Z.y, 2));
+          (re < e.autoClosePixelDistance || ae < e.autoClosePixelDistance) && (f = !0);
+        }
+      } else
+        (y.distanceTo(n) < 0.2 || y.distanceTo(o.point) < 0.2) && (f = !0);
+      f ? (n = y, o.point.copy(y), t.pointSelectorHelper.updateWithIntersect(o, { emitEvent: !1 }), T = !0) : T = !1, p.setPoints([c, n]), m.setPoints([n, o.point]);
     }
-    o.length >= 2 ? (s.setPoints([...o, n], { closed: !1 }), s.line.setPoints(s.points.slice(0, -1)), s.isBlank ? (t.cursorError = !0, i.setStyle({ lineColor: 16734553 }), l.setStyle({ lineColor: 16734553 })) : (t.cursorError = !1, i.setStyle({ lineColor: s.lineColor }), l.setStyle({ lineColor: s.lineColor }))) : s.setPoints([]);
-  }, W = () => {
-    t.off("select", R), t.off("intersectionUpdate", w), t.off("disable", T), t.plane = null, t.disable(), r == null || r.remove(i, l);
-  }, T = () => {
-    W(), r == null || r.remove(s, l, i), m(new Error("Cancelled"));
+    i.length >= 2 ? (s.setPoints([...i, n], { closed: !1 }), s.line.setPoints(s.points.slice(0, -1)), s.isBlank ? (t.cursorError = !0, p.setStyle({ lineColor: 16734553 }), m.setStyle({ lineColor: 16734553 })) : (t.cursorError = !1, p.setStyle({ lineColor: s.lineColor }), m.setStyle({ lineColor: s.lineColor }))) : s.setPoints([]), E();
+  }, F = () => {
+    t.off("select", B), t.off("intersectionUpdate", W), t.off("disable", I), t.plane = null, t.disable(), r == null || r.remove(p, m), g();
+  }, I = () => {
+    F(), r == null || r.remove(s, m, p), g(), w(new Error("Cancelled"));
   };
-  return t.on("select", R), t.on("intersectionUpdate", w), t.on("disable", T), {
-    finished: c,
-    canUndo: x,
-    canRedo: M,
-    undo: k,
-    redo: B
+  return t.on("select", B), t.on("intersectionUpdate", W), t.on("disable", I), {
+    finished: l,
+    canUndo: k,
+    canRedo: q,
+    undo: ie,
+    redo: ne
   };
 }
 export {
-  ie as Polygon,
-  X as createPolygon
+  Ue as Polygon,
+  xe as createPolygon
 };

package/libs/Sculpt/index.js

@@ -70,7 +70,7 @@ const g = class extends x {
      */
     u(this, "undo", () => {
       var e;
-      console.log("undo"), (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
+      (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
     });
     /**
      * @description: 重做

package/libs/Sculpt/typings/style.d.ts

@@ -90,3 +90,14 @@ export type DisplayInfoConfig = {
     cssStyle?: string;
 };
 export type LineStyle = LineColorStyle & LineOpacityStyle & LineWidthStyle;
+export type PolygonDrawConfig = {
+    /**
+     * @description 简单模式：不吸附、不与模型发生关系，所有点高度取模型最高点
+     * @default false
+     */
+    simpleMode?: boolean;
+    /**
+     * @description 闭合吸附的屏幕像素距离，单位px，默认10
+     */
+    autoClosePixelDistance?: number;
+};

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let F = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.67.11-alpha.1");
+    i(this, "VERSION", "3.68.0");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.67.11-alpha.1",
+    "%c %c@realsee/dnalogel %cv3.68.0",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/libs/shared-utils/three/Magnifier.d.ts

@@ -12,8 +12,6 @@ interface MagnifierConfig {
         left: string;
         top: string;
     };
-    /** 是否跳过全景图渲染 */
-    skipPanorama: boolean;
 }
 interface MagnifierEvent extends SubscribeEventMap {
     wantsPanGesture: (event: (typeof Hammer)['Input']) => boolean;

package/libs/shared-utils/three/Magnifier.js

@@ -45,8 +45,7 @@ class L {
     this.five = t, this.scale = (h = e == null ? void 0 : e.scale) != null ? h : 2, this.width = (n = e == null ? void 0 : e.width) != null ? n : 190, this.height = (o = (l = e == null ? void 0 : e.height) != null ? l : e == null ? void 0 : e.width) != null ? o : 190, this.config = {
       dragEnabled: (e == null ? void 0 : e.dragEnabled) || !1,
       autoFixPCPosition: (e == null ? void 0 : e.autoFixPCPosition) || !1,
-      initialPosition: (e == null ? void 0 : e.initialPosition) || { left: "0", top: "0" },
-      skipPanorama: (e == null ? void 0 : e.skipPanorama) || !1
+      initialPosition: (e == null ? void 0 : e.initialPosition) || { left: "0", top: "0" }
     };
     const i = this.canvas.getContext("2d");
     if (!i)
@@ -114,22 +113,21 @@ class L {
       a.disableGetPixel === !0 && (v.set(a, a.visible), a.visible = !1);
     });
     try {
-      const a = this.five.getPixels({
-        x: l - m / 2,
-        y: o - m / 2,
-        width: m,
-        height: d,
-        pixelRatio: x,
-        skipPanorama: this.config.skipPanorama
+      const a = this.five.getPixels(
+        l - m / 2,
+        o - m / 2,
+        m,
+        d,
+        x
+      );
+      v.forEach((y, b) => {
+        b.visible = y;
       });
-      v.forEach((P, b) => {
-        b.visible = P;
-      });
-      const f = Math.floor(i * c), g = Math.floor(h * c), y = f * g * 4;
-      if (!a || a.length !== y) {
+      const f = Math.floor(i * c), g = Math.floor(h * c), P = f * g * 4;
+      if (!a || a.length !== P) {
         console.warn("Magnifier: Invalid pixel data", {
           pixelsLength: a == null ? void 0 : a.length,
-          expectedLength: y,
+          expectedLength: P,
           imageWidth: f,
           imageHeight: g
         });
@@ -143,9 +141,9 @@ class L {
       }), this.imageData = new ImageData(f, g));
       try {
         this.imageData.data.set(a);
-      } catch (P) {
+      } catch (y) {
         console.error("Magnifier: Failed to set pixel data", {
-          error: P,
+          error: y,
           imageDataLength: this.imageData.data.length,
           pixelsLength: a.length,
           imageWidth: f,

package/libs/shared-utils/three/PointSelector/index.d.ts

@@ -34,11 +34,6 @@ interface Config {
      */
     actionIfNoModelUnderMouse: ActionIfNoIntersection;
     helper: PointSelectorHelperConfig;
-    /**
-     * @description 是否跳过全景图渲染
-     * @default false
-     */
-    skipPanorama: boolean;
 }
 export type PointSelectorConfig = Partial<Config>;
 type EventMap = {

package/libs/shared-utils/three/PointSelector/index.js

@@ -2,28 +2,28 @@ var R = Object.defineProperty, O = Object.defineProperties;
 var X = Object.getOwnPropertyDescriptors;
 var N = Object.getOwnPropertySymbols;
 var Y = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var M = (l, h, e) => h in l ? R(l, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[h] = e, P = (l, h) => {
+var E = (l, h, e) => h in l ? R(l, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[h] = e, P = (l, h) => {
   for (var e in h || (h = {}))
-    Y.call(h, e) && M(l, e, h[e]);
+    Y.call(h, e) && E(l, e, h[e]);
   if (N)
     for (var e of N(h))
-      B.call(h, e) && M(l, e, h[e]);
+      B.call(h, e) && E(l, e, h[e]);
   return l;
-}, T = (l, h) => O(l, X(h));
-var i = (l, h, e) => (M(l, typeof h != "symbol" ? h + "" : h, e), e);
+}, M = (l, h) => O(l, X(h));
+var i = (l, h, e) => (E(l, typeof h != "symbol" ? h + "" : h, e), e);
 import { PointSelectorHelper as C } from "./utils/PointSelectorHelper.js";
-import { isTouchDevice as k } from "../../isTouchDevice.js";
+import { isTouchDevice as j } from "../../isTouchDevice.js";
 import * as o from "three";
-import { Subscribe as j } from "../../Subscribe.js";
-import { getIntersectByRaycaster as A, getVirtualIntersectByRaycaster as G } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as W } from "../../five/getRaycasterByNdcPosition.js";
+import { Subscribe as A } from "../../Subscribe.js";
+import { getIntersectByRaycaster as k, getVirtualIntersectByRaycaster as g } from "../../five/getPosition.js";
+import { getRaycasterByNdcPosition as G } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as V } from "./utils/contents.js";
-import { rayOnLine as z } from "../../../Sculpt/utils/three/rayOnLine.js";
-import { THREERaycaster as K } from "../core/Raycaster.js";
+import { rayOnLine as W } from "../../../Sculpt/utils/three/rayOnLine.js";
+import { THREERaycaster as z } from "../core/Raycaster.js";
 const _ = new o.Vector3(), w = () => !1;
-class se extends j {
+class se extends A {
   constructor(e, t) {
-    var u, d, n, f, y;
+    var u, d, n, f;
     super();
     i(this, "_cursorError", !1);
     i(this, "actionIfNoIntersection", "virtualPoint");
@@ -181,10 +181,10 @@ class se extends j {
      */
     i(this, "updateByNdcPosition", (e) => {
       var c, u, d;
-      const t = W(this.five, e);
-      let s = A(this.five, t);
+      const t = G(this.five, e);
+      let s = k(this.five, t);
       if (s) {
-        if (this.plane && this.planeMode === "vertical" && (s = T(P({}, s), {
+        if (this.plane && this.planeMode === "vertical" && (s = M(P({}, s), {
           point: this.plane.projectPoint(s.point, new o.Vector3()),
           face: new o.Face3(0, 0, 0, this.plane.normal.clone()),
           originalPoint: s.point.clone()
@@ -219,7 +219,7 @@ class se extends j {
       if (this.actionIfNoIntersection === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoIntersection === "virtualPoint") {
-        const n = G(t, (c = this.lastIntersection) == null ? void 0 : c.distance);
+        const n = g(t, (c = this.lastIntersection) == null ? void 0 : c.distance);
         return n.face = new o.Face3(0, 0, 0, (d = (u = this.lastIntersection) == null ? void 0 : u.face) == null ? void 0 : d.normal), n.isVirtual = !0, this.lastIntersection = n, this.updatePointSelectorHelperIntersect(n), !0;
       } else if (this.actionIfNoIntersection === "disable")
         return this.updatePointSelectorHelperIntersect(null), !1;
@@ -228,7 +228,7 @@ class se extends j {
      * @description: 更新 pointSelectorHelper 的焦点位置
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
-      var s, c, u, d, n, f, y, L;
+      var s, c, u, d, n, f, T, L;
       if (!e) {
         this.pointSelectorHelper.hide(), this.pointSelectorHelper.position = e, this.emit("intersectionUpdate", e), this.five.getElement().style.cursor = V;
         return;
@@ -236,7 +236,7 @@ class se extends j {
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
       const t = P({}, e);
       if (this.adhereEnabled && this.mouseNdcPosition && this.five.renderer) {
-        const I = {
+        const S = {
           x: this.mouseNdcPosition.x,
           y: 1 - this.mouseNdcPosition.y
         }, H = this.five.renderer.getSize(new o.Vector2());
@@ -251,21 +251,21 @@ class se extends j {
             if (a.distanceTo(e.point) < this.adhereRadius)
               (!this.plane || this.plane.distanceToPoint(a) < 0.01) && (a = (d = (u = this.plane) == null ? void 0 : u.projectPoint(a, new o.Vector3())) != null ? d : a, t.point = a.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
             else {
-              const p = z({
-                raycaster: new K(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
+              const p = W({
+                raycaster: new z(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
                 line: r,
                 clampToLine: !1
               }), v = p.clone().project(this.five.camera);
               if (v.z <= 1) {
-                const b = {
+                const y = {
                   x: (v.x + 1) / 2,
                   y: (1 - v.y) / 2
-                }, S = {
-                  x: Math.abs(b.x - I.x) * H.width,
-                  y: Math.abs(b.y - I.y) * H.height
+                }, b = {
+                  x: Math.abs(y.x - S.x) * H.width,
+                  y: Math.abs(y.y - S.y) * H.height
                 };
                 let m = p.clone();
-                S.x < 10 && S.y < 10 && (!this.plane || this.plane.distanceToPoint(m) < 0.01) && (m = (f = (n = this.plane) == null ? void 0 : n.projectPoint(m, new o.Vector3())) != null ? f : m, t.point = m.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
+                b.x < 10 && b.y < 10 && (!this.plane || this.plane.distanceToPoint(m) < 0.01) && (m = (f = (n = this.plane) == null ? void 0 : n.projectPoint(m, new o.Vector3())) != null ? f : m, t.point = m.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
               }
             }
           }
@@ -274,30 +274,30 @@ class se extends j {
             if (a.IsAlwaysVisible = r.IsAlwaysVisible, this.plane && this.plane.distanceToPoint(a) > 0.01)
               continue;
             if (a.distanceTo(e.point) < this.adhereRadius) {
-              t.point = (L = (y = this.plane) == null ? void 0 : y.projectPoint(a, new o.Vector3())) != null ? L : a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
+              t.point = (L = (T = this.plane) == null ? void 0 : T.projectPoint(a, new o.Vector3())) != null ? L : a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
               break;
             } else {
               const v = a.clone().project(this.five.camera);
               if (v.z > 1)
                 continue;
-              const b = this.five.renderer.getSize(new o.Vector2()), S = {
+              const y = this.five.renderer.getSize(new o.Vector2()), b = {
                 x: (v.x + 1) / 2,
                 y: (1 - v.y) / 2
               }, m = {
-                x: Math.abs(S.x - I.x) * b.width,
-                y: Math.abs(S.y - I.y) * b.height
+                x: Math.abs(b.x - S.x) * y.width,
+                y: Math.abs(b.y - S.y) * y.height
               };
               if (m.x < 10 && m.y < 10) {
-                let E = !1;
+                let I = !1;
                 if (a.IsAlwaysVisible)
-                  E = !0;
+                  I = !0;
                 else {
                   const D = new o.Raycaster();
                   D.setFromCamera(a.clone(), this.five.camera);
                   const F = this.five.model.intersectRaycaster(D, void 0, !0)[0], x = 0.1, U = this.five.camera.position.distanceTo(a);
-                  F && F.distance < U + x && (E = !0);
+                  F && F.distance < U + x && (I = !0);
                 }
-                if (E) {
+                if (I) {
                   t.point = a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
                   break;
                 }
@@ -330,14 +330,13 @@ class se extends j {
     });
     this.five = e, this.config = P(P({}, this.config), t), this.actionIfNoIntersection = (d = (u = t == null ? void 0 : t.actionIfNoIntersection) != null ? u : t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? d : "virtualPoint";
     const s = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
-    s === "auto" ? this.mode = k ? "fixed" : "cursor" : this.mode = s;
+    s === "auto" ? this.mode = j ? "fixed" : "cursor" : this.mode = s;
     const c = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new C(this.five, T(P({}, t == null ? void 0 : t.helper), {
-      magnifierParams: P(P({}, c), (f = t == null ? void 0 : t.helper) == null ? void 0 : f.magnifierParams),
-      skipPanorama: (y = t == null ? void 0 : t.skipPanorama) != null ? y : !1
+    this.pointSelectorHelper = new C(this.five, M(P({}, t == null ? void 0 : t.helper), {
+      magnifierParams: P(P({}, c), (f = t == null ? void 0 : t.helper) == null ? void 0 : f.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {

package/libs/shared-utils/three/PointSelector/utils/PointSelectorHelper.d.ts

@@ -9,7 +9,6 @@ export interface PointSelectorHelperConfig {
     magnifierParams?: ConstructorParameters<typeof Magnifier>[1];
     pointHelper?: PointHelperAbstract | 'default' | 'highlight' | null;
     container?: Element;
-    skipPanorama?: boolean;
 }
 type EventMap = {
     intersectionUpdate: (intersection: PointIntersection) => void;