@realsee/dnalogel 2.6.6 → 2.6.7-dev.0

package/dist/CSS3DRenderPlugin/Controller.d.ts

@@ -17,7 +17,7 @@ export interface Create3DDomContainerParamsType {
         mode?: 'front';
     } | {
         mode: 'behind';
-        behindFiveContainer: HTMLElement;
+        behindFiveContainer?: HTMLElement;
     });
 }
 export default class Controller extends CSS3DRender implements BasePlugin.Controller<CSS3DRenderState, CSS3DRenderEventMap> {

package/dist/Object3DHelperPlugin/Controller.d.ts

@@ -1,16 +1,19 @@
-import type { Five } from '@realsee/five';
+import { Five } from '@realsee/five';
 import * as BasePlugin from '../base/BasePlugin';
-import type * as THREE from 'three';
-import { Object3DHelper } from '../shared-utils/Object3DHelper';
+import * as THREE from 'three';
+import { Object3DHelper } from '../shared-utils/Object3DHelper/index';
 import type { Object3DHelperState } from '../shared-utils/Object3DHelper/typings';
-import type { Object3DHelperPluginEventMap, Object3DHelperPluginState } from './typings';
+import type { HelperConfig, HelperOffset, Object3DHelperPluginEventMap, Object3DHelperPluginState } from './typings';
 export declare const VERSION = "v1.0.0";
 export declare const PLUGIN: string;
 export declare class Object3DHelperController extends BasePlugin.Controller<Object3DHelperPluginState, Object3DHelperPluginEventMap> {
     version: string;
     name: string;
     state: Object3DHelperState;
-    objectHelperMap: Map<THREE.Object3D, Object3DHelper>;
+    objectHelperMap: Map<THREE.Object3D, {
+        helper: Object3DHelper;
+        disposers: (() => any)[];
+    }>;
     private css3DObjectParentMap;
     private css3DRender;
     constructor(five: Five);
@@ -45,7 +48,10 @@ export declare class Object3DHelperController extends BasePlugin.Controller<Obje
     setState(state: Partial<Object3DHelperState>, options?: {
         userAction?: boolean;
     } & Record<string, any>): void;
-    getObject3DHelper(object3D: THREE.Object3D): Object3DHelper;
+    getObject3DHelper(object3D: THREE.Object3D): {
+        helper: Object3DHelper;
+        disposers: (() => any)[];
+    };
     /**
      * @description 添加 helper
      * @param { THREE.Object3D } object3D       要添加helper的物体
@@ -54,14 +60,23 @@ export declare class Object3DHelperController extends BasePlugin.Controller<Obje
      * @param { boolean } config.scaleHelper    缩放helper
      */
     addObject3DHelper(object3D: THREE.Object3D, config?: {
-        moveHelper?: boolean;
-        rotateHelper?: boolean;
-        scaleHelper?: boolean;
-    }): void;
+        moveHelper?: HelperConfig<{
+            offset?: HelperOffset;
+        }>;
+        rotateHelper?: HelperConfig<{
+            offset?: HelperOffset;
+            yzCircleEnable?: boolean;
+            xzCircleEnable?: boolean;
+            xyCircleEnable?: boolean;
+        }>;
+        scaleHelper?: HelperConfig;
+        boundingBoxHelper?: HelperConfig;
+    }): void | import("../shared-utils/Object3DHelper/typings").ObjectHelperControllers;
     removeObject3DHelper(object3D: THREE.Object3D): void;
     private handleEnable;
     private handleVisible;
     private handleDispose;
     private everyHelperDo;
     private actionIfStateIsEnabled;
+    private getConfig;
 }

package/dist/Object3DHelperPlugin/FiveControllerWrapper.d.ts

@@ -1,19 +1,17 @@
 /**
  * @description: 将手势操作绑定到controller上
  */
-import type { Five } from '@realsee/five';
+import type { Five, Subscribe } from '@realsee/five';
 import type { BaseController } from '../shared-utils/Object3DHelper/Base/BaseController';
 import type * as THREE from 'three';
-import type { BaseHelper } from '../shared-utils/Object3DHelper/Helper';
-declare class ControllerWrapper<Helper extends BaseHelper = BaseHelper, Controller extends BaseController = BaseController<Helper>> {
-    helperController?: Controller;
+declare class ControllerWrapper<HelperControllerInterface extends new (...params: ConstructorParameters<typeof BaseController<any>>) => any> {
+    helperController?: InstanceType<HelperControllerInterface>;
     private five;
-    constructor(five: Five, HelperController: new (...params: ConstructorParameters<typeof BaseController<Helper>>) => Controller, object: THREE.Object3D, helperObjects: Helper);
+    constructor(five: Five, HelperController: HelperControllerInterface, object: THREE.Object3D, helperObject3D: InstanceType<HelperControllerInterface>['helperObject3D'], HelperControllerConfig?: ConstructorParameters<HelperControllerInterface>[1], hooks?: Subscribe<any>);
+    dispose(): void;
     private onFiveWantsTapGesture;
     private onFiveWantsGesture;
+    private onFiveIntersectionOnModelUpdate;
 }
-declare const controllerWrapper: <Helper extends BaseHelper<THREE.Object3D> = BaseHelper<THREE.Object3D>, Controller extends BaseController<BaseHelper<THREE.Object3D>, THREE.Object3D> = BaseController<Helper, THREE.Object3D>>(five: Five, HelperController: new (camera: THREE.Camera, model: THREE.Object3D, originObject3D: THREE.Object3D, helperObject3D: Helper, container: HTMLElement, scene: THREE.Scene, onRender?: () => void) => Controller, object: THREE.Object3D, helperObjects: Helper) => ControllerWrapper<Helper, Controller>;
 export { ControllerWrapper };
-export { controllerWrapper };
 export { ControllerWrapper as FiveControllerWrapper };
-export { controllerWrapper as fiveControllerWrapper };

package/dist/Object3DHelperPlugin/typings.d.ts

@@ -3,6 +3,20 @@ export interface Object3DHelperPluginState {
     visible: boolean;
     disposed: boolean;
 }
+export interface HelperOffset {
+    x: number | {
+        percents: number;
+    };
+    y: number | {
+        percents: number;
+    };
+    z: number | {
+        percents: number;
+    };
+}
+export declare type HelperConfig<T extends Object = {}> = boolean | ({
+    enable: boolean;
+} & T);
 export declare type Object3DHelperPluginEventMap = {
     show: (options?: {
         userAction?: boolean;

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

@@ -18,4 +18,5 @@ export declare abstract class TagCacheController extends BasePlugin.Controller<S
         key: keyof TagCache;
     }): ValueOf<TagCache> | undefined;
     protected clearCache(): void;
+    protected removeCache(): void;
 }

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

@@ -1,6 +1,8 @@
 import type { Five } from '@realsee/five';
-import type { Tag, Tags, TagConfig, ContentTypeConfigKey, PlaneTag, TagElement, Point2DElement, Point3DElement, PlaneTagElement, PointTagElement, Point3DTag, TagId } from '../typings';
+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 { Raycaster } from 'three';
 export declare abstract class TagComputer extends TagCacheController {
     tags: TagElement[];
     config: {
@@ -10,7 +12,7 @@ export declare abstract class TagComputer extends TagCacheController {
     protected get isPanorama(): boolean;
     private raycaster;
     protected constructor(five: Five);
-    getTagById(id: TagId): TagElement<import("../typings").TagContentType, import("../typings").StickType>;
+    getTagById<C extends TagContentType = any, S extends StickType = any>(id: TagId): TagElement<C, S>;
     /**
      * @description: 改变类型配置
      */
@@ -19,6 +21,8 @@ export declare abstract class TagComputer extends TagCacheController {
      * @description: 获取是否可见
      */
     getVisibleByPanoIndex(tag: Tag<any, any>, panoIndex?: number): boolean;
+    /** 获取当前点位上模型中的多媒体是否应该展示 */
+    getModelMedialVisibleByPanoIndex(tag: Tag<any, any>): boolean;
     /**
      * @description: 获取是否展开
      */
@@ -38,7 +42,7 @@ export declare abstract class TagComputer extends TagCacheController {
     /**
      * @description: 获取merge后的配置
      */
-    getTagConfig(tag: Tag<any, any>): TagConfig<import("../typings").TagContentType, import("../typings").StickType>;
+    getTagConfig(tag: Tag<any, any>): TagConfig<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "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[];
     /**
@@ -46,6 +50,7 @@ export declare abstract class TagComputer extends TagCacheController {
      */
     protected setPointTagPosition(): void;
     protected setVisibleByPanoIndex(): void;
+    protected setModelMedialVisibleByPanoIndex(): void;
     protected setUnfoldedByPanoIndex(): void;
     /**
      * @description: 一个点的标签
@@ -55,12 +60,23 @@ export declare abstract class TagComputer extends TagCacheController {
         y: number;
         z: number;
     };
-    protected filterPointTag(): PointTagElement<import("../typings").TagContentType>[];
-    protected filter2DPointTag(): Point2DElement<import("../typings").TagContentType>[];
-    protected filter3DPointTag(): Point3DElement<import("../typings").TagContentType>[];
+    protected filterPointTag(): PointTagElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
+    protected filter2DPointTag(): Point2DElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
+    protected filter3DPointTag(): Point3DElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
+    protected filterModelTag(): ModelElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
     protected filter3DTag(): TagElement<any, "3DPoint" | "Plane">[];
     protected filterPlaneTag(): PlaneTagElement[];
     protected updateTagConfig(params?: {
         force?: boolean;
     }): void;
+    /** 通过射线检测标签可用性 */
+    protected getTagEnableByIntersect(tag: Tag<any, any>, raycaster: Raycaster): {
+        value: boolean;
+        reason: string;
+    };
+    /** 获取点位看向标签的射线 */
+    protected getRaycasterFromPanoIndex(tag: Tag, panoIndex: number): THREE.Raycaster;
+    /** 检测 target floor index 是否匹配当前楼层 */
+    protected checkFloorIndex(tag: TagElement): boolean;
+    protected changeTagMode(tag: TagElement<'MediaModel', 'Model'>, mode: 'behind' | 'front'): void;
 }

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

@@ -1,7 +1,8 @@
-import type { Tag, PartialDeep, TagId, Tags, State, AddTagConfig, LoadTagConfig } from '../typings';
+import type { Tag, PartialDeep, TagId, Tags, TagElement, State, AddTagConfig, LoadTagConfig } from '../typings';
 import type { TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
 import { Five } from '@realsee/five';
+import { Object3D } from 'three';
 import { TagComputer } from './TagComputer';
 export declare const pluginFlag: (name: string) => string;
 declare class PanoTagPluginController extends TagComputer {
@@ -23,8 +24,12 @@ declare class PanoTagPluginController extends TagComputer {
     /** 临时状态 */
     private temporaryState;
     private mediaStore;
+    private group;
+    private gltfObjectGroup;
     private isIOSWX;
     private store;
+    /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
+    private enabledModelTagSet;
     constructor(five: Five, params?: {
         debug?: boolean;
         config?: {
@@ -35,11 +40,11 @@ declare class PanoTagPluginController extends TagComputer {
     /**
      * @description: 加载数据
      */
-    load(data: Tags, config?: LoadTagConfig): Promise<boolean>;
+    load(data: Tags, config?: LoadTagConfig): Promise<void>;
     /**
      * @description: 添加标签
      */
-    addTag(tag: Tag | Tag[], config?: AddTagConfig): Promise<boolean>;
+    addTag(tag: Tag<any, any> | Tag<any, any>[], config?: AddTagConfig): Promise<void>;
     /**
      * @description: 改变配置
      */
@@ -89,15 +94,21 @@ declare class PanoTagPluginController extends TagComputer {
     /**
      * @description: 改变tag任意属性
      */
-    changeTagById<C extends TagContentType = any>(id: TagId, tag: PartialDeep<{
-        [P in keyof Pick<Tag<C>, 'enabled' | 'style' | 'stickType' | 'contentType' | 'data' | 'normal' | 'config'>]: Tag[P];
-    }>, deepMerge?: boolean): void;
+    changeTagById<C extends TagContentType = any>(id: TagId, tag: PartialDeep<Tag<C>>, deepMerge?: boolean): void;
     /**
      * @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;
     /**
      * @description: 设置 visible 和 unfolded
      */
@@ -118,6 +129,7 @@ declare class PanoTagPluginController extends TagComputer {
      * @description: 切换模式处理函数
      */
     private handleFiveModeChange;
+    private handleFiveInitAnimationEnded;
     private handleFiveWantsMoveToPano;
     /**
      * @description: 走点/切换模型后显示
@@ -136,6 +148,8 @@ declare class PanoTagPluginController extends TagComputer {
     private handleFiveCameraUpdateDebounce;
     private handleFiveCameraUpdate;
     private handleFivePanoArrived;
+    /** 楼层切换时，需要更新标签可见性 */
+    private handleFiveModelShownFloorChange;
     private setUnfoldedByCamera;
     /**
      * @description: 渲染单个点的标签
@@ -145,11 +159,23 @@ declare class PanoTagPluginController extends TagComputer {
      * @description: 渲染3D贴片
      */
     private updateRenderPlaneTag;
+    /** 更新所有模型标签
+     *
+     * 1. 移除不应该在场景中的模型
+     * 2. 更新模型的可见性
+     *
+     * FIXME: 有性能问题，但是之前的逻辑都是这么写，暂时先这样吧
+     */
+    private updateRenderModelTag;
     private disposeAllCSS3DContainer;
     /**
      * @description: 检查并销毁不用的3D贴片
      */
     private checkPanelTag;
+    /** 添加模型标签 */
+    private addMediaModelTag;
+    /** 加载外部模型 */
+    private loadModel;
 }
 export default PanoTagPluginController;
 export { PanoTagPluginController };

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

@@ -8,6 +8,7 @@ import type { Subscribe } from '@realsee/five';
 import type { TagId, StickType } from './tag/Utils';
 import type { TagContentType } from './tag/TagData';
 import type { Tag } from './tag/Tag';
+import { GLTFObject } from '@realsee/five/gltf-loader';
 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 {
@@ -73,11 +74,17 @@ export interface TagCache {
     minimumDistanceResult?: boolean;
     distance?: number;
     angle?: number;
-    __debug_visiblereason__?: {
+    /** MedialModelTag 中，多媒体的隐藏 & 展示 */
+    modelMedialVisible?: boolean;
+    __debug_visible_reason__?: {
         value: boolean;
         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;
@@ -102,7 +109,14 @@ 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);
 export declare type MediaStore = Writable<{
     currentMediaElement: HTMLMediaElement | null;
 }>;
@@ -110,4 +124,5 @@ export declare type PointTagElement<C extends TagContentType = TagContentType> =
 export declare type PlaneTagElement<C extends TagContentType = TagContentType> = TagElement<C, 'Plane'>;
 export declare type Point2DElement<C extends TagContentType = TagContentType> = TagElement<C, '2DPoint'>;
 export declare type Point3DElement<C extends TagContentType = TagContentType> = TagElement<C, '3DPoint'>;
+export declare type ModelElement<C extends TagContentType = TagContentType> = TagElement<C, 'Model'>;
 export {};

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

@@ -30,7 +30,7 @@ export declare type Tag<C extends TagContentType = TagContentType, S extends Sti
     /** @type {TagContentType} 内容类型，根据内容类型展示对应UI */
     contentType: C;
     /** 点 */
-    position: S extends 'Plane' ? [Position, Position, Position, Position] : S extends '2DPoint' | '3DPoint' ? Position : any;
+    position: S extends 'Plane' ? [Position, Position, Position, Position] : S extends '2DPoint' | '3DPoint' | 'Model' ? Position : any;
     /** 法向量 */
     normal?: Position;
     /** 自定义标签内容 */
@@ -50,4 +50,7 @@ export declare type Tag<C extends TagContentType = TagContentType, S extends Sti
     };
 } & (S extends '3DPoint' ? {
     normal: Position;
-} : unknown); /** 三维标签需要法向量 */
+} : unknown) & // 三维标签需要法向量
+(S extends 'Model' ? {
+    matrix: number[];
+} : unknown);

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

@@ -1,4 +1,4 @@
-import type { TagIconUrl } from './Utils';
+import type { Position, TagIconUrl } from './Utils';
 export declare type MediaData = {
     type: 'Image';
     url: string;
@@ -30,10 +30,14 @@ export declare enum ContentType {
     Marketing = "Marketing",
     /** 图片视频贴片 */
     MediaPlane = "MediaPlane",
+    /** 带有多媒体的模型 */
+    MediaModel = "MediaModel",
     /** 其他/自定义标签 */
-    Custom = "Custom"
+    Custom = "Custom",
+    /** Unknown */
+    Unknown = "Unknown"
 }
-export declare type TagContentType = keyof typeof ContentType | 'Unknown';
+export declare type TagContentType = keyof typeof ContentType;
 /**
  * @description: 标签数据
  */
@@ -147,6 +151,18 @@ interface ContentTypeMapInterface {
         playIcon?: 'withText' | 'withoutText' | string;
         extraData?: Object;
     };
+    MediaModel: {
+        modelUrl: string;
+        matrix?: number[];
+        mediaPosition: [Position, Position, Position, Position];
+        /** 多媒体在容器中的适配规则 */
+        objectFit?: ObjectFit;
+        action?: {
+            url: string;
+            type: 'iframe' | 'window';
+        };
+        mediaData: MediaData[];
+    };
     Custom: Object;
     Unknown: Object;
 }

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

@@ -22,7 +22,7 @@ export declare enum PointType {
 }
 /**  @deprecated 改用 stickType */
 export declare type TagPointType = keyof typeof PointType;
-export declare type StickType = '2DPoint' | '3DPoint' | 'Plane';
+export declare type StickType = '2DPoint' | '3DPoint' | 'Plane' | 'Model';
 export interface TagIconUrl {
     url: string;
     /** 指切图是几倍图，如 2倍图, 3倍图，默认值为 3 */

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

@@ -0,0 +1,2 @@
+import { Tag } from '../../typings';
+export declare function getMediaModelPlanPositions(tag: Tag<'MediaModel', 'Model'>): number[][];

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

@@ -1,7 +1,8 @@
-import type { Tag } from '../../typings';
+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'>;

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

@@ -1,3 +1,5 @@
-import type { Vector3 } from 'three';
+import { Vector3 } from 'three';
 import { AnyPosition } from '.';
+import { Tag } from '../typings';
 export declare function tagPosition(position: AnyPosition | [AnyPosition, AnyPosition, AnyPosition, AnyPosition]): Vector3;
+export declare function getTagPosition(tag: Tag): Vector3;