@realsee/dnalogel 3.61.5 → 3.61.7-alpha.0

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

@@ -1,61 +1,65 @@
-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 = (r, i, e) => i in r ? w(r, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[i] = e, u = (r, i) => {
-  for (var e in i || (i = {}))
-    b.call(i, e) && f(r, e, i[e]);
-  if (m)
-    for (var e of m(i))
-      E.call(i, e) && f(r, e, i[e]);
+var I = Object.defineProperty, S = Object.defineProperties;
+var b = Object.getOwnPropertyDescriptors;
+var v = Object.getOwnPropertySymbols;
+var y = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
+var f = (r, o, e) => o in r ? I(r, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[o] = e, a = (r, o) => {
+  for (var e in o || (o = {}))
+    y.call(o, e) && f(r, e, o[e]);
+  if (v)
+    for (var e of v(o))
+      E.call(o, e) && f(r, e, o[e]);
   return r;
-}, v = (r, i) => I(r, S(i));
-var s = (r, i, e) => (f(r, typeof i != "symbol" ? i + "" : i, e), e);
+}, m = (r, o) => S(r, b(o));
+var i = (r, o, e) => (f(r, typeof o != "symbol" ? o + "" : o, 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 { isTouchDevice as M } from "../../isTouchDevice.js";
+import * as u from "three";
+import { Subscribe as T } from "../../Subscribe.js";
 import { getIntersectByRaycaster as D, getVirtualIntersectByRaycaster as L } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as T } from "../../five/getRaycasterByNdcPosition.js";
+import { getRaycasterByNdcPosition as N } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as P } from "./utils/contents.js";
-const N = new p.Vector3(), d = () => !1;
-class V extends M {
+const w = new u.Vector3(), p = () => !1;
+class V extends T {
   constructor(e, t) {
-    var a, l, n, c;
+    var l, c, n, d;
     super();
-    s(this, "_cursorError", !1);
-    s(this, "actionIfNoIntersection", "virtualPoint");
-    s(this, "plane");
-    s(this, "pointSelectorHelper");
+    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 */
-    s(this, "hook", this);
-    s(this, "five");
-    s(this, "_outOfFive", !1);
-    s(this, "_enabled", !1);
-    s(this, "mode");
+    i(this, "hook", this);
+    i(this, "_outOfFive", !1);
+    i(this, "_enabled", !1);
+    i(this, "mode");
     /** 长按屏幕的动作触发后为true，手指抬起后为false */
-    s(this, "pressDown", !1);
+    i(this, "pressDown", !1);
     /** 一组吸附的点，光标靠近这些点时，会将helper以及放大镜的位置设置为这些点 */
-    s(this, "adherePoints");
+    i(this, "adherePoints");
     /** 吸附点的半径 */
-    s(this, "adherePointsRadius", 0.1);
+    i(this, "adherePointsRadius", 0.1);
     /** 有值时表明处于按压检查阶段 */
-    s(this, "setPressDown");
-    s(this, "lastFiveHelperVisible");
-    s(this, "lastIntersection");
-    s(this, "mousePosition");
-    s(this, "_mouseDownInfo");
-    s(this, "config", {});
+    i(this, "setPressDown");
+    i(this, "lastFiveHelperVisible");
+    i(this, "lastIntersection");
+    i(this, "mousePosition");
+    i(this, "_mouseDownInfo");
+    i(this, "config", {});
     /**
      * @description: 主动触发一次选点
      * @return: select 是否成功
      */
-    s(this, "select", (e) => {
+    i(this, "select", (e) => {
       e && this.updatePointSelectorHelperIntersect(e);
       const t = this.emit("wantsSelect", this.position);
       return t || (this.pointSelectorHelper.hide(), this.emit("select", this.position), console.debug(this.position)), !t;
     });
-    s(this, "onMouseWheel", (e) => {
+    i(this, "onMouseWheel", (e) => {
       this.updateByMousePosition(e);
       const t = () => this.updateByMousePosition();
       this.five.off("render.prepare", t), this.five.on("render.prepare", t), setTimeout(() => {
@@ -65,32 +69,29 @@ class V extends M {
     /**
      * @description: 鼠标进入five canvas时
      */
-    s(this, "onEnter", () => {
+    i(this, "onEnter", () => {
       this.cursorError || this.pointSelectorHelper.show(), this.outOfFive = !1, this.emit("intersectionUpdate", this.position);
     });
     /**
      * @description: 鼠标离开five canvas时
      */
-    s(this, "onLeave", () => {
+    i(this, "onLeave", () => {
       this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", null);
     });
-    s(this, "onClick", () => {
-      this.select();
-    });
-    s(this, "onMouseDown", (e) => {
+    i(this, "onMouseDown", (e) => {
       this._mouseDownInfo = {
         clientX: e.clientX,
         clientY: e.clientY,
         timestamp: performance.now()
       };
     });
-    s(this, "onMouseUp", (e) => {
+    i(this, "onMouseUp", (e) => {
       if (!this._mouseDownInfo)
         return;
-      const { clientX: t, clientY: o, timestamp: h } = this._mouseDownInfo;
-      Math.abs(e.clientX - t) < 2 && Math.abs(e.clientY - o) < 2 && performance.now() - h < 500 ? this.select() : this._mouseDownInfo = null;
+      const { clientX: t, clientY: s, timestamp: h } = this._mouseDownInfo;
+      Math.abs(e.clientX - t) < 2 && Math.abs(e.clientY - s) < 2 && performance.now() - h < 500 ? this.select() : this._mouseDownInfo = null;
     });
-    s(this, "onTouchStart", (e) => {
+    i(this, "onTouchStart", (e) => {
       this.setPressDown = setTimeout(() => {
         if (this.setPressDown = void 0, this.mousePosition = {
           clientX: e.touches[0].clientX,
@@ -101,7 +102,7 @@ class V extends M {
         this.pressDown = t;
       }, 300);
     });
-    s(this, "onTouchMove", (e) => {
+    i(this, "onTouchMove", (e) => {
       if (this.setPressDown) {
         clearTimeout(this.setPressDown), this.setPressDown = void 0;
         return;
@@ -115,7 +116,7 @@ class V extends M {
         this.updateByNdcPosition(this.mouseNdcPosition);
       }
     });
-    s(this, "onTouchEnd", (e) => {
+    i(this, "onTouchEnd", (e) => {
       if (this.setPressDown) {
         clearTimeout(this.setPressDown), this.setPressDown = void 0;
         return;
@@ -124,88 +125,105 @@ class V extends M {
         this.pressDown = !1;
       }, 100), this.select());
     });
-    s(this, "updateByMousePosition", (e) => {
+    i(this, "updateByMousePosition", (e) => {
       this.five.getElement() && (e && (this.mousePosition = e), this.updateByNdcPosition(this.mouseNdcPosition));
     });
     /**
      * @description: 根据鼠标位置计算焦点位置并更新
      */
-    s(this, "updateByNdcPosition", (e) => {
-      var h, a, l;
-      const t = T(this.five, e), o = D(this.five, t);
-      if (o)
-        return this.updatePointSelectorHelperIntersect(o), this.lastIntersection = o, !0;
+    i(this, "updateByNdcPosition", (e) => {
+      var h, l, c;
+      const t = N(this.five, e);
+      let s = D(this.five, t);
+      if (s) {
+        if (this.plane && this.planeMode === "vertical" && (s = m(a({}, s), {
+          point: this.plane.projectPoint(s.point, new u.Vector3()),
+          face: new u.Face3(0, 0, 0, this.plane.normal.clone()),
+          originalPoint: s.point.clone()
+        })), this.plane && this.planeMode === "onlyPlane") {
+          const n = t.ray.intersectPlane(this.plane, w);
+          if (!n)
+            return !1;
+          s = {
+            distance: this.five.camera.position.distanceTo(n),
+            point: n.clone(),
+            originalPoint: s.point.clone(),
+            face: new u.Face3(0, 0, 0, this.plane.normal.clone()),
+            raycaster: t
+          };
+        }
+        return this.updatePointSelectorHelperIntersect(s), this.lastIntersection = s, !0;
+      }
       if (this.plane) {
-        const n = t.ray.intersectPlane(this.plane, N);
+        const n = t.ray.intersectPlane(this.plane, w);
         if (n) {
-          const c = {
+          const d = {
             distance: this.five.camera.position.distanceTo(n),
             point: n.clone(),
-            object: new p.Object3D(),
-            face: new p.Face3(0, 0, 0, this.plane.normal.clone()),
+            object: new u.Object3D(),
+            face: new u.Face3(0, 0, 0, this.plane.normal.clone()),
             raycaster: t,
             isVirtual: !0
           };
-          return this.updatePointSelectorHelperIntersect(c), !0;
+          return this.updatePointSelectorHelperIntersect(d), !0;
         }
       }
       if (this.actionIfNoIntersection === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoIntersection === "virtualPoint") {
         const n = L(t, (h = this.lastIntersection) == null ? void 0 : h.distance);
-        return n.face = new p.Face3(0, 0, 0, (l = (a = this.lastIntersection) == null ? void 0 : a.face) == null ? void 0 : l.normal), n.isVirtual = !0, this.lastIntersection = n, this.updatePointSelectorHelperIntersect(n), !0;
+        return n.face = new u.Face3(0, 0, 0, (c = (l = this.lastIntersection) == null ? void 0 : l.face) == null ? void 0 : c.normal), n.isVirtual = !0, this.lastIntersection = n, this.updatePointSelectorHelperIntersect(n), !0;
       } else if (this.actionIfNoIntersection === "disable")
         return this.updatePointSelectorHelperIntersect(null), !1;
     });
     /**
      * @description: 更新 pointSelectorHelper 的焦点位置
      */
-    s(this, "updatePointSelectorHelperIntersect", (e) => {
+    i(this, "updatePointSelectorHelperIntersect", (e) => {
       if (!e) {
         this.onLeave(), this.five.getElement().style.cursor = P;
         return;
       }
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
-      const t = u({}, e);
-      let o = !1;
+      const t = a({}, e);
       if (typeof this.adherePoints == "function" && typeof this.adherePointsRadius == "number") {
-        for (const h of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
-          if (h.distanceTo(e.point) < this.adherePointsRadius) {
-            t.point = h.clone(), o = !0;
+        for (const s of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
+          if (s.distanceTo(e.point) < this.adherePointsRadius) {
+            t.point = s.clone(), 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);
     });
-    s(this, "mousePositionToNdcPosition", (e) => {
+    i(this, "mousePositionToNdcPosition", (e) => {
       const t = this.five.getElement();
       if (!t)
         return null;
-      const { top: o, left: h, width: a, height: l } = t.getBoundingClientRect(), { clientX: n, clientY: c } = e;
+      const { top: s, left: h, width: l, height: c } = t.getBoundingClientRect(), { clientX: n, clientY: d } = e;
       return {
-        x: (n - h) / a,
-        y: 1 - (c - o) / l
+        x: (n - h) / l,
+        y: 1 - (d - s) / c
       };
     });
-    s(this, "onFiveWantsPanGesture", () => {
+    i(this, "onFiveWantsPanGesture", () => {
       if (this.pressDown)
         return !1;
     });
-    s(this, "renderScreenCenter", () => {
+    i(this, "renderScreenCenter", () => {
       this.updateByNdcPosition({ x: 0.5, y: 0.5 });
     });
-    s(this, "emitIntersectionUpdate", (e) => {
+    i(this, "emitIntersectionUpdate", (e) => {
       this.emit("intersectionUpdate", e);
     });
-    this.five = e, this.config = u(u({}, this.config), t), this.actionIfNoIntersection = (l = (a = t == null ? void 0 : t.actionIfNoIntersection) != null ? a : t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? l : "virtualPoint";
-    const o = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
-    o === "auto" ? this.mode = y ? "fixed" : "cursor" : this.mode = o;
+    this.five = e, this.config = a(a({}, this.config), t), this.actionIfNoIntersection = (c = (l = t == null ? void 0 : t.actionIfNoIntersection) != null ? l : t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? c : "virtualPoint";
+    const s = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
+    s === "auto" ? this.mode = M ? "fixed" : "cursor" : this.mode = s;
     const h = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new H(this.five, v(u({}, t == null ? void 0 : t.helper), {
-      magnifierParams: u(u({}, h), (c = t == null ? void 0 : t.helper) == null ? void 0 : c.magnifierParams)
+    this.pointSelectorHelper = new H(this.five, m(a({}, t == null ? void 0 : t.helper), {
+      magnifierParams: a(a({}, h), (d = t == null ? void 0 : t.helper) == null ? void 0 : d.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {
@@ -242,14 +260,14 @@ class V 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", p), this.five.on("wantsChangeMode", p), this.five.on("wantsTapGesture", p), 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");
   }
   disable() {
     if (!this.enabled)
       return;
     this.enabled = !1, 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", p), this.five.off("wantsChangeMode", p), this.five.off("wantsTapGesture", p), 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");
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();

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.5",
+  "version": "3.61.7-alpha.0",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",