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

package/libs/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/libs/PanoTagPlugin/controller/Tag/MaskTag.shaders.js

@@ -7,10 +7,10 @@ void main() {
   gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
 }
 `
-), e = (
+), r = (
   /* glsl */
   `
-#extension GL_OES_standard_derivatives : enable
+#define RESOLUTION 2048.0
 
 varying vec2 vUv;
 uniform sampler2D map;
@@ -24,54 +24,65 @@ float colorGap(vec3 color1, vec3 color2) {
   return gap;
 }
 
+// 判断像素是否匹配目标颜色
+bool isMatchingColor(vec3 pixelColor) {
+  // 排除黑色像素
+  if (pixelColor.r == 0.0 && pixelColor.g == 0.0 && pixelColor.b == 0.0) {
+    return false;
+  }
+  return colorGap(pixelColor, color.rgb) < tolerance;
+}
+
+// 边缘检测函数：参考 MosaicPlugin 实现
+float detectEdge(sampler2D map, vec2 uv) {
+  vec4 centerColor = texture2D(map, uv);
+  
+  // 当前像素必须匹配目标颜色
+  if (!isMatchingColor(centerColor.rgb)) {
+    return 0.0;
+  }
+  
+  float step = 1.0 / RESOLUTION;
+  
+  // 检查4个主要方向的邻居像素
+  vec4 upColor = texture2D(map, uv + vec2(0.0, -step));
+  vec4 leftColor = texture2D(map, uv + vec2(-step, 0.0));
+  vec4 rightColor = texture2D(map, uv + vec2(step, 0.0));
+  vec4 downColor = texture2D(map, uv + vec2(0.0, step));
+  
+  // 只有当前像素匹配颜色，且至少有一个邻居不匹配时，才是边缘
+  bool hasNonMatchingNeighbor = 
+    !isMatchingColor(upColor.rgb) || 
+    !isMatchingColor(leftColor.rgb) || 
+    !isMatchingColor(rightColor.rgb) || 
+    !isMatchingColor(downColor.rgb);
+  
+  return hasNonMatchingNeighbor ? 1.0 : 0.0;
+}
+
 void main() {
   vec4 image = texture2D(map, vUv);
   
-  // 计算当前像素与目标颜色的差异
-  float gap = colorGap(image.rgb, color.rgb);
-  
   // 排除黑色像素
   if (image.r == 0.0 && image.g == 0.0 && image.b == 0.0) {
     discard;
   }
   
-  // 使用 fwidth 计算梯度，实现平滑的颜色匹配边界
-  #ifdef GL_OES_standard_derivatives
-    float smoothRange = fwidth(gap) * 3.0;
-  #else
-    float smoothRange = 0.01;
-  #endif
+  // 计算当前像素与目标颜色的差异
+  float gap = colorGap(image.rgb, color.rgb);
+  
+  // 使用固定平滑范围实现颜色匹配边界
+  float smoothRange = 0.01;
   
   // 平滑的颜色匹配因子（0-1）
   float matchFactor = 1.0 - smoothstep(tolerance - smoothRange, tolerance + smoothRange, gap);
   
   if (matchFactor > 0.0) {
-    // 检测边缘：采样周围像素
-    float edgeWidth = 0.004;
-    
-    vec4 colorLeft = texture2D(map, vUv + vec2(-edgeWidth, 0.0));
-    vec4 colorRight = texture2D(map, vUv + vec2(edgeWidth, 0.0));
-    vec4 colorUp = texture2D(map, vUv + vec2(0.0, -edgeWidth));
-    vec4 colorDown = texture2D(map, vUv + vec2(0.0, edgeWidth));
-    
-    // 计算边缘强度
-    float edgeStrength = 0.0;
-    
-    if (colorGap(colorLeft.rgb, color.rgb) >= tolerance || (colorLeft.r == 0.0 && colorLeft.g == 0.0 && colorLeft.b == 0.0)) {
-      edgeStrength += 0.25;
-    }
-    if (colorGap(colorRight.rgb, color.rgb) >= tolerance || (colorRight.r == 0.0 && colorRight.g == 0.0 && colorRight.b == 0.0)) {
-      edgeStrength += 0.25;
-    }
-    if (colorGap(colorUp.rgb, color.rgb) >= tolerance || (colorUp.r == 0.0 && colorUp.g == 0.0 && colorUp.b == 0.0)) {
-      edgeStrength += 0.25;
-    }
-    if (colorGap(colorDown.rgb, color.rgb) >= tolerance || (colorDown.r == 0.0 && colorDown.g == 0.0 && colorDown.b == 0.0)) {
-      edgeStrength += 0.25;
-    }
+    // 使用新的边缘检测方法
+    float isEdge = detectEdge(map, vUv);
     
-    // 边缘平滑过渡：edgeStrength 越大越接近边缘
-    float alpha = mix(opacity, 1.0, smoothstep(0.0, 0.3, edgeStrength));
+    // 边缘使用完全不透明，内部使用设定的透明度
+    float alpha = mix(opacity, 1.0, isEdge);
     
     // 应用匹配因子（平滑颜色边界）
     alpha *= matchFactor;
@@ -84,6 +95,6 @@ void main() {
 `
 );
 export {
-  e as maskFragmentShader,
+  r as maskFragmentShader,
   o as maskVertexShader
 };

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -38,7 +38,7 @@ import { FiveDomEvents as V } from "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/five/FivePuppet.js";
 import { Cache as se } from "../utils/Cache.js";
 import { Controller as ce } from "../../base/BasePlugin.js";
-import { objectAssignDeepExports as _ } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as P } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { entries as B } from "../../shared-utils/typescript/entries.js";
 import H from "../utils/tag/adaptConfig.js";
 import "../../vendor/svelte/internal/index.js";
@@ -181,7 +181,7 @@ class Xt extends ce {
   // eslint-disable-next-line accessor-pairs
   set tagsLengthWillUpdate(e) {
     e && (this._cache_pointTag = this.tags.filter(
-      (t) => t.stickType === "2DPoint" || t.stickType === "3DPoint" || t.stickType === "3DBox" || t.stickType === "Polygon"
+      (t) => t.stickType === "2DPoint" || t.stickType === "3DPoint" || t.stickType === "3DBox" || t.stickType === "Polygon" || t.stickType === "Mask"
     ).filter((t) => t.position), this._cache_2DPointTag = this.tags.filter((t) => t.stickType === "2DPoint").filter((t) => t.position), this._cache_css3DTag = this.tags.filter(
       (t) => t.stickType === "3DPoint" || t.stickType === "Plane" || t.stickType === "Model" && t.contentType === "MediaModel"
     ).filter((t) => {
@@ -285,29 +285,29 @@ class Xt extends ce {
           (e.contentType === g || g === "Any") && (M[m] = h);
         }
         if (y.length === 2) {
-          const [g = "Any", P = "Any"] = y;
-          g === "Mixin" && e.contentType === P && (M[m] = h), (e.stickType === g || g === "Any") && (e.contentType === P || P === "Any") && (M[m] = h);
+          const [g = "Any", k = "Any"] = y;
+          g === "Mixin" && e.contentType === k && (M[m] = h), (e.stickType === g || g === "Any") && (e.contentType === k || k === "Any") && (M[m] = h);
         }
         if (y.length === 3) {
-          const [g = "Any", P, R] = y;
-          if (P === "Audio" && e.contentType === "Audio") {
+          const [g = "Any", k, R] = y;
+          if (k === "Audio" && e.contentType === "Audio") {
             const O = e;
             (O.stickType === g || g === "Any") && O.data.appearance === R && (M[m] = h);
           }
         }
       }
     });
-    const l = (F = e.initialConfig) != null ? F : {}, r = _({}, J, this.config.globalConfig, ...Object.values(o)), f = _({}, r, l), T = {}, d = Object.values(ie.Mode);
+    const l = (F = e.initialConfig) != null ? F : {}, r = P({}, J, this.config.globalConfig, ...Object.values(o)), f = P({}, r, l), T = {}, d = Object.values(ie.Mode);
     B(c).forEach(([u, h]) => {
       d.forEach((m) => {
-        (u === "PanoramaLike" && re(m) || u === "ModelLike" && ne(m)) && (T[m] = _({}, r, ...Object.values(h), l, { _isMerged: !0 }));
+        (u === "PanoramaLike" && re(m) || u === "ModelLike" && ne(m)) && (T[m] = P({}, r, ...Object.values(h), l, { _isMerged: !0 }));
       });
     }), B(p).forEach(([u, h]) => {
       const m = T[u];
-      T[u] = _({}, r, m, ...Object.values(h), l, { _isMerged: !0 });
+      T[u] = P({}, r, m, ...Object.values(h), l, { _isMerged: !0 });
     });
-    const k = Q(W({}, f), { configWithFiveMode: T });
-    return H(k), Object.values(T).forEach((u) => H(u)), k._isMerged = !0, k;
+    const _ = Q(W({}, f), { configWithFiveMode: T });
+    return H(_), Object.values(T).forEach((u) => H(u)), _._isMerged = !0, _;
   }
 }
 export {

package/libs/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/libs/PanoTagPlugin/controller/index.js

@@ -2,15 +2,15 @@ var w = Object.defineProperty, _ = Object.defineProperties;
 var I = Object.getOwnPropertyDescriptors;
 var k = Object.getOwnPropertySymbols;
 var L = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var c = (h, p, e) => p in h ? w(h, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[p] = e, d = (h, p) => {
+var u = (h, p, e) => p in h ? w(h, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[p] = e, d = (h, p) => {
   for (var e in p || (p = {}))
-    L.call(p, e) && c(h, e, p[e]);
+    L.call(p, e) && u(h, e, p[e]);
   if (k)
     for (var e of k(p))
-      B.call(p, e) && c(h, e, p[e]);
+      B.call(p, e) && u(h, e, p[e]);
   return h;
-}, u = (h, p) => _(h, I(p));
-var m = (h, p, e) => (c(h, typeof p != "symbol" ? p + "" : p, e), e);
+}, v = (h, p) => _(h, I(p));
+var m = (h, p, e) => (u(h, typeof p != "symbol" ? p + "" : p, e), e);
 var l = (h, p, e) => new Promise((t, i) => {
   var o = (r) => {
     try {
@@ -27,9 +27,9 @@ var l = (h, p, e) => new Promise((t, i) => {
   }, n = (r) => r.done ? t(r.value) : Promise.resolve(r.value).then(o, s);
   n((e = e.apply(h, p)).next());
 });
-import * as v from "three";
+import * as T from "three";
 import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import { arrayPositionToVector3 as T } from "../../shared-utils/positionToVector3.js";
+import { arrayPositionToVector3 as y } from "../../shared-utils/positionToVector3.js";
 import { isModelTag as G, isMediaModelTag as O } from "../utils/tag/tagCheck.js";
 import { debounce as D } from "../utils/debounce.js";
 import { throttle as R } from "../utils/throttle.js";
@@ -61,7 +61,7 @@ import { ModelTag as J } from "./Tag/ModelTag.js";
 import { PlaneTag as Z } from "./Tag/PlaneTag.js";
 import { BoxTag as Y } from "./Tag/BoxTag.js";
 import { PolygonTag as K } from "./Tag/PolygonTag.js";
-import { MaskTag as y } from "./Tag/MaskTag.js";
+import { MaskTag as g } from "./Tag/MaskTag.js";
 import X from "../Components/TagContainer.js";
 import { fiveEveryReadyListener as ee } from "../../shared-utils/five/fiveEveryReadyListener.js";
 import { vector3ToArray as U } from "../../shared-utils/three/vector3ToArray.js";
@@ -394,15 +394,15 @@ class xs extends $ {
         return (t = e.getConfig().modelConfig) == null ? void 0 : t.autoLookAtEnabled;
       }).forEach((e) => {
         var a;
-        const t = new v.Mesh(new v.BoxGeometry(), new v.MeshBasicMaterial()), i = (a = e.model) == null ? void 0 : a.object;
+        const t = new T.Mesh(new T.BoxGeometry(), new T.MeshBasicMaterial()), i = (a = e.model) == null ? void 0 : a.object;
         if (!i)
           return;
         t.position.copy(i.position), t.quaternion.copy(i.quaternion);
         const o = this.five.camera.position;
         t.lookAt(o.clone().setY(t.position.y));
         const s = i.quaternion.clone(), n = t.quaternion.clone(), r = te();
-        r.onUpdate(({ progress: g }) => {
-          i.quaternion.copy(s.clone().slerp(n, g));
+        r.onUpdate(({ progress: c }) => {
+          i.quaternion.copy(s.clone().slerp(n, c));
         }), r.play();
       });
     }));
@@ -443,7 +443,7 @@ class xs extends $ {
               return console.error("updateRenderPlaneTag: tag2DContainer not found");
             this.TagContainerSvelte = new X({
               target: this.container,
-              props: u(d({}, n), { state: u(d({}, this.state), { enabled: !1 }) })
+              props: v(d({}, n), { state: v(d({}, this.state), { enabled: !1 }) })
             }), H(() => {
               var r;
               (r = this.TagContainerSvelte) == null || r.$set({ state: this.state });
@@ -483,13 +483,13 @@ class xs extends $ {
       e.tagList.forEach((n) => {
         if (n.enu_position && this.isValidArrayPosition(n.enu_position))
           try {
-            const r = T(n.enu_position), a = t.viewLayers[0].scene.enuToWorld(r);
+            const r = y(n.enu_position), a = t.viewLayers[0].scene.enuToWorld(r);
             n.position = U(a);
           } catch (r) {
           }
         if (n.enu_normal && this.isValidArrayPosition(n.enu_normal))
           try {
-            const r = T(n.enu_normal), a = t.viewLayers[0].scene.enuToWorld(r);
+            const r = y(n.enu_normal), a = t.viewLayers[0].scene.enuToWorld(r);
             n.normal = U(a);
           } catch (r) {
           }
@@ -508,7 +508,7 @@ class xs extends $ {
     return l(this, null, function* () {
       const o = (Array.isArray(e) ? e : [e]).filter((s) => s.stickType === "3DBox" || s.stickType === "Mask" || s.position).map((s) => {
         const n = V(s);
-        return n === "2DPoint" || n === "3DPoint" ? new q(this, s) : n === "Model" ? new J(this, s) : n === "Plane" ? new Z(this, s) : n === "3DBox" ? new Y(this, s) : n === "Polygon" ? new K(this, s) : n === "Mask" ? new y(this, s) : null;
+        return n === "2DPoint" || n === "3DPoint" ? new q(this, s) : n === "Model" ? new J(this, s) : n === "Plane" ? new Z(this, s) : n === "3DBox" ? new Y(this, s) : n === "Polygon" ? new K(this, s) : n === "Mask" ? new g(this, s) : null;
       });
       return o.forEach((s) => N(s)), this.tags.push(...o), this.tagsLengthWillUpdate = !0, j(this.five).then(() => l(this, null, function* () {
         var s, n;
@@ -630,7 +630,7 @@ class xs extends $ {
    */
   changeTagNormalById(e, t) {
     const i = this.getTagById(e);
-    i && i.tag3DContentSvelte && (i.tag3DContentSvelte.currentNormal = T(t));
+    i && i.tag3DContentSvelte && (i.tag3DContentSvelte.currentNormal = y(t));
   }
   /**
    * @description 改变data
@@ -688,8 +688,8 @@ class xs extends $ {
   clearTags() {
     var e;
     this.tags.length && (this.tags.forEach((t) => {
-      var i, o, s, n, r, a, g, b, C, P, S;
-      (i = t.tag3DContentSvelte) == null || i.dispose(), (s = (o = t.mediaPlane) == null ? void 0 : o.parent) == null || s.remove(t.mediaPlane), (a = (r = (n = t.model) == null ? void 0 : n.object) == null ? void 0 : r.parent) == null || a.remove(t.model.object), (b = (g = t.rectanglePlane) == null ? void 0 : g.parent) == null || b.remove(t.rectanglePlane), (C = t.boxShape) != null && C.parent && t.boxShape.parent.remove(t.boxShape), (S = (P = t.polygonShape) == null ? void 0 : P.parent) == null || S.remove(t.polygonShape), t != null && t.tagNormalLine && (t == null || t.removeTagNormalLine());
+      var i, o, s, n, r, a, c, b, C, P, S;
+      (i = t.tag3DContentSvelte) == null || i.dispose(), (s = (o = t.mediaPlane) == null ? void 0 : o.parent) == null || s.remove(t.mediaPlane), (a = (r = (n = t.model) == null ? void 0 : n.object) == null ? void 0 : r.parent) == null || a.remove(t.model.object), (b = (c = t.rectanglePlane) == null ? void 0 : c.parent) == null || b.remove(t.rectanglePlane), (C = t.boxShape) != null && C.parent && t.boxShape.parent.remove(t.boxShape), (S = (P = t.polygonShape) == null ? void 0 : P.parent) == null || S.remove(t.polygonShape), t != null && t.tagNormalLine && (t == null || t.removeTagNormalLine()), t instanceof g && t.dispose();
     }), 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();
   }
   /**
@@ -846,7 +846,7 @@ class xs extends $ {
    * @returns 性能统计信息
    */
   getMaskTagPerformanceStats() {
-    const e = y.getCacheStats(), t = this.filterMaskTag.length, i = this.filterMaskTag.filter((o) => o.visible).length;
+    const e = g.getCacheStats(), t = this.filterMaskTag.length, i = this.filterMaskTag.filter((o) => o.visible).length;
     return {
       // 标签统计
       totalMaskTags: t,
@@ -862,7 +862,7 @@ class xs extends $ {
    * 注意：这会释放所有纹理缓存，谨慎使用
    */
   clearMaskTagCache() {
-    y.clearAllCache();
+    g.clearAllCache();
   }
 }
 export {

package/libs/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/libs/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/libs/PanoTagPlugin/utils/index.js

@@ -1,34 +1,36 @@
 import { addDebugPoints as a } from "./addDebugPoints.js";
 import { noTypecheck as n } from "./noTypecheck.js";
-import { planeNormal as f } from "./planeNormal.js";
-import { getTagCenterPosition as u, getTagPosition as x } from "./tagPosition.js";
-import { checkRange as c } from "./checkRange.js";
-import { normalPositionToPositions as T } from "./normalPositionToPositions.js";
-import { debounce as h, debounceByKey as V } from "./debounce.js";
-import { throttle as y } from "./throttle.js";
-import { binarySearchFirstBig as B, searchFirstValueSmallThanLastValue as F } from "./search.js";
-import { formatVideo as S, getVideoThumbnail as Y, getVimeoId as C, getYouTubeId as D, isVimeo as K, isYouTube as L } from "./videoHelper.js";
+import { planeNormal as x } from "./planeNormal.js";
+import { applyMatrixToPoints as g, getBoxCorners as l, getTagCenterPosition as u, getTagPosition as T } from "./tagPosition.js";
+import { checkRange as d } from "./checkRange.js";
+import { normalPositionToPositions as h } from "./normalPositionToPositions.js";
+import { debounce as V, debounceByKey as y } from "./debounce.js";
+import { throttle as k } from "./throttle.js";
+import { binarySearchFirstBig as F, searchFirstValueSmallThanLastValue as I } from "./search.js";
+import { formatVideo as Y, getVideoThumbnail as D, getVimeoId as K, getYouTubeId as L, isVimeo as M, isYouTube as N } from "./videoHelper.js";
 import "three";
 import "../../shared-utils/positionToVector3.js";
 import "../../shared-utils/three/centerPoint.js";
 import "./tag/tagCheck.js";
 export {
   a as addDebugPoints,
-  B as binarySearchFirstBig,
-  c as checkRange,
-  h as debounce,
-  V as debounceByKey,
-  S as formatVideo,
+  g as applyMatrixToPoints,
+  F as binarySearchFirstBig,
+  d as checkRange,
+  V as debounce,
+  y as debounceByKey,
+  Y as formatVideo,
+  l as getBoxCorners,
   u as getTagCenterPosition,
-  x as getTagPosition,
-  Y as getVideoThumbnail,
-  C as getVimeoId,
-  D as getYouTubeId,
-  K as isVimeo,
-  L as isYouTube,
+  T as getTagPosition,
+  D as getVideoThumbnail,
+  K as getVimeoId,
+  L as getYouTubeId,
+  M as isVimeo,
+  N as isYouTube,
   n as noTypecheck,
-  T as normalPositionToPositions,
-  f as planeNormal,
-  F as searchFirstValueSmallThanLastValue,
-  y as throttle
+  h as normalPositionToPositions,
+  x as planeNormal,
+  I as searchFirstValueSmallThanLastValue,
+  k as throttle
 };

package/libs/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;

package/libs/PanoTagPlugin/utils/tagPosition.js

@@ -1,4 +1,4 @@
-import { Vector3 as t, Euler as y, Matrix4 as a } from "three";
+import { Euler as y, Vector3 as t, Matrix4 as a } from "three";
 import { centerPoint as w } from "../../shared-utils/three/centerPoint.js";
 import { is3DBoxTag as x, isPolygonTag as M, isMediaModelTag as d, isMaskTag as T } from "./tag/tagCheck.js";
 import { anyPositionToVector3 as e, vector3Position as P } from "../../shared-utils/positionToVector3.js";
@@ -46,6 +46,8 @@ function S(o) {
   return w(...Array.isArray(n) ? n : [n]);
 }
 export {
+  s as applyMatrixToPoints,
+  z as getBoxCorners,
   S as getTagCenterPosition,
   A as getTagPosition
 };

package/libs/base/BasePlugin.js

@@ -23,7 +23,7 @@ let I = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.78.0-alpha.0");
+    r(this, "VERSION", "3.78.0-alpha.1");
     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.78.0-alpha.0",
+    "%c %c@realsee/dnalogel %cv3.78.0-alpha.1",
     [
       "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.78.0-alpha.0",
+  "version": "3.78.0-alpha.1",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",