@realsee/dnalogel 3.63.0 → 3.63.1

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

@@ -2,15 +2,15 @@ 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, 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, v = (l, h) => {
   for (var e in h || (h = {}))
-    Y.call(h, e) && I(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) && I(l, e, h[e]);
+      B.call(h, e) && E(l, e, h[e]);
   return l;
-}, E = (l, h) => O(l, X(h));
-var i = (l, h, e) => (I(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 j } from "../../isTouchDevice.js";
 import * as o from "three";
@@ -92,8 +92,13 @@ class se extends A {
     /**
      * @description: 鼠标进入five canvas时
      */
-    i(this, "onEnter", () => {
-      this.cursorError || this.pointSelectorHelper.show(), this.outOfFive = !1, this.emit("intersectionUpdate", this.position);
+    i(this, "onEnter", (e) => {
+      var s;
+      const t = (s = e == null ? void 0 : e.emitEvent) != null ? s : !0;
+      this.cursorError || this.pointSelectorHelper.show(), this.outOfFive = !1, t && this.emit("intersectionUpdate", this.position);
+    });
+    i(this, "onMouseEnter", () => {
+      this.onEnter();
     });
     /**
      * @description: 鼠标离开five canvas时
@@ -178,7 +183,7 @@ class se extends A {
       const t = G(this.five, e);
       let s = k(this.five, t);
       if (s) {
-        if (this.plane && this.planeMode === "vertical" && (s = E(P({}, s), {
+        if (this.plane && this.planeMode === "vertical" && (s = M(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()
@@ -222,76 +227,79 @@ class se extends A {
      * @description: 更新 pointSelectorHelper 的焦点位置
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
-      var u, d, n, f, L, T, M, H;
+      var s, c, u, d, n, f, L, T;
       if (!e) {
         this.onLeave(), this.five.getElement().style.cursor = V;
         return;
       }
-      this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
-      const t = P({}, 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 r of this.adherePlane) {
-          const a = r.distanceToPoint(e.point);
-          let p = r.projectPoint(e.point, new o.Vector3());
-          (!this.plane || this.plane.distanceToPoint(p) < 0.01) && (p = (d = (u = this.plane) == null ? void 0 : u.projectPoint(p, new o.Vector3())) != null ? d : p, a < this.adhereRadius && (t.point = p.clone(), t.adherePoint = p.clone(), this.plane || (t.face = new o.Face3(0, 0, 0, r.normal.clone())), t.isAdsorbed = !0));
-        }
-        for (const r of this.adhereLine) {
-          let a = r.closestPointToPoint(e.point, !1, new o.Vector3());
-          if (a.distanceTo(e.point) < this.adhereRadius)
-            (!this.plane || this.plane.distanceToPoint(a) < 0.01) && (a = (f = (n = this.plane) == null ? void 0 : n.projectPoint(a, new o.Vector3())) != null ? f : a, t.point = a.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
-          else {
-            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 y = {
-                x: (v.x + 1) / 2,
-                y: (1 - v.y) / 2
-              }, b = {
-                x: Math.abs(y.x - s.x) * c.width,
-                y: Math.abs(y.y - s.y) * c.height
-              };
-              let m = p.clone();
-              b.x < 10 && b.y < 10 && (!this.plane || this.plane.distanceToPoint(m) < 0.01) && (m = (T = (L = this.plane) == null ? void 0 : L.projectPoint(m, new o.Vector3())) != null ? T : m, t.point = m.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
+      this.onEnter({ emitEvent: !1 }), this.cursorError || (this.five.getElement().style.cursor = "");
+      const t = v({}, e);
+      if (this.adhereEnabled && this.mouseNdcPosition && this.five.renderer) {
+        const S = {
+          x: this.mouseNdcPosition.x,
+          y: 1 - this.mouseNdcPosition.y
+        }, H = this.five.renderer.getSize(new o.Vector2());
+        if (this.adhereEnabled && typeof this.adherePoints == "function" && typeof this.adhereRadius == "number") {
+          for (const r of this.adherePlane) {
+            const a = r.distanceToPoint(e.point);
+            let p = r.projectPoint(e.point, new o.Vector3());
+            (!this.plane || this.plane.distanceToPoint(p) < 0.01) && (p = (c = (s = this.plane) == null ? void 0 : s.projectPoint(p, new o.Vector3())) != null ? c : p, a < this.adhereRadius && (t.point = p.clone(), t.adherePoint = p.clone(), this.plane || (t.face = new o.Face3(0, 0, 0, r.normal.clone())), t.isAdsorbed = !0));
+          }
+          for (const r of this.adhereLine) {
+            let a = r.closestPointToPoint(e.point, !1, new o.Vector3());
+            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 = W({
+                raycaster: new z(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
+                line: r,
+                clampToLine: !1
+              }), P = p.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) * H.width,
+                  y: Math.abs(y.y - S.y) * H.height
+                };
+                let m = p.clone();
+                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);
+              }
             }
           }
-        }
-        for (const r of this.adherePoints({ intersection: e, pointSelectorInstance: this })) {
-          const a = r instanceof o.Face3 ? new o.Vector3(r.a, r.b, r.c) : r;
-          if (a.IsAlwaysVisible = r.IsAlwaysVisible, this.plane && this.plane.distanceToPoint(a) > 0.01)
-            continue;
-          if (a.distanceTo(e.point) < this.adhereRadius) {
-            t.point = (H = (M = this.plane) == null ? void 0 : M.projectPoint(a, new o.Vector3())) != null ? H : 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)
+          for (const r of this.adherePoints({ intersection: e, pointSelectorInstance: this })) {
+            const a = r instanceof o.Face3 ? new o.Vector3(r.a, r.b, r.c) : r;
+            if (a.IsAlwaysVisible = r.IsAlwaysVisible, this.plane && this.plane.distanceToPoint(a) > 0.01)
               continue;
-            const y = this.five.renderer.getSize(new o.Vector2()), b = {
-              x: (v.x + 1) / 2,
-              y: (1 - v.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 (a.IsAlwaysVisible)
-                S = !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 && (S = !0);
-              }
-              if (S) {
-                t.point = a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
-                break;
+            if (a.distanceTo(e.point) < this.adhereRadius) {
+              t.point = (T = (L = this.plane) == null ? void 0 : L.projectPoint(a, new o.Vector3())) != null ? T : a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
+              break;
+            } else {
+              const P = a.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 I = !1;
+                if (a.IsAlwaysVisible)
+                  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 && (I = !0);
+                }
+                if (I) {
+                  t.point = a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
+                  break;
+                }
               }
             }
           }
@@ -319,15 +327,15 @@ class se extends A {
     i(this, "emitIntersectionUpdate", (e) => {
       this.emit("intersectionUpdate", e);
     });
-    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";
+    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 C(this.five, E(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 = new C(this.five, M(v({}, t == null ? void 0 : t.helper), {
+      magnifierParams: v(v({}, c), (f = t == null ? void 0 : t.helper) == null ? void 0 : f.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {
@@ -364,14 +372,14 @@ class se extends A {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    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");
+    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.onMouseEnter), 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.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", 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");
+    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.onMouseEnter), 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();

package/package.json

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