@realsee/dnalogel 3.74.0-alpha.3 → 3.74.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/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 闪烁
      */