@realsee/dnalogel 3.61.7-alpha.1 → 3.61.7-alpha.3

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

@@ -1,29 +1,29 @@
-var T = Object.defineProperty, L = Object.defineProperties;
-var H = Object.getOwnPropertyDescriptors;
-var y = Object.getOwnPropertySymbols;
-var D = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
-var v = (c, r, e) => r in c ? T(c, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[r] = e, d = (c, r) => {
+var _ = Object.defineProperty, O = Object.defineProperties;
+var R = Object.getOwnPropertyDescriptors;
+var D = Object.getOwnPropertySymbols;
+var U = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
+var S = (c, r, e) => r in c ? _(c, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[r] = e, m = (c, r) => {
   for (var e in r || (r = {}))
-    D.call(r, e) && v(c, e, r[e]);
-  if (y)
-    for (var e of y(r))
-      F.call(r, e) && v(c, e, r[e]);
+    U.call(r, e) && S(c, e, r[e]);
+  if (D)
+    for (var e of D(r))
+      B.call(r, e) && S(c, e, r[e]);
   return c;
-}, P = (c, r) => L(c, H(r));
-var i = (c, r, e) => (v(c, typeof r != "symbol" ? r + "" : r, e), e);
-import { PointSelectorHelper as N } from "./utils/PointSelectorHelper.js";
-import { isTouchDevice as V } from "../../isTouchDevice.js";
-import * as a from "three";
-import { Subscribe as _ } from "../../Subscribe.js";
-import { getIntersectByRaycaster as x, getVirtualIntersectByRaycaster as R } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as U } from "../../five/getRaycasterByNdcPosition.js";
-import { CURSOR_NOT_ALLOW_URL as I } from "./utils/contents.js";
-import { rayOnLine as B } from "../../../Sculpt/utils/three/rayOnLine.js";
-import { THREERaycaster as C } from "../core/Raycaster.js";
-const S = new a.Vector3(), p = () => !1;
-class k extends _ {
+}, T = (c, r) => O(c, R(r));
+var i = (c, r, e) => (S(c, typeof r != "symbol" ? r + "" : r, e), e);
+import { PointSelectorHelper as C } from "./utils/PointSelectorHelper.js";
+import { isTouchDevice as A } from "../../isTouchDevice.js";
+import * as n from "three";
+import { Subscribe as g } from "../../Subscribe.js";
+import { getIntersectByRaycaster as j, getVirtualIntersectByRaycaster as X } from "../../five/getPosition.js";
+import { getRaycasterByNdcPosition as Y } from "../../five/getRaycasterByNdcPosition.js";
+import { CURSOR_NOT_ALLOW_URL as F } from "./utils/contents.js";
+import { rayOnLine as G } from "../../../Sculpt/utils/three/rayOnLine.js";
+import { THREERaycaster as W } from "../core/Raycaster.js";
+const N = new n.Vector3(), P = () => !1;
+class te extends g {
   constructor(e, t) {
-    var u, h, o, l;
+    var u, d, o, p;
     super();
     i(this, "_cursorError", !1);
     i(this, "actionIfNoIntersection", "virtualPoint");
@@ -100,8 +100,8 @@ class k extends _ {
     i(this, "onMouseUp", (e) => {
       if (!this._mouseDownInfo)
         return;
-      const { clientX: t, clientY: s, timestamp: n } = this._mouseDownInfo;
-      Math.abs(e.clientX - t) < 2 && Math.abs(e.clientY - s) < 2 && performance.now() - n < 500 ? this.select() : this._mouseDownInfo = null;
+      const { clientX: t, clientY: s, timestamp: l } = this._mouseDownInfo;
+      Math.abs(e.clientX - t) < 2 && Math.abs(e.clientY - s) < 2 && performance.now() - l < 500 ? this.select() : this._mouseDownInfo = null;
     });
     i(this, "onTouchStart", (e) => {
       this.setPressDown = setTimeout(() => {
@@ -144,47 +144,47 @@ class k extends _ {
      * @description: 根据鼠标位置计算焦点位置并更新
      */
     i(this, "updateByNdcPosition", (e) => {
-      var n, u, h;
-      const t = U(this.five, e);
-      let s = x(this.five, t);
+      var l, u, d;
+      const t = Y(this.five, e);
+      let s = j(this.five, t);
       if (s) {
-        if (this.plane && this.planeMode === "vertical" && (s = P(d({}, s), {
-          point: this.plane.projectPoint(s.point, new a.Vector3()),
-          face: new a.Face3(0, 0, 0, this.plane.normal.clone()),
+        if (this.plane && this.planeMode === "vertical" && (s = T(m({}, s), {
+          point: this.plane.projectPoint(s.point, new n.Vector3()),
+          face: new n.Face3(0, 0, 0, this.plane.normal.clone()),
           originalPoint: s.point.clone()
         })), this.plane && this.planeMode === "onlyPlane") {
-          const o = t.ray.intersectPlane(this.plane, S);
+          const o = t.ray.intersectPlane(this.plane, N);
           if (!o)
             return !1;
           s = {
             distance: this.five.camera.position.distanceTo(o),
             point: o.clone(),
             originalPoint: s.point.clone(),
-            face: new a.Face3(0, 0, 0, this.plane.normal.clone()),
+            face: new n.Face3(0, 0, 0, this.plane.normal.clone()),
             raycaster: t
           };
         }
         return this.updatePointSelectorHelperIntersect(s), this.lastIntersection = s, !0;
       }
       if (this.plane) {
-        const o = t.ray.intersectPlane(this.plane, S);
+        const o = t.ray.intersectPlane(this.plane, N);
         if (o) {
-          const l = {
+          const p = {
             distance: this.five.camera.position.distanceTo(o),
             point: o.clone(),
-            object: new a.Object3D(),
-            face: new a.Face3(0, 0, 0, this.plane.normal.clone()),
+            object: new n.Object3D(),
+            face: new n.Face3(0, 0, 0, this.plane.normal.clone()),
             raycaster: t,
             isVirtual: !0
           };
-          return this.updatePointSelectorHelperIntersect(l), !0;
+          return this.updatePointSelectorHelperIntersect(p), !0;
         }
       }
       if (this.actionIfNoIntersection === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoIntersection === "virtualPoint") {
-        const o = R(t, (n = this.lastIntersection) == null ? void 0 : n.distance);
-        return o.face = new a.Face3(0, 0, 0, (h = (u = this.lastIntersection) == null ? void 0 : u.face) == null ? void 0 : h.normal), o.isVirtual = !0, this.lastIntersection = o, this.updatePointSelectorHelperIntersect(o), !0;
+        const o = X(t, (l = this.lastIntersection) == null ? void 0 : l.distance);
+        return o.face = new n.Face3(0, 0, 0, (d = (u = this.lastIntersection) == null ? void 0 : u.face) == null ? void 0 : d.normal), o.isVirtual = !0, this.lastIntersection = o, this.updatePointSelectorHelperIntersect(o), !0;
       } else if (this.actionIfNoIntersection === "disable")
         return this.updatePointSelectorHelperIntersect(null), !1;
     });
@@ -192,65 +192,70 @@ class k extends _ {
      * @description: 更新 pointSelectorHelper 的焦点位置
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
+      var u, d, o, p, E, M;
       if (!e) {
-        this.onLeave(), this.five.getElement().style.cursor = I;
+        this.onLeave(), this.five.getElement().style.cursor = F;
         return;
       }
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
-      const t = d({}, e);
+      const t = m({}, e), s = {
+        x: this.mouseNdcPosition.x,
+        y: 1 - this.mouseNdcPosition.y
+      }, l = this.five.renderer.getSize(new n.Vector2());
       if (typeof this.adherePoints == "function" && typeof this.adhereRadius == "number") {
-        for (const s of this.adherePlane)
-          s.distanceToPoint(e.point) < this.adhereRadius && (t.point = s.projectPoint(e.point, new a.Vector3()), this.plane || (t.face = new a.Face3(0, 0, 0, s.normal.clone())), t.isAdsorbed = !0);
-        for (const s of this.adhereLine) {
-          const n = s.closestPointToPoint(e.point, !1, new a.Vector3());
-          if (n.distanceTo(e.point) < this.adhereRadius)
-            t.point = n.clone(), t.isAdsorbed = !0;
+        for (const h of this.adhereLine) {
+          let a = h.closestPointToPoint(e.point, !1, new n.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 n.Vector3())) != null ? d : a, t.point = a.clone(), t.isAdsorbed = !0);
           else {
-            const u = B({
-              raycaster: new C(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
-              line: s,
+            const b = G({
+              raycaster: new W(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
+              line: h,
               clampToLine: !1
-            }), h = u.clone().project(this.five.camera);
-            if (h.z <= 1) {
-              const o = this.five.renderer.getSize(new a.Vector2()), l = {
-                x: (h.x + 1) / 2 * o.width,
-                y: (1 - h.y) / 2 * o.height
-              }, f = {
-                x: this.mousePosition.clientX,
-                y: this.mousePosition.clientY
+            }), v = b.clone().project(this.five.camera);
+            if (v.z <= 1) {
+              const w = {
+                x: (v.x + 1) / 2,
+                y: (1 - v.y) / 2
+              }, y = {
+                x: Math.abs(w.x - s.x) * l.width,
+                y: Math.abs(w.y - s.y) * l.height
               };
-              Math.abs(l.x - f.x) < 10 && Math.abs(l.y - f.y) < 10 && (t.point = u.clone(), t.isAdsorbed = !0);
+              let f = b.clone();
+              y.x < 10 && y.y < 10 && (!this.plane || this.plane.distanceToPoint(f) < 0.01) && (f = (p = (o = this.plane) == null ? void 0 : o.projectPoint(f, new n.Vector3())) != null ? p : f, t.point = f.clone(), t.isAdsorbed = !0);
             }
           }
         }
-        for (const s of this.adherePoints({ intersection: e, pointSelectorInstance: this })) {
-          const n = s instanceof a.Face3 ? new a.Vector3(s.a, s.b, s.c) : s;
-          if (n.IsAlwaysVisible = s.IsAlwaysVisible, n.distanceTo(e.point) < this.adhereRadius) {
-            t.point = n.clone(), !this.plane && s instanceof a.Face3 && (t.face = s), t.isAdsorbed = !0;
+        for (const h of this.adherePoints({ intersection: e, pointSelectorInstance: this })) {
+          const a = h instanceof n.Face3 ? new n.Vector3(h.a, h.b, h.c) : h;
+          if (a.IsAlwaysVisible = h.IsAlwaysVisible, this.plane && this.plane.distanceToPoint(a) > 0.01)
+            continue;
+          if (a.distanceTo(e.point) < this.adhereRadius) {
+            t.point = (M = (E = this.plane) == null ? void 0 : E.projectPoint(a, new n.Vector3())) != null ? M : a.clone(), !this.plane && h instanceof n.Face3 && (t.face = h), t.isAdsorbed = !0;
             break;
           } else {
-            const h = n.clone().project(this.five.camera);
-            if (h.z > 1)
-              return;
-            const o = this.five.renderer.getSize(new a.Vector2()), l = {
-              x: (h.x + 1) / 2 * o.width,
-              y: (1 - h.y) / 2 * o.height
+            const v = a.clone().project(this.five.camera);
+            if (v.z > 1)
+              continue;
+            const w = this.five.renderer.getSize(new n.Vector2()), y = {
+              x: (v.x + 1) / 2,
+              y: (1 - v.y) / 2
             }, f = {
-              x: this.mousePosition.clientX,
-              y: this.mousePosition.clientY
+              x: Math.abs(y.x - s.x) * w.width,
+              y: Math.abs(y.y - s.y) * w.height
             };
-            if (Math.abs(l.x - f.x) < 10 && Math.abs(l.y - f.y) < 10) {
-              let m = !1;
-              if (n.IsAlwaysVisible)
-                m = !0;
+            if (f.x < 10 && f.y < 10) {
+              let I = !1;
+              if (a.IsAlwaysVisible)
+                I = !0;
               else {
-                const w = new a.Raycaster();
-                w.setFromCamera(n.clone(), this.five.camera);
-                const b = this.five.model.intersectRaycaster(w, void 0, !0)[0], E = 0.1, M = this.five.camera.position.distanceTo(n);
-                b && b.distance < M + E && (m = !0);
+                const L = new n.Raycaster();
+                L.setFromCamera(a.clone(), this.five.camera);
+                const H = this.five.model.intersectRaycaster(L, void 0, !0)[0], V = 0.1, x = this.five.camera.position.distanceTo(a);
+                H && H.distance < x + V && (I = !0);
               }
-              if (m) {
-                t.point = n.clone(), !this.plane && s instanceof a.Face3 && (t.face = s), t.isAdsorbed = !0;
+              if (I) {
+                t.point = a.clone(), !this.plane && h instanceof n.Face3 && (t.face = h), t.isAdsorbed = !0;
                 break;
               }
             }
@@ -263,10 +268,10 @@ class k extends _ {
       const t = this.five.getElement();
       if (!t)
         return null;
-      const { top: s, left: n, width: u, height: h } = t.getBoundingClientRect(), { clientX: o, clientY: l } = e;
+      const { top: s, left: l, width: u, height: d } = t.getBoundingClientRect(), { clientX: o, clientY: p } = e;
       return {
-        x: (o - n) / u,
-        y: 1 - (l - s) / h
+        x: (o - l) / u,
+        y: 1 - (p - s) / d
       };
     });
     i(this, "onFiveWantsPanGesture", () => {
@@ -279,15 +284,15 @@ class k extends _ {
     i(this, "emitIntersectionUpdate", (e) => {
       this.emit("intersectionUpdate", e);
     });
-    this.five = e, this.config = d(d({}, this.config), t), this.actionIfNoIntersection = (h = (u = t == null ? void 0 : t.actionIfNoIntersection) != null ? u : t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? h : "virtualPoint";
+    this.five = e, this.config = m(m({}, 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 = (o = t == null ? void 0 : t.mode) != null ? o : "auto";
-    s === "auto" ? this.mode = V ? "fixed" : "cursor" : this.mode = s;
-    const n = {
+    s === "auto" ? this.mode = A ? "fixed" : "cursor" : this.mode = s;
+    const l = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new N(this.five, P(d({}, t == null ? void 0 : t.helper), {
-      magnifierParams: d(d({}, n), (l = t == null ? void 0 : t.helper) == null ? void 0 : l.magnifierParams)
+    this.pointSelectorHelper = new C(this.five, T(m({}, t == null ? void 0 : t.helper), {
+      magnifierParams: m(m({}, l), (p = t == null ? void 0 : t.helper) == null ? void 0 : p.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {
@@ -306,7 +311,7 @@ class k extends _ {
     return this._cursorError;
   }
   set cursorError(e) {
-    this._cursorError = e, this.five.getElement().style.cursor = e ? I : "", e ? this.pointSelectorHelper.hide() : this.pointSelectorHelper.show();
+    this._cursorError = e, this.five.getElement().style.cursor = e ? F : "", e ? this.pointSelectorHelper.hide() : this.pointSelectorHelper.show();
   }
   set outOfFive(e) {
     this._outOfFive = e;
@@ -324,14 +329,14 @@ class k extends _ {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    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");
+    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.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", 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");
+    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();
@@ -341,5 +346,5 @@ class k extends _ {
   }
 }
 export {
-  k as PointSelector
+  te as PointSelector
 };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.61.7-alpha.1",
+  "version": "3.61.7-alpha.3",
   "main": "./dist/index.js",
-  "module": "./libs/index.js",
+  "module": "./dist/index.js",
   "types": "./libs/index.d.ts",
   "author": "REALSEE-DEVELOPER",
   "repository": {