@realsee/dnalogel 3.46.0 → 3.47.0

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

@@ -1,31 +1,35 @@
-var P = Object.defineProperty, E = Object.defineProperties;
-var S = Object.getOwnPropertyDescriptors;
-var p = Object.getOwnPropertySymbols;
-var w = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
-var f = (o, s, e) => s in o ? P(o, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[s] = e, l = (o, s) => {
+var v = Object.defineProperty, E = Object.defineProperties;
+var w = Object.getOwnPropertyDescriptors;
+var f = Object.getOwnPropertySymbols;
+var S = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
+var p = (n, s, e) => s in n ? v(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e, l = (n, s) => {
   for (var e in s || (s = {}))
-    w.call(s, e) && f(o, e, s[e]);
-  if (p)
-    for (var e of p(s))
-      C.call(s, e) && f(o, e, s[e]);
-  return o;
-}, c = (o, s) => E(o, S(s));
-var i = (o, s, e) => (f(o, typeof s != "symbol" ? s + "" : s, e), e);
-import { PointSelectorHelper as y } from "./utils/PointSelectorHelper.js";
+    S.call(s, e) && p(n, e, s[e]);
+  if (f)
+    for (var e of f(s))
+      y.call(s, e) && p(n, e, s[e]);
+  return n;
+}, m = (n, s) => E(n, w(s));
+var i = (n, s, e) => (p(n, typeof s != "symbol" ? s + "" : s, e), e);
+import { PointSelectorHelper as I } from "./utils/PointSelectorHelper.js";
 import { isTouchDevice as b } from "../../isTouchDevice.js";
-import H from "hammerjs";
-import { Subscribe as F } from "../../Subscribe.js";
-import { getIntersectByNdcPosition as d } from "../../five/getPosition.js";
-const h = () => !1;
-class M extends F {
+import C from "hammerjs";
+import * as u from "three";
+import { Subscribe as H } from "../../Subscribe.js";
+import { getIntersectByRaycaster as F, getVirtualIntersectByRaycaster as M } from "../../five/getPosition.js";
+import { getRaycasterByNdcPosition as N } from "../../five/getRaycasterByNdcPosition.js";
+const x = new u.Vector3(), d = () => !1;
+class V extends H {
   constructor(e, t) {
-    var a, u;
+    var a, o, c;
     super();
     /**
      * @description: 不在 five canvas 上时为 true
      */
     i(this, "outOfFive", !1);
     i(this, "enabled", !1);
+    i(this, "actionIfNoModelUnderMouse", "virtualPoint");
+    i(this, "plane");
     i(this, "pointSelectorHelper");
     /** @deprecated directly use `pointSelector.on/off` instead */
     i(this, "hook", this);
@@ -39,8 +43,9 @@ class M extends F {
     /** 吸附点的半径 */
     i(this, "adherePointsRadius", 0.1);
     i(this, "lastFiveHelperVisible");
+    i(this, "lastIntersection");
     i(this, "mousePosition");
-    i(this, "config");
+    i(this, "config", {});
     /**
      * @description: 主动触发一次选点
      * @return: select 是否成功
@@ -63,26 +68,20 @@ class M extends F {
       this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", null);
     });
     i(this, "onTap", (e) => {
-      if (e != null && e.center && (this.mousePosition = {
+      e != null && e.center && (this.mousePosition = {
         clientX: e.center.x,
         clientY: e.center.y
-      }), !this.mouseNdcPosition)
-        return;
-      const t = d(this.five, this.mouseNdcPosition, { virtualPoint: this.virtualPoint });
-      t != null && t.face && this.select(t);
+      }), this.select();
     });
     /**
      * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
      * 2. 如果有长按点，把长按点位置更新为当前位置
      */
     i(this, "onPan", (e) => {
-      if (!this.pressDown || (e != null && e.center && (this.mousePosition = {
+      this.pressDown && (e != null && e.center && (this.mousePosition = {
         clientX: e.center.x,
         clientY: e.center.y
-      }), !this.mouseNdcPosition))
-        return;
-      const t = d(this.five, this.mouseNdcPosition, { virtualPoint: this.virtualPoint });
-      t != null && t.face && this.updatePointSelectorHelperIntersect(t);
+      }), this.mouseNdcPosition && this.updateByNdcPosition(this.mouseNdcPosition));
     });
     /**
      * @description: 长按屏幕后，更新长按点的位置
@@ -93,8 +92,8 @@ class M extends F {
         clientY: e.center.y
       }), !this.mouseNdcPosition)
         return;
-      const t = d(this.five, this.mouseNdcPosition, { virtualPoint: this.virtualPoint });
-      t != null && t.face && (this.pressDown = !0, this.updatePointSelectorHelperIntersect(t));
+      const t = this.updateByNdcPosition(this.mouseNdcPosition);
+      this.pressDown = t;
     });
     /**
      * @description: 手指抬起后，重置pressDown状态
@@ -106,11 +105,34 @@ class M extends F {
       this.five.getElement() && (this.mousePosition = e, this.updateByNdcPosition(this.mouseNdcPosition));
     });
     /**
-     * @description: 根据鼠标位置更新helper位置
+     * @description: 根据鼠标位置计算焦点位置并更新
      */
     i(this, "updateByNdcPosition", (e) => {
-      const t = d(this.five, e, { virtualPoint: this.virtualPoint });
-      this.updatePointSelectorHelperIntersect(t);
+      var h, a;
+      const t = N(this.five, e), r = F(this.five, t);
+      if (r)
+        return this.updatePointSelectorHelperIntersect(r), this.lastIntersection = r, !0;
+      if (this.plane) {
+        const o = t.ray.intersectPlane(this.plane, x);
+        if (o) {
+          const c = {
+            distance: this.five.camera.position.distanceTo(o),
+            point: o.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;
+        }
+      }
+      if (this.actionIfNoModelUnderMouse === "lastPoint")
+        return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
+      if (this.actionIfNoModelUnderMouse === "virtualPoint") {
+        const o = M(t, (h = this.lastIntersection) == null ? void 0 : h.distance);
+        return o.face = new u.Face3(0, 0, 0, (a = this.lastIntersection) == null ? void 0 : a.face.normal), this.lastIntersection = o, this.updatePointSelectorHelperIntersect(o), !0;
+      } else if (this.actionIfNoModelUnderMouse === "disable")
+        return this.updatePointSelectorHelperIntersect(null), !1;
     });
     /**
      * @description: 更新 pointSelectorHelper 的焦点位置
@@ -122,24 +144,24 @@ class M extends F {
       }
       this.onEnter(), this.five.getElement().style.cursor = "";
       const t = l({}, e);
-      let n = !1;
+      let r = !1;
       if (typeof this.adherePoints == "function" && typeof this.adherePointsRadius == "number") {
-        for (const r of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
-          if (r.distanceTo(e.point) < this.adherePointsRadius) {
-            t.point = r.clone(), n = !0;
+        for (const h of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
+          if (h.distanceTo(e.point) < this.adherePointsRadius) {
+            t.point = h.clone(), r = !0;
             break;
           }
       }
-      this.pointSelectorHelper.updateWithIntersect(t, { emitEvent: !1 }), this.emit("intersectionUpdate", t, n);
+      this.pointSelectorHelper.updateWithIntersect(t, { emitEvent: !1 }), this.emit("intersectionUpdate", t, r);
     });
     i(this, "mousePositionToNdcPosition", (e) => {
       const t = this.five.getElement();
       if (!t)
         return null;
-      const { top: n, left: r, width: a, height: u } = t.getBoundingClientRect(), { clientX: m, clientY: v } = e;
+      const { top: r, left: h, width: a, height: o } = t.getBoundingClientRect(), { clientX: c, clientY: P } = e;
       return {
-        x: (m - r) / a,
-        y: 1 - (v - n) / u
+        x: (c - h) / a,
+        y: 1 - (P - r) / o
       };
     });
     i(this, "onFiveWantsPanGesture", () => {
@@ -152,15 +174,15 @@ class M extends F {
     i(this, "emitIntersectionUpdate", (e) => {
       this.emit("intersectionUpdate", e);
     });
-    this.five = e, this.config = t != null ? t : {};
-    const n = (a = t == null ? void 0 : t.mode) != null ? a : "auto";
-    n === "auto" ? this.mode = b ? "fixed" : "cursor" : this.mode = n;
-    const r = {
+    this.five = e, this.config = l(l({}, this.config), t), this.actionIfNoModelUnderMouse = (a = t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? a : "virtualPoint";
+    const r = (o = t == null ? void 0 : t.mode) != null ? o : "auto";
+    r === "auto" ? this.mode = b ? "fixed" : "cursor" : this.mode = r;
+    const h = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new y(e, c(l({}, t == null ? void 0 : t.helper), {
-      magnifierParams: l(l({}, r), (u = t == null ? void 0 : t.helper) == null ? void 0 : u.magnifierParams)
+    this.pointSelectorHelper = new I(this.five, m(l({}, t == null ? void 0 : t.helper), {
+      magnifierParams: l(l({}, h), (c = t == null ? void 0 : t.helper) == null ? void 0 : c.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {
@@ -169,11 +191,6 @@ class M extends F {
   get mouseNdcPosition() {
     return this.mousePosition ? this.mousePositionToNdcPosition(this.mousePosition) : null;
   }
-  get virtualPoint() {
-    var t;
-    const e = (t = this.config.virtualPoint) != null ? t : !0;
-    return typeof e == "boolean" ? e : Array.isArray(e) ? e.includes(this.five.state.mode) : !0;
-  }
   enable() {
     if (this.enabled)
       return;
@@ -181,14 +198,14 @@ class M extends F {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.hammer || (this.hammer = new H(e)), this.mode === "cursor" ? (this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", h), this.five.on("wantsChangeMode", h), this.five.on("wantsTapGesture", h), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.updateByMousePosition), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : 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.hammer || (this.hammer = new C(e)), this.mode === "cursor" ? (this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", d), this.five.on("wantsChangeMode", d), this.five.on("wantsTapGesture", d), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.updateByMousePosition), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : 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", h), this.five.off("wantsChangeMode", h), this.five.off("wantsTapGesture", h), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.updateByMousePosition), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), 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", d), this.five.off("wantsChangeMode", d), this.five.off("wantsTapGesture", d), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.updateByMousePosition), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), 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();
@@ -198,5 +215,5 @@ class M extends F {
   }
 }
 export {
-  M as PointSelector
+  V as PointSelector
 };

package/libs/typings/typings.d.ts

@@ -7,6 +7,8 @@ export interface Intersection {
     face?: {
         normal: THREE.Vector3;
     } | null;
+    /** 焦点距离 */
+    distance?: number;
 }
 export type PartialObjectDeep<ObjectType extends object> = {
     [KeyType in keyof ObjectType]?: PartialDeep<ObjectType[KeyType]>;

package/package.json

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