@realsee/dnalogel 3.74.0-alpha.3 → 3.74.1-alpha.0

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

@@ -7,7 +7,11 @@ export type PointTagInterface<C extends TagContentType = TagContentType> = TagIn
 export declare class PointTag<C extends TagContentType = TagContentType> extends BaseTag<C, '2DPoint' | '3DPoint'> {
     private __Object__;
     private requestIdleCallbackId?;
+    private iconPixelGap;
+    private _temp;
+    private _lastUpdateCache;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
+    initialTagLine(): void;
     /**
      * @description 展开自己，收起其他标签
      */
@@ -22,6 +26,11 @@ export declare class PointTag<C extends TagContentType = TagContentType> extends
      */
     setUnfold(unfolded: boolean): void;
     setPosition(position: ArrayPosition): void;
+    /**
+     * 更新标签连线的位置，使其端点与icon保持固定像素距离
+     * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
+     */
+    private updateTagNormalLinePosition;
     updateScreenPosition(params?: {
         force?: boolean;
     }): void;
@@ -29,4 +38,9 @@ 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 获取额外的闪烁目标，包括法线（如果有）
+     */
+    protected getAdditionalBlinkTargets(): any | any[] | null;
 }

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

@@ -1,8 +1,11 @@
-var h = Object.defineProperty;
-var c = (s, o, t) => o in s ? h(s, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[o] = t;
-var p = (s, o, t) => (c(s, typeof o != "symbol" ? o + "" : o, t), t);
-import { BaseTag as g } from "./BaseTag.js";
-import * as l from "three";
+var I = Object.defineProperty;
+var M = (p, h, t) => h in p ? I(p, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : p[h] = t;
+var c = (p, h, t) => (M(p, typeof h != "symbol" ? h + "" : h, t), t);
+import { BaseTag as U } from "./BaseTag.js";
+import * as r from "three";
+import { Line as R } from "@realsee/five/line";
+import { anyPositionToVector3 as g } from "../../../shared-utils/positionToVector3.js";
+import { transformPosition as P } from "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -11,13 +14,11 @@ import "../../utils/tag/adaptConfig.js";
 import "../../typings/tag/TagConfig.js";
 import "@realsee/five";
 import "../../../shared-utils/tag.js";
-import "../../../shared-utils/positionToVector3.js";
 import "../../../shared-utils/five/vector3ToScreen.js";
 import "../../../shared-utils/five/getFiveModel.js";
 import "../../../shared-utils/Utils/FiveUtil.js";
 import "../../../shared-utils/Utils/BaseUtil.js";
 import "../../../shared-utils/Utils/WorkUtil.js";
-import "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/three/temp.js";
 import "../../../shared-utils/three/core/Raycaster.js";
 import "../../../shared-utils/dom/resizeObserver.js";
@@ -36,7 +37,6 @@ import "../../../shared-utils/three/centerPoint.js";
 import "../../../shared-utils/three/getObjectVisible.js";
 import "../../../shared-utils/three/CSS3DRenderer/index.js";
 import "../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "@realsee/five/line";
 import "../../../shared-utils/isNil.js";
 import "../../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../../shared-utils/three/core/Sphere.js";
@@ -88,12 +88,57 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/promise/withResolvers.js";
-const v = new l.Vector2();
-class Lt extends g {
-  constructor(t, i) {
-    super(t, i);
-    p(this, "__Object__");
-    p(this, "requestIdleCallbackId");
+const _ = new r.Vector2();
+class _i extends U {
+  constructor(t, e) {
+    var o, i, n, s, a;
+    super(t, e);
+    c(this, "__Object__");
+    c(this, "requestIdleCallbackId");
+    // icon 与线条端点的固定像素间距
+    c(this, "iconPixelGap", 10);
+    // 优化：重用临时对象，避免频繁创建
+    c(this, "_temp", {
+      lineStart: new r.Vector3(),
+      // 线条起点（project后会变成NDC）
+      iconPos: new r.Vector3(),
+      // icon位置（project后会变成NDC）
+      screenDirPixel: new r.Vector2(),
+      // 屏幕方向（normalize后会变成单位向量）
+      targetNDC: new r.Vector2(),
+      // 目标NDC坐标
+      lineDir: new r.Vector3(),
+      // 线条方向（计算w0时重用）
+      lineEnd: new r.Vector3(),
+      // 线条终点
+      raycaster: new r.Raycaster()
+      // 射线投射器
+    });
+    // 用于变化检测的缓存值
+    c(this, "_lastUpdateCache", {
+      position: [0, 0, 0],
+      screenLeft: 0,
+      screenTop: 0,
+      scale: 1,
+      visible: !1
+    });
+    if ((i = (o = e.style) == null ? void 0 : o.point) != null && i.width) {
+      const d = (a = (s = (n = e.style) == null ? void 0 : n.point) == null ? void 0 : s.scale) != null ? a : 1;
+      this.iconPixelGap = e.style.point.width * d * 1.4 / 2 + 2;
+    }
+    e.contentType === "Audio" && (this.iconPixelGap = 34 / 2 + 2), this.initialTagLine();
+  }
+  initialTagLine() {
+    var n, s, a;
+    const t = this.config;
+    if (!this.five.renderer || !((n = t == null ? void 0 : t.tagNormalLineConfig) != null && n.enabled) || !this.normalLineLength)
+      return;
+    const e = this.five.renderer.getSize(_), o = this.five.renderer.getPixelRatio(), i = P(g(this.originPosition), this.plugin.workUtil.transform);
+    this.tagNormalLine = new R(new r.Vector3().fromArray(this.position), i), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
+      color: new r.Vector3(1, 1, 1),
+      linewidth: (a = (s = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : s.lineWidth) != null ? a : 1.2,
+      dashed: !1
+    }), 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 展开自己，收起其他标签
@@ -101,20 +146,20 @@ class Lt extends g {
   unfoldAndFoldOthers() {
     if (this.isPopoverConfigEnabled())
       return;
-    const t = this.can("fold"), i = this.can("unfold");
-    t && i && (this.state.unfolded = !this.state.unfolded, this.manuallyOperated = !0, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((r) => {
-      r.id !== this.id && r.fold();
+    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((o) => {
+      o.id !== this.id && o.fold();
     }));
   }
   onClick(t) {
     t.target === "TagPoint" && this.unfoldAndFoldOthers();
   }
   applyVisible() {
-    var t, i;
-    this.currentVisible && this.updateScreenPosition(), (t = this.tag3DContentSvelte) != null && t.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible), (i = this.tag3DContentSvelte) == null || i.svelteApp.$set({
+    var t, e;
+    this.currentVisible && this.updateScreenPosition(), (t = this.tag3DContentSvelte) != null && t.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible), (e = this.tag3DContentSvelte) == null || e.svelteApp.$set({
       state: this.plugin.state,
       temporaryState: this.temporaryState
-    }), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
+    }), !this.tagNormalLine && this.normalLineLength && this.initialTagLine(), this.tagNormalLine && (this.tagNormalLine.visible = this.visible), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
   unfold() {
     this.isPopoverConfigEnabled() || this.setUnfold(!0);
@@ -129,45 +174,99 @@ class Lt extends g {
   setUnfold(t) {
     if (this.isPopoverConfigEnabled())
       return;
-    const i = this.can("fold"), r = this.can("unfold");
-    i && r && (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 = t, this.cache.clear(), this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
+    this.originPosition = t, this.position = (() => {
+      const e = this.plugin.workUtil.transform;
+      let o = P(g(t), e).toArray();
+      if (this.normal && this.normalLineLength) {
+        const i = this.computeNormal();
+        o = new r.Vector3().fromArray(o).clone().add(i.clone().setLength(this.normalLineLength)).toArray();
+      }
+      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(t) {
+    var L, x, C, N, S, T, D;
+    if (!this.screenPosition || !this.tagNormalLine)
+      return;
+    const { force: e = !1 } = t != null ? t : {};
+    if (!(e ? this.state.visible : this.currentVisible)) {
+      this.tagNormalLine.visible = !1;
+      return;
+    }
+    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, E = Math.abs(((L = this.screenPosition.leftPx) != null ? L : 0) - i.screenLeft) > 0.5 || Math.abs(((x = this.screenPosition.topPx) != null ? x : 0) - i.screenTop) > 0.5 || Math.abs(((C = this.screenPosition.scale) != null ? C : 1) - i.scale) > 2e-3;
+      if (!u && !E)
+        return;
+    }
+    if (i.position = new r.Vector3().fromArray(this.position).toArray(), i.screenLeft = (N = this.screenPosition.leftPx) != null ? N : 0, i.screenTop = (S = this.screenPosition.topPx) != null ? S : 0, i.scale = (T = this.screenPosition.scale) != null ? T : 1, i.visible = this.visible, !this.five.renderer)
+      return;
+    const s = this.five.renderer.getSize(_), a = P(g(this.originPosition), this.plugin.workUtil.transform).toArray();
+    this._temp.lineStart.fromArray(a), 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) * s.x / 2,
+      (this._temp.iconPos.y - this._temp.lineStart.y) * s.y / 2
+    );
+    const d = this._temp.screenDirPixel.length();
+    this._temp.screenDirPixel.normalize();
+    const m = this.iconPixelGap * ((D = this.screenPosition.scale) != null ? D : 1);
+    this._temp.targetNDC.set(
+      (this._temp.iconPos.x * s.x / 2 - this._temp.screenDirPixel.x * m) / (s.x / 2),
+      (this._temp.iconPos.y * s.y / 2 - this._temp.screenDirPixel.y * m) / (s.y / 2)
+    ), this._temp.raycaster.setFromCamera(this._temp.targetNDC, this.five.camera);
+    const l = this._temp.raycaster.ray;
+    this._temp.lineStart.fromArray(a), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(l.origin).sub(this._temp.lineStart);
+    const A = l.direction.dot(l.direction), f = l.direction.dot(this._temp.lineDir), y = this._temp.lineDir.dot(this._temp.lineDir), w = l.direction.dot(this._temp.lineEnd), V = this._temp.lineDir.dot(this._temp.lineEnd), v = A * y - f * f;
+    let b = 0;
+    Math.abs(v) > 1e-4 && (b = (f * V - y * w) / v), this._temp.lineEnd.copy(l.origin).add(l.direction.multiplyScalar(Math.max(0, b)));
+    const k = this._temp.lineStart.distanceTo(this._temp.iconPos);
+    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > k) {
+      const u = Math.max(0, 1 - m / d);
+      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;
   }
   updateScreenPosition(t) {
-    var a;
+    var s;
     if (this.stickType !== "2DPoint" && this.stickType !== "3DPoint")
       return;
-    const { force: i = !1 } = t != null ? t : {}, r = i ? this.state.visible : this.currentVisible, e = (a = this.__Object__) != null ? a : {
+    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__ = e, !r && this.screenPosition ? (e.inAnimation = !0, e.timeoutId = setTimeout(() => {
+    if (this.__Object__ = i, !o && this.screenPosition ? (i.inAnimation = !0, i.timeoutId = setTimeout(() => {
       requestAnimationFrame(() => {
-        this.currentVisible || (e.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)) : e.timeoutId && (clearTimeout(e.timeoutId), e.inAnimation = !1, e.timeoutId = void 0), !r && !e.inAnimation)
+    }, 1e3)) : i.timeoutId && (clearTimeout(i.timeoutId), i.inAnimation = !1, i.timeoutId = void 0), !o && !i.inAnimation)
       return;
     const n = this.computeTagProject();
     if (n && this.five.renderer) {
-      const m = (() => {
+      const a = this.getDistance(void 0, 1), d = (() => {
         if (!this.currentConfig.simulate3D)
           return 1;
-        const u = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), f = this.getDistance(void 0, 1);
-        return Math.max(Math.min(1 - u * f / 40, 1), 0.7);
-      })(), d = this.five.renderer.getSize(v);
+        const l = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI);
+        return Math.max(Math.min(1 - l * a / 40, 1), 0.7);
+      })(), m = this.five.renderer.getSize(_);
       this.screenPosition = {
-        leftPx: (n.x + 1) / 2 * d.x,
-        topPx: (-n.y + 1) / 2 * d.y,
-        scale: m
-      };
+        leftPx: (n.x + 1) / 2 * m.x,
+        topPx: (-n.y + 1) / 2 * m.y,
+        scale: d
+      }, this.updateTagNormalLinePosition({ force: t == null ? void 0 : t.force });
     } else
       this.screenPosition = null;
     this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
-  set(t, i = !0) {
-    super.set(t, i), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
+  set(t, e = !0) {
+    var o, i, n;
+    super.set(t, e), this.normalLineLength = (n = (i = (o = t.style) == null ? void 0 : o.point) == null ? void 0 : i.normalLen) != null ? n : 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"] });
@@ -177,14 +276,24 @@ class Lt extends g {
       return;
     const t = this.getUnfoldedByPanoIndex();
     if (this.state && (t !== void 0 && (this.state.unfolded = t), t && !this.state.visible)) {
-      const i = this.getConfig();
-      typeof i.unfoldedConfig == "object" && i.unfoldedConfig.autoFoldWhenHide !== !1 && (this.state.unfolded = !1);
+      const e = this.getConfig();
+      typeof e.unfoldedConfig == "object" && e.unfoldedConfig.autoFoldWhenHide !== !1 && (this.state.unfolded = !1);
     }
   }
   computeNormal() {
-    return new l.Vector3().fromArray(this.normal);
+    return new r.Vector3().fromArray(this.normal);
+  }
+  removeTagNormalLine() {
+    this.tagNormalLine && (this.plugin.group.remove(this.tagNormalLine), this.tagNormalLine = null);
+  }
+  /**
+   * @description 获取额外的闪烁目标，包括法线（如果有）
+   */
+  getAdditionalBlinkTargets() {
+    var t;
+    return (t = this.tagNormalLine) != null && t.line ? this.tagNormalLine.line : null;
   }
 }
 export {
-  Lt as PointTag
+  _i as PointTag
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -679,7 +679,7 @@ class Fs 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), t != null && t.tagNormalLine && (t == null || t.removeTagNormalLine());
     }), 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/PanoTagPlugin/tag.config.js

@@ -31,6 +31,10 @@ const e = {
         showShare: !0
       },
       viewMoreText: "查看更多"
+    },
+    tagNormalLineConfig: {
+      enabled: !0,
+      lineWidth: 1.2
     }
   },
   contentTypeConfig: {

package/libs/PanoTagPlugin/typings/tag/TagConfig.d.ts

@@ -356,6 +356,21 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
          */
         beforeOpen?: (tag?: TagInstance) => boolean | undefined;
     };
+    /**
+     * @description 标签法线相关配置
+     */
+    tagNormalLineConfig?: {
+        /**
+         * @description 是否启用标签法线
+         * @default true
+         */
+        enabled?: boolean;
+        /**
+         * @description 标签法线宽度
+         * @default 1.2
+         */
+        lineWidth?: number;
+    };
 }
 export declare const defaultGlobalConfig: TagConfig;
 type ConfigFunction = (five: Five, tagState: {

package/libs/PanoTagPlugin/typings/tag/Utils.d.ts

@@ -55,6 +55,8 @@ export interface TagIconUrl {
     scale?: number;
     /** 帧动画配置 */
     animation?: TagIconAnimationConfig;
+    /** 标签法线长度 */
+    normalLen?: number;
 }
 export interface TagStyle {
     /** 小圆点样式 */

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

@@ -14,24 +14,11 @@ export type PolygonCreateConfig = Partial<PolygonStyle & CreateLimitConfig & Pol
     onPointPlaced?: (points: THREE.Vector3[]) => void;
     onUndo?: () => void;
     onRedo?: () => void;
-    /**
-     * @description 检测到自相交时的回调
-     * @param point 尝试添加但被拒绝的点坐标
-     */
-    __onSelfIntersect?: (point: THREE.Vector3) => void;
-    /**
-     * @description 将要添加的下一个点
-     */
-    __onWillAddPoint?: (point: THREE.Vector3, points: THREE.Vector3[]) => void;
     /**
      * @description 检测是否自相交，如果自交，禁止添加下一个点
      * @default false
      */
     experimental_self_intersect_check?: boolean;
-    /**
-     * 最多允许能添加的点数
-     */
-    experimental_max_point_count?: number;
 };
 export declare class Polygon extends BaseObject<PolygonImportData> {
     readonly type = "Polygon";