@realsee/dnalogel 3.72.5-alpha.2 → 3.72.5-alpha.3

package/libs/PanoTagPlugin/controller/Tag/BaseTag.js

@@ -66,9 +66,9 @@ import { getTagPosition as W, getTagCenterPosition as J } from "../../utils/tagP
 import { checkRange as M } from "../../utils/checkRange.js";
 import { isMediaPlaneTag as H, isMediaModelTag as D } from "../../utils/tag/tagCheck.js";
 import { getUrlExt as q } from "../../../shared-utils/url/getUrl.js";
-import { getFloorIndex as ce } from "../../../shared-utils/five/getFloorIndex.js";
+import { getFloorIndex as de } from "../../../shared-utils/five/getFloorIndex.js";
 import { safeObj as X } from "../../../shared-utils/safeObj.js";
-import { Cache as de } from "../../utils/Cache.js";
+import { Cache as ce } from "../../utils/Cache.js";
 import { _raycaster as j } from "../../../shared-utils/three/temp.js";
 import { withResolvers as ue } from "../../../shared-utils/promise/withResolvers.js";
 import "../../../shared-utils/typescript/entries.js";
@@ -179,14 +179,14 @@ class Wi {
       }
       return i;
     });
-    var f, p, h, c, d, u, v, b;
+    var f, p, h, d, c, u, v, b;
     this.plugin = i;
     const t = te(e);
     e.stickType = t;
     const o = JSON.parse(JSON.stringify(e.data)), s = (f = e.initialConfig) != null ? f : e.config ? JSON.parse(JSON.stringify(e.config)) : {};
     e.initialConfig = s;
     const r = F(e, i.config), l = this.getConfig(e);
-    e.config = l, this.id = (p = e.id) != null ? p : fe(), this.enabled = (h = e.enabled) != null ? h : !0, this.contentType = e.contentType, this.hoverEnabled = (d = (c = l.popoverConfig) == null ? void 0 : c.enabled) != null ? d : !0, this.data = (u = l.initialData) != null && u.important ? x(e.data, o, l.initialData) : x(e.data, l.initialData, o);
+    e.config = l, this.id = (p = e.id) != null ? p : fe(), this.enabled = (h = e.enabled) != null ? h : !0, this.contentType = e.contentType, this.hoverEnabled = (c = (d = l.popoverConfig) == null ? void 0 : d.enabled) != null ? c : !0, this.data = (u = l.initialData) != null && u.important ? x(e.data, o, l.initialData) : x(e.data, l.initialData, o);
     let n;
     typeof l.unfoldedConfig == "object" ? l.unfoldedConfig.keep === "unfolded" ? n = !0 : l.unfoldedConfig.keep === "folded" ? n = !1 : n = !this.can("fold") : n = !this.can("fold"), this.state = y({
       visible: void 0,
@@ -205,7 +205,7 @@ class Wi {
     })(), this.matrix = e.matrix ? (() => {
       const g = new P.Matrix4().fromArray(e.matrix);
       return g.premultiply(i.workUtil.transform), g.elements;
-    })() : e.matrix, this.initialConfig = s, this.computedConfig = r, this.stickType = t, this.config = e.config, this.fiveState = e.fiveState, this.normal = e.normal, this.cache = new de(), this.hooks = new ie(), Object.keys(e).forEach((g) => {
+    })() : e.matrix, this.initialConfig = s, this.computedConfig = r, this.stickType = t, this.config = e.config, this.fiveState = e.fiveState, this.normal = e.normal, this.cache = new ce(), this.hooks = new ie(), Object.keys(e).forEach((g) => {
       this[g] === void 0 && e[g] !== void 0 && (this[g] = e[g]);
     });
   }
@@ -280,36 +280,36 @@ class Wi {
    */
   blink(i) {
     return B(this, null, function* () {
-      var l, n, f, p, h, c;
+      var l, n, f, p, h, d;
       yield this.ready(), this._currentBlinkInstance && !this._currentBlinkInstance.completed && ((n = (l = this._currentBlinkInstance).preComplete) == null || n.call(l), this._currentBlinkInstance = void 0);
       const e = (f = this.enabled) != null ? f : !0, t = (p = this.state) == null ? void 0 : p.visible, o = e && t;
-      o === !1 && (this.state.visible = !0, this.enabled = !0, this.applyVisible(), this.plugin.render(), this.computeRenderType() !== "Mesh" ? yield new Promise((d) => {
+      o === !1 && (this.state.visible = !0, this.enabled = !0, this.applyVisible(), this.plugin.render(), this.computeRenderType() !== "Mesh" ? yield new Promise((c) => {
         if (this.dom || this.contentDom) {
-          d();
+          c();
           return;
         }
         const u = setInterval(() => {
-          (this.dom || this.contentDom) && (d(), clearInterval(u));
+          (this.dom || this.contentDom) && (c(), clearInterval(u));
         }, 16.7);
-      }) : this.stickType === "Model" && !((h = this.model) != null && h.object) ? yield (c = this.model) == null ? void 0 : c.promise : this.stickType === "Plane" && (yield new Promise((d) => {
+      }) : this.stickType === "Model" && !((h = this.model) != null && h.object) ? yield (d = this.model) == null ? void 0 : d.promise : this.stickType === "Plane" && (yield new Promise((c) => {
         if (this.mediaPlane) {
-          d();
+          c();
           return;
         }
         const u = setInterval(() => {
-          this.mediaPlane && (d(), clearInterval(u));
+          this.mediaPlane && (c(), clearInterval(u));
         }, 16.7);
       })), this.dom && (this.dom.style.visibility = "hidden"), this.contentDom && (this.contentDom.style.visibility = "hidden"));
       const s = (() => {
         var v, b, g;
-        const d = [];
-        d.push(this.dom), d.push((b = (v = this.tag3DContentSvelte) == null ? void 0 : v.css3DInstance) == null ? void 0 : b.container), d.push((g = this.model) == null ? void 0 : g.object), d.push(this.mediaPlane);
+        const c = [];
+        c.push(this.dom), c.push((b = (v = this.tag3DContentSvelte) == null ? void 0 : v.css3DInstance) == null ? void 0 : b.container), c.push((g = this.model) == null ? void 0 : g.object), c.push(this.mediaPlane);
         const u = this.getAdditionalBlinkTargets();
         if (u) {
           const k = Array.isArray(u) ? u : [u];
-          d.push(...k);
+          c.push(...k);
         }
-        return d.filter(Boolean);
+        return c.filter(Boolean);
       })();
       if (!s.length) {
         console.warn("tagDom is empty");
@@ -326,8 +326,8 @@ class Wi {
       }, i));
       try {
         yield this._currentBlinkInstance.finished;
-      } catch (d) {
-        console.debug("Blink animation interrupted:", d);
+      } catch (c) {
+        console.debug("Blink animation interrupted:", c);
       } finally {
         this._currentBlinkInstance = void 0;
       }
@@ -353,14 +353,14 @@ class Wi {
    * @description 启用
    */
   enable() {
-    this.enabled = !0, this.hooks.emit("enable"), this.applyVisible();
+    this.enabled = !0, this.hooks.emit("enable"), this.five.needsRender = !0, this.applyVisible();
   }
   /**
    * @description 禁用
    */
   disable() {
     var i;
-    this.enabled = !1, this.hooks.emit("disable"), (i = this.rectanglePlane) == null || i.delete(), this.applyVisible();
+    this.enabled = !1, this.hooks.emit("disable"), (i = this.rectanglePlane) == null || i.delete(), this.five.needsRender = !0, this.applyVisible();
   }
   /**
    * @deprecated use `setData` instead
@@ -495,7 +495,7 @@ class Wi {
   computeVisible(i) {
     const e = y(y({}, this.five.getCurrentState()), i), { panoIndex: t, mode: o } = e, s = [];
     return (() => {
-      var f, h, c, d;
+      var f, h, d, c;
       const n = (f = this.getConfig().visibleConfig) != null ? f : {};
       if (typeof n == "function")
         return {
@@ -527,7 +527,7 @@ class Wi {
             return {
               value: !1,
               checkedList: s,
-              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(c = this.fiveState) == null ? void 0 : c.panoIndex}`
+              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(d = this.fiveState) == null ? void 0 : d.panoIndex}`
             };
         }
         if (n.visibleDistance !== void 0 && (s.push("visibleDistance"), n.visibleDistance !== "unLimited")) {
@@ -548,7 +548,7 @@ class Wi {
               checkedList: s,
               reason: `intersectRaycaster check failed: panoIndex is ${t}`
             };
-          if (t === ((d = this.fiveState) == null ? void 0 : d.panoIndex))
+          if (t === ((c = this.fiveState) == null ? void 0 : c.panoIndex))
             s.push("intersectCheckSkiped");
           else {
             const v = this.computeVisibleByIntersect(t);
@@ -607,16 +607,16 @@ class Wi {
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
     const s = se(
       (() => {
-        var d;
-        const c = (d = e.checkPoints) != null ? d : "center";
-        return c === "center" ? J(this) : c === "corner" ? W(this) : Array.isArray(c) ? c : [];
+        var c;
+        const d = (c = e.checkPoints) != null ? c : "center";
+        return d === "center" ? J(this) : d === "corner" ? W(this) : Array.isArray(d) ? d : [];
       })()
     );
     let r = 0, l = 0;
-    for (const c of s) {
-      const d = new P.Vector3().subVectors(c, o).normalize();
+    for (const d of s) {
+      const c = new P.Vector3().subVectors(d, o).normalize();
       let u;
-      j.set(o, d);
+      j.set(o, c);
       const [v] = this.fiveUtil.model.intersectRaycaster(j);
       u = v == null ? void 0 : v.distance;
       const b = (() => {
@@ -627,7 +627,7 @@ class Wi {
           return (L = K.model) == null ? void 0 : L.object;
         }).filter(N), [G] = j.intersectObjects(Z, !0);
         return G;
-      })(), g = o.distanceTo(c), k = (f = e.distanceAccuracy) != null ? f : 0.01;
+      })(), g = o.distanceTo(d), k = (f = e.distanceAccuracy) != null ? f : 0.01;
       u = Math.min(u != null ? u : 1 / 0, (p = b == null ? void 0 : b.distance) != null ? p : 1 / 0), u + k >= g ? r++ : l++;
       const I = (h = e.needPassed) != null ? h : 1;
       if (r >= I)
@@ -647,7 +647,7 @@ class Wi {
     var o, s, r, l, n, f, p;
     let i = 0;
     const e = (o = this.fiveState) == null ? void 0 : o.panoIndex;
-    e !== void 0 ? i = (s = this.workUtil.getObserver(e)) == null ? void 0 : s.floorIndex : i = ce(
+    e !== void 0 ? i = (s = this.workUtil.getObserver(e)) == null ? void 0 : s.floorIndex : i = de(
       this.workUtil.work,
       (p = (f = (l = (r = this.model) == null ? void 0 : r.object) == null ? void 0 : l.position) != null ? f : (n = this.mediaPlane) == null ? void 0 : n.position) != null ? p : J(this)
     );
@@ -699,8 +699,8 @@ class Wi {
           const f = this.computeTagProject();
           if (!f)
             return !1;
-          const { x: p, y: h, z: c } = f;
-          return !(Math.abs(c) > 1 || Math.abs(p) > 1 || Math.abs(h) > 1);
+          const { x: p, y: h, z: d } = f;
+          return !(Math.abs(d) > 1 || Math.abs(p) > 1 || Math.abs(h) > 1);
         }).map((n) => ({ tag: n, id: n.id, tagConfig: n.getConfig().unfoldedConfig })).filter(({ tagConfig: n }) => {
           var f, p;
           return !(typeof n == "function" || n.keep || n.autoUnfold === !1 || ((f = n.autoUnfold) == null ? void 0 : f.enable) === !1 || ((p = n.autoUnfold) == null ? void 0 : p.strategy) !== "MinimumDistance");
@@ -722,19 +722,19 @@ class Wi {
           var v, b;
           if (!h.currentVisible)
             return !1;
-          const c = h.getConfig().unfoldedConfig;
-          if (h.manuallyOperated || typeof c != "object" || (c == null ? void 0 : c.autoUnfold) === !1 || ((v = c == null ? void 0 : c.autoUnfold) == null ? void 0 : v.strategy) !== "ScreenCenter" || c.keep || ((b = c.autoUnfold) == null ? void 0 : b.enable) === !1 || !r.containsPoint(new P.Vector3().fromArray(h.position)))
+          const d = h.getConfig().unfoldedConfig;
+          if (h.manuallyOperated || typeof d != "object" || (d == null ? void 0 : d.autoUnfold) === !1 || ((v = d == null ? void 0 : d.autoUnfold) == null ? void 0 : v.strategy) !== "ScreenCenter" || d.keep || ((b = d.autoUnfold) == null ? void 0 : b.enable) === !1 || !r.containsPoint(new P.Vector3().fromArray(h.position)))
             return !1;
-          const u = c.autoUnfold.distance;
+          const u = d.autoUnfold.distance;
           if (u) {
             const g = h.getDistance();
             if (M(g, u) === !1)
               return !1;
           }
           return !0;
-        }).sort((h, c) => {
-          const d = new P.Vector3().fromArray(h.position), u = new P.Vector3().fromArray(c.position);
-          return l.angleTo(d.sub(this.five.camera.position)) - l.angleTo(u.sub(this.five.camera.position));
+        }).sort((h, d) => {
+          const c = new P.Vector3().fromArray(h.position), u = new P.Vector3().fromArray(d.position);
+          return l.angleTo(c.sub(this.five.camera.position)) - l.angleTo(u.sub(this.five.camera.position));
         }).findIndex((h) => h.id === this.id);
         if (f === -1 || f <= ((t = i.autoUnfold.maxNumber) != null ? t : 1) - 1 === !1)
           return !1;

package/libs/PanoTagPlugin/controller/Tag/PointTag.d.ts

@@ -38,6 +38,7 @@ export declare class PointTag<C extends TagContentType = TagContentType> extends
     setData(...data: Parameters<InstanceType<typeof BaseTag<C, '2DPoint' | '3DPoint'>>['setData']>): void;
     updateUnfoldedByPanoIndex(): void;
     computeNormal(): THREE.Vector3;
+    removeTagNormalLine(): void;
     /**
      * @description 获取额外的闪烁目标，包括法线（如果有）
      */

package/libs/PanoTagPlugin/controller/Tag/PointTag.js

@@ -1,11 +1,11 @@
-var C = Object.defineProperty;
-var S = (p, l, t) => l in p ? C(p, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : p[l] = t;
-var m = (p, l, t) => (S(p, typeof l != "symbol" ? l + "" : l, t), t);
-import { BaseTag as N } from "./BaseTag.js";
-import * as n from "three";
-import { Line as T } from "@realsee/five/line";
-import { anyPositionToVector3 as D } from "../../../shared-utils/positionToVector3.js";
-import { transformPosition as A } from "../../../shared-utils/five/transformPosition.js";
+var D = Object.defineProperty;
+var A = (m, a, t) => a in m ? D(m, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : m[a] = t;
+var p = (m, a, t) => (A(m, typeof a != "symbol" ? a + "" : a, t), t);
+import { BaseTag as w } from "./BaseTag.js";
+import * as r from "three";
+import { Line as V } from "@realsee/five/line";
+import { anyPositionToVector3 as E } from "../../../shared-utils/positionToVector3.js";
+import { transformPosition as k } from "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -87,54 +87,55 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/promise/withResolvers.js";
-const u = new n.Vector2();
-class pi extends N {
+const u = new r.Vector2();
+class di extends w {
   constructor(t, e) {
-    var i, o, s, r, a;
+    var i, o, s, n, l;
     super(t, e);
-    m(this, "__Object__");
-    m(this, "requestIdleCallbackId");
+    p(this, "__Object__");
+    p(this, "requestIdleCallbackId");
     // icon 与线条端点的固定像素间距
-    m(this, "iconPixelGap", 10);
+    p(this, "iconPixelGap", 10);
     // 优化：重用临时对象，避免频繁创建
-    m(this, "_temp", {
-      lineStart: new n.Vector3(),
+    p(this, "_temp", {
+      lineStart: new r.Vector3(),
       // 线条起点（project后会变成NDC）
-      iconPos: new n.Vector3(),
+      iconPos: new r.Vector3(),
       // icon位置（project后会变成NDC）
-      screenDirPixel: new n.Vector2(),
+      screenDirPixel: new r.Vector2(),
       // 屏幕方向（normalize后会变成单位向量）
-      targetNDC: new n.Vector2(),
+      targetNDC: new r.Vector2(),
       // 目标NDC坐标
-      lineDir: new n.Vector3(),
+      lineDir: new r.Vector3(),
       // 线条方向（计算w0时重用）
-      lineEnd: new n.Vector3(),
+      lineEnd: new r.Vector3(),
       // 线条终点
-      raycaster: new n.Raycaster()
+      raycaster: new r.Raycaster()
       // 射线投射器
     });
-    // 用于变化检测的缓存值（position不需要缓存，因为它基于originPosition计算）
-    m(this, "_lastUpdateCache", {
+    // 用于变化检测的缓存值
+    p(this, "_lastUpdateCache", {
       position: [0, 0, 0],
       screenLeft: 0,
       screenTop: 0,
+      scale: 1,
       visible: !1
     });
     if ((o = (i = e.style) == null ? void 0 : i.point) != null && o.width) {
-      const h = (a = (r = (s = e.style) == null ? void 0 : s.point) == null ? void 0 : r.scale) != null ? a : 1;
+      const h = (l = (n = (s = e.style) == null ? void 0 : s.point) == null ? void 0 : n.scale) != null ? l : 1;
       this.iconPixelGap = e.style.point.width * h * 1.4 / 2 + 2;
     }
     this.initialTagLine();
   }
   initialTagLine() {
-    var o, s, r;
+    var o, s, n;
     const t = this.config;
     if (!((o = t == null ? void 0 : t.tagNormalLineConfig) != null && o.enabled) || !this.normalLineLength)
       return;
     const e = this.five.renderer.getSize(u), i = this.five.renderer.getPixelRatio();
-    this.tagNormalLine = new T(new n.Vector3().fromArray(this.position), new n.Vector3().fromArray(this.originPosition)), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
-      color: new n.Vector3(1, 1, 1),
-      linewidth: (r = (s = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : s.lineWidth) != null ? r : 1.2,
+    this.tagNormalLine = new V(new r.Vector3().fromArray(this.position), new r.Vector3().fromArray(this.originPosition)), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
+      color: new r.Vector3(1, 1, 1),
+      linewidth: (n = (s = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : s.lineWidth) != null ? n : 1.2,
       dashed: !1
     }), this.tagNormalLine.line.material.transparent = !0, this.tagNormalLine.line.material.depthWrite = !1, this.tagNormalLine.line.material.depthTest = !1, this.tagNormalLine.line.material.dashed = !1, this.tagNormalLine.line.renderOrder = 2, this.tagNormalLine.setResolution(e.width * i, e.height * i), this.tagNormalLine.visible = !1, this.tagNormalLine.name = `tagNormalLine-${this.id}`, this.plugin.group.add(this.tagNormalLine);
   }
@@ -178,10 +179,10 @@ class pi extends N {
   setPosition(t) {
     this.originPosition = t, this.position = (() => {
       const e = this.plugin.workUtil.transform;
-      let i = A(D(t), e).toArray();
+      let i = k(E(t), e).toArray();
       if (this.normal && this.normalLineLength) {
         const o = this.computeNormal();
-        i = new n.Vector3().fromArray(i).clone().add(o.clone().setLength(this.normalLineLength)).toArray();
+        i = new r.Vector3().fromArray(i).clone().add(o.clone().setLength(this.normalLineLength)).toArray();
       }
       return i;
     })(), this.cache.clear(), this._lastUpdateCache.position = [0, 0, 0], this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -191,7 +192,7 @@ class pi extends N {
    * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
    */
   updateTagNormalLinePosition() {
-    var _, y, v, b;
+    var _, y, v, L, b, x, C;
     if (!this.screenPosition || !this.tagNormalLine)
       return;
     if (!this.visible) {
@@ -200,38 +201,40 @@ class pi extends N {
     }
     const t = this._lastUpdateCache;
     if (!(this.visible !== t.visible)) {
-      const f = Math.abs(this.position[0] - t.position[0]) > 1e-3 || Math.abs(this.position[1] - t.position[1]) > 1e-3 || Math.abs(this.position[2] - t.position[2]) > 1e-3, x = Math.abs(((_ = this.screenPosition.leftPx) != null ? _ : 0) - t.screenLeft) > 0.5 || Math.abs(((y = this.screenPosition.topPx) != null ? y : 0) - t.screenTop) > 0.5;
-      if (!f && !x)
+      const f = Math.abs(this.position[0] - t.position[0]) > 1e-3 || Math.abs(this.position[1] - t.position[1]) > 1e-3 || Math.abs(this.position[2] - t.position[2]) > 1e-3, T = Math.abs(((_ = this.screenPosition.leftPx) != null ? _ : 0) - t.screenLeft) > 0.5 || Math.abs(((y = this.screenPosition.topPx) != null ? y : 0) - t.screenTop) > 0.5 || Math.abs(((v = this.screenPosition.scale) != null ? v : 1) - t.scale) > 2e-3;
+      if (!f && !T)
         return;
     }
-    t.position = new n.Vector3().fromArray(this.position).toArray(), t.screenLeft = (v = this.screenPosition.leftPx) != null ? v : 0, t.screenTop = (b = this.screenPosition.topPx) != null ? b : 0, t.visible = this.visible;
+    t.position = new r.Vector3().fromArray(this.position).toArray(), t.screenLeft = (L = this.screenPosition.leftPx) != null ? L : 0, t.screenTop = (b = this.screenPosition.topPx) != null ? b : 0, t.scale = (x = this.screenPosition.scale) != null ? x : 1, t.visible = this.visible;
     const i = this.five.renderer.getSize(u);
     this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineStart.project(this.five.camera), this._temp.iconPos.project(this.five.camera), this._temp.screenDirPixel.set(
       (this._temp.iconPos.x - this._temp.lineStart.x) * i.x / 2,
       (this._temp.iconPos.y - this._temp.lineStart.y) * i.y / 2
     );
     const o = this._temp.screenDirPixel.length();
-    this._temp.screenDirPixel.normalize(), this._temp.targetNDC.set(
-      (this._temp.iconPos.x * i.x / 2 - this._temp.screenDirPixel.x * this.iconPixelGap) / (i.x / 2),
-      (this._temp.iconPos.y * i.y / 2 - this._temp.screenDirPixel.y * this.iconPixelGap) / (i.y / 2)
+    this._temp.screenDirPixel.normalize();
+    const s = this.iconPixelGap * ((C = this.screenPosition.scale) != null ? C : 1);
+    this._temp.targetNDC.set(
+      (this._temp.iconPos.x * i.x / 2 - this._temp.screenDirPixel.x * s) / (i.x / 2),
+      (this._temp.iconPos.y * i.y / 2 - this._temp.screenDirPixel.y * s) / (i.y / 2)
     ), this._temp.raycaster.setFromCamera(this._temp.targetNDC, this.five.camera);
-    const s = this._temp.raycaster.ray;
-    this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(s.origin).sub(this._temp.lineStart);
-    const r = s.direction.dot(s.direction), a = s.direction.dot(this._temp.lineDir), h = this._temp.lineDir.dot(this._temp.lineDir), c = s.direction.dot(this._temp.lineEnd), d = this._temp.lineDir.dot(this._temp.lineEnd), g = r * h - a * a;
+    const n = this._temp.raycaster.ray;
+    this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(n.origin).sub(this._temp.lineStart);
+    const l = n.direction.dot(n.direction), h = n.direction.dot(this._temp.lineDir), c = this._temp.lineDir.dot(this._temp.lineDir), d = n.direction.dot(this._temp.lineEnd), N = this._temp.lineDir.dot(this._temp.lineEnd), g = l * c - h * h;
     let P = 0;
-    Math.abs(g) > 1e-4 && (P = (a * d - h * c) / g), this._temp.lineEnd.copy(s.origin).add(s.direction.multiplyScalar(Math.max(0, P)));
-    const L = this._temp.lineStart.distanceTo(this._temp.iconPos);
-    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > L) {
-      const f = Math.max(0, 1 - this.iconPixelGap / o);
+    Math.abs(g) > 1e-4 && (P = (h * N - c * d) / g), this._temp.lineEnd.copy(n.origin).add(n.direction.multiplyScalar(Math.max(0, P)));
+    const S = this._temp.lineStart.distanceTo(this._temp.iconPos);
+    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > S) {
+      const f = Math.max(0, 1 - s / o);
       this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, f);
     }
-    this.tagNormalLine.setPoints(this._temp.lineStart, this._temp.lineEnd), this.tagNormalLine.visible = !0, this.five.needsRender = !0;
+    this.tagNormalLine.setPoints(this._temp.lineStart, this._temp.lineEnd), this.tagNormalLine.visible = !0;
   }
   updateScreenPosition(t) {
-    var r;
+    var n;
     if (this.stickType !== "2DPoint" && this.stickType !== "3DPoint")
       return;
-    const { force: e = !1 } = t != null ? t : {}, i = e ? this.state.visible : this.currentVisible, o = (r = this.__Object__) != null ? r : {
+    const { force: e = !1 } = t != null ? t : {}, i = e ? this.state.visible : this.currentVisible, o = (n = this.__Object__) != null ? n : {
       timeoutId: void 0,
       inAnimation: !1
     };
@@ -243,11 +246,11 @@ class pi extends N {
       return;
     const s = this.computeTagProject();
     if (s && this.five.renderer) {
-      const a = this.getDistance(void 0, 1), h = (() => {
+      const l = this.getDistance(void 0, 1), h = (() => {
         if (!this.currentConfig.simulate3D)
           return 1;
         const d = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI);
-        return Math.max(Math.min(1 - d * a / 40, 1), 0.7);
+        return Math.max(Math.min(1 - d * l / 40, 1), 0.7);
       })(), c = this.five.renderer.getSize(u);
       this.screenPosition = {
         leftPx: (s.x + 1) / 2 * c.x,
@@ -275,7 +278,10 @@ class pi extends N {
     }
   }
   computeNormal() {
-    return new n.Vector3().fromArray(this.normal);
+    return new r.Vector3().fromArray(this.normal);
+  }
+  removeTagNormalLine() {
+    this.tagNormalLine && (this.plugin.group.remove(this.tagNormalLine), this.tagNormalLine = null);
   }
   /**
    * @description 获取额外的闪烁目标，包括法线（如果有）
@@ -286,5 +292,5 @@ class pi extends N {
   }
 }
 export {
-  pi as PointTag
+  di as PointTag
 };

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let A = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.72.5-alpha.2");
+    r(this, "VERSION", "3.72.5-alpha.3");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.72.5-alpha.2",
+    "%c %c@realsee/dnalogel %cv3.72.5-alpha.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/package.json

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