@realsee/dnalogel 3.81.7 → 3.81.8-alpha.2

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

@@ -1,36 +1,36 @@
 var F = Object.defineProperty;
 var R = Object.getOwnPropertySymbols;
-var B = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
-var E = (m, c, e) => c in m ? F(m, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[c] = e, v = (m, c) => {
+var B = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
+var E = (m, c, e) => c in m ? F(m, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[c] = e, C = (m, c) => {
   for (var e in c || (c = {}))
     B.call(c, e) && E(m, e, c[e]);
   if (R)
     for (var e of R(c))
-      A.call(c, e) && E(m, e, c[e]);
+      z.call(c, e) && E(m, e, c[e]);
   return m;
 };
 var x = (m, c, e) => (E(m, typeof c != "symbol" ? c + "" : c, e), e);
 var S = (m, c, e) => new Promise((s, t) => {
-  var o = (l) => {
+  var o = (h) => {
     try {
-      r(e.next(l));
+      r(e.next(h));
     } catch (n) {
       t(n);
     }
-  }, i = (l) => {
+  }, i = (h) => {
     try {
-      r(e.throw(l));
+      r(e.throw(h));
     } catch (n) {
       t(n);
     }
-  }, r = (l) => l.done ? s(l.value) : Promise.resolve(l.value).then(o, i);
+  }, r = (h) => h.done ? s(h.value) : Promise.resolve(h.value).then(o, i);
   r((e = e.apply(m, c)).next());
 });
-import { BaseTag as D } from "./BaseTag.js";
+import { BaseTag as A } from "./BaseTag.js";
 import * as g from "three";
-import { anime as $ } from "../../../vendor/animejs/lib/anime.es.js";
-import { maskVertexShader as z, maskFragmentShaderMulti as G } from "./MaskTag.shaders.js";
-import { transformPosition as L } from "../../../shared-utils/five/transformPosition.js";
+import { anime as D } from "../../../vendor/animejs/lib/anime.es.js";
+import { maskVertexShader as $, maskFragmentShaderMulti as V } from "./MaskTag.shaders.js";
+import { transformPosition as G } from "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -131,7 +131,7 @@ function w(m) {
   }
   return [0, 0, 0];
 }
-const h = class extends D {
+const l = class extends A {
   constructor(e, s) {
     var i;
     super(e, s);
@@ -195,15 +195,15 @@ const h = class extends D {
       if (typeof e == "number") {
         this.loadingMask = !0;
         try {
-          const t = yield h.loadMaskTexture(this.maskUrl);
+          const t = yield l.loadMaskTexture(this.maskUrl);
           this.maskTexture = t;
-          const o = h.getMeshKey(e);
+          const o = l.getMeshKey(e);
           this._sharedMeshKey = o;
-          let i = h.sharedMeshRegistry.get(o);
-          const r = this.getColorKey(), l = this.buildStyleForMaterial();
-          i ? i.maskSource !== this.maskUrl && (h.releaseMaskTexture(i.maskSource), i.maskTexture = t, i.maskSource = this.maskUrl, i.material.uniforms.map.value = t) : (i = h.createSharedMesh(t, this.maskUrl, this.plugin), h.sharedMeshRegistry.set(o, i), this.plugin.imagePlaneGroup.add(i.mesh));
+          let i = l.sharedMeshRegistry.get(o);
+          const r = this.getColorKey(), h = this.buildStyleForMaterial();
+          i ? i.maskSource !== this.maskUrl && (l.releaseMaskTexture(i.maskSource), i.maskTexture = t, i.maskSource = this.maskUrl, i.material.uniforms.map.value = t, i.material.uniforms.maskTexelSize.value = l.getMaskTexelSize(t)) : (i = l.createSharedMesh(t, this.maskUrl, this.plugin), l.sharedMeshRegistry.set(o, i), this.plugin.imagePlaneGroup.add(i.mesh));
           const n = i.styleIndexByColorKey.get(r);
-          n !== void 0 ? (this.sharedStyleIndex = n, this.maskMesh = i.mesh, this.updateStyleSlotInMaterial(i.material, n, l)) : (i.tagsByColorKey.set(r, this), this.appendStyleToMaterial(i.material, l), this.sharedStyleIndex = i.tagsByColorKey.size - 1, i.styleIndexByColorKey.set(r, this.sharedStyleIndex), this.maskMesh = i.mesh), this.setupSharedMeshRaycast(i), this.updateMeshTransform(), this.setupClickEvents(), this.updateScreenPosition(), i.mesh.visible = !0;
+          n !== void 0 ? (this.sharedStyleIndex = n, this.maskMesh = i.mesh, this.updateStyleSlotInMaterial(i.material, n, h)) : (i.tagsByColorKey.set(r, this), this.appendStyleToMaterial(i.material, h), this.sharedStyleIndex = i.tagsByColorKey.size - 1, i.styleIndexByColorKey.set(r, this.sharedStyleIndex), this.maskMesh = i.mesh), this.setupSharedMeshRaycast(i), this.updateMeshTransform(), this.setupClickEvents(), this.updateScreenPosition(), i.mesh.visible = !0;
         } finally {
           this.loadingMask = !1;
         }
@@ -220,18 +220,24 @@ const h = class extends D {
       opacity: this.enabled && this.visible ? e.opacity : 0
     };
   }
+  static getMaskTexelSize(e) {
+    var i, r;
+    const s = e.image, t = Math.max((i = s == null ? void 0 : s.width) != null ? i : 1, 1), o = Math.max((r = s == null ? void 0 : s.height) != null ? r : 1, 1);
+    return new g.Vector2(1 / t, 1 / o);
+  }
   static createSharedMesh(e, s, t) {
-    const r = Math.max(1, Math.ceil(Math.sqrt(0))), l = 1, n = new Float32Array(r * l * 4), a = new g.DataTexture(n, r, l, g.RGBAFormat, g.FloatType);
+    const r = Math.max(1, Math.ceil(Math.sqrt(0))), h = 1, n = new Float32Array(r * h * 4), a = new g.DataTexture(n, r, h, g.RGBAFormat, g.FloatType);
     a.needsUpdate = !0;
     const d = new g.ShaderMaterial({
-      vertexShader: z,
-      fragmentShader: G,
+      vertexShader: $,
+      fragmentShader: V,
       uniforms: {
         map: { value: e },
         mergedTexture: { value: a },
         groupCount: { value: 0 },
         textureWidth: { value: r },
-        pixelsPerGroup: { value: 3 }
+        pixelsPerGroup: { value: 3 },
+        maskTexelSize: { value: l.getMaskTexelSize(e) }
       },
       depthWrite: !1,
       depthTest: !1,
@@ -264,26 +270,26 @@ const h = class extends D {
     s.__maskRaycastSet = !0;
     let t = null, o = null;
     const i = () => {
-      const l = e.maskTexture;
-      if (!(l != null && l.image))
+      const h = e.maskTexture;
+      if (!(h != null && h.image))
         return null;
-      if (o === l && t)
+      if (o === h && t)
         return t;
-      o = l;
+      o = h;
       try {
         const n = document.createElement("canvas"), a = n.getContext("2d");
         if (!a)
           return null;
-        const d = l.image;
+        const d = h.image;
         return n.width = d.width, n.height = d.height, a.drawImage(d, 0, 0), t = a.getImageData(0, 0, d.width, d.height), t;
       } catch (n) {
         return null;
       }
     }, r = s.raycast.bind(s);
-    s.raycast = (l, n) => {
+    s.raycast = (h, n) => {
       var k, I;
       const a = [];
-      if (r(l, a), a.length === 0)
+      if (r(h, a), a.length === 0)
         return;
       const d = a[0];
       if (!d.uv || !((k = e.maskTexture) != null && k.image))
@@ -324,16 +330,16 @@ const h = class extends D {
       var a, d, u;
       if (!this.maskMesh || this._sharedMeshKey === null || this.sharedStyleIndex < 0)
         return;
-      const s = h.sharedMeshRegistry.get(this._sharedMeshKey);
+      const s = l.sharedMeshRegistry.get(this._sharedMeshKey);
       if (!s)
         return;
-      const i = { opacity: this.buildStyleForMaterial().opacity }, r = (a = e == null ? void 0 : e.duration) != null ? a : 300, l = (d = e == null ? void 0 : e.loop) != null ? d : 4, n = $({
+      const i = { opacity: this.buildStyleForMaterial().opacity }, r = (a = e == null ? void 0 : e.duration) != null ? a : 300, h = (d = e == null ? void 0 : e.loop) != null ? d : 4, n = D({
         targets: i,
         opacity: [0, 1],
         duration: r,
         easing: (u = e == null ? void 0 : e.easing) != null ? u : "easeInOutQuad",
         direction: "alternate",
-        loop: l,
+        loop: h,
         update: () => {
           const p = this.buildStyleForMaterial();
           p.opacity = i.opacity, this.updateStyleSlotInMaterial(s.material, this.sharedStyleIndex, p);
@@ -352,7 +358,7 @@ const h = class extends D {
    */
   set(e, s = !0) {
     var o, i;
-    super.set(e, s), e.style && (this.tagStyle = v(v({}, this.tagStyle), e.style), (o = e.style) != null && o.mask && this.updateMaskStyle());
+    super.set(e, s), e.style && (this.tagStyle = C(C({}, this.tagStyle), e.style), (o = e.style) != null && o.mask && this.updateMaskStyle());
     const t = (i = e.mask) != null ? i : e.maskUrl;
     t && t !== this.maskUrl && (this.maskUrl = t, this.updateSharedMeshTexture()), e.color !== void 0 && (this.targetColor = w(e.color), this.updateMaskStyle()), this.maskMesh && this.updateMaskStyle();
   }
@@ -369,7 +375,7 @@ const h = class extends D {
     try {
       if (!this.enabled || !this.plugin.state.enabled || !this.fiveUtil.model || !this.maskUrl)
         return !1;
-      const t = v(v({}, this.five.getCurrentState()), e), { panoIndex: o } = t;
+      const t = C(C({}, this.five.getCurrentState()), e), { panoIndex: o } = t;
       return o !== ((s = this.fiveState) == null ? void 0 : s.panoIndex) ? !1 : super.getVisible(t);
     } catch (t) {
       return !1;
@@ -381,7 +387,7 @@ const h = class extends D {
    */
   computeVisible(e) {
     var o, i, r;
-    const s = v(v({}, this.five.getCurrentState()), e), { panoIndex: t } = s;
+    const s = C(C({}, this.five.getCurrentState()), e), { panoIndex: t } = s;
     return t !== ((o = this.fiveState) == null ? void 0 : o.panoIndex) ? {
       value: !1,
       reason: {
@@ -475,7 +481,7 @@ const h = class extends D {
     const s = this.workUtil.getObserver(e);
     if (!s)
       return;
-    this.maskMesh.position.copy(L(s.position, this.workUtil.transform)), this.maskMesh.quaternion.copy(s.quaternion);
+    this.maskMesh.position.copy(G(s.position, this.workUtil.transform)), this.maskMesh.quaternion.copy(s.quaternion);
     const t = new g.Vector3(), o = new g.Quaternion(), i = new g.Vector3();
     this.workUtil.transform.decompose(t, o, i), this.maskMesh.quaternion.multiply(o), this.five.needsRender = !0;
   }
@@ -485,17 +491,17 @@ const h = class extends D {
    * @returns {Array} 解析后的 styleList
    */
   parseStyleListFromMaterial(e) {
-    const s = e.uniforms, t = s.groupCount.value, o = s.pixelsPerGroup.value, r = s.mergedTexture.value.image.data, l = [];
+    const s = e.uniforms, t = s.groupCount.value, o = s.pixelsPerGroup.value, r = s.mergedTexture.value.image.data, h = [];
     for (let n = 0; n < t; n++) {
-      const a = n * o, d = a * 4, u = r[d] * 255, p = r[d + 1] * 255, C = r[d + 2] * 255, y = r[d + 3], f = (a + 1) * 4, M = r[f] * 255, k = r[f + 1] * 255, I = r[f + 2] * 255, T = r[f + 3] * 255, K = (a + 2) * 4, P = r[K];
-      l.push({
-        color: [Math.round(u), Math.round(p), Math.round(C), y],
+      const a = n * o, d = a * 4, u = r[d] * 255, p = r[d + 1] * 255, v = r[d + 2] * 255, y = r[d + 3], f = (a + 1) * 4, M = r[f] * 255, k = r[f + 1] * 255, I = r[f + 2] * 255, T = r[f + 3] * 255, K = (a + 2) * 4, P = r[K];
+      h.push({
+        color: [Math.round(u), Math.round(p), Math.round(v), y],
         tolerance: Math.round(M),
         highlightColor: [Math.round(k), Math.round(I), Math.round(T)],
         opacity: P
       });
     }
-    return l;
+    return h;
   }
   /**
    * 步骤2：更新材质的样式纹理（追加新元素后）
@@ -505,9 +511,9 @@ const h = class extends D {
   appendStyleToMaterial(e, s) {
     const t = this.parseStyleListFromMaterial(e);
     Array.isArray(s) ? t.push(...s) : t.push(s);
-    const o = t.length, i = 3, l = o * i, n = 1, a = new Float32Array(l * n * 4);
-    t.forEach((p, C) => {
-      const y = C * i, f = y * 4;
+    const o = t.length, i = 3, h = o * i, n = 1, a = new Float32Array(h * n * 4);
+    t.forEach((p, v) => {
+      const y = v * i, f = y * 4;
       a[f] = p.color[0] / 255, a[f + 1] = p.color[1] / 255, a[f + 2] = p.color[2] / 255, a[f + 3] = p.color[3];
       const M = (y + 1) * 4;
       a[M] = p.tolerance / 255, a[M + 1] = p.highlightColor[0] / 255, a[M + 2] = p.highlightColor[1] / 255, a[M + 3] = p.highlightColor[2] / 255;
@@ -515,7 +521,7 @@ const h = class extends D {
       a[k] = p.opacity, a[k + 1] = 0, a[k + 2] = 0, a[k + 3] = 0;
     });
     const d = e.uniforms.mergedTexture.value, u = d.image;
-    u.data = a, u.width = l, u.height = n, d.needsUpdate = !0, e.uniforms.groupCount.value = o, e.uniforms.textureWidth.value = l, console.log(`成功追加样式，当前总组数：${o}`);
+    u.data = a, u.width = h, u.height = n, d.needsUpdate = !0, e.uniforms.groupCount.value = o, e.uniforms.textureWidth.value = h, console.log(`成功追加样式，当前总组数：${o}`);
   }
   /**
    * 获取 Mask 样式配置（合并用户配置和默认值）
@@ -560,10 +566,10 @@ const h = class extends D {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars -- 保留参数与 set() 调用一致
   reloadMask(e) {
     var i;
-    const s = (i = this.fiveState) == null ? void 0 : i.panoIndex, t = this.getColorKey(), o = typeof s == "number" ? h.getMeshKey(s) : this._sharedMeshKey;
+    const s = (i = this.fiveState) == null ? void 0 : i.panoIndex, t = this.getColorKey(), o = typeof s == "number" ? l.getMeshKey(s) : this._sharedMeshKey;
     if (o) {
-      const r = h.sharedMeshRegistry.get(o);
-      r && (r.tagsByColorKey.delete(t), r.styleIndexByColorKey.delete(t), r.tagsByColorKey.size === 0 && (r.mesh.parent && r.mesh.parent.remove(r.mesh), r.mesh.geometry.dispose(), r.mesh.material.dispose(), r.material.uniforms.mergedTexture.value.dispose(), h.releaseMaskTexture(r.maskSource), h.sharedMeshRegistry.delete(o)));
+      const r = l.sharedMeshRegistry.get(o);
+      r && (r.tagsByColorKey.delete(t), r.styleIndexByColorKey.delete(t), r.tagsByColorKey.size === 0 && (r.mesh.parent && r.mesh.parent.remove(r.mesh), r.mesh.geometry.dispose(), r.mesh.material.dispose(), r.material.uniforms.mergedTexture.value.dispose(), l.releaseMaskTexture(r.maskSource), l.sharedMeshRegistry.delete(o)));
     }
     this.maskMesh = void 0, this._sharedMeshKey = null, this.sharedStyleIndex = -1, this.maskTexture = void 0, this.visible && !this.loadingMask && this.initializeMaskMesh();
   }
@@ -579,15 +585,15 @@ const h = class extends D {
       const e = (i = this.fiveState) == null ? void 0 : i.panoIndex;
       if (typeof e != "number")
         return;
-      const s = h.getMeshKey(e), t = h.sharedMeshRegistry.get(s);
+      const s = l.getMeshKey(e), t = l.sharedMeshRegistry.get(s);
       if (!t) {
         yield this.initializeMaskMesh();
         return;
       }
       if (t.maskSource === this.maskUrl)
         return;
-      const o = yield h.loadMaskTexture(this.maskUrl);
-      this.maskTexture = o, h.releaseMaskTexture(t.maskSource), t.maskTexture = o, t.maskSource = this.maskUrl, t.material.uniforms.map.value = o, this.five.needsRender = !0;
+      const o = yield l.loadMaskTexture(this.maskUrl);
+      this.maskTexture = o, l.releaseMaskTexture(t.maskSource), t.maskTexture = o, t.maskSource = this.maskUrl, t.material.uniforms.map.value = o, t.material.uniforms.maskTexelSize.value = l.getMaskTexelSize(o), this.five.needsRender = !0;
     });
   }
   /**
@@ -596,7 +602,7 @@ const h = class extends D {
   updateMaskStyle() {
     if (!this.maskMesh || this._sharedMeshKey === null || this.sharedStyleIndex < 0)
       return;
-    const e = h.sharedMeshRegistry.get(this._sharedMeshKey);
+    const e = l.sharedMeshRegistry.get(this._sharedMeshKey);
     e && this.updateStyleSlotInMaterial(e.material, this.sharedStyleIndex, this.buildStyleForMaterial());
   }
   /**
@@ -620,8 +626,8 @@ const h = class extends D {
     this._disposed = !0, this.cleanupClickEvents();
     const e = this._sharedMeshKey, s = this.getColorKey();
     if (e) {
-      const t = h.sharedMeshRegistry.get(e);
-      t && (t.tagsByColorKey.delete(s), t.styleIndexByColorKey.delete(s), t.tagsByColorKey.size === 0 ? (t.mesh.parent && t.mesh.parent.remove(t.mesh), t.mesh.geometry.dispose(), t.mesh.material.dispose(), t.material.uniforms.mergedTexture.value.dispose(), h.releaseMaskTexture(t.maskSource), h.sharedMeshRegistry.delete(e)) : h.rebuildEntryMaterial(t));
+      const t = l.sharedMeshRegistry.get(e);
+      t && (t.tagsByColorKey.delete(s), t.styleIndexByColorKey.delete(s), t.tagsByColorKey.size === 0 ? (t.mesh.parent && t.mesh.parent.remove(t.mesh), t.mesh.geometry.dispose(), t.mesh.material.dispose(), t.material.uniforms.mergedTexture.value.dispose(), l.releaseMaskTexture(t.maskSource), l.sharedMeshRegistry.delete(e)) : l.rebuildEntryMaterial(t));
     }
     this.maskMesh = void 0, this._sharedMeshKey = null, this.sharedStyleIndex = -1, this.maskTexture = void 0, this.five.needsRender = !0;
   }
@@ -653,27 +659,27 @@ const h = class extends D {
    * 清除所有点位共享 mesh（重新 load 数据前调用）
    */
   static clearSharedMeshRegistry() {
-    h.sharedMeshRegistry.forEach((e) => {
+    l.sharedMeshRegistry.forEach((e) => {
       e.tagsByColorKey.forEach((s) => {
         s.maskMesh = void 0, s._sharedMeshKey = null, s.sharedStyleIndex = -1;
-      }), e.mesh.parent && e.mesh.parent.remove(e.mesh), e.mesh.geometry.dispose(), e.mesh.material.dispose(), e.material.uniforms.mergedTexture.value.dispose(), h.releaseMaskTexture(e.maskSource);
-    }), h.sharedMeshRegistry.clear();
+      }), e.mesh.parent && e.mesh.parent.remove(e.mesh), e.mesh.geometry.dispose(), e.mesh.material.dispose(), e.material.uniforms.mergedTexture.value.dispose(), l.releaseMaskTexture(e.maskSource);
+    }), l.sharedMeshRegistry.clear();
   }
   /**
    * 将 style 列表写入材质（用于重建材质）
    */
   static writeStyleListToMaterial(e, s) {
-    const t = s.length, o = 3, r = t * o, l = 1, n = new Float32Array(r * l * 4);
+    const t = s.length, o = 3, r = t * o, h = 1, n = new Float32Array(r * h * 4);
     s.forEach((u, p) => {
-      const C = p * o, y = C * 4;
+      const v = p * o, y = v * 4;
       n[y] = u.color[0] / 255, n[y + 1] = u.color[1] / 255, n[y + 2] = u.color[2] / 255, n[y + 3] = u.color[3];
-      const f = (C + 1) * 4;
+      const f = (v + 1) * 4;
       n[f] = u.tolerance / 255, n[f + 1] = u.highlightColor[0] / 255, n[f + 2] = u.highlightColor[1] / 255, n[f + 3] = u.highlightColor[2] / 255;
-      const M = (C + 2) * 4;
+      const M = (v + 2) * 4;
       n[M] = u.opacity;
     });
     const a = e.uniforms.mergedTexture.value, d = a.image;
-    d.data = n, d.width = r, d.height = l, a.needsUpdate = !0, e.uniforms.groupCount.value = t, e.uniforms.textureWidth.value = r;
+    d.data = n, d.width = r, d.height = h, a.needsUpdate = !0, e.uniforms.groupCount.value = t, e.uniforms.textureWidth.value = r;
   }
   /**
    * destroy 后重建该点位材质，更新剩余 tag 的 styleIndex
@@ -683,7 +689,7 @@ const h = class extends D {
     if (s.length === 0)
       return;
     const t = s.map((o) => o.getStyleForMaterial());
-    h.writeStyleListToMaterial(e.material, t), s.forEach((o, i) => {
+    l.writeStyleListToMaterial(e.material, t), s.forEach((o, i) => {
       o.sharedStyleIndex = i, e.styleIndexByColorKey.set(`${o.targetColor[0]},${o.targetColor[1]},${o.targetColor[2]}`, i);
     });
   }
@@ -696,8 +702,8 @@ const h = class extends D {
     if (typeof e == "string")
       return e;
     {
-      let s = h.canvasSymbolMap.get(e);
-      return s || (s = Symbol("canvas-mask"), h.canvasSymbolMap.set(e, s)), s;
+      let s = l.canvasSymbolMap.get(e);
+      return s || (s = Symbol("canvas-mask"), l.canvasSymbolMap.set(e, s)), s;
     }
   }
   /**
@@ -707,7 +713,7 @@ const h = class extends D {
    */
   static loadMaskTexture(e) {
     return S(this, null, function* () {
-      const s = h.getMaskCacheKey(e), t = h.maskTextureCache.get(s);
+      const s = l.getMaskCacheKey(e), t = l.maskTextureCache.get(s);
       if (t)
         return t.refCount++, t.texture;
       const o = performance.now(), i = new AbortController();
@@ -735,13 +741,13 @@ const h = class extends D {
           });
         } else
           r = new g.CanvasTexture(e), r.needsUpdate = !0, console.log("[MaskTag] Created texture from canvas, size:", e.width, "x", e.height);
-        r.wrapS = g.ClampToEdgeWrapping, r.wrapT = g.ClampToEdgeWrapping, r.minFilter = g.LinearFilter, r.magFilter = g.LinearFilter, r.anisotropy = 4, r instanceof g.CanvasTexture && (r.needsUpdate = !0), h.maskTextureCache.set(s, {
+        r.wrapS = g.ClampToEdgeWrapping, r.wrapT = g.ClampToEdgeWrapping, r.minFilter = g.NearestFilter, r.magFilter = g.NearestFilter, r.anisotropy = 4, r instanceof g.CanvasTexture && (r.needsUpdate = !0), l.maskTextureCache.set(s, {
           texture: r,
           refCount: 1,
           abortController: i
         });
-        const l = performance.now() - o, n = typeof e == "string" ? e.substring(0, 50) : "Canvas";
-        if (console.log(`[MaskTag Performance] Texture loaded in ${l.toFixed(2)}ms, source: ${n}`), r.image) {
+        const h = performance.now() - o, n = typeof e == "string" ? e.substring(0, 50) : "Canvas";
+        if (console.log(`[MaskTag Performance] Texture loaded in ${h.toFixed(2)}ms, source: ${n}`), r.image) {
           const a = (r.image.width * r.image.height * 4 / 1048576).toFixed(2);
           console.log(`[MaskTag Memory] Texture size: ${r.image.width}x${r.image.height}, estimated memory: ${a}MB`);
         }
@@ -757,10 +763,10 @@ const h = class extends D {
    */
   static releaseMaskTexture(e) {
     var o;
-    const s = h.getMaskCacheKey(e), t = h.maskTextureCache.get(s);
+    const s = l.getMaskCacheKey(e), t = l.maskTextureCache.get(s);
     if (t && (t.refCount--, t.refCount <= 0)) {
       const i = typeof e == "string" ? e.substring(0, 50) : "Canvas";
-      console.log(`[MaskTag Memory] Releasing texture (refCount=0): ${i}`), (o = t.abortController) == null || o.abort(), t.texture.dispose(), h.maskTextureCache.delete(s);
+      console.log(`[MaskTag Memory] Releasing texture (refCount=0): ${i}`), (o = t.abortController) == null || o.abort(), t.texture.dispose(), l.maskTextureCache.delete(s);
     }
   }
   /**
@@ -770,21 +776,21 @@ const h = class extends D {
   static getCacheStats() {
     let e = 0, s = 0;
     const t = [];
-    return h.maskTextureCache.forEach((o, i) => {
+    return l.maskTextureCache.forEach((o, i) => {
       e += o.refCount;
       let r = 0;
       if (o.texture.image) {
         const n = o.texture.image.width || 0, a = o.texture.image.height || 0;
         r = n * a * 4 / (1024 * 1024), s += r;
       }
-      const l = typeof i == "string" ? i.substring(0, 80) : "[Canvas]";
+      const h = typeof i == "string" ? i.substring(0, 80) : "[Canvas]";
       t.push({
-        source: l,
+        source: h,
         refCount: o.refCount,
         sizeMB: parseFloat(r.toFixed(2))
       });
     }), {
-      totalCached: h.maskTextureCache.size,
+      totalCached: l.maskTextureCache.size,
       totalRefCount: e,
       estimatedMemoryMB: parseFloat(s.toFixed(2)),
       cacheEntries: t
@@ -795,13 +801,13 @@ const h = class extends D {
    * 注意：这会释放所有纹理，即使它们仍在使用中
    */
   static clearAllCache() {
-    console.warn("[MaskTag] Clearing all texture cache"), h.maskTextureCache.forEach((e) => {
+    console.warn("[MaskTag] Clearing all texture cache"), l.maskTextureCache.forEach((e) => {
       var s;
       (s = e.abortController) == null || s.abort(), e.texture.dispose();
-    }), h.maskTextureCache.clear();
+    }), l.maskTextureCache.clear();
   }
 };
-let b = h;
+let b = l;
 /**
  * Mask 纹理缓存（静态，所有 MaskTag 实例共享）
  * key: mask URL 或 canvas 的 symbol, value: { texture: THREE.Texture, refCount: number, abortController?: AbortController }

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

@@ -7,4 +7,4 @@
  */
 export declare const maskVertexShader = "\nvarying vec2 vUv;\nvoid main() {\n  vUv = uv;\n  gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n}\n";
 /** 多 style：mergedTexture 中每组 3 像素为 color(id)/tolerance+highlight/opacity，用 color 作 id 匹配 */
-export declare const maskFragmentShaderMulti = "\n#define RESOLUTION 2048.0\n#define MAX_GROUPS 64\n#define STRICT_MATCH 0.5/255.0\n\nvarying vec2 vUv;\nuniform sampler2D map;\nuniform sampler2D mergedTexture;\nuniform float groupCount;\nuniform float textureWidth;\nuniform float pixelsPerGroup;\n\nfloat colorGap(vec3 a, vec3 b) {\n  return abs(a.r - b.r) + abs(a.g - b.g) + abs(a.b - b.b);\n}\n\nvec4 readStyleColor(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5));\n}\n\nvec4 readStyleToleranceHighlight(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup + 1.0;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5));\n}\n\nfloat readStyleOpacity(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup + 2.0;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5)).r;\n}\n\nfloat detectEdge(sampler2D map, vec2 uv, vec3 matchColor, float tolerance) {\n  vec4 centerColor = texture2D(map, uv);\n  if (colorGap(centerColor.rgb, matchColor) >= tolerance) return 0.0;\n  float step = 1.0 / RESOLUTION;\n  vec4 u = texture2D(map, uv + vec2(0.0, -step));\n  vec4 l = texture2D(map, uv + vec2(-step, 0.0));\n  vec4 r = texture2D(map, uv + vec2(step, 0.0));\n  vec4 d = texture2D(map, uv + vec2(0.0, step));\n  bool edge = colorGap(u.rgb, matchColor) >= tolerance || colorGap(l.rgb, matchColor) >= tolerance\n    || colorGap(r.rgb, matchColor) >= tolerance || colorGap(d.rgb, matchColor) >= tolerance;\n  return edge ? 1.0 : 0.0;\n}\n\nvoid main() {\n  vec4 image = texture2D(map, vUv);\n  if (image.r == 0.0 && image.g == 0.0 && image.b == 0.0) discard;\n\n  // WebGL 1.0 \u8981\u6C42\u5FAA\u73AF\u7EC8\u6B62\u6761\u4EF6\u5FC5\u987B\u662F\u7F16\u8BD1\u65F6\u5E38\u91CF\uFF0C\u6240\u4EE5\u7528 MAX_GROUPS\uFF0C\u5FAA\u73AF\u5185\u68C0\u67E5 groupCount\n  for (float i = 0.0; i < float(MAX_GROUPS); i += 1.0) {\n    if (i < groupCount) {\n      vec4 styleColor = readStyleColor(i);\n      vec3 colorRgb = styleColor.rgb;\n      float tol = readStyleToleranceHighlight(i).r * 3.0;\n      vec3 highlight = readStyleToleranceHighlight(i).gba;\n      float opacity = readStyleOpacity(i);\n      \n      if (opacity > 0.0) {\n        float gap = colorGap(image.rgb, colorRgb);\n        if (gap > STRICT_MATCH) continue;\n        float smoothRange = 0.01;\n        float matchFactor = 1.0 - smoothstep(tol - smoothRange, tol + smoothRange, gap);\n        if (matchFactor > 0.0) {\n          float isEdge = detectEdge(map, vUv, colorRgb, tol);\n          float alpha = mix(opacity, 1.0, isEdge);\n          alpha *= max(matchFactor, 0.9);\n          gl_FragColor = vec4(highlight, alpha);\n          return;\n        }\n      }\n    }\n  }\n  discard;\n}\n";
+export declare const maskFragmentShaderMulti = "\n#define MAX_GROUPS 64\n#define STRICT_MATCH 0.5/255.0\n\nvarying vec2 vUv;\nuniform sampler2D map;\nuniform sampler2D mergedTexture;\nuniform float groupCount;\nuniform float textureWidth;\nuniform float pixelsPerGroup;\nuniform vec2 maskTexelSize;\n\nfloat colorGap(vec3 a, vec3 b) {\n  return abs(a.r - b.r) + abs(a.g - b.g) + abs(a.b - b.b);\n}\n\nfloat exactMatch(vec3 sampleColor, vec3 targetColor) {\n  return colorGap(sampleColor, targetColor) <= STRICT_MATCH ? 1.0 : 0.0;\n}\n\nvec4 readStyleColor(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5));\n}\n\nvec4 readStyleToleranceHighlight(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup + 1.0;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5));\n}\n\nfloat readStyleOpacity(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup + 2.0;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5)).r;\n}\n\nvoid main() {\n  vec4 center = texture2D(map, vUv);\n  vec2 quarterTexel = maskTexelSize * 0.25;\n  vec3 sample0 = texture2D(map, vUv + quarterTexel * vec2(-1.0, -1.0)).rgb;\n  vec3 sample1 = texture2D(map, vUv + quarterTexel * vec2(1.0, -1.0)).rgb;\n  vec3 sample2 = texture2D(map, vUv + quarterTexel * vec2(-1.0, 1.0)).rgb;\n  vec3 sample3 = texture2D(map, vUv + quarterTexel * vec2(1.0, 1.0)).rgb;\n\n  float bestCoverage = 0.0;\n  float bestScore = -1.0;\n  float bestOpacity = 0.0;\n  vec3 bestHighlight = vec3(0.0);\n\n  // WebGL 1.0 \u8981\u6C42\u5FAA\u73AF\u7EC8\u6B62\u6761\u4EF6\u5FC5\u987B\u662F\u7F16\u8BD1\u65F6\u5E38\u91CF\uFF0C\u6240\u4EE5\u7528 MAX_GROUPS\uFF0C\u5FAA\u73AF\u5185\u68C0\u67E5 groupCount\n  for (float i = 0.0; i < float(MAX_GROUPS); i += 1.0) {\n    if (i < groupCount) {\n      vec3 colorRgb = readStyleColor(i).rgb;\n      vec3 highlight = readStyleToleranceHighlight(i).gba;\n      float opacity = readStyleOpacity(i);\n\n      if (opacity > 0.0) {\n        float coverage = 0.25 * (\n          exactMatch(sample0, colorRgb) +\n          exactMatch(sample1, colorRgb) +\n          exactMatch(sample2, colorRgb) +\n          exactMatch(sample3, colorRgb)\n        );\n        // coverage \u76F8\u540C\u65F6\u4F18\u5148\u9009\u62E9\u4E2D\u5FC3\u50CF\u7D20\u6240\u5C5E\u6807\u7B7E\uFF0C\u907F\u514D\u76F8\u90BB\u6807\u7B7E\u8FB9\u754C\u968F\u6CE8\u518C\u987A\u5E8F\u95EA\u70C1\u3002\n        float score = coverage + exactMatch(center.rgb, colorRgb) * 0.001;\n        if (coverage > 0.0 && score > bestScore) {\n          bestCoverage = coverage;\n          bestScore = score;\n          bestOpacity = opacity;\n          bestHighlight = highlight;\n        }\n      }\n    }\n  }\n\n  if (bestCoverage > 0.0) {\n    gl_FragColor = vec4(bestHighlight, bestOpacity * bestCoverage);\n    return;\n  }\n  discard;\n}\n";

package/libs/PanoTagPlugin/controller/Tag/MaskTag.shaders.js

@@ -10,7 +10,6 @@ void main() {
 ), t = (
   /* glsl */
   `
-#define RESOLUTION 2048.0
 #define MAX_GROUPS 64
 #define STRICT_MATCH 0.5/255.0
 
@@ -20,11 +19,16 @@ uniform sampler2D mergedTexture;
 uniform float groupCount;
 uniform float textureWidth;
 uniform float pixelsPerGroup;
+uniform vec2 maskTexelSize;
 
 float colorGap(vec3 a, vec3 b) {
   return abs(a.r - b.r) + abs(a.g - b.g) + abs(a.b - b.b);
 }
 
+float exactMatch(vec3 sampleColor, vec3 targetColor) {
+  return colorGap(sampleColor, targetColor) <= STRICT_MATCH ? 1.0 : 0.0;
+}
+
 vec4 readStyleColor(float groupIndex) {
   float px = groupIndex * pixelsPerGroup;
   float texX = (px + 0.5) / textureWidth;
@@ -43,47 +47,49 @@ float readStyleOpacity(float groupIndex) {
   return texture2D(mergedTexture, vec2(texX, 0.5)).r;
 }
 
-float detectEdge(sampler2D map, vec2 uv, vec3 matchColor, float tolerance) {
-  vec4 centerColor = texture2D(map, uv);
-  if (colorGap(centerColor.rgb, matchColor) >= tolerance) return 0.0;
-  float step = 1.0 / RESOLUTION;
-  vec4 u = texture2D(map, uv + vec2(0.0, -step));
-  vec4 l = texture2D(map, uv + vec2(-step, 0.0));
-  vec4 r = texture2D(map, uv + vec2(step, 0.0));
-  vec4 d = texture2D(map, uv + vec2(0.0, step));
-  bool edge = colorGap(u.rgb, matchColor) >= tolerance || colorGap(l.rgb, matchColor) >= tolerance
-    || colorGap(r.rgb, matchColor) >= tolerance || colorGap(d.rgb, matchColor) >= tolerance;
-  return edge ? 1.0 : 0.0;
-}
-
 void main() {
-  vec4 image = texture2D(map, vUv);
-  if (image.r == 0.0 && image.g == 0.0 && image.b == 0.0) discard;
+  vec4 center = texture2D(map, vUv);
+  vec2 quarterTexel = maskTexelSize * 0.25;
+  vec3 sample0 = texture2D(map, vUv + quarterTexel * vec2(-1.0, -1.0)).rgb;
+  vec3 sample1 = texture2D(map, vUv + quarterTexel * vec2(1.0, -1.0)).rgb;
+  vec3 sample2 = texture2D(map, vUv + quarterTexel * vec2(-1.0, 1.0)).rgb;
+  vec3 sample3 = texture2D(map, vUv + quarterTexel * vec2(1.0, 1.0)).rgb;
+
+  float bestCoverage = 0.0;
+  float bestScore = -1.0;
+  float bestOpacity = 0.0;
+  vec3 bestHighlight = vec3(0.0);
 
   // WebGL 1.0 要求循环终止条件必须是编译时常量，所以用 MAX_GROUPS，循环内检查 groupCount
   for (float i = 0.0; i < float(MAX_GROUPS); i += 1.0) {
     if (i < groupCount) {
-      vec4 styleColor = readStyleColor(i);
-      vec3 colorRgb = styleColor.rgb;
-      float tol = readStyleToleranceHighlight(i).r * 3.0;
+      vec3 colorRgb = readStyleColor(i).rgb;
       vec3 highlight = readStyleToleranceHighlight(i).gba;
       float opacity = readStyleOpacity(i);
-      
+
       if (opacity > 0.0) {
-        float gap = colorGap(image.rgb, colorRgb);
-        if (gap > STRICT_MATCH) continue;
-        float smoothRange = 0.01;
-        float matchFactor = 1.0 - smoothstep(tol - smoothRange, tol + smoothRange, gap);
-        if (matchFactor > 0.0) {
-          float isEdge = detectEdge(map, vUv, colorRgb, tol);
-          float alpha = mix(opacity, 1.0, isEdge);
-          alpha *= max(matchFactor, 0.9);
-          gl_FragColor = vec4(highlight, alpha);
-          return;
+        float coverage = 0.25 * (
+          exactMatch(sample0, colorRgb) +
+          exactMatch(sample1, colorRgb) +
+          exactMatch(sample2, colorRgb) +
+          exactMatch(sample3, colorRgb)
+        );
+        // coverage 相同时优先选择中心像素所属标签，避免相邻标签边界随注册顺序闪烁。
+        float score = coverage + exactMatch(center.rgb, colorRgb) * 0.001;
+        if (coverage > 0.0 && score > bestScore) {
+          bestCoverage = coverage;
+          bestScore = score;
+          bestOpacity = opacity;
+          bestHighlight = highlight;
         }
       }
     }
   }
+
+  if (bestCoverage > 0.0) {
+    gl_FragColor = vec4(bestHighlight, bestOpacity * bestCoverage);
+    return;
+  }
   discard;
 }
 `

package/libs/base/BasePlugin.js

@@ -1,7 +1,7 @@
 var e = Object.defineProperty;
 var s = (o, t, i) => t in o ? e(o, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[t] = i;
 var r = (o, t, i) => (s(o, typeof t != "symbol" ? t + "" : t, i), i);
-import { Subscribe as m } from "../shared-utils/Subscribe.js";
+import { Subscribe as l } from "../shared-utils/Subscribe.js";
 import "../shared-utils/tag.js";
 import "three";
 import "../vendor/hammerjs/hammer.js";
@@ -15,7 +15,7 @@ import "../shared-utils/three/blink.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../vendor/earcut/src/earcut.js";
-import { FiveUtil as l } from "../shared-utils/Utils/FiveUtil.js";
+import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
 import { DEFAULT_STATIC_PREFIX as p } from "../shared-utils/url/defaultUrls.js";
 import "../shared-utils/five/FivePuppet.js";
 let I = class {
@@ -23,7 +23,7 @@ let I = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.81.7");
+    r(this, "VERSION", "3.81.8-alpha.2");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");
@@ -31,9 +31,9 @@ let I = class {
     /**
      * @description: 插件事件钩子
      */
-    r(this, "hooks", new m());
+    r(this, "hooks", new l());
     r(this, "staticPrefix", p);
-    this.five = t, this.fiveUtil = new l(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
+    this.five = t, this.fiveUtil = new m(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
   }
   set workCode(t) {
     this.workUtil.workCode = t, this.onWorkCodeChange();

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.81.7",
+    "%c %c@realsee/dnalogel %cv3.81.8-alpha.2",
     [
       "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.81.7",
+  "version": "3.81.8-alpha.2",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",