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

package/dist/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/dist/PanoTagPlugin/controller/Tag/MaskTag.d.ts

@@ -13,13 +13,17 @@ 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;
+    /**
+     * mask 图片 URL 或 Canvas 元素（2:1 全景图格式）
+     */
+    maskUrl: string | HTMLCanvasElement;
     /**
      * 目标颜色（RGB 格式）
      */
@@ -36,6 +40,10 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      * 是否正在加载 mask
      */
     private loadingMask;
+    /**
+     * 资源是否已释放
+     */
+    private _disposed;
     /**
      * 标签样式配置
      */
@@ -50,6 +58,11 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      * Mask 标签返回向上的法向量（因为是贴在 cube 面上）
      */
     computeNormal(): THREE.Vector3;
+    /**
+     * 获取额外的闪烁目标
+     * 返回 maskMesh 用于 blink 动画
+     */
+    protected getAdditionalBlinkTargets(): any | any[] | null;
     /**
      * 更新标签数据
      */
@@ -59,6 +72,14 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      * Mask 标签仅在当前点位可见
      */
     getVisible(fiveState?: Partial<FiveState>): boolean;
+    /**
+     * 重写 computeVisible 方法
+     * 增加 Mask 特有的可见性检查逻辑，用于 whyHide 功能
+     */
+    protected computeVisible(_fiveState?: Partial<FiveState>): {
+        value: boolean;
+        reason?: any;
+    };
     /**
      * 点击事件处理
      */
@@ -121,18 +142,41 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
      */
     private updateMaskStyle;
     /**
-     * 销毁标签
+     * 更新 Canvas 纹理（仅当 maskUrl 为 Canvas 时有效）
+     * 当 canvas 内容发生变化时，调用此方法更新渲染
+     */
+    updateCanvasTexture(): void;
+    /**
+     * 清理 MaskTag 特有的资源（内部方法，避免重复调用）
+     */
+    private disposeMaskResources;
+    /**
+     * 清理 MaskTag 特有的资源（公开方法）
      */
     dispose(): void;
+    /**
+     * 禁用标签（重写父类方法）
+     */
+    disable(): void;
+    /**
+     * 销毁标签（重写父类方法）
+     */
+    destroy(): void;
+    /**
+     * 获取 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 +188,7 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
         totalRefCount: number;
         estimatedMemoryMB: number;
         cacheEntries: Array<{
-            url: string;
+            source: string;
             refCount: number;
             sizeMB: number;
         }>;

package/dist/PanoTagPlugin/controller/Tag/MaskTag.shaders.d.ts

@@ -9,5 +9,6 @@ export declare const maskVertexShader = "\nvarying vec2 vUv;\nvoid main() {\n  v
 /**
  * Fragment Shader
  * 实现颜色匹配和高亮渲染逻辑
+ * 参考 MosaicPlugin 的边缘检测实现
  */
-export declare const maskFragmentShader = "\n#extension GL_OES_standard_derivatives : enable\n\nvarying vec2 vUv;\nuniform sampler2D map;\nuniform vec4 color;\nuniform float tolerance;\nuniform vec3 highlightColor;\nuniform float opacity;\n\nfloat colorGap(vec3 color1, vec3 color2) {\n  float gap = abs(color1.r - color2.r) + abs(color1.g - color2.g) + abs(color1.b - color2.b);\n  return gap;\n}\n\nvoid main() {\n  vec4 image = texture2D(map, vUv);\n  \n  // \u8BA1\u7B97\u5F53\u524D\u50CF\u7D20\u4E0E\u76EE\u6807\u989C\u8272\u7684\u5DEE\u5F02\n  float gap = colorGap(image.rgb, color.rgb);\n  \n  // \u6392\u9664\u9ED1\u8272\u50CF\u7D20\n  if (image.r == 0.0 && image.g == 0.0 && image.b == 0.0) {\n    discard;\n  }\n  \n  // \u4F7F\u7528 fwidth \u8BA1\u7B97\u68AF\u5EA6\uFF0C\u5B9E\u73B0\u5E73\u6ED1\u7684\u989C\u8272\u5339\u914D\u8FB9\u754C\n  #ifdef GL_OES_standard_derivatives\n    float smoothRange = fwidth(gap) * 3.0;\n  #else\n    float smoothRange = 0.01;\n  #endif\n  \n  // \u5E73\u6ED1\u7684\u989C\u8272\u5339\u914D\u56E0\u5B50\uFF080-1\uFF09\n  float matchFactor = 1.0 - smoothstep(tolerance - smoothRange, tolerance + smoothRange, gap);\n  \n  if (matchFactor > 0.0) {\n    // \u68C0\u6D4B\u8FB9\u7F18\uFF1A\u91C7\u6837\u5468\u56F4\u50CF\u7D20\n    float edgeWidth = 0.004;\n    \n    vec4 colorLeft = texture2D(map, vUv + vec2(-edgeWidth, 0.0));\n    vec4 colorRight = texture2D(map, vUv + vec2(edgeWidth, 0.0));\n    vec4 colorUp = texture2D(map, vUv + vec2(0.0, -edgeWidth));\n    vec4 colorDown = texture2D(map, vUv + vec2(0.0, edgeWidth));\n    \n    // \u8BA1\u7B97\u8FB9\u7F18\u5F3A\u5EA6\n    float edgeStrength = 0.0;\n    \n    if (colorGap(colorLeft.rgb, color.rgb) >= tolerance || (colorLeft.r == 0.0 && colorLeft.g == 0.0 && colorLeft.b == 0.0)) {\n      edgeStrength += 0.25;\n    }\n    if (colorGap(colorRight.rgb, color.rgb) >= tolerance || (colorRight.r == 0.0 && colorRight.g == 0.0 && colorRight.b == 0.0)) {\n      edgeStrength += 0.25;\n    }\n    if (colorGap(colorUp.rgb, color.rgb) >= tolerance || (colorUp.r == 0.0 && colorUp.g == 0.0 && colorUp.b == 0.0)) {\n      edgeStrength += 0.25;\n    }\n    if (colorGap(colorDown.rgb, color.rgb) >= tolerance || (colorDown.r == 0.0 && colorDown.g == 0.0 && colorDown.b == 0.0)) {\n      edgeStrength += 0.25;\n    }\n    \n    // \u8FB9\u7F18\u5E73\u6ED1\u8FC7\u6E21\uFF1AedgeStrength \u8D8A\u5927\u8D8A\u63A5\u8FD1\u8FB9\u7F18\n    float alpha = mix(opacity, 1.0, smoothstep(0.0, 0.3, edgeStrength));\n    \n    // \u5E94\u7528\u5339\u914D\u56E0\u5B50\uFF08\u5E73\u6ED1\u989C\u8272\u8FB9\u754C\uFF09\n    alpha *= matchFactor;\n    \n    gl_FragColor = vec4(highlightColor, alpha);\n  } else {\n    discard;\n  }\n}\n";
+export declare const maskFragmentShader = "\n#define RESOLUTION 2048.0\n\nvarying vec2 vUv;\nuniform sampler2D map;\nuniform vec4 color;\nuniform float tolerance;\nuniform vec3 highlightColor;\nuniform float opacity;\n\nfloat colorGap(vec3 color1, vec3 color2) {\n  float gap = abs(color1.r - color2.r) + abs(color1.g - color2.g) + abs(color1.b - color2.b);\n  return gap;\n}\n\n// \u5224\u65AD\u50CF\u7D20\u662F\u5426\u5339\u914D\u76EE\u6807\u989C\u8272\nbool isMatchingColor(vec3 pixelColor) {\n  // \u6392\u9664\u9ED1\u8272\u50CF\u7D20\n  if (pixelColor.r == 0.0 && pixelColor.g == 0.0 && pixelColor.b == 0.0) {\n    return false;\n  }\n  return colorGap(pixelColor, color.rgb) < tolerance;\n}\n\n// \u8FB9\u7F18\u68C0\u6D4B\u51FD\u6570\uFF1A\u53C2\u8003 MosaicPlugin \u5B9E\u73B0\nfloat detectEdge(sampler2D map, vec2 uv) {\n  vec4 centerColor = texture2D(map, uv);\n  \n  // \u5F53\u524D\u50CF\u7D20\u5FC5\u987B\u5339\u914D\u76EE\u6807\u989C\u8272\n  if (!isMatchingColor(centerColor.rgb)) {\n    return 0.0;\n  }\n  \n  float step = 1.0 / RESOLUTION;\n  \n  // \u68C0\u67E54\u4E2A\u4E3B\u8981\u65B9\u5411\u7684\u90BB\u5C45\u50CF\u7D20\n  vec4 upColor = texture2D(map, uv + vec2(0.0, -step));\n  vec4 leftColor = texture2D(map, uv + vec2(-step, 0.0));\n  vec4 rightColor = texture2D(map, uv + vec2(step, 0.0));\n  vec4 downColor = texture2D(map, uv + vec2(0.0, step));\n  \n  // \u53EA\u6709\u5F53\u524D\u50CF\u7D20\u5339\u914D\u989C\u8272\uFF0C\u4E14\u81F3\u5C11\u6709\u4E00\u4E2A\u90BB\u5C45\u4E0D\u5339\u914D\u65F6\uFF0C\u624D\u662F\u8FB9\u7F18\n  bool hasNonMatchingNeighbor = \n    !isMatchingColor(upColor.rgb) || \n    !isMatchingColor(leftColor.rgb) || \n    !isMatchingColor(rightColor.rgb) || \n    !isMatchingColor(downColor.rgb);\n  \n  return hasNonMatchingNeighbor ? 1.0 : 0.0;\n}\n\nvoid main() {\n  vec4 image = texture2D(map, vUv);\n  \n  // \u6392\u9664\u9ED1\u8272\u50CF\u7D20\n  if (image.r == 0.0 && image.g == 0.0 && image.b == 0.0) {\n    discard;\n  }\n  \n  // \u8BA1\u7B97\u5F53\u524D\u50CF\u7D20\u4E0E\u76EE\u6807\u989C\u8272\u7684\u5DEE\u5F02\n  float gap = colorGap(image.rgb, color.rgb);\n  \n  // \u4F7F\u7528\u56FA\u5B9A\u5E73\u6ED1\u8303\u56F4\u5B9E\u73B0\u989C\u8272\u5339\u914D\u8FB9\u754C\n  float smoothRange = 0.01;\n  \n  // \u5E73\u6ED1\u7684\u989C\u8272\u5339\u914D\u56E0\u5B50\uFF080-1\uFF09\n  float matchFactor = 1.0 - smoothstep(tolerance - smoothRange, tolerance + smoothRange, gap);\n  \n  if (matchFactor > 0.0) {\n    // \u4F7F\u7528\u65B0\u7684\u8FB9\u7F18\u68C0\u6D4B\u65B9\u6CD5\n    float isEdge = detectEdge(map, vUv);\n    \n    // \u8FB9\u7F18\u4F7F\u7528\u5B8C\u5168\u4E0D\u900F\u660E\uFF0C\u5185\u90E8\u4F7F\u7528\u8BBE\u5B9A\u7684\u900F\u660E\u5EA6\n    float alpha = mix(opacity, 1.0, isEdge);\n    \n    // \u5E94\u7528\u5339\u914D\u56E0\u5B50\uFF08\u5E73\u6ED1\u989C\u8272\u8FB9\u754C\uFF09\n    alpha *= matchFactor;\n    \n    gl_FragColor = vec4(highlightColor, alpha);\n  } else {\n    discard;\n  }\n}\n";

package/dist/PanoTagPlugin/controller/index.d.ts

@@ -189,7 +189,7 @@ declare class PanoTagPluginController extends TagRender {
             totalRefCount: number;
             estimatedMemoryMB: number;
             cacheEntries: {
-                url: string;
+                source: string;
                 refCount: number;
                 sizeMB: number;
             }[];

package/dist/PanoTagPlugin/typings/tag/Tag.d.ts

@@ -57,8 +57,8 @@ export type Tag<C extends TagContentType = TagContentType, S extends StickType =
     matrix: number[];
 } : unknown) & // 模型标签需要模型
 (S extends 'Mask' ? {
-    mask: string;
-    color: [number, number, number] | number;
+    mask: string | HTMLCanvasElement;
+    color: [number, number, number] | number | string;
 } : unknown) & {
     [key: string]: any;
 };

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

@@ -107,8 +107,8 @@ export interface TagStyle {
     };
     /** Mask 标签样式 */
     mask?: {
-        /** 高亮颜色（RGB 数组或十六进制数字） */
-        color?: [number, number, number] | number;
+        /** 高亮颜色（支持 RGB 数组、十六进制数字、#FFFFFF 格式字符串） */
+        color?: [number, number, number] | number | string;
         /** 透明度 0-1，用于填充区域；描边区域始终完全不透明 */
         opacity?: number;
         /** 颜色匹配容差（归一化值 0-1，默认 0.001） */

package/dist/PanoTagPlugin/utils/tagPosition.d.ts

@@ -1,4 +1,12 @@
 import type { Vector3 } from 'three';
-import type { TagInstance } from '../typings';
+import type { TagInstance, BoxPosition } from '../typings';
+/**
+ * 计算 BoxPosition 的8个角点
+ */
+export declare function getBoxCorners(boxPosition: BoxPosition): Vector3[];
+/**
+ * 应用 matrix 变换到点数组
+ */
+export declare function applyMatrixToPoints(points: Vector3[], matrix?: number[]): Vector3[];
 export declare function getTagPosition(tag: TagInstance): Vector3 | [Vector3, Vector3, Vector3, Vector3] | Vector3[];
 export declare function getTagCenterPosition(tag: TagInstance): Vector3;