@realsee/dnalogel 2.26.2 → 2.27.0-dev.1

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

@@ -1,13 +1 @@
-import { Vector3 } from 'three';
-export type AnyPosition = Vector3 | number[] | {
-    x: number;
-    y: number;
-    z: number;
-};
-export declare const positionToVector3: ({ x, y, z }: {
-    x: number;
-    y: number;
-    z: number;
-}) => Vector3;
-export declare const arrayPositionToVector3: (arrayPosition: number[]) => Vector3;
-export declare const anyPositionToVector3: (position: AnyPosition) => Vector3;
+export { anyPositionToVector3, arrayPositionToVector3, positionToVector3, type AnyPosition } from '../../shared-utils/positionToVector3';

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

@@ -1,5 +1,5 @@
 import type * as THREE from 'three';
-import type { AnyPosition } from '..';
+import { type AnyPosition } from '../../../shared-utils/positionToVector3';
 import { ICSS3DRenderer as CSS3DRenderer } from './CSS3DRenderer';
 import { Subscribe } from '../../../shared-utils/Subscribe';
 import { CSS3DObjectPlus } from './CSS3DObject';

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

@@ -5,14 +5,17 @@ import * as BasePlugin from '../../base/BasePlugin';
 export declare abstract class TagCache extends BasePlugin.Controller<State, EventMap> {
     private tagCacheByPanoIndex;
     protected constructor(five: Five);
-    protected getCache({ panoIndex }: {
+    /**
+     * @description: 获取缓存
+     */
+    protected getCache(params?: {
         panoIndex?: number;
     }): Map<TagId, TagCacheInterface>;
-    protected getCache({ panoIndex, id }: {
+    protected getCache(params?: {
         panoIndex?: number;
         id: TagId;
     }): TagCacheInterface;
-    protected getCache({ panoIndex, id, key, }: {
+    protected getCache(params?: {
         panoIndex?: number;
         id: TagId;
         key: keyof TagCacheInterface;

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

@@ -1,24 +1,16 @@
-import type { Five, Mode } from '@realsee/five';
-import * as THREE from 'three';
+import type { Five, Mode, State as FiveState } from '@realsee/five';
 import type { TagInstance } from '../typings';
-import type { Raycaster } from 'three';
 import { TagUtil } from './TagUtil';
 export declare abstract class TagComputer extends TagUtil {
-    private raycaster;
     protected constructor(five: Five);
     /**
      * @description: 获取是否可见
      */
     getVisibleByPanoIndex(tag: TagInstance, panoIndex?: number): boolean;
     getVisibleByFiveMode(tag: TagInstance, mode?: Mode): boolean;
-    /**
-     * @description 获取标签当前状态
-     * @return (this.state.visible && tag.state.visible) ?? true
-     */
-    getCurrentVisibleState(tag: TagInstance): boolean;
-    getVisible(tag: TagInstance): boolean;
+    getVisible(tag: TagInstance, state?: Partial<FiveState>): boolean;
     /** 获取当前点位上模型中的多媒体是否应该展示 */
-    getModelMedialVisibleByPanoIndex(tag: TagInstance): boolean;
+    getModelMedialVisibleByPanoIndex(tag: TagInstance, panoIndex?: number): boolean;
     /**
      * @description: 获取是否展开
      */
@@ -46,12 +38,26 @@ export declare abstract class TagComputer extends TagUtil {
         z: number;
     };
     /** 通过射线检测标签可用性 */
-    protected getTagEnableByIntersect(tag: TagInstance, raycaster: Raycaster): {
+    protected getTagEnableByIntersect(tag: TagInstance, panoIndex?: number): {
+        value: boolean;
+        reason: {
+            type: string;
+            fivePanoIndex: number;
+            passedCount?: undefined;
+            needPassed?: undefined;
+        };
+    } | {
+        value: boolean;
+        reason?: undefined;
+    } | {
         value: boolean;
-        reason: string;
+        reason: {
+            type: string;
+            passedCount: number;
+            needPassed: number;
+            fivePanoIndex?: undefined;
+        };
     };
-    /** 获取点位看向标签的射线 */
-    protected getRaycasterFromPanoIndex(tag: TagInstance, panoIndex: number): THREE.Raycaster;
     /** 检测是否匹配当前楼层 */
     private getVisibleByFloorIndex;
 }

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

@@ -30,13 +30,16 @@ export declare abstract class TagUtil extends TagCache {
     pauseCurrentMedia(): void;
     /**
      * @description: 获取merge后的配置
-     * TODO: 缓存
      */
-    getTagConfig(tag: Tag): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
+    getTagConfig(tag: Tag, params?: {
+        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 updateTagConfig(params?: {
-        force?: boolean;
-    }): void;
+    protected updateTagConfig(): void;
     protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
     protected getRenderType(tag: TagInstance): 'Dom' | 'Mesh' | 'BehindDom';
     /**
@@ -53,10 +56,8 @@ export declare abstract class TagUtil extends TagCache {
     protected getTagNormal(tag: TagInstance): THREE.Vector3 | undefined;
     protected get filterPointTag(): PointTagInstance[];
     protected get filter2DPointTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "2DPoint">[];
-    protected get filter3DPointTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">[];
     protected get filterImagePlane(): TagInstance<"MediaPlane", "Plane">[];
     protected get filterMediaModel(): TagInstance<"MediaModel", "Model">[];
-    protected get filterModelTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model">[];
     protected get filterCSS3DTag(): (TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
     /**
      * @description 检查是否已经销毁

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

@@ -1,5 +1,5 @@
-import type { Tag, TagId, Tags, TagInstance, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig } from '../typings';
-import type { PickTagContentTypeInContentTypeConfigKey, TagContentType } from '..';
+import type { Tag, TagId, Tags, TagInstance, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey } from '../typings';
+import type { TagConfigByKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
 import { type Five } from '@realsee/five';
 import { TagRender } from './TagRender';
@@ -38,7 +38,7 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * @description: 改变类型配置
      */
-    changeContentTypeConfig<T extends ContentTypeConfigKey>(key: ContentTypeConfigKey, contentTypeConfig: PickTagContentTypeInContentTypeConfigKey<T> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<T>> : unknown, merge?: boolean): void;
+    changeContentTypeConfig<T extends ContentTypeConfigKey>(key: T, contentTypeConfig: TagConfigByKey<T>, merge?: boolean): void;
     show(params?: {
         userAction?: boolean;
         withAnimation?: boolean;

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

@@ -74,7 +74,7 @@ export interface TagCacheInterface {
     modelMedialVisible?: boolean;
     __debug_visible_reason__?: {
         value: boolean;
-        reason?: string;
+        reason?: any;
     };
 }
 export type MediaStore = Writable<{

package/dist/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, PickTagContentTypeInContentTypeConfigKey, ContentTypeConfigKey } from './Utils';
+import type { Position, TagId, StickType, TagStyle, ElementRenderer, TagConfigByKey, ContentTypeConfigKey } from './Utils';
 import type { ContentType, DeprecatedTagProperty } from '../../Archive/deprecated';
 export interface Tags {
     version?: string;
@@ -10,7 +10,7 @@ export interface Tags {
     globalConfig?: TagConfig;
     /** 按type配置 */
     contentTypeConfig?: {
-        [key in ContentTypeConfigKey]?: PickTagContentTypeInContentTypeConfigKey<key> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<key>> : unknown;
+        [key in ContentTypeConfigKey]?: TagConfigByKey<key>;
     };
     /** 标签列表配置 */
     tagList: Tag[];

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

@@ -4,6 +4,7 @@ import type { ContentTypeMap, TagContentType } from './TagData';
 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>;
     /** 标签点或中心点的到摄像机的距离 */
@@ -16,9 +17,9 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
     visibleConfig?: {
         /**
          * @description 保持可见/不可见, 设置后visibleConfig下所有其他配置都不生效
-         * @default undefined
+         * @default null
          */
-        keep?: 'visible' | 'hidden';
+        keep?: 'visible' | 'hidden' | null;
         /**
          * @description 在哪些 five mode 下可见
          * @default ['Panorama']
@@ -62,6 +63,16 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
              * @default 0.01
              */
             distanceAccuracy?: number;
+            /**
+             * @description: 碰撞检测的点
+             * @default 'center'
+             */
+            checkPoints?: 'center' | 'corner' | Vector3[];
+            /**
+             * @description: 碰撞检测策略，多少点通过检测则认为碰撞通过
+             * @default 1
+             */
+            needPassed?: number;
         };
         /**
          * @description 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角，范围内自动展开，范围外自动收起
@@ -104,9 +115,15 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
             enable?: boolean;
             /** 自动展开：最近标签自动展开 */
             strategy?: 'MinimumDistance';
-            /** 展开的最大数量, 默认为1 */
+            /**
+             * @description: 展开的最大数量
+             * @default 1
+             */
             maxNumber?: number;
-            /** 展开的最大距离, 默认为无限制 */
+            /**
+             * @description: 展开的最大距离
+             * @default 无限制
+             */
             distance?: MinMax;
         };
     } | ConfigFunction;
@@ -117,17 +134,27 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
         /** 展开/收起 */
         unfolded?: boolean;
     };
-    initialData?: PartialObjectDeep<ContentTypeMap[C]>;
+    initialData?: C extends TagContentType ? PartialObjectDeep<ContentTypeMap[C]> & {
+        important?: boolean;
+    } : {
+        [key: string]: any;
+        important?: boolean;
+    };
     tag3DConfig?: Create3DDomContainerParamsType['config'];
     modelConfig?: {
         autoLookAtEnabled?: boolean;
     };
-    /** 当图片为一张时可以通过Mesh渲染 */
+    /**
+     * @description: 当图片为一张时可以选择通过Mesh渲染
+     * @default 'Dom'
+     */
     renderType?: 'Mesh' | 'Dom';
     /**
      * @description: 是否可以点击
      * @default true
      */
     clickable?: boolean;
+    isMerged?: boolean;
 }
+export declare const defaultGlobalConfig: TagConfig<any>;
 export {};

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

@@ -3,6 +3,7 @@ import type { Group } from 'three';
 import type { TagContentType } from './TagData';
 import type { ImagePlane } from '../../utils/model/mediaPlane';
 import type { TagInstance } from './TagInstance';
+import type { TagConfig } from '../..';
 export type TagId = string | number;
 export type ArrayPosition = number[];
 export type Position = ArrayPosition;
@@ -65,6 +66,7 @@ export type ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any
  * @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 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'>;
 /** 二维标签 */

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

@@ -1,4 +1,4 @@
-export * from '../../CSS3DRenderPlugin/utils';
+export * from '../../shared-utils/positionToVector3';
 export * from './addDebugPoints';
 export * from './noTypecheck';
 export * from './planeNormal';

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

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