@realsee/dnalogel 3.77.3 → 3.78.0-alpha.0

package/libs/PanoTagPlugin/typings/controller.d.ts

@@ -33,6 +33,15 @@ export type TagClickParams = {
 } | {
     target: 'TagPopoverContent';
     tag: TagInstance;
+} | {
+    target: 'TagBoxModel';
+    tag: TagInstance;
+} | {
+    target: 'TagPolygonModel';
+    tag: TagInstance;
+} | {
+    target: 'TagMaskModel';
+    tag: TagInstance;
 });
 export interface PluginEventMap extends BasePlugin.EventMap<State> {
     loaded: () => void;
@@ -79,6 +88,7 @@ export type TagEvents<C extends TagContentType = TagContentType> = {
     }) => void;
     showPopover: () => void;
     hidePopover: () => void;
+    positionChanged: (position: TagInstance<C>['position']) => void;
 };
 export interface TagCacheInterface {
     visible?: boolean;

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

@@ -1,7 +1,7 @@
 import type { State as FiveState } from '@realsee/five';
 import type { TagConfig } from './TagConfig';
 import type { ContentTypeMap, TagContentType } from './TagData';
-import type { Position, TagId, StickType, TagStyle, ElementRenderer, TagConfigByKey, ContentTypeConfigKey } from './Utils';
+import type { Position, TagId, StickType, TagStyle, ElementRenderer, TagConfigByKey, ContentTypeConfigKey, BoxPosition, PolygonPosition, MaskPosition } from './Utils';
 import type { DeprecatedTagProperty } from '../../Archive/deprecated';
 import type { LiteralUnion } from 'type-fest';
 export interface Tags {
@@ -33,7 +33,7 @@ export type Tag<C extends TagContentType = TagContentType, S extends StickType =
      */
     contentType: LiteralUnion<C, string>;
     /** 点 */
-    position: S extends 'Plane' ? [Position, Position, Position, Position] : S extends '2DPoint' | '3DPoint' | 'Model' ? Position : Position | [Position, Position, Position, Position];
+    position: S extends 'Plane' ? [Position, Position, Position, Position] : S extends '2DPoint' | '3DPoint' | 'Model' ? Position : S extends '3DBox' ? BoxPosition : S extends 'Polygon' ? PolygonPosition : S extends 'Mask' ? MaskPosition : Position | [Position, Position, Position, Position];
     /** 法向量 */
     normal?: Position;
     /** 自定义标签内容 */
@@ -52,8 +52,13 @@ export type Tag<C extends TagContentType = TagContentType, S extends StickType =
     hoverEnabled?: boolean;
 } & (S extends '3DPoint' ? {
     normal: Position;
-} : unknown) & (S extends 'Model' ? {
+} : unknown) & // 三维标签需要法向量
+(S extends 'Model' ? {
     matrix: number[];
+} : unknown) & // 模型标签需要模型
+(S extends 'Mask' ? {
+    mask: string;
+    color: [number, number, number] | number;
 } : unknown) & {
     [key: string]: any;
 };

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

@@ -15,7 +15,34 @@ export interface MinMax {
     min?: number;
     max?: number;
 }
-export type StickType = '2DPoint' | '3DPoint' | 'Plane' | 'Model';
+export type StickType = '2DPoint' | '3DPoint' | 'Plane' | 'Model' | '3DBox' | 'Polygon' | 'Mask';
+/**
+ * 3DBox 位置定义
+ */
+export interface BoxPosition {
+    /** 起始点坐标 [x, y, z] */
+    start: ArrayPosition;
+    /** 结束点坐标 [x, y, z] */
+    end: ArrayPosition;
+    /** 旋转角度 [x, y, z]（欧拉角） */
+    rotation: ArrayPosition;
+}
+/** 3DBox 标签 */
+export type BoxTag<C extends TagContentType = TagContentType> = TagInstance<C, '3DBox'>;
+/**
+ * Polygon 位置定义
+ * 多边形由多个点组成，至少需要 3 个点
+ */
+export type PolygonPosition = ArrayPosition[];
+/** Polygon 标签 */
+export type PolygonTag<C extends TagContentType = TagContentType> = TagInstance<C, 'Polygon'>;
+/**
+ * Mask 位置定义
+ * Mask 标签的 position 由 mask 图和 color 计算得出，类型为普通的 Position
+ */
+export type MaskPosition = Position;
+/** Mask 标签 */
+export type MaskTag<C extends TagContentType = TagContentType> = TagInstance<C, 'Mask'>;
 /**
  * @description 标签 icon 动画配置
  */
@@ -67,6 +94,28 @@ export interface TagStyle {
          */
         size?: 'S' | 'M' | 'L' | 'XL' | number;
     } & TagIconUrl;
+    /** 3D Box 和Polygon样式 */
+    boxOrpolygon?: {
+        /** 填充颜色（十六进制） */
+        color?: number;
+        /** 填充透明度 0-1 */
+        opacity?: number;
+        /** 线条颜色（十六进制） */
+        lineColor?: number;
+        /** 线条宽度 */
+        lineWidth?: number;
+    };
+    /** Mask 标签样式 */
+    mask?: {
+        /** 高亮颜色（RGB 数组或十六进制数字） */
+        color?: [number, number, number] | number;
+        /** 透明度 0-1，用于填充区域；描边区域始终完全不透明 */
+        opacity?: number;
+        /** 颜色匹配容差（归一化值 0-1，默认 0.001） */
+        tolerance?: number;
+        /** @deprecated 使用 color 代替 */
+        highlightColor?: [number, number, number] | number;
+    };
 }
 export type TagGLTFObject = GLTFObject & {
     customID: number | string;

package/libs/PanoTagPlugin/utils/addDebugPoints.js

@@ -1,8 +1,8 @@
 import * as o from "three";
-import { arrayPositionToVector3 as c } from "../../shared-utils/positionToVector3.js";
-function M(h, p) {
-  p.forEach((t) => {
-    const r = new o.SphereGeometry(0.02, 16, 16), i = [], a = [
+import { arrayPositionToVector3 as p } from "../../shared-utils/positionToVector3.js";
+function M(l, y) {
+  y.forEach((s) => {
+    const c = new o.SphereGeometry(0.02, 16, 16), r = [], n = [
       new o.MeshBasicMaterial({ color: 16776960 }),
       // 黄
       new o.MeshBasicMaterial({ color: 16711935 }),
@@ -12,17 +12,31 @@ function M(h, p) {
       new o.MeshBasicMaterial({ color: 65535 })
       // 蓝
     ];
-    if (t.position.length === 4)
-      t.position.forEach((e, s) => {
-        const l = a[s], n = new o.Mesh(r, l);
-        n.position.copy(c(e)), i.push(n);
+    if (s.stickType === "3DBox") {
+      const e = s.position;
+      if (e != null && e.start && (e != null && e.end)) {
+        const i = new o.Mesh(c, n[0]);
+        i.position.copy(p(e.start)), r.push(i);
+        const t = new o.Mesh(c, n[1]);
+        t.position.copy(p(e.end)), r.push(t);
+      }
+    } else if (s.stickType === "Polygon") {
+      const e = s.position;
+      Array.isArray(e) && e.length > 0 && e.forEach((i, t) => {
+        const a = n[t % n.length], h = new o.Mesh(c, a);
+        h.position.copy(p(i)), r.push(h);
       });
-    else {
-      const e = a[0], s = new o.Mesh(r, e);
-      s.position.copy(c(t.position)), i.push(s);
+    } else if (Array.isArray(s.position) && s.position.length === 4)
+      s.position.forEach((e, i) => {
+        const t = n[i], a = new o.Mesh(c, t);
+        a.position.copy(p(e)), r.push(a);
+      });
+    else if (Array.isArray(s.position)) {
+      const e = n[0], i = new o.Mesh(c, e);
+      i.position.copy(p(s.position)), r.push(i);
     }
-    i.forEach((e) => {
-      e.material.depthTest = !1, h.scene.add(e);
+    r.forEach((e) => {
+      e.material.depthTest = !1, l.scene.add(e);
     });
   });
 }

package/libs/PanoTagPlugin/utils/sculptDataToBoxPosition.d.ts

@@ -0,0 +1,6 @@
+import * as THREE from 'three';
+import type { BoxPosition } from '../typings';
+/**
+ * 将 Sculpt 数据转换为 BoxPosition
+ */
+export declare function sculptDataToBoxPosition(bottomPoints: THREE.Vector3[], heightPoint: THREE.Vector3): BoxPosition;

package/libs/PanoTagPlugin/utils/sculptDataToBoxPosition.js

@@ -0,0 +1,18 @@
+import * as t from "three";
+function E(r, p) {
+  const s = new t.Vector3().subVectors(p, r[0]), y = r.map((n) => n.clone().add(s)), i = [...r, ...y], e = new t.Vector3();
+  i.forEach((n) => e.add(n)), e.divideScalar(8);
+  const x = new t.Vector3().subVectors(r[1], r[0]).clone().normalize(), l = s.clone().normalize(), V = new t.Vector3().crossVectors(x, l).normalize(), h = new t.Matrix4().makeBasis(x, l, V), m = new t.Quaternion().setFromRotationMatrix(h), a = new t.Euler().setFromQuaternion(m), w = m.clone().inverse(), c = i.map((n) => n.clone().sub(e).applyQuaternion(w)), u = c.map((n) => n.x), z = c.map((n) => n.y), d = c.map((n) => n.z), o = new t.Vector3(
+    (Math.max(...u) - Math.min(...u)) / 2,
+    (Math.max(...z) - Math.min(...z)) / 2,
+    (Math.max(...d) - Math.min(...d)) / 2
+  ), M = new t.Vector3(e.x - o.x, e.y - o.y, e.z - o.z), A = new t.Vector3(e.x + o.x, e.y + o.y, e.z + o.z);
+  return {
+    start: M.toArray(),
+    end: A.toArray(),
+    rotation: [a.x, a.y, a.z]
+  };
+}
+export {
+  E as sculptDataToBoxPosition
+};

package/libs/PanoTagPlugin/utils/tag/tagCheck.d.ts

@@ -1,9 +1,15 @@
 import type { TagContentType, TagInstance } from '../../typings';
 import type { ModelTagInterface } from '../../controller/Tag/ModelTag';
 import type { PlaneTagInterface } from '../../controller/Tag/PlaneTag';
+import type { PolygonTagInterface } from '../../controller/Tag/PolygonTag';
+import type { BoxTagInterface } from '../../controller/Tag/BoxTag';
+import type { MaskTagInterface } from '../../controller/Tag/MaskTag';
 export declare function isPlaneTag<T extends TagContentType>(tag: TagInstance<T>): tag is PlaneTagInterface<T>;
 export declare function isPoint3DTag<T extends TagContentType>(tag: TagInstance<T>): tag is TagInstance<T, '3DPoint'>;
 export declare function is3DTag<T extends TagContentType>(tag: TagInstance): tag is TagInstance<T, '3DPoint'> | TagInstance<T, 'Plane'>;
 export declare function isMediaModelTag(tag: TagInstance): tag is ModelTagInterface<'MediaModel'>;
 export declare function isModelTag(tag: TagInstance): tag is ModelTagInterface<'Model'>;
 export declare function isMediaPlaneTag(tag: TagInstance): tag is PlaneTagInterface<'MediaModel'>;
+export declare function isPolygonTag(tag: TagInstance): tag is PolygonTagInterface;
+export declare function is3DBoxTag(tag: TagInstance): tag is BoxTagInterface;
+export declare function isMaskTag(tag: TagInstance): tag is MaskTagInterface;

package/libs/PanoTagPlugin/utils/tag/tagCheck.js

@@ -1,26 +1,38 @@
-function n(e) {
-  return e.stickType === "Plane";
+function e(n) {
+  return n.stickType === "Plane";
 }
-function i(e) {
-  return e.stickType === "3DPoint";
+function i(n) {
+  return n.stickType === "3DPoint";
 }
-function t(e) {
-  return e.stickType === "3DPoint" || e.stickType === "Plane";
+function t(n) {
+  return n.stickType === "3DPoint" || n.stickType === "Plane";
 }
-function o(e) {
-  return e.stickType === "Model" && e.contentType === "MediaModel";
+function o(n) {
+  return n.stickType === "Model" && n.contentType === "MediaModel";
 }
-function c(e) {
-  return e.stickType === "Model" && e.contentType === "Model";
+function c(n) {
+  return n.stickType === "Model" && n.contentType === "Model";
 }
-function T(e) {
-  return e.stickType === "Plane" && e.contentType === "MediaPlane";
+function T(n) {
+  return n.stickType === "Plane" && n.contentType === "MediaPlane";
+}
+function s(n) {
+  return n.stickType === "Polygon";
+}
+function r(n) {
+  return n.stickType === "3DBox";
+}
+function u(n) {
+  return n.stickType === "Mask";
 }
 export {
+  r as is3DBoxTag,
   t as is3DTag,
+  u as isMaskTag,
   o as isMediaModelTag,
   T as isMediaPlaneTag,
   c as isModelTag,
-  n as isPlaneTag,
-  i as isPoint3DTag
+  e as isPlaneTag,
+  i as isPoint3DTag,
+  s as isPolygonTag
 };

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

@@ -1,4 +1,4 @@
-import { Vector3 } from 'three';
+import type { Vector3 } from 'three';
 import type { TagInstance } from '../typings';
-export declare function getTagPosition(tag: TagInstance): Vector3 | [Vector3, Vector3, Vector3, 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,22 +1,51 @@
-import { Matrix4 as n } from "three";
-import { centerPoint as e } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as a } from "./tag/tagCheck.js";
-import { anyPositionToVector3 as m, vector3Position as s } from "../../shared-utils/positionToVector3.js";
-function p(o) {
-  const i = (() => {
-    if (a(o) && o.matrix) {
-      const r = new n().fromArray(o.matrix);
-      return o.data.mediaPosition.map((t) => m(t).clone().applyMatrix4(r));
-    } else
-      return o.position;
+import { Vector3 as t, Euler as y, 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";
+function z(o) {
+  const n = e(o.start), r = e(o.end), i = new y().fromArray(o.rotation), c = new t((n.x + r.x) / 2, (n.y + r.y) / 2, (n.z + r.z) / 2), p = new t(Math.abs(r.x - n.x) / 2, Math.abs(r.y - n.y) / 2, Math.abs(r.z - n.z) / 2), m = new a().makeRotationFromEuler(i), u = [
+    // 底面4个点 (y = -0.5)
+    new t(-0.5, -0.5, -0.5),
+    new t(0.5, -0.5, -0.5),
+    new t(0.5, -0.5, 0.5),
+    new t(-0.5, -0.5, 0.5),
+    // 顶面4个点 (y = 0.5)
+    new t(-0.5, 0.5, -0.5),
+    new t(0.5, 0.5, -0.5),
+    new t(0.5, 0.5, 0.5),
+    new t(-0.5, 0.5, 0.5)
+  ], f = p.clone().multiplyScalar(2);
+  return u.map((l) => l.clone().multiply(f).applyMatrix4(m).add(c));
+}
+function s(o, n) {
+  if (!n)
+    return o;
+  const r = new a().fromArray(n);
+  return o.map((i) => i.clone().applyMatrix4(r));
+}
+function A(o) {
+  const n = (() => {
+    if (x(o) && o.position) {
+      const r = z(o.position);
+      return s(r, o.matrix);
+    }
+    if (M(o) && o.position) {
+      const r = o.position.map((i) => e(i));
+      return s(r, o.matrix);
+    }
+    if (d(o) && o.matrix) {
+      const r = o.data.mediaPosition.map((i) => e(i));
+      return s(r, o.matrix);
+    }
+    return T(o) ? o.position && Array.isArray(o.position) ? e(o.position) : (console.warn("[getTagPosition] Mask tag without position, tag id:", o.id), new t(0, 0, 0)) : o.position;
   })();
-  return s(i);
+  return P(n);
 }
-function x(o) {
-  const i = p(o);
-  return e(...Array.isArray(i) ? i : [i]);
+function S(o) {
+  const n = A(o);
+  return w(...Array.isArray(n) ? n : [n]);
 }
 export {
-  x as getTagCenterPosition,
-  p as getTagPosition
+  S as getTagCenterPosition,
+  A as getTagPosition
 };

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.77.3");
+    r(this, "VERSION", "3.78.0-alpha.0");
     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();