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

package/libs/PanoMeasurePlugin/utils/isIntersecting.js

@@ -1,52 +1,48 @@
-function m(n, s) {
-  const o = Array.isArray(s) ? s : [s];
-  for (let u = 0; u < o.length; u++) {
-    const t = n.start, c = n.end, r = o[u].start, e = o[u].end;
-    if (!(f(t, r) || f(t, e) || f(c, r) || f(c, e) || f(t, c)) && M([t.x, t.y, t.z], [c.x, c.y, c.z], [r.x, r.y, r.z], [e.x, e.y, e.z]))
+function a(n, t) {
+  const s = Array.isArray(t) ? t : [t];
+  for (let u = 0; u < s.length; u++) {
+    const r = n.start, e = n.end, c = s[u].start, o = s[u].end;
+    if (!(f(r, c) || f(r, o) || f(e, c) || f(e, o) || f(r, e)) && d([r.x, r.y, r.z], [e.x, e.y, e.z], [c.x, c.y, c.z], [o.x, o.y, o.z]))
       return !0;
   }
   return !1;
 }
-function M(n, s, o, u) {
-  const t = [s[0] - n[0], s[1] - n[1], s[2] - n[2]], c = [u[0] - o[0], u[1] - o[1], u[2] - o[2]], r = [
-    { a: [t[0], -c[0]], b: o[0] - n[0] },
-    { a: [t[1], -c[1]], b: o[1] - n[1] },
-    { a: [t[2], -c[2]], b: o[2] - n[2] }
-  ], e = [
-    [0, 1],
-    // X 和 Y
-    [0, 2],
-    // X 和 Z
-    [1, 2]
-    // Y 和 Z
-  ];
-  for (const [i, y] of e) {
-    const b = [r[i].a, r[y].a], z = [r[i].b, r[y].b], a = V(b);
-    if (Math.abs(a) < 1e-10)
-      continue;
-    const g = h(b, a), [q, I] = j(g, z);
-    return !!(x(q) && x(I));
-  }
-  return !1;
+function d(n, t, s, u) {
+  const r = [t[0] - n[0], t[1] - n[1], t[2] - n[2]], e = [u[0] - s[0], u[1] - s[1], u[2] - s[2]], c = [
+    [r[0], -e[0]],
+    [r[1], -e[1]],
+    [r[2], -e[2]]
+  ], o = [s[0] - n[0], s[1] - n[1], s[2] - n[2]], i = g(c, o);
+  if (i === null)
+    return !1;
+  const [x, z] = i;
+  return !!(y(x) && y(z));
+}
+function g(n, t) {
+  if (q(n) === 0)
+    return null;
+  const u = I(n);
+  return V(u, t);
 }
-function V(n) {
+function q(n) {
   return n[0][0] * n[1][1] - n[0][1] * n[1][0];
 }
-function h(n, s) {
+function I(n) {
+  const t = n[0][0] * n[1][1] - n[0][1] * n[1][0];
   return [
-    [n[1][1] / s, -n[0][1] / s],
-    [-n[1][0] / s, n[0][0] / s]
+    [n[1][1] / t, -n[0][1] / t],
+    [-n[1][0] / t, n[0][0] / t]
   ];
 }
-function j(n, s) {
-  return [n[0][0] * s[0] + n[0][1] * s[1], n[1][0] * s[0] + n[1][1] * s[1]];
+function V(n, t) {
+  return [n[0][0] * t[0] + n[0][1] * t[1], n[1][0] * t[0] + n[1][1] * t[1]];
 }
-function x(n) {
+function y(n) {
   return n >= 0 && n <= 1;
 }
-function f(n, s) {
-  return n.x === s.x && n.y === s.y && n.z === s.z;
+function f(n, t) {
+  return n.x === t.x && n.y === t.y && n.z === t.z;
 }
 export {
-  m as isIntersecting
+  a as isIntersecting
 };

package/libs/PanoTagPlugin/Components/Common/TagPoint.js

@@ -115,11 +115,11 @@ function Me(t) {
         ),
         z(
           e,
-          "mouseenter",
-          /*mouseenter_handler*/
+          "pointerenter",
+          /*pointerenter_handler*/
           t[16]
         ),
-        z(e, "mouseleave", function() {
+        z(e, "pointerleave", function() {
           he(
             /*handleMouseLeave*/
             t[3]

package/libs/PanoTagPlugin/Components/Tag/AudioTag/AudioPoint.js

@@ -1,4 +1,4 @@
-import { SvelteComponent as _, init as b, safe_not_equal as k, append_styles as v, create_component as m, mount_component as c, transition_in as g, transition_out as h, destroy_component as p, createEventDispatcher as M, element as w, attr as E, insert as C, listen as d, is_function as f, detach as P, run_all as L } from "../../../../vendor/svelte/internal/index.js";
+import { SvelteComponent as _, init as b, safe_not_equal as k, append_styles as v, create_component as m, mount_component as c, transition_in as g, transition_out as p, destroy_component as h, createEventDispatcher as M, element as w, attr as E, insert as C, listen as d, is_function as f, detach as P, run_all as L } from "../../../../vendor/svelte/internal/index.js";
 import R from "../../Common/Audio.js";
 import A from "../../Common/Icon/audioIcon.js";
 import "../../../utils/audio/SharedAudio.js";
@@ -30,13 +30,13 @@ function z(t) {
             t[2]
           ) && t[2].apply(this, arguments);
         }),
-        d(e, "mouseenter", function() {
+        d(e, "pointerenter", function() {
           f(
             /*handleMouseEnter*/
             t[3]
           ) && t[3].apply(this, arguments);
         }),
-        d(e, "mouseleave", function() {
+        d(e, "pointerleave", function() {
           f(
             /*handleMouseLeave*/
             t[4]
@@ -55,10 +55,10 @@ function z(t) {
       n || (g(a.$$.fragment, r), n = !0);
     },
     o(r) {
-      h(a.$$.fragment, r), n = !1;
+      p(a.$$.fragment, r), n = !1;
     },
     d(r) {
-      r && P(e), p(a), o = !1, L(l);
+      r && P(e), h(a), o = !1, L(l);
     }
   };
 }
@@ -130,10 +130,10 @@ function U(t) {
       a || (g(e.$$.fragment, n), a = !0);
     },
     o(n) {
-      h(e.$$.fragment, n), a = !1;
+      p(e.$$.fragment, n), a = !1;
     },
     d(n) {
-      p(e, n);
+      h(e, n);
     }
   };
 }

package/libs/PanoTagPlugin/Components/TagItem.js

@@ -1,4 +1,4 @@
-import { SvelteComponent as ve, init as Ce, safe_not_equal as ke, append_styles as he, space as ae, empty as Te, insert as R, transition_in as b, transition_out as h, check_outros as V, detach as Z, getContext as Pe, onMount as ye, element as X, attr as _, toggle_class as H, set_style as F, append as Ee, group_outros as j, create_component as Y, mount_component as $, destroy_component as x, binding_callbacks as W, noop as I, bind as Me, add_flush_callback as Se } from "../../vendor/svelte/internal/index.js";
+import { SvelteComponent as ve, init as Ce, safe_not_equal as ke, append_styles as Te, space as ae, empty as he, insert as R, transition_in as b, transition_out as T, check_outros as V, detach as Z, getContext as Pe, onMount as ye, element as X, attr as _, toggle_class as H, set_style as F, append as Ee, group_outros as j, create_component as Y, mount_component as $, destroy_component as x, binding_callbacks as W, noop as I, bind as Me, add_flush_callback as Se } from "../../vendor/svelte/internal/index.js";
 import we from "./Tag/index.js";
 import "three";
 import { noTypecheck as ie } from "../utils/noTypecheck.js";
@@ -189,7 +189,7 @@ import "./Common/TagPopover/TagPopoverToolBar.js";
 import "./Common/TagPopover/ArrowRightIcon.js";
 import "./Common/TagPopover/ShareIcon.js";
 function Ue(t) {
-  he(t, "svelte-2g2g8a", ".tag.svelte-2g2g8a{position:absolute;width:0rem;height:0rem;overflow:visible;pointer-events:auto;will-change:opacity;transition:opacity 0.2s linear}.tag.enableZIndex.svelte-2g2g8a{position:absolute}.tag.hide.svelte-2g2g8a{opacity:0;pointer-events:none}.tag.hide.svelte-2g2g8a *{pointer-events:none !important}.tag.unClickable.svelte-2g2g8a{pointer-events:none !important}.tag.unClickable.svelte-2g2g8a *{pointer-events:none !important}");
+  Te(t, "svelte-2g2g8a", ".tag.svelte-2g2g8a{position:absolute;width:0rem;height:0rem;overflow:visible;pointer-events:auto;will-change:opacity;transition:opacity 0.2s linear}.tag.enableZIndex.svelte-2g2g8a{position:absolute}.tag.hide.svelte-2g2g8a{opacity:0;pointer-events:none}.tag.hide.svelte-2g2g8a *{pointer-events:none !important}.tag.unClickable.svelte-2g2g8a{pointer-events:none !important}.tag.unClickable.svelte-2g2g8a *{pointer-events:none !important}");
 }
 function re(t) {
   let e, i, a, m, r, n, u, l, g, d;
@@ -253,11 +253,11 @@ function re(t) {
     },
     p(f, s) {
       let w = i;
-      i = L(f), i === w ? v[i].p(f, s) : (j(), h(v[w], 1, 1, () => {
+      i = L(f), i === w ? v[i].p(f, s) : (j(), T(v[w], 1, 1, () => {
         v[w] = null;
       }), V(), a = v[i], a ? a.p(f, s) : (a = v[i] = U[i](f), a.c()), b(a, 1), a.m(e, m));
       let D = r;
-      r = S(f), r === D ? C[r].p(f, s) : (j(), h(C[D], 1, 1, () => {
+      r = S(f), r === D ? C[r].p(f, s) : (j(), T(C[D], 1, 1, () => {
         C[D] = null;
       }), V(), n = C[r], n ? n.p(f, s) : (n = C[r] = o[r](f), n.c()), b(n, 1), n.m(e, null)), (!d || s[0] & /*id*/
       8388608) && _(
@@ -311,7 +311,7 @@ function re(t) {
       d || (b(a), b(n), d = !0);
     },
     o(f) {
-      h(a), h(n), d = !1;
+      T(a), T(n), d = !1;
     },
     d(f) {
       f && Z(e), v[i].d(), C[r].d(), t[36](null);
@@ -400,7 +400,7 @@ function ze(t) {
         a || (b(e.$$.fragment, n), a = !0);
       },
       o(n) {
-        h(e.$$.fragment, n), a = !1;
+        T(e.$$.fragment, n), a = !1;
       },
       d(n) {
         t[35](null), x(e, n);
@@ -487,7 +487,7 @@ function Re(t) {
       i || (b(e.$$.fragment, a), i = !0);
     },
     o(a) {
-      h(e.$$.fragment, a), i = !1;
+      T(e.$$.fragment, a), i = !1;
     },
     d(a) {
       x(e, a);
@@ -593,7 +593,7 @@ function ne(t) {
       i || (b(e.$$.fragment, m), i = !0);
     },
     o(m) {
-      h(e.$$.fragment, m), i = !1;
+      T(e.$$.fragment, m), i = !1;
     },
     d(m) {
       x(e, m);
@@ -616,7 +616,7 @@ function Ze(t) {
   ), n = i && ne(t);
   return {
     c() {
-      r && r.c(), e = ae(), n && n.c(), a = Te();
+      r && r.c(), e = ae(), n && n.c(), a = he();
     },
     m(l, g) {
       r && r.m(l, g), R(l, e, g), n && n.m(l, g), R(l, a, g), m = !0;
@@ -627,7 +627,7 @@ function Ze(t) {
       l[9] && (!/*disable*/
       l[22] || /*isHovering*/
       l[11]) ? r ? (r.p(l, g), g[0] & /*screenPosition, disable, isHovering*/
-      4196864 && b(r, 1)) : (r = re(l), r.c(), b(r, 1), r.m(e.parentNode, e)) : r && (j(), h(r, 1, 1, () => {
+      4196864 && b(r, 1)) : (r = re(l), r.c(), b(r, 1), r.m(e.parentNode, e)) : r && (j(), T(r, 1, 1, () => {
         r = null;
       }), V()), g[0] & /*tag, hasPopoverContent, isHovering*/
       16779265 && (i = /*tag*/
@@ -635,7 +635,7 @@ function Ze(t) {
       l[24] && /*isHovering*/
       (l[11] || /*tag*/
       ((d = l[0].config.popoverConfig) == null ? void 0 : d.debug))), i ? n ? (n.p(l, g), g[0] & /*tag, hasPopoverContent, isHovering*/
-      16779265 && b(n, 1)) : (n = ne(l), n.c(), b(n, 1), n.m(a.parentNode, a)) : n && (j(), h(n, 1, 1, () => {
+      16779265 && b(n, 1)) : (n = ne(l), n.c(), b(n, 1), n.m(a.parentNode, a)) : n && (j(), T(n, 1, 1, () => {
         n = null;
       }), V());
     },
@@ -643,7 +643,7 @@ function Ze(t) {
       m || (b(r), b(n), m = !0);
     },
     o(l) {
-      h(r), h(n), m = !1;
+      T(r), T(n), m = !1;
     },
     d(l) {
       r && r.d(l), l && Z(e), n && n.d(l), l && Z(a);
@@ -653,7 +653,7 @@ function Ze(t) {
 function Ne(t, e, i) {
   let a, m, r, n, u, l, g, d, U, v, L, { tag: o } = e, { mediaStore: C } = e, { rendererMap: S = /* @__PURE__ */ new Map() } = e, { contentTypeMap: f = /* @__PURE__ */ new Map() } = e, { state: s } = e, { temporaryState: w } = e, { wrapperElement: D = null } = e, { popoverContainer: ee = null } = e;
   const pe = Pe("hooks");
-  let T = !1, y, P, B = null, G = !1, J = !1, K = null, Q = null, N = !1, te = 0, oe = 0;
+  let h = !1, y, P, B = null, G = !1, J = !1, K = null, Q = null, N = !1, te = 0, oe = 0;
   const me = {
     audioInstanceReady: (p) => {
       i(14, Q = p.detail), i(15, N = !Q.paused);
@@ -674,13 +674,13 @@ function Ne(t, e, i) {
   let O = !1;
   const q = (p) => {
     if (P && clearTimeout(P), p === !0 && !O) {
-      O = !0, i(11, T = !0);
+      O = !0, i(11, h = !0);
       return;
     }
     P = setTimeout(
       () => {
         var c;
-        !G && !J && !((c = o.config.popoverConfig) != null && c.debug) && (O = !1, i(11, T = !1));
+        !G && !J && !((c = o.config.popoverConfig) != null && c.debug) && (O = !1, i(11, h = !1));
       },
       300
     );
@@ -690,7 +690,7 @@ function Ne(t, e, i) {
     G = !1, q(!1);
   }, ue = (p) => {
     var c, k, E, M, z, A;
-    if (J = !0, o.isPopoverConfigEnabled() && o.isHoverEnabled() && ((k = (c = o.currentConfig) == null ? void 0 : c.popoverConfig) == null ? void 0 : k.trigger) === "hover") {
+    if (p.pointerType === "mouse" && (J = !0, o.isPopoverConfigEnabled() && o.isHoverEnabled() && ((k = (c = o.currentConfig) == null ? void 0 : c.popoverConfig) == null ? void 0 : k.trigger) === "hover")) {
       if (P && clearTimeout(P), y !== void 0)
         return;
       ((M = (E = o.currentConfig) == null ? void 0 : E.popoverConfig) == null ? void 0 : M.triggerDelay) > 0 ? y = setTimeout(
@@ -702,14 +702,14 @@ function Ne(t, e, i) {
     }
   }, se = (p) => {
     var c, k;
-    J = !1, o.isHoverEnabled() && o.isPopoverConfigEnabled() && ((k = (c = o.currentConfig) == null ? void 0 : c.popoverConfig) == null ? void 0 : k.trigger) === "hover" && (y !== void 0 && (clearTimeout(y), y = void 0), q(!1));
+    p.pointerType === "mouse" && (J = !1, o.isHoverEnabled() && o.isPopoverConfigEnabled() && ((k = (c = o.currentConfig) == null ? void 0 : c.popoverConfig) == null ? void 0 : k.trigger) === "hover" && (y !== void 0 && (clearTimeout(y), y = void 0), q(!1)));
   }, de = (p) => {
     var k, E;
     const c = o.contentType === "Audio" && o.data.appearance === "plane";
-    o.isPopoverConfigEnabled() && o.isHoverEnabled() && ((E = (k = o.currentConfig) == null ? void 0 : k.popoverConfig) == null ? void 0 : E.trigger) === "click" && (c ? T || (i(11, T = !0), o.hooks.emit("hover", { event: p, tag: o })) : (i(11, T = !T), T && o.hooks.emit("hover", { event: p, tag: o })));
+    o.isPopoverConfigEnabled() && o.isHoverEnabled() && ((E = (k = o.currentConfig) == null ? void 0 : k.popoverConfig) == null ? void 0 : E.trigger) === "click" && (c ? h || (i(11, h = !0), o.hooks.emit("hover", { event: p, tag: o })) : (i(11, h = !h), h && o.hooks.emit("hover", { event: p, tag: o })));
   };
   function ge() {
-    O = !1, i(11, T = !1);
+    O = !1, i(11, h = !1);
   }
   ye(() => () => {
     y && clearTimeout(y), P && clearTimeout(P);
@@ -761,7 +761,7 @@ function Ne(t, e, i) {
     d,
     u,
     a,
-    T,
+    h,
     B,
     K,
     Q,

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

@@ -12,6 +12,7 @@ import type { PartialObjectDeep } from '../../../typings/typings';
 import type { LiteralUnion } from 'type-fest';
 import type { CSS3DObjectPlus } from '../../../shared-utils/CSS3DRender/CSS3DObject';
 import type { Rectangle } from '../../../Sculpt/Objects/Rectangle';
+import { Line } from '@realsee/five/line';
 /**
  * @description 标签实例
  * @property `id` 标签id
@@ -62,9 +63,11 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
     } | null;
     normal: Tag<C, S>['normal'];
     mediaPlane?: ImagePlane | VideoPlane;
+    tagNormalLine: Line;
     hooks: Subscribe<TagEvents<C>>;
     zIndex?: number;
     manuallyOperated: boolean;
+    normalLineLength?: number;
     play?: () => void;
     pause?: () => void;
     get five(): import("@realsee/five").Five;
@@ -114,6 +117,11 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
         targetMode?: 'Panorama' | 'Mapview';
         pointConfig?: Parameters<typeof lookPoint>[2];
     }): Promise<this>;
+    /**
+     * @description 获取额外的闪烁目标（子类可以重写此方法添加额外的闪烁目标，如法线等）
+     * @returns 额外的闪烁目标或目标数组，返回 null/undefined 表示没有额外目标
+     */
+    protected getAdditionalBlinkTargets(): any | any[] | null;
     /**
      * @description 闪烁
      */