@realsee/dnalogel 3.55.0 → 3.56.0

package/libs/shared-utils/tag.js

@@ -1,17 +1,17 @@
 var y = Object.defineProperty;
 var b = (c, e, t) => e in c ? y(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t;
 var i = (c, e, t) => (b(c, typeof e != "symbol" ? e + "" : e, t), t);
-import { anyPositionToVector3 as d } from "./positionToVector3.js";
+import { anyPositionToVector3 as p } from "./positionToVector3.js";
 import * as P from "three";
-import { vector3ToScreen as m } from "./five/vector3ToScreen.js";
+import { vector3ToScreen as v } from "./five/vector3ToScreen.js";
 import { getFiveModel as g } from "./five/getFiveModel.js";
 import { FiveUtil as C } from "./Utils/FiveUtil.js";
-import { _raycaster as v } from "./three/temp.js";
+import { _raycaster as m } from "./three/temp.js";
 import { resizeObserver as U } from "./dom/resizeObserver.js";
 import { fiveEveryReadyListener as x } from "./five/fiveEveryReadyListener.js";
 const E = new P.Vector2();
 class w {
-  constructor(e, t, o) {
+  constructor(e, t, r) {
     /**
      * @description 单个标签 dom
      */
@@ -24,6 +24,7 @@ class w {
      * [0] this.visible
      * [1] 碰撞检测
      * [2] 元素遮挡
+     * [3] 强制显示
      * ```
      */
     i(this, "visibles", []);
@@ -58,6 +59,12 @@ class w {
     i(this, "config");
     i(this, "fiveUtil");
     i(this, "disposers", []);
+    i(this, "onModeChange", () => {
+      this.visibles[3] = void 0, this.updateVisible();
+    });
+    i(this, "onPanoArrived", () => {
+      this.visibles[3] = void 0, this.updateVisible();
+    });
     i(this, "onCameraUpdate", () => {
       this.visible !== !1 && this.updateScreenPosition();
     });
@@ -73,10 +80,10 @@ class w {
       this.visible && (this.updateIntersectCheckVisible(), this.needsRender = !0);
     });
     i(this, "applyVisible", () => {
-      this.visibles.every((t) => t !== !1) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
+      this.visibles[3] === !0 || this.visibles.every((t) => t !== !1) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
     });
     i(this, "updateIntersectCheckVisible", () => {
-      var n, r;
+      var n, o;
       if (!this.position)
         return;
       if (!this.intersectCheck) {
@@ -85,13 +92,13 @@ class w {
       }
       let e = !1, t = 0.01;
       this.fiveUtil.workUtil.fromType === "poincare" && (t = 0.05);
-      const o = this.transformedPosition.clone().sub(this.five.camera.position).normalize();
-      v.set(this.five.camera.position, o);
-      const h = (n = g(this.five).intersectRaycaster(v)) != null ? n : [], a = (r = v.intersectObjects(this.extraObjectsForIntersectCheck, !0)) != null ? r : [], s = [...h, ...a].sort((p, f) => p.distance - f.distance)[0];
+      const r = this.transformedPosition.clone().sub(this.five.camera.position).normalize();
+      m.set(this.five.camera.position, r);
+      const h = (n = g(this.five).intersectRaycaster(m)) != null ? n : [], a = (o = m.intersectObjects(this.extraObjectsForIntersectCheck, !0)) != null ? o : [], s = [...h, ...a].sort((d, f) => d.distance - f.distance)[0];
       s ? e = (s == null ? void 0 : s.distance) + t > this.transformedPosition.distanceTo(this.five.camera.position) : e = !0, this.visibles[1] = e;
     });
     var h, a, l;
-    this.five = e, this.fiveUtil = (h = e.__fiveUtil__) != null ? h : e.__fiveUtil__ = new C(e), this.originPosition = t ? d(t).clone() : void 0, this.transformedPosition = (a = this.originPosition) == null ? void 0 : a.clone(), this.positionsForRotate = (l = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : l.map((s) => d(s).clone()), this.config = o != null ? o : {}, this.container = (() => {
+    this.five = e, this.fiveUtil = (h = e.__fiveUtil__) != null ? h : e.__fiveUtil__ = new C(e), this.originPosition = t ? p(t).clone() : void 0, this.transformedPosition = (a = this.originPosition) == null ? void 0 : a.clone(), this.positionsForRotate = (l = r == null ? void 0 : r.positionsForRotate) == null ? void 0 : l.map((s) => p(s).clone()), this.config = r != null ? r : {}, this.container = (() => {
       const s = document.createElement("div");
       return s.classList.add("light-tag"), s.style.width = "0", s.style.height = "0", s.style.position = "absolute", s.style.transition = "opacity 0.2s linear", s;
     })(), this.addResizeListener(), this.show(), this.enable(), setTimeout(() => {
@@ -107,8 +114,8 @@ class w {
   /**
    * @description 显示标签
    */
-  show() {
-    this.visible = !0, this.visibles[0] = !0, this.container.style.opacity = "1", this.container.style.pointerEvents = "auto", this.updateVisible(), this.onCameraUpdate();
+  show(e) {
+    this.visible = !0, this.visibles[0] = !0, e != null && e.force && (this.visibles[3] = !0), this.container.style.opacity = "1", this.container.style.pointerEvents = "auto", this.updateVisible(), this.onCameraUpdate();
   }
   /**
    * @description 隐藏标签
@@ -120,23 +127,23 @@ class w {
    * @description 启用标签
    */
   enable() {
-    var o, h, a, l, s;
+    var r, h, a, l, s;
     if (this.enabled)
       return;
-    this.enabled = !0, this.wrapper = (a = (h = this.config.wrapper) != null ? h : (o = this.five.getElement()) == null ? void 0 : o.parentElement) != null ? a : document.body;
+    this.enabled = !0, this.wrapper = (a = (h = this.config.wrapper) != null ? h : (r = this.five.getElement()) == null ? void 0 : r.parentElement) != null ? a : document.body;
     const e = `light-tag-wrapper-${(s = (l = this.config) == null ? void 0 : l.namespace) != null ? s : "default"}`;
     if (!this.tagWrapper) {
-      let n = Array.from(this.wrapper.children).find((r) => r.id === e);
+      let n = Array.from(this.wrapper.children).find((o) => o.id === e);
       if (!n) {
-        const r = document.createElement("div");
-        n = r, r.id = e, r.style.position = "absolute", r.style.overflow = "hidden", r.style.top = "0", r.style.left = "0", r.style.width = "100%", r.style.height = "100%", r.style.pointerEvents = "none", r.style.zIndex = "1", this.wrapper.appendChild(n);
+        const o = document.createElement("div");
+        n = o, o.id = e, o.style.position = "absolute", o.style.overflow = "hidden", o.style.top = "0", o.style.left = "0", o.style.width = "100%", o.style.height = "100%", o.style.pointerEvents = "none", o.style.zIndex = "1", this.wrapper.appendChild(n);
       }
       this.tagWrapper = n;
     }
     this.tagWrapper.appendChild(this.container), this.updateVisible();
     const t = x(this.five, this.onFiveEveryReady);
-    this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("cameraFovUpdate", this.onCameraFovUpdate), this.five.on("panoArrived", this.updateVisible), this.five.on("modeChange", this.updateVisible), this.disposer = () => {
-      t(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("cameraFovUpdate", this.onCameraFovUpdate), this.five.off("panoArrived", this.updateVisible), this.five.off("modeChange", this.updateVisible);
+    this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("cameraFovUpdate", this.onCameraFovUpdate), this.five.on("panoArrived", this.onPanoArrived), this.five.on("modeChange", this.onModeChange), this.disposer = () => {
+      t(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("cameraFovUpdate", this.onCameraFovUpdate), this.five.off("panoArrived", this.onPanoArrived), this.five.off("modeChange", this.onModeChange);
     };
   }
   /**
@@ -158,7 +165,7 @@ class w {
    * @param positionsForRotate 用于 css 旋转的斜线的两个端点
    */
   setPosition(e, t) {
-    this.transformedPosition = d(e).clone(), this.positionsForRotate = t == null ? void 0 : t.map((o) => d(o).clone()), this.onCameraUpdate(), setTimeout(() => this.onCameraUpdate(), 0);
+    this.transformedPosition = p(e).clone(), this.positionsForRotate = t == null ? void 0 : t.map((r) => p(r).clone()), this.onCameraUpdate(), setTimeout(() => this.onCameraUpdate(), 0);
   }
   setTransformMatrix(e) {
     var t;
@@ -169,12 +176,12 @@ class w {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const e = this.five.renderer.getSize(E), t = m(this.five.camera, this.transformedPosition, e);
+    const e = this.five.renderer.getSize(E), t = v(this.five.camera, this.transformedPosition, e);
     if (!t) {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const o = (() => {
+    const r = (() => {
       if (!this.simulate3D)
         return 1;
       const a = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), l = this.transformedPosition.distanceTo(this.five.camera.position);
@@ -182,19 +189,19 @@ class w {
     })(), h = (() => {
       if (this.positionsForRotate === void 0 || this.positionsForRotate.length !== 2)
         return 0;
-      const [a, l] = this.positionsForRotate, s = m(this.five.camera, a, e), n = m(this.five.camera, l, e);
+      const [a, l] = this.positionsForRotate, s = v(this.five.camera, a, e), n = v(this.five.camera, l, e);
       if (!s || !n)
         return 0;
-      const r = s.leftPx > n.leftPx ? n : s, p = s.leftPx > n.leftPx ? s : n, f = p.leftPx - r.leftPx, u = p.topPx - r.topPx;
+      const o = s.leftPx > n.leftPx ? n : s, d = s.leftPx > n.leftPx ? s : n, f = d.leftPx - o.leftPx, u = d.topPx - o.topPx;
       return Math.atan2(u, f) * (180 / Math.PI);
     })();
-    this.container.style.left = t.leftPx + "px", this.container.style.top = t.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${o})`, h && (this.container.style.transform += ` rotate(${h}deg)`);
+    this.container.style.left = t.leftPx + "px", this.container.style.top = t.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${r})`, h && (this.container.style.transform += ` rotate(${h}deg)`);
   }
   addResizeListener() {
     const e = this.five.getElement();
     if (e) {
-      const { observe: t, unobserve: o } = U(this.onCameraUpdate, e);
-      t(), this.disposers.push(o);
+      const { observe: t, unobserve: r } = U(this.onCameraUpdate, e);
+      t(), this.disposers.push(r);
     }
   }
 }

package/package.json

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