@realsee/dnalogel 3.63.2 → 3.63.3

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.63.2",
+    "%c %c@realsee/dnalogel %cv3.63.3",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

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

@@ -38,23 +38,23 @@ interface Config {
 export type PointSelectorConfig = Partial<Config>;
 type EventMap = {
     /**
-     * @description: 与模型交点更新时触发，移出监听范围时为null
+     * @description 与模型交点更新时触发，移出监听范围时为null
      */
     intersectionUpdate: (intersection: PointIntersection | null) => void;
     /**
-     * @description: 试图打点，返回false则不打点
+     * @description 试图打点，返回false则不打点
      */
     wantsSelect: (intersection: PointIntersection) => boolean | void;
     /**
-     * @description: 打点成功
+     * @description 打点成功
      */
     select: (intersection: PointIntersection) => void;
     /**
-     * @description: 功能开启
+     * @description 功能开启
      */
     enable: () => void;
     /**
-     * @description: 功能关闭
+     * @description 功能关闭
      */
     disable: () => void;
 };
@@ -139,11 +139,14 @@ export declare class PointSelector extends Subscribe<EventMap> {
      * @description: 鼠标进入five canvas时
      */
     private onEnter;
+    /**
+     * @description: 鼠标进入five canvas时
+     */
     private onMouseEnter;
     /**
      * @description: 鼠标离开five canvas时
      */
-    private onLeave;
+    private onMouseLeave;
     private onMouseDown;
     private onMouseUp;
     private onTouchStart;

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

@@ -2,7 +2,7 @@ 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 E = (l, h, e) => h in l ? R(l, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[h] = e, v = (l, h) => {
+var E = (l, h, e) => h in l ? R(l, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[h] = e, P = (l, h) => {
   for (var e in h || (h = {}))
     Y.call(h, e) && E(l, e, h[e]);
   if (N)
@@ -92,18 +92,19 @@ class se extends A {
     /**
      * @description: 鼠标进入five canvas时
      */
-    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, "onEnter", () => {
+      this.cursorError || this.pointSelectorHelper.show(), this.outOfFive = !1;
     });
+    /**
+     * @description: 鼠标进入five canvas时
+     */
     i(this, "onMouseEnter", () => {
-      this.onEnter();
+      this.onEnter(), this.emit("intersectionUpdate", this.position);
     });
     /**
      * @description: 鼠标离开five canvas时
      */
-    i(this, "onLeave", () => {
+    i(this, "onMouseLeave", () => {
       this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", null);
     });
     i(this, "onMouseDown", (e) => {
@@ -183,7 +184,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 = M(v({}, s), {
+        if (this.plane && this.planeMode === "vertical" && (s = M(P({}, 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()
@@ -229,11 +230,11 @@ class se extends A {
     i(this, "updatePointSelectorHelperIntersect", (e) => {
       var s, c, u, d, n, f, L, T;
       if (!e) {
-        this.onLeave(), this.five.getElement().style.cursor = V;
+        this.onMouseLeave(), this.five.getElement().style.cursor = V;
         return;
       }
-      this.onEnter({ emitEvent: !1 }), this.cursorError || (this.five.getElement().style.cursor = "");
-      const t = v({}, e);
+      this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
+      const t = P({}, e);
       if (this.adhereEnabled && this.mouseNdcPosition && this.five.renderer) {
         const S = {
           x: this.mouseNdcPosition.x,
@@ -254,11 +255,11 @@ class se extends A {
                 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) {
+              }), v = p.clone().project(this.five.camera);
+              if (v.z <= 1) {
                 const y = {
-                  x: (P.x + 1) / 2,
-                  y: (1 - P.y) / 2
+                  x: (v.x + 1) / 2,
+                  y: (1 - v.y) / 2
                 }, b = {
                   x: Math.abs(y.x - S.x) * H.width,
                   y: Math.abs(y.y - S.y) * H.height
@@ -276,12 +277,12 @@ class se extends A {
               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)
+              const v = a.clone().project(this.five.camera);
+              if (v.z > 1)
                 continue;
               const y = this.five.renderer.getSize(new o.Vector2()), b = {
-                x: (P.x + 1) / 2,
-                y: (1 - P.y) / 2
+                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
@@ -327,15 +328,15 @@ class se extends A {
     i(this, "emitIntersectionUpdate", (e) => {
       this.emit("intersectionUpdate", e);
     });
-    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";
+    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";
     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, 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 = new C(this.five, M(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.hide();
   }
   get position() {
@@ -372,14 +373,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.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");
+    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.onMouseLeave), 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.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");
+    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.onMouseLeave), 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.2",
+  "version": "3.63.3",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",