@realsee/dnalogel 3.78.0-alpha.0 → 3.78.0-alpha.2

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

@@ -58,11 +58,11 @@ import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../../vendor/earcut/src/earcut.js";
 import { vectorToCoordinates as le } from "../../../shared-utils/vectorToCoordinate.js";
-import { transformPosition as w } from "../../../shared-utils/five/transformPosition.js";
+import { transformPosition as T } from "../../../shared-utils/five/transformPosition.js";
 import { lookPoint as ae } from "../../../shared-utils/five/lookPoint.js";
 import { uuid as fe } from "../../../shared-utils/uuid.js";
 import "../../../shared-utils/five/FivePuppet.js";
-import { objectAssignDeepExports as T } from "../../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as w } from "../../../vendor/object-assign-deep/objectAssignDeep.js";
 import { getTagPosition as q, getTagCenterPosition as X } from "../../utils/tagPosition.js";
 import { checkRange as S } from "../../utils/checkRange.js";
 import { isMediaPlaneTag as Z, isMediaModelTag as O } from "../../utils/tag/tagCheck.js";
@@ -189,7 +189,7 @@ class Jt {
     const s = JSON.parse(JSON.stringify(e.data)), o = (f = e.initialConfig) != null ? f : e.config ? JSON.parse(JSON.stringify(e.config)) : {};
     e.initialConfig = o;
     const l = R(e, t.config), r = this.getConfig(e);
-    e.config = r, this.id = (m = e.id) != null ? m : fe(), this.enabled = (p = e.enabled) != null ? p : !0, this.contentType = e.contentType, this.hoverEnabled = (c = (d = r.popoverConfig) == null ? void 0 : d.enabled) != null ? c : !0, this.data = (u = r.initialData) != null && u.important ? T(e.data, s, r.initialData) : T(e.data, r.initialData, s);
+    e.config = r, this.id = (m = e.id) != null ? m : fe(), this.enabled = (p = e.enabled) != null ? p : !0, this.contentType = e.contentType, this.hoverEnabled = (c = (d = r.popoverConfig) == null ? void 0 : d.enabled) != null ? c : !0, this.data = (u = r.initialData) != null && u.important ? w(e.data, s, r.initialData) : w(e.data, r.initialData, s);
     let n;
     typeof r.unfoldedConfig == "object" ? r.unfoldedConfig.keep === "unfolded" ? n = !0 : r.unfoldedConfig.keep === "folded" ? n = !1 : n = !this.can("fold") : n = !this.can("fold"), this.state = y({
       visible: void 0,
@@ -206,17 +206,17 @@ class Jt {
           };
         const { start: x, end: A, rotation: F } = h;
         return {
-          start: w(M(x), P).toArray(),
-          end: w(M(A), P).toArray(),
-          rotation: w(M(F), P).toArray()
+          start: T(M(x), P).toArray(),
+          end: T(M(A), P).toArray(),
+          rotation: M(F).toArray()
         };
       }
       if (e.stickType === "Polygon")
-        return h ? h.map(M).map((x) => w(x, P).toArray()) : [];
+        return h ? h.map(M).map((x) => T(x, P).toArray()) : [];
       if (!h)
         return;
       let I = h;
-      if (Array.isArray(h) && h.length === 4 ? I = h.map(M).map((x) => w(x, P).toArray()) : I = w(M(h), P).toArray(), (e.stickType === "2DPoint" || e.stickType === "3DPoint") && ((U = r == null ? void 0 : r.tagNormalLineConfig) != null && U.enabled) && e.normal && this.normalLineLength) {
+      if (Array.isArray(h) && h.length === 4 ? I = h.map(M).map((x) => T(x, P).toArray()) : I = T(M(h), P).toArray(), (e.stickType === "2DPoint" || e.stickType === "3DPoint") && ((U = r == null ? void 0 : r.tagNormalLineConfig) != null && U.enabled) && e.normal && this.normalLineLength) {
         const x = new C.Vector3().fromArray(e.normal);
         I = new C.Vector3().fromArray(I).clone().add(x.clone().setLength(this.normalLineLength)).toArray();
       }
@@ -398,7 +398,7 @@ class Jt {
    * @param deepMerge 是否深度合并 data，默认为 true
    */
   setData(t, e = !0) {
-    e ? this.data = T(this.data, t) : this.data = y(y({}, this.data), t), this.hooks.emit("dataChanged", this.data);
+    e ? this.data = w(this.data, t) : this.data = y(y({}, this.data), t), this.hooks.emit("dataChanged", this.data);
   }
   /**
    * @description 修改标签位置
@@ -411,7 +411,7 @@ class Jt {
    * @param deepMerge 是否深度合并 data，默认为 true
    */
   set(t, e = !0) {
-    this.plugin.tagsLengthWillUpdate = !0, e ? T(this, t) : Object.assign(this, t), this.cache.clear();
+    this.plugin.tagsLengthWillUpdate = !0, e ? w(this, t) : Object.assign(this, t), this.cache.clear();
   }
   updateConfig() {
     var i;
@@ -420,7 +420,7 @@ class Jt {
     const e = this.getConfig();
     if (this.config = e, this.config.initialData) {
       const s = JSON.parse(JSON.stringify(this.data));
-      this.data = (i = e.initialData) != null && i.important ? T(this.data, s, e.initialData) : T(this.data, e.initialData, s);
+      this.data = (i = e.initialData) != null && i.important ? w(this.data, s, e.initialData) : w(this.data, e.initialData, s);
     }
     this.cache.clear();
   }

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

@@ -107,6 +107,7 @@ export declare class BoxTag<C extends TagContentType = TagContentType> extends B
      * 显示在 Box 最右侧的顶点位置
      */
     updateScreenPosition(): void;
+    get centerPosition(): THREE.Vector3;
     /**
      * 应用可见性变化
      */

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

@@ -28,8 +28,8 @@ var b = (a, s, t) => new Promise((i, o) => {
 });
 import { BaseTag as C } from "./BaseTag.js";
 import * as r from "three";
-import { Sculpt as E } from "../../../Sculpt/index.js";
-import { Box as P } from "../../../Sculpt/Objects/Box/index.js";
+import { Sculpt as P } from "../../../Sculpt/index.js";
+import { Box as E } from "../../../Sculpt/Objects/Box/index.js";
 import "../../../shared-utils/tag.js";
 import "../../../vendor/hammerjs/hammer.js";
 import "../../../shared-utils/three/PointSelector/index.js";
@@ -45,7 +45,8 @@ import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../../vendor/earcut/src/earcut.js";
 import { uuid as B } from "../../../shared-utils/uuid.js";
 import "../../../shared-utils/five/FivePuppet.js";
-import { sculptDataToBoxPosition as z } from "../../utils/sculptDataToBoxPosition.js";
+import { getBoxCorners as z, applyMatrixToPoints as T } from "../../utils/tagPosition.js";
+import { sculptDataToBoxPosition as D } from "../../utils/sculptDataToBoxPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -67,9 +68,8 @@ import "../../../shared-utils/Utils/FiveUtil.js";
 import "../../../shared-utils/Utils/BaseUtil.js";
 import "../../../shared-utils/Utils/WorkUtil.js";
 import "../../../shared-utils/five/getFiveModel.js";
-import "../../utils/tagPosition.js";
-import "../../utils/tag/tagCheck.js";
 import "../../utils/checkRange.js";
+import "../../utils/tag/tagCheck.js";
 import "../../../shared-utils/url/getUrl.js";
 import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
@@ -210,7 +210,7 @@ import "../../../shared-utils/forReverseEach.js";
 import "../../../Sculpt/Objects/Line/index.js";
 import "../../../Sculpt/Editors/BoxMeshEditor.js";
 import "../../../Sculpt/Meshes/Box.js";
-class _o extends C {
+class ie extends C {
   constructor(t, i) {
     super(t, i);
     d(this, "tagStyle");
@@ -295,11 +295,11 @@ class _o extends C {
     const t = this.position;
     if (!(t != null && t.start) || !(t != null && t.end) || !(t != null && t.rotation))
       return;
-    const i = new E(this.five, void 0, {
+    const i = new P(this.five, void 0, {
       magnifier: null
     });
     i.clear(), i.group.removeFromParent();
-    const o = this.boxPositionToSculptData(t), e = this.getBoxStyle(), p = new P(
+    const o = this.boxPositionToSculptData(t), e = this.getBoxStyle(), p = new E(
       {
         id: B(),
         type: "Box",
@@ -386,7 +386,7 @@ class _o extends C {
   syncBoxPositionFromSculpt() {
     if (!this.boxShape)
       return;
-    const t = this.boxShape.data, i = t.points.map((p) => u(p)), o = u(t.heightPoint), e = z(i, o);
+    const t = this.boxShape.data, i = t.points.map((p) => u(p)), o = u(t.heightPoint), e = D(i, o);
     this.position = e, this.hooks.emit("positionChanged", e);
   }
   /**
@@ -483,6 +483,13 @@ class _o extends C {
     }
     this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
+  get centerPosition() {
+    const t = z(this.position), i = T(t, this.matrix);
+    let o = i[0];
+    return i.forEach((e) => {
+      e.x > o.x && (o = e);
+    }), o;
+  }
   /**
    * 应用可见性变化
    */
@@ -501,5 +508,5 @@ class _o extends C {
   }
 }
 export {
-  _o as BoxTag
+  ie as BoxTag
 };

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

@@ -5,6 +5,7 @@ import * as THREE from 'three';
 import type { PartialObjectDeep } from '../../../typings/typings';
 import type { Tag } from '../..';
 import type { State as FiveState } from '@realsee/five';
+import type { AnimeParams } from 'animejs';
 export type MaskTagInterface<C extends TagContentType = TagContentType> = TagInstance<C, 'Mask'>;
 /**
  * Mask 类型的标签
@@ -13,13 +14,19 @@ export type MaskTagInterface<C extends TagContentType = TagContentType> = TagIns
 export declare class MaskTag<C extends TagContentType = TagContentType> extends BaseTag<C, 'Mask'> {
     /**
      * Mask 纹理缓存（静态，所有 MaskTag 实例共享）
-     * key: mask URL, value: { texture: THREE.Texture, refCount: number, abortController?: AbortController }
+     * key: mask URL 或 canvas 的 symbol, value: { texture: THREE.Texture, refCount: number, abortController?: AbortController }
      */
     private static maskTextureCache;
     /**
-     * mask 图片 URL（2:1 全景图格式）
+     * Canvas 到 Symbol 的映射（用于缓存 canvas 纹理）
      */
-    maskUrl: string;
+    private static canvasSymbolMap;
+    /** 同点位共用 mesh：key = meshKey(panoIndex + maskKey), value = 共享数据 */
+    private static sharedMeshRegistry;
+    /**
+     * mask 图片 URL 或 Canvas 元素（2:1 全景图格式）
+     */
+    maskUrl: string | HTMLCanvasElement;
     /**
      * 目标颜色（RGB 格式）
      */
@@ -36,6 +43,10 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      * 是否正在加载 mask
      */
     private loadingMask;
+    /**
+     * 资源是否已释放
+     */
+    private _disposed;
     /**
      * 标签样式配置
      */
@@ -44,21 +55,61 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      * 点击事件清理函数
      */
     private clickEventDispose?;
+    /** 当前 tag 在共享 style 纹理中的下标（color 即 id） */
+    private sharedStyleIndex;
+    /** 共享 mesh 的 registry key，用于 updateMaskStyle / dispose 查找 entry */
+    private _sharedMeshKey;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
+    private getColorKey;
+    /** 同点位共用一个 mesh，key 仅用 panoIndex（string/canvas 切换时不会因 key 不同而重复创建） */
+    private static getMeshKey;
+    /**
+     * 初始化/挂载到同点位共享 mesh，用 appendStyleToMaterial 注册本 tag 的 style（color 即 id）
+     */
+    private initializeMaskMesh;
+    /** 构建用于 mergedTexture 的 style 对象（color 作 id），tolerance 0–255 */
+    private buildStyleForMaterial;
+    private static createSharedMesh;
+    /** 仅更新材质中某一 slot 的 style（用于 enable/disable/updateMaskStyle） */
+    private updateStyleSlotInMaterial;
+    private setupSharedMeshRaycast;
     /**
      * 计算法向量
      * Mask 标签返回向上的法向量（因为是贴在 cube 面上）
      */
     computeNormal(): THREE.Vector3;
+    /**
+     * 不把共享 mesh 作为 blink 目标，闪烁通过本 tag 的 style opacity 动画实现
+     */
+    protected getAdditionalBlinkTargets(): any | any[] | null;
+    /**
+     * 闪烁仅针对本 tag：通过改变本 tag 在 merged texture 中的 opacity 实现
+     */
+    blink(animeConfig?: Partial<AnimeParams>): Promise<void>;
     /**
      * 更新标签数据
      */
     set(tag: PartialObjectDeep<Tag<C, 'Mask'>>, deepMerge?: boolean): void;
+    /** 供 rebuildEntryMaterial 使用：返回当前 tag 的 style 对象 */
+    getStyleForMaterial(): {
+        color: number[];
+        tolerance: number;
+        highlightColor: number[];
+        opacity: number;
+    };
     /**
      * 重写 getVisible 方法
      * Mask 标签仅在当前点位可见
      */
     getVisible(fiveState?: Partial<FiveState>): boolean;
+    /**
+     * 重写 computeVisible 方法
+     * 增加 Mask 特有的可见性检查逻辑，用于 whyHide 功能
+     */
+    protected computeVisible(_fiveState?: Partial<FiveState>): {
+        value: boolean;
+        reason?: any;
+    };
     /**
      * 点击事件处理
      */
@@ -84,7 +135,7 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      */
     updateScreenPosition(): void;
     /**
-     * 应用可见性变化
+     * 应用可见性变化（通过 style opacity 控制展示，共享 mesh 保持 visible）
      */
     applyVisible(): void;
     /**
@@ -93,19 +144,23 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      */
     private updateMeshTransform;
     /**
-     * 初始化 Mask Mesh（使用 Sphere）
+     * 步骤1：从材质中解析出 styleList
+     * @param {THREE.ShaderMaterial} material - 目标材质
+     * @returns {Array} 解析后的 styleList
      */
-    private initializeMaskMesh;
+    private parseStyleListFromMaterial;
     /**
-     * 创建 Sphere mesh（参考 itemMask 实现）
+     * 步骤2：更新材质的样式纹理（追加新元素后）
+     * @param {THREE.ShaderMaterial} material - 目标材质
+     * @param {Array} newStyle - 要追加的新样式对象
      */
-    private createSphereMesh;
+    private appendStyleToMaterial;
     /**
      * 获取 Mask 样式配置（合并用户配置和默认值）
      */
     private getMaskStyle;
     /**
-     * 设置点击事件
+     * 设置点击事件（仅当 raycast 命中本 tag 的 color 时触发）
      */
     private setupClickEvents;
     /**
@@ -113,26 +168,71 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      */
     private cleanupClickEvents;
     /**
-     * 重新加载 mask 图
+     * 重新加载 mask 图：从旧点位 mesh 注销，再按新 maskUrl 初始化
      */
     private reloadMask;
     /**
-     * 更新 mask 样式
+     * changeTagById 改 mask 时：只更新共享 mesh 的 texture，不 unregister
+     * 有 entry 则换图；无 entry 则走完整初始化
+     */
+    private updateSharedMeshTexture;
+    /**
+     * 更新当前 tag 在共享材质中的 style slot（color/style 控制展示）
      */
-    private updateMaskStyle;
+    updateMaskStyle(): void;
     /**
-     * 销毁标签
+     * 更新 Canvas 纹理（仅当 maskUrl 为 Canvas 时有效）
+     * 当 canvas 内容发生变化时，调用此方法更新渲染
+     */
+    updateCanvasTexture(): void;
+    /**
+     * 清理当前标签：从共享材质中删除本 tag 的样式槽，并更新材质；
+     * 若该点位已无其他 tag 则销毁 mesh 并释放纹理。
+     */
+    private disposeMaskResources;
+    /**
+     * 清理 MaskTag 特有的资源（公开方法）
      */
     dispose(): void;
+    /**
+     * 禁用标签（通过 style opacity=0 隐藏，不拆 mesh）
+     */
+    disable(): void;
+    /**
+     * 启用标签（恢复 style 展示）
+     */
+    enable(): void;
+    /**
+     * 销毁标签（重写父类方法）
+     */
+    destroy(): void;
+    /**
+     * 清除所有点位共享 mesh（重新 load 数据前调用）
+     */
+    static clearSharedMeshRegistry(): void;
+    /**
+     * 将 style 列表写入材质（用于重建材质）
+     */
+    private static writeStyleListToMaterial;
+    /**
+     * destroy 后重建该点位材质，更新剩余 tag 的 styleIndex
+     */
+    private static rebuildEntryMaterial;
+    /**
+     * 获取 mask 的缓存 key
+     * @param maskSource mask URL 或 Canvas
+     * @returns 缓存 key
+     */
+    private static getMaskCacheKey;
     /**
      * 加载 Mask 纹理（静态方法，支持缓存和引用计数）
-     * @param maskUrl mask 图片 URL
+     * @param maskSource mask 图片 URL 或 Canvas 元素
      * @returns Promise<THREE.Texture>
      */
     private static loadMaskTexture;
     /**
      * 释放 Mask 纹理（静态方法）
-     * @param maskUrl mask 图片 URL
+     * @param maskSource mask 图片 URL 或 Canvas 元素
      */
     private static releaseMaskTexture;
     /**
@@ -144,7 +244,7 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
         totalRefCount: number;
         estimatedMemoryMB: number;
         cacheEntries: Array<{
-            url: string;
+            source: string;
             refCount: number;
             sizeMB: number;
         }>;