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

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";
+var w = Object.defineProperty;
+var E = (m, l, t) => l in m ? w(m, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : m[l] = t;
+var c = (m, l, t) => (E(m, typeof l != "symbol" ? l + "" : l, t), t);
+import { BaseTag as k } 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";
+import { Line as I } from "@realsee/five/line";
+import { anyPositionToVector3 as M } from "../../../shared-utils/positionToVector3.js";
+import { transformPosition as R } from "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -87,17 +87,17 @@ 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 g = new n.Vector2();
+class gi extends k {
   constructor(t, e) {
-    var i, o, s, r, a;
+    var o, i, r, s, h;
     super(t, e);
-    m(this, "__Object__");
-    m(this, "requestIdleCallbackId");
+    c(this, "__Object__");
+    c(this, "requestIdleCallbackId");
     // icon 与线条端点的固定像素间距
-    m(this, "iconPixelGap", 10);
+    c(this, "iconPixelGap", 10);
     // 优化：重用临时对象，避免频繁创建
-    m(this, "_temp", {
+    c(this, "_temp", {
       lineStart: new n.Vector3(),
       // 线条起点（project后会变成NDC）
       iconPos: new n.Vector3(),
@@ -113,30 +113,31 @@ class pi extends N {
       raycaster: new n.Raycaster()
       // 射线投射器
     });
-    // 用于变化检测的缓存值（position不需要缓存，因为它基于originPosition计算）
-    m(this, "_lastUpdateCache", {
+    // 用于变化检测的缓存值
+    c(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;
-      this.iconPixelGap = e.style.point.width * h * 1.4 / 2 + 2;
+    if ((i = (o = e.style) == null ? void 0 : o.point) != null && i.width) {
+      const p = (h = (s = (r = e.style) == null ? void 0 : r.point) == null ? void 0 : s.scale) != null ? h : 1;
+      this.iconPixelGap = e.style.point.width * p * 1.4 / 2 + 2;
     }
-    this.initialTagLine();
+    e.contentType === "Audio" && (this.iconPixelGap = 34 / 2 + 2), this.initialTagLine();
   }
   initialTagLine() {
-    var o, s, r;
+    var i, r, s;
     const t = this.config;
-    if (!((o = t == null ? void 0 : t.tagNormalLineConfig) != null && o.enabled) || !this.normalLineLength)
+    if (!((i = t == null ? void 0 : t.tagNormalLineConfig) != null && i.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({
+    const e = this.five.renderer.getSize(g), o = this.five.renderer.getPixelRatio();
+    this.tagNormalLine = new I(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,
+      linewidth: (s = (r = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : r.lineWidth) != null ? s : 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);
+    }), this.tagNormalLine.line.material.transparent = !0, this.tagNormalLine.line.material.depthWrite = !1, this.tagNormalLine.line.material.depthTest = !0, this.tagNormalLine.line.material.dashed = !1, this.tagNormalLine.line.renderOrder = 2, this.tagNormalLine.setResolution(e.width * o, e.height * o), this.tagNormalLine.visible = !1, this.tagNormalLine.name = `tagNormalLine-${this.id}`, this.plugin.group.add(this.tagNormalLine);
   }
   /**
    * @description 展开自己，收起其他标签
@@ -145,8 +146,8 @@ class pi extends N {
     if (this.isPopoverConfigEnabled())
       return;
     const t = this.can("fold"), e = this.can("unfold");
-    t && e && (this.state.unfolded = !this.state.unfolded, this.manuallyOperated = !0, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((i) => {
-      i.id !== this.id && i.fold();
+    t && e && (this.state.unfolded = !this.state.unfolded, this.manuallyOperated = !0, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((o) => {
+      o.id !== this.id && o.fold();
     }));
   }
   onClick(t) {
@@ -172,95 +173,98 @@ class pi extends N {
   setUnfold(t) {
     if (this.isPopoverConfigEnabled())
       return;
-    const e = this.can("fold"), i = this.can("unfold");
-    e && i && (this.state.unfolded = t, this.hooks.emit(t ? "unfolded" : "folded"), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
+    const e = this.can("fold"), o = this.can("unfold");
+    e && o && (this.state.unfolded = t, this.hooks.emit(t ? "unfolded" : "folded"), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
   }
   setPosition(t) {
     this.originPosition = t, this.position = (() => {
       const e = this.plugin.workUtil.transform;
-      let i = A(D(t), e).toArray();
+      let o = R(M(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();
+        const i = this.computeNormal();
+        o = new n.Vector3().fromArray(o).clone().add(i.clone().setLength(this.normalLineLength)).toArray();
       }
-      return i;
+      return o;
     })(), this.cache.clear(), this._lastUpdateCache.position = [0, 0, 0], this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
   /**
    * 更新标签连线的位置，使其端点与icon保持固定像素距离
    * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
    */
-  updateTagNormalLinePosition() {
-    var _, y, v, b;
+  updateTagNormalLinePosition(t) {
+    var v, b, L, x, C, N, S;
     if (!this.screenPosition || !this.tagNormalLine)
       return;
-    if (!this.visible) {
+    const { force: e = !1 } = t != null ? t : {};
+    if (!(e ? this.state.visible : this.currentVisible)) {
       this.tagNormalLine.visible = !1;
       return;
     }
-    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 i = this._lastUpdateCache;
+    if (!(this.visible !== i.visible)) {
+      const u = Math.abs(this.position[0] - i.position[0]) > 1e-3 || Math.abs(this.position[1] - i.position[1]) > 1e-3 || Math.abs(this.position[2] - i.position[2]) > 1e-3, V = Math.abs(((v = this.screenPosition.leftPx) != null ? v : 0) - i.screenLeft) > 0.5 || Math.abs(((b = this.screenPosition.topPx) != null ? b : 0) - i.screenTop) > 0.5 || Math.abs(((L = this.screenPosition.scale) != null ? L : 1) - i.scale) > 2e-3;
+      if (!u && !V)
         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;
-    const i = this.five.renderer.getSize(u);
+    i.position = new n.Vector3().fromArray(this.position).toArray(), i.screenLeft = (x = this.screenPosition.leftPx) != null ? x : 0, i.screenTop = (C = this.screenPosition.topPx) != null ? C : 0, i.scale = (N = this.screenPosition.scale) != null ? N : 1, i.visible = this.visible;
+    const s = this.five.renderer.getSize(g);
     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
+      (this._temp.iconPos.x - this._temp.lineStart.x) * s.x / 2,
+      (this._temp.iconPos.y - this._temp.lineStart.y) * s.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)
+    const h = this._temp.screenDirPixel.length();
+    this._temp.screenDirPixel.normalize();
+    const p = this.iconPixelGap * ((S = this.screenPosition.scale) != null ? S : 1);
+    this._temp.targetNDC.set(
+      (this._temp.iconPos.x * s.x / 2 - this._temp.screenDirPixel.x * p) / (s.x / 2),
+      (this._temp.iconPos.y * s.y / 2 - this._temp.screenDirPixel.y * p) / (s.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;
-    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);
-      this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, f);
+    const a = 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(a.origin).sub(this._temp.lineStart);
+    const d = a.direction.dot(a.direction), f = a.direction.dot(this._temp.lineDir), P = this._temp.lineDir.dot(this._temp.lineDir), T = a.direction.dot(this._temp.lineEnd), D = this._temp.lineDir.dot(this._temp.lineEnd), _ = d * P - f * f;
+    let y = 0;
+    Math.abs(_) > 1e-4 && (y = (f * D - P * T) / _), this._temp.lineEnd.copy(a.origin).add(a.direction.multiplyScalar(Math.max(0, y)));
+    const A = this._temp.lineStart.distanceTo(this._temp.iconPos);
+    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > A) {
+      const u = Math.max(0, 1 - p / h);
+      this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, u);
     }
-    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 s;
     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 : {}, o = e ? this.state.visible : this.currentVisible, i = (s = this.__Object__) != null ? s : {
       timeoutId: void 0,
       inAnimation: !1
     };
-    if (this.__Object__ = o, !i && this.screenPosition ? (o.inAnimation = !0, o.timeoutId = setTimeout(() => {
+    if (this.__Object__ = i, !o && this.screenPosition ? (i.inAnimation = !0, i.timeoutId = setTimeout(() => {
       requestAnimationFrame(() => {
-        this.currentVisible || (o.inAnimation = !1, this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
+        this.currentVisible || (i.inAnimation = !1, this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
       });
-    }, 1e3)) : o.timeoutId && (clearTimeout(o.timeoutId), o.inAnimation = !1, o.timeoutId = void 0), !i && !o.inAnimation)
+    }, 1e3)) : i.timeoutId && (clearTimeout(i.timeoutId), i.inAnimation = !1, i.timeoutId = void 0), !o && !i.inAnimation)
       return;
-    const s = this.computeTagProject();
-    if (s && this.five.renderer) {
-      const a = this.getDistance(void 0, 1), h = (() => {
+    const r = this.computeTagProject();
+    if (r && this.five.renderer) {
+      const h = this.getDistance(void 0, 1), p = (() => {
         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);
-      })(), c = this.five.renderer.getSize(u);
+        return Math.max(Math.min(1 - d * h / 40, 1), 0.7);
+      })(), a = this.five.renderer.getSize(g);
       this.screenPosition = {
-        leftPx: (s.x + 1) / 2 * c.x,
-        topPx: (-s.y + 1) / 2 * c.y,
-        scale: h
-      }, this.updateTagNormalLinePosition();
+        leftPx: (r.x + 1) / 2 * a.x,
+        topPx: (-r.y + 1) / 2 * a.y,
+        scale: p
+      }, this.updateTagNormalLinePosition({ force: t == null ? void 0 : t.force });
     } else
       this.screenPosition = null;
     this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
   set(t, e = !0) {
-    var i, o, s;
-    super.set(t, e), this.normalLineLength = (s = (o = (i = t.style) == null ? void 0 : i.point) == null ? void 0 : o.normalLen) != null ? s : 0, this._lastUpdateCache.position = [0, 0, 0], this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
+    var o, i, r;
+    super.set(t, e), this.normalLineLength = (r = (i = (o = t.style) == null ? void 0 : o.point) == null ? void 0 : i.normalLen) != null ? r : 0, this._lastUpdateCache.position = [0, 0, 0], this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
   }
   setData(...t) {
     super.setData(...t), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -277,6 +281,9 @@ class pi extends N {
   computeNormal() {
     return new n.Vector3().fromArray(this.normal);
   }
+  removeTagNormalLine() {
+    this.tagNormalLine && (this.plugin.group.remove(this.tagNormalLine), this.tagNormalLine = null);
+  }
   /**
    * @description 获取额外的闪烁目标，包括法线（如果有）
    */
@@ -286,5 +293,5 @@ class pi extends N {
   }
 }
 export {
-  pi as PointTag
+  gi as PointTag
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -678,7 +678,7 @@ class _s extends R {
     var e;
     this.tags.length && (this.tags.forEach((t) => {
       var i, o, n, s, r, a;
-      (i = t.tag3DContentSvelte) == null || i.dispose(), (n = (o = t.mediaPlane) == null ? void 0 : o.parent) == null || n.remove(t.mediaPlane), (a = (r = (s = t.model) == null ? void 0 : s.object) == null ? void 0 : r.parent) == null || a.remove(t.model.object);
+      (i = t.tag3DContentSvelte) == null || i.dispose(), (n = (o = t.mediaPlane) == null ? void 0 : o.parent) == null || n.remove(t.mediaPlane), (a = (r = (s = t.model) == null ? void 0 : s.object) == null ? void 0 : r.parent) == null || a.remove(t.model.object), this.group.remove(t.tagNormalLine);
     }), this.tags = [], this.tagsLengthWillUpdate = !0, this.hooks.emit("tagsLengthChange"), (e = this.TagContainerSvelte) == null || e.$destroy(), this.TagContainerSvelte = void 0, this.disposeAllCSS3DContainer()), this.enabledModelTagSet.clear(), this.cache.clear();
   }
   /**

package/libs/Sculpt/Objects/Polygon/index.d.ts

@@ -14,6 +14,11 @@ export type PolygonCreateConfig = Partial<PolygonStyle & CreateLimitConfig & Pol
     onPointPlaced?: (points: THREE.Vector3[]) => void;
     onUndo?: () => void;
     onRedo?: () => void;
+    /**
+     * @description 检测是否自相交，如果自交，禁止添加下一个点
+     * @default false
+     */
+    experimental_self_intersect_check?: boolean;
 };
 export declare class Polygon extends BaseObject<PolygonImportData> {
     readonly type = "Polygon";