@realsee/dnalogel 2.12.0 → 2.13.1

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

@@ -1,4 +1,3 @@
-export * from './centerPoint';
 export * from './even';
 export * from './random';
 export * from './positionToVector3';

package/{libs/PanoTagPlugin/controller/TagCacheController.d.ts → dist/PanoTagPlugin/controller/TagCache.d.ts}

@@ -1,22 +1,22 @@
 import type { Five } from '@realsee/five';
 import type { ValueOf } from 'type-fest';
-import type { TagId, TagCache, State, EventMap } from '../typings';
+import type { TagId, TagCacheInterface, EventMap, State } from '../typings';
 import * as BasePlugin from '../../base/BasePlugin';
-export declare abstract class TagCacheController extends BasePlugin.Controller<State, EventMap> {
+export declare abstract class TagCache extends BasePlugin.Controller<State, EventMap> {
     private tagCacheByPanoIndex;
     protected constructor(five: Five);
     protected getCache({ panoIndex }: {
         panoIndex?: number;
-    }): Map<TagId, TagCache>;
+    }): Map<TagId, TagCacheInterface>;
     protected getCache({ panoIndex, id }: {
         panoIndex?: number;
         id: TagId;
-    }): TagCache;
-    protected getCache({ panoIndex, id, key }: {
+    }): TagCacheInterface;
+    protected getCache({ panoIndex, id, key, }: {
         panoIndex?: number;
         id: TagId;
-        key: keyof TagCache;
-    }): ValueOf<TagCache> | undefined;
+        key: keyof TagCacheInterface;
+    }): ValueOf<TagCacheInterface> | undefined;
     protected clearCache(): void;
     protected removeCache(): void;
 }

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

@@ -1,22 +1,11 @@
 import type { Five, Mode } from '@realsee/five';
 import * as THREE from 'three';
-import type { Tag, Tags, TagConfig, ContentTypeConfigKey, PlaneTag, TagElement, Point2DElement, Point3DElement, PlaneTagElement, PointTagElement, Point3DTag, TagId, ModelElement, TagContentType, StickType } from '../typings';
-import { TagCacheController } from './TagCacheController';
+import type { Tag } from '../typings';
 import { Raycaster } from 'three';
-export declare abstract class TagComputer extends TagCacheController {
-    tags: TagElement[];
-    config: {
-        globalConfig?: Tags['globalConfig'];
-        contentTypeConfig?: Tags['contentTypeConfig'];
-    };
-    protected get isPanorama(): boolean;
+import { TagUtil } from './TagUtil';
+export declare abstract class TagComputer extends TagUtil {
     private raycaster;
     protected constructor(five: Five);
-    getTagById<C extends TagContentType = any, S extends StickType = any>(id: TagId): TagElement<C, S> | undefined;
-    /**
-     * @description: 改变类型配置
-     */
-    changeContentTypeConfig(key: ContentTypeConfigKey, contentTypeConfig: TagConfig, merge?: boolean): void;
     /**
      * @description: 获取是否可见
      */
@@ -35,19 +24,6 @@ export declare abstract class TagComputer extends TagCacheController {
      * @description: 获取是否展开
      */
     getUnfoldedByCamera(tag: Tag<any, any>): boolean;
-    /**
-     * @description: 获取距离
-     */
-    getDistance(tag: Tag<any, any>, panoIndex?: number): number;
-    /**
-     * @description: 获取角度
-     */
-    getAngle(tag: Point3DTag | PlaneTag, panoIndex?: number): number;
-    /**
-     * @description: 获取merge后的配置
-     */
-    getTagConfig(tag: Tag<any, any>): TagConfig<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown", StickType>;
-    protected can(action: 'show' | 'hide' | 'fold' | 'unfold', tag: Tag<any, any>): boolean;
     protected sort<T extends Tag<any, any>>(tags: T[]): T[];
     /**
      * @description: 一个点的标签
@@ -64,15 +40,6 @@ export declare abstract class TagComputer extends TagCacheController {
         y: number;
         z: number;
     };
-    protected filterPointTag(): PointTagElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
-    protected filter2DPointTag(): Point2DElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
-    protected filter3DPointTag(): Point3DElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
-    protected filterModelTag(): ModelElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
-    protected filter3DTag(): TagElement<any, "Model" | "3DPoint" | "Plane">[];
-    protected filterPlaneTag(): PlaneTagElement[];
-    protected updateTagConfig(params?: {
-        force?: boolean;
-    }): void;
     /** 通过射线检测标签可用性 */
     protected getTagEnableByIntersect(tag: Tag<any, any>, raycaster: Raycaster): {
         value: boolean;

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

@@ -0,0 +1,58 @@
+import { TagComputer } from './TagComputer';
+import type { Tag, TagElement, TagGLTFObject, TagObjectGroup, TagGLTFObjectGroup, ImagePlaneGroup } from '../typings';
+import type { TemporaryState } from '../typings';
+import { Object3D } from 'three';
+import TagContainerSvelte from '../Components/TagContainer.svelte';
+import { Five } from '@realsee/five';
+export declare abstract class TagRender extends TagComputer {
+    protected group: TagObjectGroup;
+    protected imagePlaneGroup: ImagePlaneGroup;
+    protected gltfObjectGroup: TagGLTFObjectGroup;
+    /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
+    protected enabledModelTagSet: Set<string | number>;
+    /** 临时状态 */
+    protected temporaryState: TemporaryState;
+    /** 点标签 */
+    protected TagContainerSvelte?: TagContainerSvelte;
+    constructor(five: Five);
+    clearTags(): void;
+    /**
+     * @description: 更新所有标签
+     */
+    protected updateRenderAllTags(): void;
+    protected updateRenderImageModel(): void;
+    /**
+     * @description: 渲染3D贴片
+     */
+    protected updateRenderPlaneTag(): void;
+    /** 更新所有模型标签
+     *
+     * 1. 移除不应该在场景中的模型
+     * 2. 更新模型的可见性
+     *
+     * FIXME: 有性能问题，但是之前的逻辑都是这么写，暂时先这样吧
+     */
+    protected updateRenderModelTag(): void;
+    protected updateTagModelVisible(): void;
+    /** 更新标签中多媒体面片的位置
+     * @param tag 标签
+     * @param model 模型
+     * @param scale css3DObject 原始缩放比例
+     */
+    protected updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagElement<any, S>, model: Object3D): void;
+    /** 添加模型标签 */
+    protected addMediaModelTag(tags: Tag[]): Promise<void>;
+    /**
+     * @description: 渲染单个点的标签
+     */
+    protected updateRenderPointTag(): void;
+    protected updateTagContainerVisible(): void;
+    protected disposeAllCSS3DContainer(): void;
+    /**
+     * @description: 检查并销毁不用的3D贴片
+     */
+    protected clearUnusedPanelTag(): void;
+    /** 加载外部模型 */
+    protected loadModel: (tag: TagElement<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
+    private updateTagCss3DObjectVisible;
+}

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

@@ -0,0 +1,56 @@
+import type { TagElement, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
+import type { Tag, Tags, Point2DElement, Point3DElement, PlaneTagElement, PointTagElement, Point3DTag, ModelElement } from '../typings';
+import { TagCache } from './TagCache';
+import { CSS3DRenderPluginExportType } from '../../CSS3DRenderPlugin';
+import { Five } from '@realsee/five';
+export declare abstract class TagUtil extends TagCache {
+    config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
+    tags: TagElement[];
+    protected mediaStore: MediaStore;
+    /** css3DRenderPlugin */
+    protected css3DRenderPlugin?: CSS3DRenderPluginExportType;
+    protected store: {
+        /** 清理函数数组 */
+        disposers: (() => any)[];
+        visibleWithAnimation?: boolean;
+        css3DRenderDisposer: Map<TagId, () => void>;
+        eventListenerDisposer?: () => void;
+        resizeObserverDisposer?: () => void;
+        resizeObserverDisposerAdding: boolean;
+        disposed: boolean;
+    };
+    protected get isPanorama(): boolean;
+    protected constructor(five: Five);
+    getTagById<C extends TagContentType = any, S extends StickType = any>(id: TagId): TagElement<C, S> | undefined;
+    /** 暂停当前标签内进行的所有多媒体 */
+    pauseCurrentMedia(): void;
+    /**
+     * @description: 获取merge后的配置
+     * TODO: 缓存
+     */
+    getTagConfig(tag: Tag<any, any>): TagConfig<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown", StickType>;
+    protected loadVideoFirstFrame(): void;
+    protected updateTagConfig(params?: {
+        force?: boolean;
+    }): void;
+    protected can<T extends TagElement<any, any>>(action: 'show' | 'hide' | 'fold' | 'unfold' | 'renderByMesh', paramsTag: T): boolean;
+    /**
+     * @description: 获取角度
+     */
+    protected getAngle(tag: Point3DTag | PlaneTag, panoIndex?: number): number;
+    /**
+     * @description: 获取距离
+     */
+    protected getDistance(tag: Tag<any, any>, panoIndex?: number): number;
+    protected get filterPointTag(): PointTagElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
+    protected get filter2DPointTag(): Point2DElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
+    protected get filter3DPointTag(): Point3DElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
+    protected get filterImageModel(): PlaneTagElement<"MediaPlane">[];
+    protected get filterModelTag(): ModelElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
+    protected get filter3DTag(): (TagElement<any, "Plane"> | TagElement<any, "Model"> | TagElement<any, "3DPoint">)[];
+    /**
+     * @description 检查是否已经销毁
+     * @returns isDisposed; 已经销毁返回 true，否则返回 false
+     */
+    protected checkDisposed(): boolean;
+}

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

@@ -1,11 +1,10 @@
-import type { Tag, PartialDeep, TagId, Tags, TagElement, State, AddTagConfig, LoadTagConfig } from '../typings';
+import type { Tag, PartialDeep, TagId, Tags, TagElement, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig } from '../typings';
 import type { TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
 import { Five } from '@realsee/five';
-import { Object3D } from 'three';
-import { TagComputer } from './TagComputer';
+import { TagRender } from './TagRender';
 export declare const pluginFlag: (name: string) => string;
-declare class PanoTagPluginController extends TagComputer {
+declare class PanoTagPluginController extends TagRender {
     /** state */
     state: {
         enabled: boolean;
@@ -15,25 +14,9 @@ declare class PanoTagPluginController extends TagComputer {
     private params;
     /** debug */
     private debug;
-    /** css3DRenderPlugin */
-    private css3DRenderPlugin?;
-    /** 点标签 */
-    private TagContainerSvelte?;
-    /** 临时状态 */
-    private temporaryState;
-    private mediaStore;
-    private group;
-    private gltfObjectGroup;
-    private isIOSWX;
-    private store;
-    /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
-    private enabledModelTagSet;
     constructor(five: Five, params?: {
+        config?: Pick<Tags, 'contentTypeConfig' | 'globalConfig'>;
         debug?: boolean;
-        config?: {
-            globalConfig?: Tags['globalConfig'];
-            contentTypeConfig?: Tags['contentTypeConfig'];
-        };
     });
     /**
      * @description: 加载数据
@@ -42,16 +25,19 @@ declare class PanoTagPluginController extends TagComputer {
     /**
      * @description: 添加标签
      */
-    addTag(tag: Tag<any, any> | Tag<any, any>[], config?: AddTagConfig): Promise<void>;
+    addTag(tag: Tag<any, any> | Tag<any, any>[], paramsConfig?: AddTagConfig): Promise<void>;
     /**
      * @description: 改变配置
      */
-    changeConfig(config: TagComputer['config'], merge?: boolean): void;
+    changeConfig(config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>, merge?: boolean): void;
     /**
      * @description: 改变全局配置
      */
-    changeGlobalConfig(globalConfig: TagComputer['config']['globalConfig'], merge?: boolean): void;
-    clearTags(): void;
+    changeGlobalConfig(globalConfig: Tags['globalConfig'], merge?: boolean): void;
+    /**
+     * @description: 改变类型配置
+     */
+    changeContentTypeConfig(key: ContentTypeConfigKey, contentTypeConfig: TagConfig, merge?: boolean): void;
     show(params?: {
         userAction?: boolean;
         withAnimation?: boolean;
@@ -66,15 +52,16 @@ declare class PanoTagPluginController extends TagComputer {
     disable(params?: {
         userAction?: boolean;
     }): void;
-    /**
-     * @description: 销毁
-     */
-    dispose(): void;
     setState(state: Partial<State>, params: {
         userAction?: boolean;
         visibleWithAnimation?: boolean;
     }): void;
+    /**
+     * @description: 销毁
+     */
+    dispose(): void;
     changeUnfoldedById(id: TagId, unfolded: boolean): void;
+    changeEnabledById(id: TagId, enabled: boolean): void;
     /**
      * @description: 修改3D标签normal
      */
@@ -97,17 +84,8 @@ declare class PanoTagPluginController extends TagComputer {
      * @description: 销毁tag
      */
     destroyTagById(id: TagId | TagId[]): void;
-    /** 暂停当前标签内进行的所有多媒体 */
-    pauseCurrentMedia(): void;
     /** 更改 tag 模型 */
     changeTagModel: (tag: TagElement<any, 'Model'>, data: PartialDeep<Tag<'MediaModel'>['data']>) => Promise<void>;
-    /** 更新标签中多媒体面片的位置
-     * @param tag 标签
-     * @param model 模型
-     * @param scale css3DObject 原始缩放比例
-     */
-    updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagElement<any, S>, model: Object3D): void;
-    private updateTagCss3DObjectVisible;
     /**
      * @description: 设置 visible 和 unfolded
      */
@@ -116,12 +94,10 @@ declare class PanoTagPluginController extends TagComputer {
     private handleHide;
     private handleEnable;
     private handleDisable;
-    private disposedErrorLog;
     /**
      * @description: 添加 cameraUpdate, panoArrived 等事件监听
      */
     private addEventListener;
-    private loadVideoFirstFrame;
     private addResizeListener;
     private addResizeObserver;
     /**
@@ -133,48 +109,16 @@ declare class PanoTagPluginController extends TagComputer {
     /**
      * @description: 走点/切换模型后显示
      */
-    private temporaryShow;
     /**
      * @description: 走点/切换模型时临时隐藏
      */
-    private temporaryHide;
     private clickhandler;
-    /**
-     * @description: 更新所有标签
-     */
-    private updateRenderAllTags;
-    private updateTagContainerVisible;
     private handleFiveCameraUpdateDebounce;
     private handleFiveCameraUpdate;
     private handleFivePanoArrived;
     /** 楼层切换时，需要更新标签可见性 */
     private handleFiveModelShownFloorChange;
     private setUnfoldedByCamera;
-    /**
-     * @description: 渲染单个点的标签
-     */
-    private updateRenderPointTag;
-    /**
-     * @description: 渲染3D贴片
-     */
-    private updateRenderPlaneTag;
-    /** 更新所有模型标签
-     *
-     * 1. 移除不应该在场景中的模型
-     * 2. 更新模型的可见性
-     *
-     * FIXME: 有性能问题，但是之前的逻辑都是这么写，暂时先这样吧
-     */
-    private updateRenderModelTag;
-    private disposeAllCSS3DContainer;
-    /**
-     * @description: 检查并销毁不用的3D贴片
-     */
-    private checkPanelTag;
-    /** 添加模型标签 */
-    private addMediaModelTag;
-    /** 加载外部模型 */
-    private loadModel;
     private changeTagMode;
 }
 export default PanoTagPluginController;

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

@@ -5,10 +5,10 @@ import type { Vector3 } from 'three';
 import type { Create3DDomContainerReturnType } from '../../CSS3DRenderPlugin';
 import type { Writable } from 'svelte/store';
 import type { Subscribe } from '@realsee/five';
-import type { TagId, StickType } from './tag/Utils';
+import type { TagId, StickType, TagGLTFObject } from './tag/Utils';
 import type { TagContentType } from './tag/TagData';
 import type { Tag } from './tag/Tag';
-import { GLTFObject } from '@realsee/five/gltf-loader';
+import type ImageModel from '../utils/model/imageModel';
 declare type NonNullable<T> = T extends null | undefined | void ? never : T;
 export declare type TagHooks = InstanceType<typeof PanoTagPluginController>['hooks'];
 export interface State extends BasePlugin.State {
@@ -68,7 +68,7 @@ export declare type TagEvents = {
     show: () => void;
     hide: () => void;
 };
-export interface TagCache {
+export interface TagCacheInterface {
     visible?: boolean;
     unfolded?: boolean;
     minimumDistanceResult?: boolean;
@@ -81,16 +81,11 @@ export interface TagCache {
         reason?: string;
     };
 }
-export declare type TagGLTFObject = GLTFObject & {
-    customID: number | string;
-    isTagModel: boolean;
-};
 export declare type TagElement<C extends TagContentType = TagContentType, S extends StickType = StickType> = Tag<C, S> & Partial<{
     pointTagStyle: {
         leftPercent: number;
         topPercent: number;
     };
-    clickable: boolean;
     temporaryState: {
         visible: boolean;
     };
@@ -100,6 +95,12 @@ export declare type TagElement<C extends TagContentType = TagContentType, S exte
         initialNormal: Vector3;
         currentNormal: Vector3;
     };
+    imageModel: ImageModel;
+    model: {
+        promise: Promise<TagGLTFObject>;
+        object?: TagGLTFObject;
+    };
+    mediaVisible: boolean;
     play: () => void;
     pause: () => void;
 }> & {
@@ -109,14 +110,12 @@ export declare type TagElement<C extends TagContentType = TagContentType, S exte
     };
     hooks: Subscribe<TagEvents>;
     mergedConfig: TagConfig<C, S>;
-} & (S extends 'Model' ? {
-    model?: {
-        promise: Promise<TagGLTFObject>;
-        object?: TagGLTFObject;
-    };
-} : unknown) & (C extends 'MediaModel' ? {
-    mediaVisible?: boolean;
-} : unknown);
+    unfold: () => void;
+    fold: () => void;
+    enable: () => void;
+    disable: () => void;
+    destroy: () => void;
+};
 export declare type MediaStore = Writable<{
     currentMediaElement: HTMLMediaElement | null;
 }>;

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

@@ -85,5 +85,7 @@ export interface TagConfig<C extends TagContentType = TagContentType, S extends
         unfolded?: boolean;
     };
     tag3DConfig?: Create3DDomContainerParamsType['config'];
+    /** 当图片为一张时可以通过Mesh渲染 */
+    renderType?: 'Mesh' | 'Dom';
     clickable?: false;
 }

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

@@ -1,5 +1,8 @@
+import { GLTFObject } from '@realsee/five/gltf-loader';
+import { Group } from 'three';
 import type { Tag } from './Tag';
 import type { TagContentType } from './TagData';
+import ImageModel from '../../utils/model/imageModel';
 export declare type TagId = string | number;
 export declare type ArrayPosition = number[];
 export declare type Position = ArrayPosition;
@@ -43,6 +46,19 @@ export interface TagStyle {
         size?: TagIconSize;
     } & TagIconUrl;
 }
+export declare type TagGLTFObject = GLTFObject & {
+    customID: number | string;
+    isTagModel: boolean;
+};
+export interface TagObjectGroup extends Group {
+    children: Array<TagGLTFObjectGroup>;
+}
+export interface TagGLTFObjectGroup extends Group {
+    children: TagGLTFObject[];
+}
+export interface ImagePlaneGroup extends Group {
+    children: ImageModel[];
+}
 /**
  * @description S: 18; M: 20; L: 24; XL: 28
  */

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

@@ -0,0 +1 @@
+export declare const isIOSWX: boolean;

package/dist/PanoTagPlugin/utils/model/imageModel.d.ts

@@ -0,0 +1,8 @@
+import * as THREE from 'three';
+import { Vector3 } from 'three';
+declare class ImageModel extends THREE.Mesh {
+    name: string;
+    imageSrc?: string;
+    constructor(imageSrc: string, cornerPoints: Vector3[]);
+}
+export default ImageModel;

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

@@ -1,8 +1,8 @@
 import type { Tag, TagElement } from '../../typings';
-export declare function isPointTag(tag: Tag): boolean;
-export declare function isPlaneTag(tag: Tag): boolean;
-export declare function isPoint2DTag(tag: Tag): boolean;
-export declare function isPoint3DTag(tag: Tag): boolean;
-export declare function is2DTag(tag: Tag): boolean;
-export declare function is3DTag(tag: Tag): boolean;
-export declare function isMediaModelTag(tag: Tag): tag is TagElement<'MediaModel', 'Model'>;
+export declare function isPointTag(tag: Tag<any, any>): boolean;
+export declare function isPlaneTag(tag: Tag<any, any>): boolean;
+export declare function isPoint2DTag(tag: Tag<any, any>): boolean;
+export declare function isPoint3DTag(tag: Tag<any, any>): boolean;
+export declare function is2DTag(tag: Tag<any, any>): boolean;
+export declare function is3DTag(tag: Tag<any, any>): boolean;
+export declare function isMediaModelTag(tag: Tag<any, any>): tag is TagElement<'MediaModel', 'Model'>;