@realsee/dnalogel 3.61.14 → 3.61.15-alpha.0

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

@@ -6,6 +6,12 @@ import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
 export type { PointIntersection };
 export type ActionIfNoIntersection = LiteralString<'virtualPoint' | 'lastPoint' | 'disable'>;
+export type AdherePoint = (Vector3 | THREE.Face3) & {
+    /**
+     * @description 被模型遮挡也能看到的点
+     */
+    IsAlwaysVisible?: boolean;
+};
 type PointerSelectorMode = 'fixed' | 'cursor';
 interface Config {
     /**
@@ -33,9 +39,8 @@ export type PointSelectorConfig = Partial<Config>;
 type EventMap = {
     /**
      * @description: 与模型交点更新时触发，移出监听范围时为null
-     * @param isAdhered 是否为吸附的点
      */
-    intersectionUpdate: (intersection: PointIntersection | null, isAdhered?: boolean) => void;
+    intersectionUpdate: (intersection: PointIntersection | null) => void;
     /**
      * @description: 试图打点，返回false则不打点
      */
@@ -68,10 +73,30 @@ export declare class PointSelector extends Subscribe<EventMap> {
     _cursorError: boolean;
     actionIfNoIntersection: ActionIfNoIntersection;
     plane?: THREE.Plane | null;
+    /**
+     * @description 结果区别：vertical: 射线和模型的交点在plane上的投影点；onlyPlane: 不论射线和模型是否有交点，都为射线和plane的焦点；onlyVirtual: 仅当射线和模型没有交点时，为射线和plane的焦点
+     */
+    planeMode: 'vertical' | 'onlyPlane' | 'onlyVirtual';
     readonly pointSelectorHelper: PointSelectorHelper;
+    five: Five;
     /** @deprecated directly use `pointSelector.on/off` instead */
     readonly hook: this;
-    private five;
+    /**
+     * @description 吸附功能总开关，方便临时的一键开启/关闭
+     */
+    private adhereEnabled;
+    /**
+     * @description 吸附半径
+     */
+    adhereRadius: number;
+    /**
+     * @description 吸附面
+     */
+    adherePlane: THREE.Plane[];
+    /**
+     * @description 吸附线
+     */
+    adhereLine: THREE.Line3[];
     private set outOfFive(value);
     private _outOfFive;
     private set enabled(value);
@@ -81,8 +106,6 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private pressDown;
     /** 一组吸附的点，光标靠近这些点时，会将helper以及放大镜的位置设置为这些点 */
     private adherePoints;
-    /** 吸附点的半径 */
-    private adherePointsRadius;
     /** 有值时表明处于按压检查阶段 */
     private setPressDown?;
     private lastFiveHelperVisible?;
@@ -96,15 +119,21 @@ export declare class PointSelector extends Subscribe<EventMap> {
     enable(): void;
     disable(): void;
     dispose(): void;
-    setAdherePoints(points: Vector3[] | ((params: {
+    setAdherePoints(points: AdherePoint[] | ((params: {
         intersection: PointIntersection;
         pointSelectorInstance: PointSelector;
-    }) => Vector3[]) | null, radius?: number): void;
+    }) => AdherePoint[]) | null, 
+    /**
+     * @deprecated use `.adhereRadius = 0.1` instead
+     */
+    radius?: number): void;
     /**
      * @description: 主动触发一次选点
      * @return: select 是否成功
      */
     select: (intersection?: PointIntersection) => boolean;
+    private onKeyDown;
+    private onKeyUp;
     private onMouseWheel;
     /**
      * @description: 鼠标进入five canvas时
@@ -114,7 +143,6 @@ export declare class PointSelector extends Subscribe<EventMap> {
      * @description: 鼠标离开five canvas时
      */
     private onLeave;
-    private onClick;
     private onMouseDown;
     private onMouseUp;
     private onTouchStart;

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

@@ -1,35 +1,57 @@
-var w = Object.defineProperty, I = Object.defineProperties;
-var S = Object.getOwnPropertyDescriptors;
-var m = Object.getOwnPropertySymbols;
-var b = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
-var f = (h, s, e) => s in h ? w(h, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[s] = e, l = (h, s) => {
-  for (var e in s || (s = {}))
-    b.call(s, e) && f(h, e, s[e]);
-  if (m)
-    for (var e of m(s))
-      E.call(s, e) && f(h, e, s[e]);
-  return h;
-}, v = (h, s) => I(h, S(s));
-var i = (h, s, e) => (f(h, typeof s != "symbol" ? s + "" : s, e), e);
-import { PointSelectorHelper as H } from "./utils/PointSelectorHelper.js";
-import { isTouchDevice as y } from "../../isTouchDevice.js";
-import * as p from "three";
-import { Subscribe as M } from "../../Subscribe.js";
-import { getIntersectByRaycaster as D, getVirtualIntersectByRaycaster as L } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as T } from "../../five/getRaycasterByNdcPosition.js";
-import { CURSOR_NOT_ALLOW_URL as P } from "./utils/contents.js";
-const N = new p.Vector3(), d = () => !1;
-class O extends M {
+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 I = (l, a, e) => a in l ? R(l, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[a] = e, v = (l, a) => {
+  for (var e in a || (a = {}))
+    Y.call(a, e) && I(l, e, a[e]);
+  if (N)
+    for (var e of N(a))
+      B.call(a, e) && I(l, e, a[e]);
+  return l;
+}, E = (l, a) => O(l, X(a));
+var i = (l, a, e) => (I(l, typeof a != "symbol" ? a + "" : a, e), e);
+import { PointSelectorHelper as C } from "./utils/PointSelectorHelper.js";
+import { isTouchDevice as j } from "../../isTouchDevice.js";
+import * as o from "three";
+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 W } from "../../../Sculpt/utils/three/rayOnLine.js";
+import { THREERaycaster as z } from "../core/Raycaster.js";
+const _ = new o.Vector3(), w = () => !1;
+class se extends A {
   constructor(e, t) {
-    var a, c, r, u;
+    var u, d, n, p;
     super();
     i(this, "_cursorError", !1);
     i(this, "actionIfNoIntersection", "virtualPoint");
     i(this, "plane");
+    /**
+     * @description 结果区别：vertical: 射线和模型的交点在plane上的投影点；onlyPlane: 不论射线和模型是否有交点，都为射线和plane的焦点；onlyVirtual: 仅当射线和模型没有交点时，为射线和plane的焦点
+     */
+    i(this, "planeMode", "onlyVirtual");
     i(this, "pointSelectorHelper");
+    i(this, "five");
     /** @deprecated directly use `pointSelector.on/off` instead */
     i(this, "hook", this);
-    i(this, "five");
+    /**
+     * @description 吸附功能总开关，方便临时的一键开启/关闭
+     */
+    i(this, "adhereEnabled", !0);
+    /**
+     * @description 吸附半径
+     */
+    i(this, "adhereRadius", 0.1);
+    /**
+     * @description 吸附面
+     */
+    i(this, "adherePlane", []);
+    /**
+     * @description 吸附线
+     */
+    i(this, "adhereLine", []);
     i(this, "_outOfFive", !1);
     i(this, "_enabled", !1);
     i(this, "mode");
@@ -37,8 +59,6 @@ class O extends M {
     i(this, "pressDown", !1);
     /** 一组吸附的点，光标靠近这些点时，会将helper以及放大镜的位置设置为这些点 */
     i(this, "adherePoints");
-    /** 吸附点的半径 */
-    i(this, "adherePointsRadius", 0.1);
     /** 有值时表明处于按压检查阶段 */
     i(this, "setPressDown");
     i(this, "lastFiveHelperVisible");
@@ -56,6 +76,12 @@ class O extends M {
       const t = this.emit("wantsSelect", this.position);
       return t || (this.pointSelectorHelper.hide(), this.emit("select", this.position), console.debug(this.position)), !t;
     });
+    i(this, "onKeyDown", (e) => {
+      e.key === "Shift" && (this.adhereEnabled = !1);
+    });
+    i(this, "onKeyUp", (e) => {
+      e.key === "Shift" && (this.adhereEnabled = !0);
+    });
     i(this, "onMouseWheel", (e) => {
       this.updateByMousePosition(e);
       const t = () => this.updateByMousePosition();
@@ -75,9 +101,6 @@ class O extends M {
     i(this, "onLeave", () => {
       this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", null);
     });
-    i(this, "onClick", () => {
-      this.select();
-    });
     i(this, "onMouseDown", (e) => {
       this._mouseDownInfo = {
         clientX: e.clientX,
@@ -88,8 +111,8 @@ class O extends M {
     i(this, "onMouseUp", (e) => {
       if (!this._mouseDownInfo)
         return;
-      const { clientX: t, clientY: o, timestamp: n } = this._mouseDownInfo;
-      Math.abs(e.clientX - t) < 2 && Math.abs(e.clientY - o) < 2 && performance.now() - n < 500 ? this.select() : this._mouseDownInfo = null;
+      const { clientX: t, clientY: s, timestamp: c } = this._mouseDownInfo;
+      Math.abs(e.clientX - t) < 2 && Math.abs(e.clientY - s) < 2 && performance.now() - c < 500 ? this.select() : this._mouseDownInfo = null;
     });
     i(this, "onTouchStart", (e) => {
       this._touchStartInfo = {
@@ -110,8 +133,8 @@ class O extends M {
       if (this.setPressDown) {
         let t = !1;
         if (this._touchStartInfo) {
-          const { clientX: o, clientY: n } = this._touchStartInfo;
-          (Math.abs(e.touches[0].clientX - o) > 2 || Math.abs(e.touches[0].clientY - n) > 2) && (t = !0);
+          const { clientX: s, clientY: c } = this._touchStartInfo;
+          (Math.abs(e.touches[0].clientX - s) > 2 || Math.abs(e.touches[0].clientY - c) > 2) && (t = !0);
         }
         t && (clearTimeout(this.setPressDown), this.setPressDown = void 0);
         return;
@@ -135,35 +158,56 @@ class O extends M {
       }, 100), this.select());
     });
     i(this, "updateByMousePosition", (e) => {
-      this.five.getElement() && (e && (this.mousePosition = e), this.updateByNdcPosition(this.mouseNdcPosition));
+      e.buttons !== 0 ? this.pointSelectorHelper.hide() : this.pointSelectorHelper.show(), !(e.buttons !== 0 || !this.five.getElement()) && (e && (this.mousePosition = {
+        clientX: e.clientX,
+        clientY: e.clientY
+      }), this.updateByNdcPosition(this.mouseNdcPosition));
     });
     /**
      * @description: 根据鼠标位置计算焦点位置并更新
      */
     i(this, "updateByNdcPosition", (e) => {
-      var n, a, c;
-      const t = T(this.five, e), o = D(this.five, t);
-      if (o)
-        return this.updatePointSelectorHelperIntersect(o), this.lastIntersection = o, !0;
+      var c, u, d;
+      const t = G(this.five, e);
+      let s = k(this.five, t);
+      if (s) {
+        if (this.plane && this.planeMode === "vertical" && (s = E(v({}, 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()
+        })), this.plane && this.planeMode === "onlyPlane") {
+          const n = t.ray.intersectPlane(this.plane, _);
+          if (!n)
+            return !1;
+          s = {
+            distance: this.five.camera.position.distanceTo(n),
+            point: n.clone(),
+            originalPoint: s.point.clone(),
+            face: new o.Face3(0, 0, 0, this.plane.normal.clone()),
+            raycaster: t
+          };
+        }
+        return this.updatePointSelectorHelperIntersect(s), this.lastIntersection = s, !0;
+      }
       if (this.plane) {
-        const r = t.ray.intersectPlane(this.plane, N);
-        if (r) {
-          const u = {
-            distance: this.five.camera.position.distanceTo(r),
-            point: r.clone(),
-            object: new p.Object3D(),
-            face: new p.Face3(0, 0, 0, this.plane.normal.clone()),
+        const n = t.ray.intersectPlane(this.plane, _);
+        if (n) {
+          const p = {
+            distance: this.five.camera.position.distanceTo(n),
+            point: n.clone(),
+            object: new o.Object3D(),
+            face: new o.Face3(0, 0, 0, this.plane.normal.clone()),
             raycaster: t,
             isVirtual: !0
           };
-          return this.updatePointSelectorHelperIntersect(u), !0;
+          return this.updatePointSelectorHelperIntersect(p), !0;
         }
       }
       if (this.actionIfNoIntersection === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoIntersection === "virtualPoint") {
-        const r = L(t, (n = this.lastIntersection) == null ? void 0 : n.distance);
-        return r.face = new p.Face3(0, 0, 0, (c = (a = this.lastIntersection) == null ? void 0 : a.face) == null ? void 0 : c.normal), r.isVirtual = !0, this.lastIntersection = r, this.updatePointSelectorHelperIntersect(r), !0;
+        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;
     });
@@ -171,30 +215,91 @@ class O extends M {
      * @description: 更新 pointSelectorHelper 的焦点位置
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
+      var u, d, n, p, T, L, M, H;
       if (!e) {
-        this.onLeave(), this.five.getElement().style.cursor = P;
+        this.onLeave(), this.five.getElement().style.cursor = V;
         return;
       }
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
-      const t = l({}, e);
-      let o = !1;
-      if (typeof this.adherePoints == "function" && typeof this.adherePointsRadius == "number") {
-        for (const n of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
-          if (n.distanceTo(e.point) < this.adherePointsRadius) {
-            t.point = n.clone(), o = !0;
+      const t = v({}, e), s = {
+        x: this.mouseNdcPosition.x,
+        y: 1 - this.mouseNdcPosition.y
+      }, c = this.five.renderer.getSize(new o.Vector2());
+      if (this.adhereEnabled && typeof this.adherePoints == "function" && typeof this.adhereRadius == "number") {
+        for (const h of this.adherePlane) {
+          const r = h.distanceToPoint(e.point);
+          let f = h.projectPoint(e.point, new o.Vector3());
+          (!this.plane || this.plane.distanceToPoint(f) < 0.01) && (f = (d = (u = this.plane) == null ? void 0 : u.projectPoint(f, new o.Vector3())) != null ? d : f, r < this.adhereRadius && (t.point = f, this.plane || (t.face = new o.Face3(0, 0, 0, h.normal.clone())), t.isAdsorbed = !0));
+        }
+        for (const h of this.adhereLine) {
+          let r = h.closestPointToPoint(e.point, !1, new o.Vector3());
+          if (r.distanceTo(e.point) < this.adhereRadius)
+            (!this.plane || this.plane.distanceToPoint(r) < 0.01) && (r = (p = (n = this.plane) == null ? void 0 : n.projectPoint(r, new o.Vector3())) != null ? p : r, t.point = r.clone(), t.isAdsorbed = !0);
+          else {
+            const f = W({
+              raycaster: new z(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
+              line: h,
+              clampToLine: !1
+            }), P = f.clone().project(this.five.camera);
+            if (P.z <= 1) {
+              const y = {
+                x: (P.x + 1) / 2,
+                y: (1 - P.y) / 2
+              }, b = {
+                x: Math.abs(y.x - s.x) * c.width,
+                y: Math.abs(y.y - s.y) * c.height
+              };
+              let m = f.clone();
+              b.x < 10 && b.y < 10 && (!this.plane || this.plane.distanceToPoint(m) < 0.01) && (m = (L = (T = this.plane) == null ? void 0 : T.projectPoint(m, new o.Vector3())) != null ? L : m, t.point = m.clone(), t.isAdsorbed = !0);
+            }
+          }
+        }
+        for (const h of this.adherePoints({ intersection: e, pointSelectorInstance: this })) {
+          const r = h instanceof o.Face3 ? new o.Vector3(h.a, h.b, h.c) : h;
+          if (r.IsAlwaysVisible = h.IsAlwaysVisible, this.plane && this.plane.distanceToPoint(r) > 0.01)
+            continue;
+          if (r.distanceTo(e.point) < this.adhereRadius) {
+            t.point = (H = (M = this.plane) == null ? void 0 : M.projectPoint(r, new o.Vector3())) != null ? H : r.clone(), !this.plane && h instanceof o.Face3 && (t.face = h), t.isAdsorbed = !0;
             break;
+          } else {
+            const P = r.clone().project(this.five.camera);
+            if (P.z > 1)
+              continue;
+            const y = this.five.renderer.getSize(new o.Vector2()), b = {
+              x: (P.x + 1) / 2,
+              y: (1 - P.y) / 2
+            }, m = {
+              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 S = !1;
+              if (r.IsAlwaysVisible)
+                S = !0;
+              else {
+                const D = new o.Raycaster();
+                D.setFromCamera(r.clone(), this.five.camera);
+                const F = this.five.model.intersectRaycaster(D, void 0, !0)[0], x = 0.1, U = this.five.camera.position.distanceTo(r);
+                F && F.distance < U + x && (S = !0);
+              }
+              if (S) {
+                t.point = r.clone(), !this.plane && h instanceof o.Face3 && (t.face = h), t.isAdsorbed = !0;
+                break;
+              }
+            }
           }
+        }
       }
-      this.pointSelectorHelper.updateWithIntersect(t, { emitEvent: !1 }), this.emit("intersectionUpdate", t, o);
+      this.pointSelectorHelper.updateWithIntersect(t, { emitEvent: !1 }), this.emit("intersectionUpdate", t);
     });
     i(this, "mousePositionToNdcPosition", (e) => {
       const t = this.five.getElement();
       if (!t)
         return null;
-      const { top: o, left: n, width: a, height: c } = t.getBoundingClientRect(), { clientX: r, clientY: u } = e;
+      const { top: s, left: c, width: u, height: d } = t.getBoundingClientRect(), { clientX: n, clientY: p } = e;
       return {
-        x: (r - n) / a,
-        y: 1 - (u - o) / c
+        x: (n - c) / u,
+        y: 1 - (p - s) / d
       };
     });
     i(this, "onFiveWantsPanGesture", () => {
@@ -207,15 +312,15 @@ class O extends M {
     i(this, "emitIntersectionUpdate", (e) => {
       this.emit("intersectionUpdate", e);
     });
-    this.five = e, this.config = l(l({}, this.config), t), this.actionIfNoIntersection = (c = (a = t == null ? void 0 : t.actionIfNoIntersection) != null ? a : t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? c : "virtualPoint";
-    const o = (r = t == null ? void 0 : t.mode) != null ? r : "auto";
-    o === "auto" ? this.mode = y ? "fixed" : "cursor" : this.mode = o;
-    const n = {
+    this.five = e, this.config = v(v({}, 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 = 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 H(this.five, v(l({}, t == null ? void 0 : t.helper), {
-      magnifierParams: l(l({}, n), (u = t == null ? void 0 : t.helper) == null ? void 0 : u.magnifierParams)
+    this.pointSelectorHelper = new C(this.five, E(v({}, t == null ? void 0 : t.helper), {
+      magnifierParams: v(v({}, c), (p = t == null ? void 0 : t.helper) == null ? void 0 : p.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {
@@ -234,7 +339,7 @@ class O extends M {
     return this._cursorError;
   }
   set cursorError(e) {
-    this._cursorError = e, this.five.getElement().style.cursor = e ? P : "", e ? this.pointSelectorHelper.hide() : this.pointSelectorHelper.show();
+    this._cursorError = e, this.five.getElement().style.cursor = e ? V : "", e ? this.pointSelectorHelper.hide() : this.pointSelectorHelper.show();
   }
   set outOfFive(e) {
     this._outOfFive = e;
@@ -252,22 +357,22 @@ class O extends M {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.mode === "cursor" ? (this.five.on("wantsMoveToPano", d), this.five.on("wantsChangeMode", d), this.five.on("wantsTapGesture", d), e.addEventListener("touchstart", this.onTouchStart, { passive: !0 }), e.addEventListener("touchmove", this.onTouchMove), e.addEventListener("touchend", this.onTouchEnd), e.addEventListener("mousedown", this.onMouseDown), e.addEventListener("mouseup", this.onMouseUp), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
+    this.mode === "cursor" ? (this.five.on("wantsMoveToPano", w), this.five.on("wantsChangeMode", w), this.five.on("wantsTapGesture", w), e.addEventListener("touchstart", this.onTouchStart, { passive: !0 }), e.addEventListener("touchmove", this.onTouchMove), e.addEventListener("touchend", this.onTouchEnd), e.addEventListener("mousedown", this.onMouseDown), e.addEventListener("mouseup", this.onMouseUp), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), document.addEventListener("keydown", this.onKeyDown), document.addEventListener("keyup", this.onKeyUp), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
   }
   disable() {
     if (!this.enabled)
       return;
-    this.enabled = !1, this.pointSelectorHelper.disable(), this.five.getElement().style.cursor = "";
+    this.enabled = !1, this.adherePoints = null, this.adhereLine = [], this.adherePlane = [], this.plane = void 0, this.pointSelectorHelper.disable(), this.five.getElement().style.cursor = "";
     const e = this.five.getElement();
-    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", d), this.five.off("wantsChangeMode", d), this.five.off("wantsTapGesture", d), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("touchstart", this.onTouchStart), e == null || e.removeEventListener("touchmove", this.onTouchMove), e == null || e.removeEventListener("touchend", this.onTouchEnd), e == null || e.removeEventListener("mousedown", this.onMouseDown), e == null || e.removeEventListener("mouseup", this.onMouseUp), e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
+    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", w), this.five.off("wantsChangeMode", w), this.five.off("wantsTapGesture", w), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("touchstart", this.onTouchStart), e == null || e.removeEventListener("touchmove", this.onTouchMove), e == null || e.removeEventListener("touchend", this.onTouchEnd), e == null || e.removeEventListener("mousedown", this.onMouseDown), e == null || e.removeEventListener("mouseup", this.onMouseUp), e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), document.removeEventListener("keydown", this.onKeyDown), document.removeEventListener("keyup", this.onKeyUp), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
   }
   setAdherePoints(e, t) {
-    e ? typeof e == "function" ? this.adherePoints = e : this.adherePoints = () => e : this.adherePoints = null, typeof t == "number" && (this.adherePointsRadius = t);
+    e ? typeof e == "function" ? this.adherePoints = e : this.adherePoints = () => e : this.adherePoints = null;
   }
 }
 export {
-  O as PointSelector
+  se as PointSelector
 };

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

@@ -15,6 +15,7 @@ declare function createRingMesh(): THREE.Mesh<THREE.RingGeometry, THREE.MeshBasi
 declare function createBallMesh(): THREE.Mesh<THREE.SphereGeometry, THREE.MeshBasicMaterial>;
 declare function createCSSBallMesh(): ICSS3DSprite;
 export declare class PointHelper2 extends THREE.Object3D implements PointHelperAbstract {
+    disableGetPixel: boolean;
     planeMesh: ReturnType<typeof createPlaneMesh>;
     ringMesh: ReturnType<typeof createRingMesh>;
     crossline: ReturnType<typeof createCrossline>;

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

@@ -121,6 +121,7 @@ function S() {
 class E extends t.Object3D {
   constructor(r) {
     super();
+    o(this, "disableGetPixel", !0);
     o(this, "planeMesh");
     o(this, "ringMesh");
     o(this, "crossline");
@@ -128,7 +129,7 @@ class E extends t.Object3D {
     o(this, "ballMesh");
     o(this, "cssBallMesh");
     const i = 0.18;
-    this.planeMesh = P(), this.ringMesh = C(), this.crossline = b(), this.lineMesh = V(i), this.ballMesh = x(), this.cssBallMesh = S(), this.ballMesh.position.setZ(i), this.cssBallMesh.position.setZ(i), this.planeMesh.renderOrder = 0, this.ringMesh.renderOrder = 1, this.crossline.renderOrder = 2, this.lineMesh.renderOrder = 3, this.ballMesh.renderOrder = 4, this.add(this.planeMesh, this.crossline, this.lineMesh, this.ballMesh, this.ringMesh, this.cssBallMesh), A(r);
+    this.planeMesh = P(), this.ringMesh = C(), this.crossline = b(), this.lineMesh = V(i), this.ballMesh = x(), this.cssBallMesh = S(), this.ballMesh.position.setZ(i), this.cssBallMesh.position.setZ(i), this.planeMesh.renderOrder = 0, this.ringMesh.renderOrder = 1, this.crossline.renderOrder = 2, this.lineMesh.renderOrder = 3, this.ballMesh.renderOrder = 4, this.add(this.planeMesh, this.lineMesh, this.ballMesh, this.ringMesh, this.cssBallMesh), A(r);
   }
   updateWithIntersect(r) {
     if (!r.face)

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

@@ -18,6 +18,14 @@ type EventMap = {
     disabled: () => void;
 };
 export interface PointIntersection extends Intersection {
+    /**
+     * @description 被吸附
+     */
+    isAdsorbed?: boolean;
+    /**
+     * @description 原始焦点
+     */
+    originalPoint?: THREE.Vector3;
     isVirtual?: boolean;
     raycaster?: THREE.Raycaster;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.61.14",
+  "version": "3.61.15-alpha.0",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",