@realsee/dnalogel 3.0.0-0 → 3.0.0-11

package/dist/CSS3DRenderPlugin/Controller.d.ts

@@ -14,7 +14,6 @@ export interface Create3DDomContainerParamsType {
         autoRender?: boolean;
         container?: HTMLElement;
         pointerEvents?: 'none' | 'auto';
-        wrapperStyle?: Partial<CSSStyleDeclaration>;
     } & ({
         mode?: 'front';
     } | {
@@ -82,7 +81,7 @@ export default class Controller extends CSS3DRender implements BasePlugin.Contro
     };
     getBehindFiveElement(): HTMLElement;
     /**
-     * @description: 获取静态资源的url
-     */
+       * @description: 获取静态资源的url
+    */
     absoluteUrl(url: string): string;
 }

package/dist/CSS3DRenderPlugin/utils/three/CSS3DObject.d.ts

@@ -1,6 +1,5 @@
 import { CSS3DObject } from 'three/examples/jsm/renderers/CSS3DRenderer';
-import type { Matrix4, Quaternion } from 'three';
-import { Vector3 } from 'three';
+import { Matrix4, Quaternion, Vector3 } from 'three';
 import { Subscribe } from '../../../shared-utils/Subscribe';
 import OpacityMesh from './OpacityMesh';
 export declare const MinRatio = 0.00216;
@@ -35,7 +34,6 @@ export declare class CSS3DObjectPlus<T extends HTMLElement = HTMLElement> extend
         ratio?: number;
         dpr?: number;
         pointerEvents?: 'none' | 'auto';
-        style?: Partial<CSSStyleDeclaration>;
     });
     setVisible(visible: boolean, params?: {
         setSelfVisible: boolean;

package/dist/CSS3DRenderPlugin/utils/three/CSS3DRender.d.ts

@@ -47,7 +47,6 @@ export interface Create3DDElementParamsType {
         autoRender?: boolean;
         container?: HTMLElement;
         pointerEvents?: 'none' | 'auto';
-        wrapperStyle?: Partial<CSSStyleDeclaration>;
         scene?: THREE.Scene;
     } & ({
         mode?: 'front';

package/dist/PanoTagPlugin/controller/TagCache.d.ts

@@ -8,14 +8,14 @@ export declare abstract class TagCache extends BasePlugin.Controller<State, Even
     /**
      * @description: 获取缓存
      */
-    protected getPanoIndexCache(params?: {
+    protected getCache(params?: {
         panoIndex?: number;
     }): Map<TagId, TagCacheInterface>;
-    protected getPanoIndexCache(params?: {
+    protected getCache(params?: {
         panoIndex?: number;
         id: TagId;
     }): TagCacheInterface;
-    protected getPanoIndexCache(params?: {
+    protected getCache(params?: {
         panoIndex?: number;
         id: TagId;
         key: keyof TagCacheInterface;

package/dist/PanoTagPlugin/controller/TagComputer.d.ts

@@ -1,4 +1,4 @@
-import type { Five, State as FiveState } from '@realsee/five';
+import type { Five, Mode, State as FiveState } from '@realsee/five';
 import type { TagInstance } from '../typings';
 import { TagUtil } from './TagUtil';
 export declare abstract class TagComputer extends TagUtil {
@@ -6,7 +6,11 @@ export declare abstract class TagComputer extends TagUtil {
     /**
      * @description: 获取是否可见
      */
-    getVisible(tag: TagInstance, fiveState?: Partial<FiveState>): boolean;
+    getVisibleByPanoIndex(tag: TagInstance, panoIndex?: number): boolean;
+    getVisibleByFiveMode(tag: TagInstance, mode?: Mode): boolean;
+    getVisible(tag: TagInstance, state?: Partial<FiveState>): boolean;
+    /** 获取当前点位上模型中的多媒体是否应该展示 */
+    getModelMedialVisibleByPanoIndex(tag: TagInstance, panoIndex?: number): boolean;
     /**
      * @description: 获取是否展开
      */
@@ -15,16 +19,18 @@ export declare abstract class TagComputer extends TagUtil {
      * @description: 获取是否展开
      */
     getUnfoldedByCamera(tag: TagInstance): boolean;
-    protected setTagZIndex(tags: TagInstance[]): void;
-    protected calculateTagZIndex(tag: TagInstance): number;
+    protected sort<T extends TagInstance>(tags: T[]): T[];
+    protected setTagZIndex<T extends TagInstance>(tags: T[]): void;
     /**
      * @description: 一个点的标签
      */
     protected setPointTagPosition(): void;
-    protected setVisible(tags?: TagInstance[]): void;
+    protected setVisible(): void;
+    protected setVisibleByPanoIndex(): void;
+    protected setModelMedialVisible(): void;
     protected setUnfoldedByPanoIndex(): void;
     /**
-     * @description 一个点的标签
+     * @description: 一个点的标签
      */
     protected getTagProject(tag: TagInstance): {
         x: number;

package/dist/PanoTagPlugin/controller/TagRender.d.ts

@@ -1,7 +1,7 @@
 import { TagComputer } from './TagComputer';
 import type { Tag, TagInstance, TagGLTFObject, TagObjectGroup, TagGLTFObjectGroup, ImagePlaneGroup, TagContentType, ElementRenderer, TagRendererMap } from '../typings';
 import type { TemporaryState } from '../typings';
-import type { Object3D } from 'three';
+import { type Object3D } from 'three';
 import TagContainerSvelte from '../Components/TagContainer.svelte';
 import type { Five } from '@realsee/five';
 export declare abstract class TagRender extends TagComputer {
@@ -59,7 +59,6 @@ export declare abstract class TagRender extends TagComputer {
      * @description: 渲染单个点的标签
      */
     protected updateRenderPointTag(): void;
-    protected updatePointTagPosition(): void;
     protected updateTagContainerVisible(): void;
     protected disposeAllCSS3DContainer(): void;
     /**
@@ -68,7 +67,4 @@ export declare abstract class TagRender extends TagComputer {
     protected clearUnusedPanelTag(): void;
     /** 加载外部模型 */
     protected loadModel: (tag: TagInstance<'Model', 'Model'> | TagInstance<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
-    protected updateDomView(params?: {
-        withAnimation?: boolean;
-    }): void;
 }

package/dist/PanoTagPlugin/controller/TagUtil.d.ts

@@ -3,9 +3,7 @@ import * as THREE from 'three';
 import type { Tag, Tags, PointTagInstance, Point3DTag } from '../typings';
 import { TagCache } from './TagCache';
 import type { CSS3DRenderPluginExportType } from '../../CSS3DRenderPlugin';
-import { Five } from '@realsee/five';
-import type { State as FiveState } from '@realsee/five';
-import type { Mode } from '@realsee/five';
+import type { Five } from '@realsee/five';
 import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
     tags: TagInstance[];
@@ -23,6 +21,7 @@ export declare abstract class TagUtil extends TagCache {
         resizeObserverDisposerAdding: boolean;
         disposed: boolean;
     };
+    protected get isPanorama(): boolean;
     protected domEvents: FiveDomEvents;
     private mouseInfo?;
     protected constructor(five: Five);
@@ -30,17 +29,16 @@ export declare abstract class TagUtil extends TagCache {
     /** 暂停当前标签内进行的所有多媒体 */
     pauseCurrentMedia(): void;
     /**
-     * @description: 获取标签配置
+     * @description: 获取merge后的配置
      */
     getTagConfig(tag: Tag, params?: {
-        useCache?: boolean;
-        fiveMode?: Mode;
+        useCache: boolean;
     }): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
     /**
      * @description 获取标签当前状态
      */
     getCurrentVisibleState(tag: TagInstance): boolean;
-    protected loadVideoFirstFrame: () => void;
+    protected loadVideoFirstFrame(): void;
     protected updateTagConfig(): void;
     protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
     protected getRenderType(tag: TagInstance): 'Dom' | 'Mesh' | 'BehindDom';
@@ -51,7 +49,7 @@ export declare abstract class TagUtil extends TagCache {
     /**
      * @description: 获取距离
      */
-    protected getDistance(tag: TagInstance, fiveState?: Partial<FiveState>): number;
+    protected getDistance(tag: TagInstance, panoIndex?: number): number;
     protected getPositions(tag: TagInstance): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
     protected preventWhenMouseDown: () => false | void;
     protected addObjectClickHandler(tag: TagInstance, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
@@ -66,8 +64,4 @@ export declare abstract class TagUtil extends TagCache {
      * @returns isDisposed; 已经销毁返回 true，否则返回 false
      */
     protected checkDisposed(): boolean;
-    /**
-     * @description: 获取merge后的配置
-     */
-    private calculateTagConfig;
 }

package/dist/PanoTagPlugin/controller/index.d.ts

@@ -108,7 +108,11 @@ declare class PanoTagPluginController extends TagRender {
     private addEventListener;
     private addResizeListener;
     private addResizeObserver;
-    private updateVisible;
+    /**
+     * @description: 切换模式处理函数
+     */
+    private handleFiveModeChange;
+    private handleFiveInitAnimationEnded;
     private handleFiveWantsMoveToPano;
     /**
      * @description: 走点/切换模型后显示
@@ -117,11 +121,11 @@ declare class PanoTagPluginController extends TagRender {
      * @description: 走点/切换模型时临时隐藏
      */
     private clickhandler;
+    private handleFiveCameraUpdateDebounce;
     private handleFiveCameraUpdate;
     private handleFivePanoArrived;
     /** 楼层切换时，需要更新标签可见性 */
     private handleFiveModelShownFloorChange;
-    private onFiveEveryReady;
     private setUnfoldedByCamera;
     private changeTagMode;
 }

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

@@ -2,8 +2,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 { DeprecatedTagProperty } from '../../Archive/deprecated';
-import type { LiteralUnion } from 'type-fest';
+import type { ContentType, DeprecatedTagProperty } from '../../Archive/deprecated';
 export interface Tags {
     version?: string;
     /** tag配置 > 按type配置 > 全局配置 */
@@ -24,7 +23,7 @@ export type Tag<C extends TagContentType = TagContentType, S extends StickType =
     /** @type {StickType} 附着方式 */
     stickType: S;
     /** @type {TagContentType} 内容类型，根据内容类型展示对应UI */
-    contentType: LiteralUnion<C, string>;
+    contentType: C extends ContentType.Unknown ? string : C;
     /** 点 */
     position: S extends 'Plane' ? [Position, Position, Position, Position] : S extends '2DPoint' | '3DPoint' | 'Model' ? Position : Position | [Position, Position, Position, Position];
     /** 法向量 */

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

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

@@ -4,13 +4,11 @@ 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;
@@ -63,15 +61,13 @@ export interface ImagePlaneGroup extends Group {
 }
 export type AudioAppearance = TagInstance<'Audio'>['data']['appearance'];
 export type AudioTagTypeConfigKey = `${StickType | 'Any'}-Audio-${AudioAppearance}`;
-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;
+export type ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any'}` | TagContentType | AudioTagTypeConfigKey | `Mixin-${string}`;
 /**
  * @description: 从 ContentTypeConfigKey 中提取 ContentTypeConfigKey 对应的 TagContentType 是啥，没找到就是 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 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 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'>;
@@ -79,4 +75,3 @@ 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/dist/PanoTagPlugin/utils/actionAfterFiveModelLoad.d.ts

@@ -0,0 +1,4 @@
+import type { Five } from '@realsee/five';
+export declare function actionAfterFiveModelLoad(five: Five, fuc: () => any): void;
+export declare function waitFiveModelLoaded(five: Five): Promise<void>;
+export declare function fiveModelLoaded(five: Five): boolean;

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

@@ -1,8 +1,10 @@
+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/dist/PanoTagPlugin/utils/planeNormal.d.ts

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