@realsee/dnalogel 2.30.3 → 3.0.0-0

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

@@ -5,26 +5,59 @@ import type { MinMax } from './Utils';
 import type { TagInstance } from './TagInstance';
 import type { PartialObjectDeep } from '../../../typings/typings';
 import type { Vector3 } from 'three';
-type ConfigFunction = (five: Five, tagState: {
-    tag: TagInstance<any>;
-    /** 标签点或中心点的到摄像机的距离 */
-    distance: number;
-    /** 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角 */
-    angleRange?: number;
-}) => boolean;
 export interface TagConfig<C extends TagContentType = TagContentType> {
-    /** 显示/隐藏配置 */
+    /**
+     * @description: 显示/隐藏相关配置
+     */
     visibleConfig?: {
         /**
-         * @description 保持可见/不可见, 设置后visibleConfig下所有其他配置都不生效
+         * @description 在 `visibleFiveMode` 指定的 `mode` 中，保持可见/不可见。设置后 `visibleConfig` 中除了 `visibleFiveMode` 外的所有其他配置都不生效
          * @default null
+         * @example
+         * ```typescript
+         * // 在 Panorama 和 Floorplan 模式下永远保持可见
+         * const config = {
+         *  keep: 'visible',
+         *  visibleFiveMode: ['Panorama', 'Floorplan'],
+         * }
+         * // 在 tag.fiveState.mode 中时，永远保持可见
+         * const config = {
+         *  keep: 'visible',
+         * }
+         * ```
          */
         keep?: 'visible' | 'hidden' | null;
         /**
-         * @description 在哪些 five mode 下可见
-         * @default ['Panorama']
+         * @description 在哪些 `five mode` 下可见
+         * @tips 默认值的设定是在 config 合并后，而不是合并前
+         * @default
+         * ```
+         *  visibleFiveMode = tag.fiveState?.mode ?? 'Panorama'
+         * ```
+         * @example
+         * ```typescript
+         * const tag = {
+         *  ...
+         *  fiveState: {
+         *    mode: 'Floorplan',
+         *  }
+         *  ...
+         *  config: {},
+         * }
+         * // 相当于
+         * const tag = {
+         *  ...
+         *  fiveState: {
+         *    mode: 'Floorplan',
+         *  }
+         *  ...
+         *  config: {
+         *    visibleFiveMode: 'Floorplan',
+         *  },
+         * }
+         * ```
          */
-        visibleFiveMode?: Mode[];
+        visibleFiveMode?: Mode | Mode[] | 'PanoramaLike' | 'ModelLike' | 'all';
         /**
          * @description 当 visibleFiveMode 包含 'Floorplan' 或者 'MapView' 时，是否仅在当前楼层模型下可见
          * @default false
@@ -32,24 +65,27 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
         followModelVisibility?: boolean;
         /**
          * @description 走点时不隐藏
+         * @fivemode 只在全景模式下生效
          * @default false
          */
-        alwaysShowWhenMovePano?: true;
+        alwaysShowWhenMovePano?: boolean;
         /**
-         * @description min-max米内显示 | 无距离限制
+         * @description 配置可见距离
+         * @fivemode 只在全景模式下生效
          * @default 'unLimited'
          */
         visibleDistance?: MinMax | 'unLimited';
         /**
-         * @description: 限制xx点位上可见，默认为all
-         * @param all: 不限制
-         * @param current: 仅当前点位可见
-         * @param: number[] 仅指定点位可见
+         * @description 配置标签可见点位
+         * @fivemode 只在全景模式下生效
+         * @param all 不限制
+         * @param current 仅当前点位可见
+         * @param number[] 仅指定点位可见
          * @default 'all'
          */
         visiblePanoIndex?: 'all' | 'current' | number[];
         /**
-         * @description 碰撞检测配置，默认开启
+         * @description 碰撞检测配置
          * @default true
          */
         intersectRaycaster?: boolean | {
@@ -76,11 +112,14 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
         };
         /**
          * @description 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角，范围内自动展开，范围外自动收起
+         * @fivemode 只在全景模式下生效
          * @default undefined
          */
         angleRange?: MinMax;
     } | ConfigFunction;
-    /** 展开/收起配置 */
+    /**
+     * @description: 展开/收起相关配置
+     */
     unfoldedConfig?: {
         /**
          * @description: 保持展开/收起，设置后unfoldedConfig下所有其他配置都不生效
@@ -178,4 +217,11 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
     _isMerged?: boolean;
 }
 export declare const defaultGlobalConfig: TagConfig;
+type ConfigFunction = (five: Five, tagState: {
+    tag: TagInstance<any>;
+    /** 标签点或中心点的到摄像机的距离 */
+    distance: number;
+    /** 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角 */
+    angleRange?: number;
+}) => boolean;
 export {};

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

@@ -7,7 +7,7 @@ import type { Vector3 } from 'three';
 import type { ImagePlane, VideoPlane } from '../../utils/model/mediaPlane';
 import type { TagEvents } from '../controller';
 import type { TagConfig } from './TagConfig';
-import type { Subscribe } from '@realsee/five';
+import type { Mode, Subscribe } from '@realsee/five';
 import type { SetRequired } from 'type-fest';
 import type { PartialObjectDeep } from '../../../typings/typings';
 type RequiredTag<C extends TagContentType = TagContentType, S extends StickType = StickType> = SetRequired<Tag<C, S>, 'id' | 'data' | 'enabled' | 'config' | 'stickType' | 'contentType'>;
@@ -35,7 +35,7 @@ export type TagInstance<C extends TagContentType = TagContentType, S extends Sti
         promise: Promise<TagGLTFObject>;
         object?: TagGLTFObject;
     };
-    mediaVisible: boolean;
+    loading: boolean;
     play: () => void;
     pause: () => void;
 }> & {
@@ -43,6 +43,11 @@ export type TagInstance<C extends TagContentType = TagContentType, S extends Sti
         visible?: boolean;
         unfolded: boolean;
     };
+    config: TagConfig<C> & {
+        configWithFiveMode?: {
+            [key in Mode]?: TagConfig<C>;
+        };
+    };
     hooks: Subscribe<TagEvents<C>>;
     unfold: () => void;
     fold: () => void;

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

@@ -4,11 +4,13 @@ import type { TagContentType } from './TagData';
 import type { ImagePlane } from '../../utils/model/mediaPlane';
 import type { TagInstance } from './TagInstance';
 import type { TagConfig } from '../..';
+import type { Mode } from '@realsee/five';
 export type TagId = string | number;
 export type ArrayPosition = number[];
 export type Position = ArrayPosition;
 export type PanoIndex = number;
 export type WorkCode = string;
+export type ModelId = string;
 export interface MinMax {
     min?: number;
     max?: number;
@@ -61,13 +63,15 @@ export interface ImagePlaneGroup extends Group {
 }
 export type AudioAppearance = TagInstance<'Audio'>['data']['appearance'];
 export type AudioTagTypeConfigKey = `${StickType | 'Any'}-Audio-${AudioAppearance}`;
-export type ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any'}` | TagContentType | AudioTagTypeConfigKey | `Mixin-${string}`;
+type _ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any'}` | TagContentType | AudioTagTypeConfigKey | `Mixin-${string}` | 'Any';
+export type ContentTypeConfigKeySplit = [StickType | 'Any', TagContentType | 'Any'] | [TagContentType] | [StickType | 'Any', 'Audio', AudioAppearance] | ['Mixin', string] | ['Any'] | [];
+type FiveModeType = `[${Mode | 'PanoramaLike' | 'ModelLike'}]`;
+export type ContentTypeConfigKey = FiveModeType | `${FiveModeType}-${_ContentTypeConfigKey}` | _ContentTypeConfigKey;
 /**
  * @description: 从 ContentTypeConfigKey 中提取 ContentTypeConfigKey 对应的 TagContentType 是啥，没找到就是 never
  */
-export type PickTagContentTypeInContentTypeConfigKey<T extends ContentTypeConfigKey> = T extends `${any}-Audio-${any}` ? 'Audio' : T extends `Mixin-${string}` ? string : T extends `${any}-${infer C}` ? C : T extends TagContentType ? T : never;
+export type PickTagContentTypeInContentTypeConfigKey<T extends ContentTypeConfigKey> = T extends FiveModeType ? never : T extends `${FiveModeType}-${infer P extends _ContentTypeConfigKey}` ? PickTagContentTypeInContentTypeConfigKey<P> : T extends `${any}-Audio-${any}` ? 'Audio' : T extends `Mixin-${string}` ? string : T extends `${any}-${infer C}` ? C : T extends TagContentType ? T : never;
 export type TagConfigByKey<T extends ContentTypeConfigKey> = PickTagContentTypeInContentTypeConfigKey<T> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<T>> : TagConfig<any>;
-export type ContentTypeConfigKeySplit = [StickType | 'Any', TagContentType | 'Any'] | ['Mixin', string] | [TagContentType] | [StickType | 'Any', 'Audio', AudioAppearance];
 export type PointTag<C extends TagContentType = TagContentType> = TagInstance<C, '2DPoint' | '3DPoint'>;
 /** 二维标签 */
 export type Point2DTag<C extends TagContentType = TagContentType> = TagInstance<C, '2DPoint'>;
@@ -75,3 +79,4 @@ export type Point2DTag<C extends TagContentType = TagContentType> = TagInstance<
 export type Point3DTag<C extends TagContentType = TagContentType> = TagInstance<C, '3DPoint'>;
 /** 三维贴片 */
 export type PlaneTag<C extends TagContentType = TagContentType> = TagInstance<C, 'Plane'>;
+export {};

package/libs/PanoTagPlugin/utils/addDebugPoints.js

@@ -1,5 +1,5 @@
-import { arrayPositionToVector3 as c } from "../../shared-utils/positionToVector3.js";
 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 = [

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

@@ -1,10 +1,8 @@
-export * from '../../shared-utils/positionToVector3';
 export * from './addDebugPoints';
 export * from './noTypecheck';
 export * from './planeNormal';
 export * from './tagPosition';
 export * from './checkRange';
-export * from './actionAfterFiveModelLoad';
 export * from './normalPositionToPositions';
 export * from './debounce';
 export * from './throttle';

package/libs/PanoTagPlugin/utils/index.js

@@ -1,36 +1,28 @@
-import { anyPositionToVector3 as a, arrayPositionToVector3 as n, positionToVector3 as m, vector3Position as p } from "../../shared-utils/positionToVector3.js";
-import { addDebugPoints as f } from "./addDebugPoints.js";
-import { noTypecheck as x } from "./noTypecheck.js";
-import { planeNormal as l } from "./planeNormal.js";
-import { getTagCenterPosition as T, getTagPosition as g } from "./tagPosition.js";
-import { checkRange as v } from "./checkRange.js";
-import { actionAfterFiveModelLoad as b, fiveModelLoaded as u, waitFiveModelLoaded as y } from "./actionAfterFiveModelLoad.js";
-import { normalPositionToPositions as L } from "./normalPositionToPositions.js";
-import { debounce as k } from "./debounce.js";
-import { throttle as w } from "./throttle.js";
-import { binarySearchFirstBig as A, searchFirstValueSmallThanLastValue as B } from "./search.js";
-import { resizeObserver as D } from "./resizeObserver.js";
+import { addDebugPoints as p } from "./addDebugPoints.js";
+import { noTypecheck as n } from "./noTypecheck.js";
+import { planeNormal as f } from "./planeNormal.js";
+import { getTagCenterPosition as l, getTagPosition as c } from "./tagPosition.js";
+import { checkRange as h } from "./checkRange.js";
+import { normalPositionToPositions as T } from "./normalPositionToPositions.js";
+import { debounce as u } from "./debounce.js";
+import { throttle as k } from "./throttle.js";
+import { binarySearchFirstBig as F, searchFirstValueSmallThanLastValue as S } from "./search.js";
+import { resizeObserver as v } from "./resizeObserver.js";
 import "three";
+import "../../shared-utils/positionToVector3.js";
 import "../../shared-utils/three/centerPoint.js";
 import "./tag/tagCheck.js";
 export {
-  b as actionAfterFiveModelLoad,
-  f as addDebugPoints,
-  a as anyPositionToVector3,
-  n as arrayPositionToVector3,
-  A as binarySearchFirstBig,
-  v as checkRange,
-  k as debounce,
-  u as fiveModelLoaded,
-  T as getTagCenterPosition,
-  g as getTagPosition,
-  x as noTypecheck,
-  L as normalPositionToPositions,
-  l as planeNormal,
-  m as positionToVector3,
-  D as resizeObserver,
-  B as searchFirstValueSmallThanLastValue,
-  w as throttle,
-  p as vector3Position,
-  y as waitFiveModelLoaded
+  p as addDebugPoints,
+  F as binarySearchFirstBig,
+  h as checkRange,
+  u as debounce,
+  l as getTagCenterPosition,
+  c as getTagPosition,
+  n as noTypecheck,
+  T as normalPositionToPositions,
+  f as planeNormal,
+  v as resizeObserver,
+  S as searchFirstValueSmallThanLastValue,
+  k as throttle
 };

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

@@ -1,4 +1,4 @@
 import type { Vector3 } from 'three';
-import { type AnyPosition } from '.';
+import { type AnyPosition } from '../../shared-utils/positionToVector3';
 export declare function planeNormal(points: [AnyPosition, AnyPosition, AnyPosition] | [AnyPosition, AnyPosition, AnyPosition, AnyPosition]): Vector3;
 export declare function planeNormal(points: AnyPosition[]): Vector3 | void;

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

@@ -0,0 +1,2 @@
+import type { Tag, TagConfig } from '../..';
+export default function adaptConfig(config: TagConfig, tag?: Tag): void;

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

@@ -0,0 +1,7 @@
+function v(e, i) {
+  var d, l, f, o;
+  typeof e.visibleConfig == "object" && (e.visibleConfig.visibleFiveMode = (f = (l = e.visibleConfig.visibleFiveMode) != null ? l : (d = i == null ? void 0 : i.fiveState) == null ? void 0 : d.mode) != null ? f : "Panorama", e.visibleConfig.keep && (e.visibleConfig.keep === "visible" ? e.visibleConfig = { keep: e.visibleConfig.keep, visibleFiveMode: (o = e.visibleConfig) == null ? void 0 : o.visibleFiveMode } : e.visibleConfig.keep === "hidden" && (e.visibleConfig = { keep: e.visibleConfig.keep }))), typeof e.unfoldedConfig == "object" && (e.unfoldedConfig.disableFold && (e.unfoldedConfig = { keep: "unfolded" }), e.unfoldedConfig.disableUnfold && (e.unfoldedConfig = { keep: "folded" }), e.unfoldedConfig.keep && (e.unfoldedConfig = { keep: e.unfoldedConfig.keep }));
+}
+export {
+  v as default
+};

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "2.30.3");
+    i(this, "VERSION", "3.0.0-0");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -292,8 +292,7 @@ class qt extends O {
     e != null && e.selector && (this.selector = e.selector, console.warn("不推荐继续使用 params.selector 配置父容器，请使用 appendTo 方法")), this.showState = {
       mode: "Mapview",
       longitude: 0,
-      latitude: Math.PI / 2,
-      fov: 80
+      latitude: Math.PI / 2
     };
     const i = {
       northDesc: "北",

package/libs/floorplan/utils/correctFiveState.d.ts

@@ -3,7 +3,7 @@ import type { Five, Mode } from '@realsee/five';
 export interface ShowState {
     latitude: number;
     longitude: number;
-    fov: number;
+    fov?: number;
     mode: Mode;
     offset?: THREE.Vector3;
 }

package/libs/floorplan/utils/correctFiveState.js

@@ -1,54 +1,55 @@
-var c = (e, r, o) => new Promise((d, a) => {
-  var i = (t) => {
+var c = (e, t, o) => new Promise((m, n) => {
+  var i = (r) => {
     try {
-      u(o.next(t));
+      u(o.next(r));
     } catch (f) {
-      a(f);
+      n(f);
     }
-  }, n = (t) => {
+  }, a = (r) => {
     try {
-      u(o.throw(t));
+      u(o.throw(r));
     } catch (f) {
-      a(f);
+      n(f);
     }
-  }, u = (t) => t.done ? d(t.value) : Promise.resolve(t.value).then(i, n);
-  u((o = o.apply(e, r)).next());
+  }, u = (r) => r.done ? m(r.value) : Promise.resolve(r.value).then(i, a);
+  u((o = o.apply(e, t)).next());
 });
 import { to as l } from "../../shared-utils/to.js";
-import { FloorplanErrorType as m } from "./constant.js";
+import { FloorplanErrorType as p } from "./constant.js";
 import { nearlyEqual as s } from "../../shared-utils/nearlyEqual.js";
-import { changeMode as p } from "../../shared-utils/five/changeMode.js";
-function g(e, r) {
-  if (e.currentMode !== r.mode)
+import { changeMode as M } from "../../shared-utils/five/changeMode.js";
+import { omit as g } from "../../shared-utils/filter.js";
+function h(e, t) {
+  if (e.currentMode !== t.mode)
     return !1;
-  const { latitude: o, longitude: d, fov: a, offset: i } = r, { latitude: n, longitude: u, offset: t } = e.getCurrentState(), f = e.camera.fov;
-  return !(!s(o, n, 2) || !s(d, u, 2) || i !== void 0 && i.distanceTo(t) > 0.01 || a !== f);
+  const { latitude: o, longitude: m, fov: n, offset: i } = t, { latitude: a, longitude: u, offset: r } = e.getCurrentState(), f = e.camera.fov;
+  return !(!s(o, a, 2) || !s(m, u, 2) || i !== void 0 && i.distanceTo(r) > 0.01 || n !== f);
 }
-function y(e, r, o = !0) {
+function b(e, t, o = !0) {
   return c(this, null, function* () {
-    if (g(e, r) === !0)
+    if (h(e, t) === !0)
       return;
-    const a = e.getCurrentState();
-    if (a.mode !== r.mode) {
-      const [M] = yield l(p(e, [r.mode, r, void 0, o]));
-      if (M)
-        throw new Error(m.ChangeModeError);
+    const n = e.getCurrentState();
+    if (n.mode !== t.mode) {
+      const [d] = yield l(M(e, [t.mode, t, void 0, o]));
+      if (d)
+        throw d;
       return;
     }
-    const { latitude: i, longitude: n, fov: u } = a, t = Math.min(
+    const { latitude: i, longitude: a, fov: u } = n, r = Math.min(
       1e3,
       Math.max(
         200,
         Math.abs(i - Math.PI / 2) * 1e3,
-        (n > Math.PI ? 2 * Math.PI - n : n) * 500,
-        Math.abs(u - r.fov) * 10
+        (a > Math.PI ? 2 * Math.PI - a : a) * 500,
+        typeof t.fov == "number" ? Math.abs(u - t.fov) * 10 : 1 / 0
       )
-    ), [f] = yield l(e.updateCamera(r, t, o));
+    ), [f] = yield l(e.updateCamera(g(t, ["mode"]), r, o));
     if (f)
-      throw new Error(m.UpdateCameraError);
+      throw new Error(p.UpdateCameraError);
   });
 }
 export {
-  g as checkShowState,
-  y as correctFiveState
+  h as checkShowState,
+  b as correctFiveState
 };

package/libs/index.d.ts

@@ -24,4 +24,5 @@ export * from './PanoVideoPlugin';
 export * from './PipelinePlugin';
 export * from './AreaMakerPlugin';
 export * from './CurrentPanoImagePlugin';
+export * from './PanoTagPlugin';
 export * as Util from './shared-utils';