@realsee/dnalogel 3.21.2 → 3.22.0

package/dist/ModelMakerPlugin/Controller.d.ts

@@ -0,0 +1,26 @@
+import type { Five } from '@realsee/five';
+import * as BasePlugin from '../base/BasePluginWithData';
+import type * as PluginType from './typings';
+export declare class Controller extends BasePlugin.Controller<PluginType.State, PluginType.EventMap, PluginType.ServerData, PluginType.ServerData> {
+    state: PluginType.State;
+    protected data: PluginType.ServerData;
+    private group;
+    private items;
+    private tagRendererMap;
+    constructor(five: Five);
+    load(serverData: PluginType.ServerData): Promise<void>;
+    setState(targetState: Partial<PluginType.State>): void;
+    registerTagRenderer(map: Partial<Record<PluginType.ItemType, PluginType.ElementRenderer>>): void;
+    enable(): void;
+    disable(): void;
+    show(): void;
+    hide(): void;
+    clear(): void;
+    dispose(): void;
+    private handleShow;
+    private handleHide;
+    private handleEnable;
+    private handleDisable;
+    private onWantsMovePano;
+    private updateTagRenderer;
+}

package/dist/ModelMakerPlugin/index.d.ts

@@ -0,0 +1,4 @@
+import type { Five } from '@realsee/five';
+import type * as ModelMakerPluginType from './typings';
+export declare const ModelMakerPlugin: (five: Five) => ModelMakerPluginType.ModelMakerController;
+export type { ModelMakerPluginType };

package/dist/ModelMakerPlugin/item/baseItem.d.ts

@@ -0,0 +1,35 @@
+import type { Five, Mode } from '@realsee/five';
+import * as THREE from 'three';
+import { Subscribe } from '../../shared-utils/Subscribe';
+import type { LightTag } from '../../shared-utils/tag';
+import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
+type Event = {
+    enable: () => boolean;
+    disable: () => boolean;
+    click: (item: ModelMakerBaseItem) => void | boolean;
+};
+export declare class ModelMakerBaseItem extends Subscribe<Event> {
+    get container(): HTMLDivElement;
+    type: string;
+    tag: LightTag;
+    rawData: any;
+    protected five: Five;
+    protected model: THREE.Object3D;
+    protected group: THREE.Object3D;
+    protected enabled: boolean;
+    protected fiveDomEvents: FiveDomEvents;
+    constructor(params: {
+        five: Five;
+        model: THREE.Object3D;
+        group: THREE.Object3D;
+        type: string;
+        rawData?: any;
+        visibleMode?: Mode[];
+    });
+    show(): void;
+    hide(): void;
+    enable(): void;
+    disable(): void;
+    protected onClick(): boolean;
+}
+export {};

package/dist/ModelMakerPlugin/item/boxItem.d.ts

@@ -0,0 +1,4 @@
+import { ModelMakerPolygonItem } from './polygonItem';
+export declare class ModelMakerBoxItem extends ModelMakerPolygonItem {
+    constructor(...args: ConstructorParameters<typeof ModelMakerPolygonItem>);
+}

package/dist/ModelMakerPlugin/item/polygonItem.d.ts

@@ -0,0 +1,9 @@
+import { ModelMakerBaseItem } from './baseItem';
+export declare class ModelMakerPolygonItem extends ModelMakerBaseItem {
+    constructor(...args: ConstructorParameters<typeof ModelMakerBaseItem>);
+    enable(): void;
+    disable(): void;
+    show(): void;
+    protected onClick(): boolean;
+    private hideTag;
+}

package/dist/ModelMakerPlugin/item/prismItem.d.ts

@@ -0,0 +1,4 @@
+import { ModelMakerBaseItem } from './baseItem';
+export declare class ModelMakerPrismItem extends ModelMakerBaseItem {
+    constructor(...args: ConstructorParameters<typeof ModelMakerBaseItem>);
+}

package/dist/ModelMakerPlugin/typings/data.d.ts

@@ -0,0 +1,41 @@
+export interface ServerData {
+    list: (ServerBoxItem | ServerTrianglesItem | ServerPrismItem)[];
+}
+export interface ServerBaseItem {
+    id?: number;
+    name?: string;
+}
+export interface ServerBoxItem extends ServerBaseItem {
+    type: 'box';
+    object_data: {
+        /** box 的其中一个顶点坐标 */
+        start: number[];
+        /** start 对角位置的顶点坐标 */
+        end: number[];
+        /** box 的欧拉角旋转，旋转顺序是 [XYZ] */
+        rotation: number[];
+        color?: string;
+        opacity?: number;
+    };
+}
+export interface ServerTrianglesItem extends ServerBaseItem {
+    type: 'triangles';
+    object_data: {
+        panoIndex: number;
+        points: number[][];
+        color?: string;
+        opacity?: number;
+    };
+}
+export interface ServerPrismItem extends ServerBaseItem {
+    type: 'prism';
+    object_data: {
+        points: number[][];
+        floorIndex?: number;
+        height: number;
+        fixedY?: number;
+        fixedHeight?: number;
+        color: string;
+        opacity?: number;
+    };
+}

package/dist/ModelMakerPlugin/typings/index.d.ts

@@ -0,0 +1,52 @@
+import type * as BasePlugin from '../../base/BasePluginWithData';
+import type * as THREE from 'three';
+import type { ModelMakerBaseItem } from '../item/baseItem';
+import type { ServerData } from './data';
+export type { Controller as ModelMakerController } from '../Controller';
+export type * from './data';
+/** 插件状态 */
+export interface State extends BasePlugin.State {
+    /** 插件是否启用 */
+    enabled: boolean;
+    /** 插件整体是否可见 */
+    visible: boolean;
+}
+/** 插件事件 */
+export interface EventMap extends BasePlugin.EventMap<State, ServerData> {
+    /** visible 从 false 到 true 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    show: (event: {
+        userAction: boolean;
+    }) => void;
+    /** visible 从 true 到 false 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    hide: (event: {
+        userAction: boolean;
+    }) => void;
+    /** enabled 从 false 到 true 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    enable: (event: {
+        userAction: boolean;
+    }) => void;
+    /** enabled 从 true 到 false 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    disable: (event: {
+        userAction: boolean;
+    }) => void;
+    /** 插件内容点击的回调
+     * @param event.target 点击的标注实例
+     * @param event.intersectObjects 射线与标注模型的交点集合
+     * @param event.wantsFiveTapGestureParams Five wantsFiveTapGesture 的回调参数
+     * @returns <boolean> | <void> 返回 false 会阻止 Five wantsFiveTapGesture 的回调，其余 return 值会被忽略
+     */
+    wantsTap: (event: {
+        target: any;
+        intersectObjects: THREE.Intersection[];
+    }) => boolean | void;
+}
+export type ItemType = ServerData['list'][number]['type'];
+export type ElementRenderer = (container: HTMLElement, item: ModelMakerBaseItem) => () => void;

package/dist/ModelMakerPlugin/utils/tagRenderer.d.ts

@@ -0,0 +1,3 @@
+import type * as PluginType from '../typings';
+declare const tagRendererMap: Record<PluginType.ItemType, PluginType.ElementRenderer>;
+export { tagRendererMap };

package/dist/Sculpt/Meshes/Area.d.ts

@@ -1,30 +1,9 @@
 import type { LineStyle } from '../utils/color';
-import { type AnyPositions } from '../../shared-utils/positionToVector3';
-import { PolylineWithDotsMesh } from './Polyline';
-import * as THREE from 'three';
-import PolygonMesh from './Polygon';
 import type { PointsData } from '../utils/data';
 import type { ColoredMeshStyle } from '../utils/three/ColoredMesh';
+import { PolygonWithEdgeMesh } from './PolygonWithEdge';
 export type AreaStyle = ColoredMeshStyle & LineStyle;
 export type AreaData = PointsData;
-export declare class AreaMesh extends PolylineWithDotsMesh {
+export declare class AreaMesh extends PolygonWithEdgeMesh {
     name: string;
-    polygon: PolygonMesh;
-    get color(): THREE.Color;
-    get opacity(): number;
-    /** 多边形前三个点组成的平面，用来使得后面加的点也落在这个平面上 */
-    private planeHelper;
-    private planeHelperNeedUpdate;
-    constructor(params?: Partial<AreaStyle & AreaData>);
-    setStyle(params: Partial<AreaStyle>): void;
-    setPoints(points: AnyPositions, autoClosed?: boolean): void;
-    getGeometryInfo(): {
-        center: THREE.Vector3;
-        area: number;
-    };
-    /**
-     * @description: 获取一个点投影在当前平面上的点
-     */
-    projectPoint(point: THREE.Vector3): THREE.Vector3;
-    private updatePlaneHelper;
 }

package/dist/Sculpt/Meshes/Polygon.d.ts

@@ -10,9 +10,12 @@ export type PolygonData = PointsData;
 export default class PolygonMesh extends ColoredMesh<THREE.BufferGeometry> {
     name: string;
     get isBlank(): boolean;
+    get center(): THREE.Vector3;
     points: THREE.Vector3[];
     planeHelperNeedUpdate: boolean;
+    private geometryInfoNeedUpdate;
     private planeHelper;
+    private geometryInfo;
     private opacityBeforeHighlight;
     private highlighted;
     constructor(params?: Partial<PolygonStyle & PolygonData>);

package/dist/Sculpt/Meshes/PolygonWithEdge.d.ts

@@ -0,0 +1,22 @@
+import type { AnyPositions } from '../../shared-utils/positionToVector3';
+import { PolylineMesh } from './Polyline';
+import type { LineStyle } from '../utils/color';
+import PolygonMesh, { type PolygonData, type PolygonStyle } from './Polygon';
+import * as THREE from 'three';
+export type PolygonWithEdgeMeshStyle = PolygonStyle & LineStyle;
+/**
+ * @description: 带边线的多边形
+ */
+export declare class PolygonWithEdgeMesh extends PolygonMesh {
+    name: string;
+    get lineWidth(): number;
+    get lineColor(): THREE.Color;
+    protected line: PolylineMesh;
+    constructor(params?: Partial<PolygonWithEdgeMeshStyle & PolygonData>);
+    setPoints(points: AnyPositions, params?: {
+        closed: boolean;
+    }): void;
+    setStyle(style: Partial<PolygonWithEdgeMeshStyle>): void;
+    highlight(): void;
+    unhighlight(): void;
+}

package/dist/Sculpt/Meshes/Polyline.d.ts

@@ -1,34 +1,36 @@
 import { type AnyPositions } from '../../shared-utils/positionToVector3';
 import { IObject3D } from '../../shared-utils/three/IObject3D';
 import { LineWithDotsMesh } from './LineWithDots';
-import { LineMesh, type LineMeshStyle } from './Line';
+import type { LineMeshStyle } from './Line';
 import type { PointsData } from '../utils/data';
 import * as THREE from 'three';
 export type PolylineStyle = LineMeshStyle;
 export type PolylineData = PointsData;
-export declare abstract class PolylineBaseMesh<WithDots extends boolean = true> extends IObject3D {
+export declare abstract class PolylineBaseMesh extends IObject3D {
     name: string;
     get lineColor(): THREE.Color;
     get lineWidth(): number;
     get dashed(): boolean;
     get occlusionVisibility(): boolean;
     get points(): THREE.Vector3[];
-    lines: Array<WithDots extends true ? LineWithDotsMesh : LineMesh>;
+    lines: Array<LineWithDotsMesh>;
     private withDots;
     private paramsStyle;
     constructor(params?: Partial<PolylineStyle & PolylineData & {
-        withDots: WithDots extends true ? true : false;
+        withDots: boolean;
     }>);
-    setPoints(points: AnyPositions): void;
+    setPoints(points: AnyPositions, params?: {
+        closed: boolean;
+    }): void;
     setStyle(style: Partial<PolylineStyle>): void;
     highlight(): void;
     unhighlight(): void;
 }
-export declare class PolylineMesh extends PolylineBaseMesh<false> {
+export declare class PolylineMesh extends PolylineBaseMesh {
     name: string;
     constructor(...params: ConstructorParameters<typeof PolylineBaseMesh>);
 }
-export declare class PolylineWithDotsMesh extends PolylineBaseMesh<true> {
+export declare class PolylineWithDotsMesh extends PolylineBaseMesh {
     name: string;
     constructor(...params: ConstructorParameters<typeof PolylineBaseMesh>);
 }

package/dist/Sculpt/Meshes/Prism.d.ts

@@ -1,9 +1,10 @@
 import { IObject3D } from '../../shared-utils/three/IObject3D';
 import { type AnyPosition, type AnyPositions } from '../../shared-utils/positionToVector3';
-import { AreaMesh, type AreaData } from './Area';
+import type { AreaData } from './Area';
 import * as THREE from 'three';
 import type { LineStyle } from '../utils/color';
 import type { ColoredMeshStyle } from '../utils/three/ColoredMesh';
+import { PolygonWithEdgeMesh } from './PolygonWithEdge';
 export type PrismStyle = ColoredMeshStyle & LineStyle;
 export interface PrismData extends AreaData {
     heightPoint: AnyPosition;
@@ -14,8 +15,9 @@ export interface PrismData extends AreaData {
 export declare class PrismMesh extends IObject3D {
     name: string;
     heightPoint: THREE.Vector3;
-    bottomPolygon: AreaMesh;
-    topPolygon: AreaMesh;
+    bottomPolygon: PolygonWithEdgeMesh;
+    topPolygon: PolygonWithEdgeMesh;
+    get center(): THREE.Vector3;
     get color(): THREE.Color;
     get lineWidth(): number;
     get lineColor(): THREE.Color;

package/dist/Sculpt/Objects/Base/index.d.ts

@@ -2,6 +2,7 @@ import type { FiveDomEventMap } from '../../../shared-utils/five/FiveDomEvents';
 import { IObject3D } from '../../../shared-utils/three/IObject3D';
 import type { BaseEditor } from './Editor';
 import type { RequiredDeep } from 'type-fest';
+import type { ImportDataToExportData } from '../../typings/utils.type';
 import type * as THREE from 'three';
 export interface BaseImportData {
     id?: string;
@@ -24,7 +25,8 @@ export interface BaseObjectConfig {
 /**
  * @description: 基础对象
  */
-export declare abstract class BaseObject<ImportData extends BaseImportData = BaseImportData, ExportData extends BaseExportData = any, Config extends BaseObjectConfig = BaseObjectConfig> extends IObject3D {
+export declare abstract class BaseObject<ImportData extends BaseImportData = BaseImportData, ExportData extends BaseExportData = ImportDataToExportData<ImportData>, // 有性能问题，先注释掉
+Config extends BaseObjectConfig = BaseObjectConfig> extends IObject3D {
     name: string;
     readonly isSculptObject = true;
     draggable: boolean;
@@ -49,7 +51,7 @@ export declare abstract class BaseObject<ImportData extends BaseImportData = Bas
     protected get pointSelector(): import("../../../shared-utils/three/PointSelector").PointSelector;
     constructor(data?: Partial<ImportData>, config?: Partial<Config>);
     on: <T extends keyof FiveDomEventMap>(event: T, callback: FiveDomEventMap[T]) => void;
-    off: (event: keyof FiveDomEventMap, callback: (e: import("../../../shared-utils/five/FiveDomEvents").FiveDomEvent) => any, ...args: any[]) => void;
+    off: (event: keyof FiveDomEventMap, callback?: (e: import("../../../shared-utils/five/FiveDomEvents").FiveDomEvent) => any, ...args: any[]) => void;
     stopCreating(): void;
     delete(): void;
     highlight(): void;

package/dist/Sculpt/Objects/Polygon/Editor.d.ts

@@ -1,8 +1,9 @@
 import type { Polygon } from '.';
 import type { FiveDomEvent } from '../../../shared-utils/five/FiveDomEvents';
 import { LineEditor } from '../Polyline/Editor';
+import * as THREE from 'three';
 export declare class PolygonEditor extends LineEditor<Polygon> {
-    get lines(): import("../../Meshes/LineWithDots").LineWithDotsMesh[];
+    get points(): THREE.Vector3[];
     constructor(originObject: Polygon);
     protected onDrag: (event: FiveDomEvent) => void;
 }

package/dist/Sculpt/Objects/Polyline/Editor.d.ts

@@ -3,11 +3,10 @@ import type { FiveDomEvent } from '../../../shared-utils/five/FiveDomEvents';
 import type { Polyline } from '.';
 import type * as THREE from 'three';
 import { PointMesh } from '../../Meshes/Point';
-import type { LineWithDotsMesh } from '../../Meshes/LineWithDots';
 export declare abstract class LineEditor<OriginObject extends THREE.Object3D = THREE.Object3D> extends BaseEditor<OriginObject> {
     protected draggingPoints: PointMesh[];
-    protected get points(): PointMesh[];
-    abstract get lines(): LineWithDotsMesh[];
+    protected get pointMeshes(): PointMesh[];
+    abstract get points(): THREE.Vector3[];
     get pointHandles(): PointMesh[];
     constructor(originObject: OriginObject);
     enable(): void;
@@ -17,9 +16,7 @@ export declare abstract class LineEditor<OriginObject extends THREE.Object3D = T
     protected abstract onDrag(event: FiveDomEvent): void;
 }
 export declare class PolylineEditor extends LineEditor<Polyline> {
-    get lines(): LineWithDotsMesh[];
+    get points(): THREE.Vector3[];
     constructor(originObject: Polyline);
-    enable(): void;
-    disable(): void;
     protected onDrag: (event: FiveDomEvent) => void;
 }

package/dist/Sculpt/index.d.ts

@@ -137,35 +137,59 @@ export declare class Sculpt extends Subscribe<Event> {
     /**
      * @description: 开始绘制点
      */
-    createPoint(params?: Parameters<Point['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createPoint(params?: Parameters<Point['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制空间折线
      */
-    createPolyline(params?: Parameters<Polyline['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createPolyline(params?: Parameters<Polyline['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制平面多边形
      */
-    createPolygon(params?: Parameters<Polygon['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createPolygon(params?: Parameters<Polygon['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制多棱柱
      */
-    createPrism(params?: Parameters<Prism['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createPrism(params?: Parameters<Prism['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制矩形
      */
-    createRectangle(params?: Parameters<Rectangle['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createRectangle(params?: Parameters<Rectangle['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制圆形
      */
-    createCircle(params?: Parameters<Circle['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createCircle(params?: Parameters<Circle['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制圆柱
      */
-    createCylinder(params?: Parameters<Cylinder['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createCylinder(params?: Parameters<Cylinder['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 开始绘制 Box
      */
-    createBox(params?: Parameters<Box['create']>[0]): Promise<BaseObject<any, any, BaseObjectConfig>>;
+    createBox(params?: Parameters<Box['create']>[0]): Promise<BaseObject<any, {
+        [x: string]: any;
+        id: string | number;
+    }, BaseObjectConfig>>;
     /**
      * @description: 撤销
      */

package/dist/Sculpt/typings/utils.type.d.ts

@@ -1,7 +1,10 @@
 import type * as THREE from 'three';
-import type { LiteralUnion, UnknownArray } from 'type-fest';
+import type { LiteralUnion, Merge, UnknownArray } from 'type-fest';
 import type { IsNull, NonRecursiveType } from 'type-fest/source/internal';
 export type LiteralString<T> = LiteralUnion<T, string>;
+export type ImportDataToExportData<T> = Merge<JsonData<T>, {
+    id: string | number;
+}>;
 export type JsonVector3<T> = ReplaceDeep<T, THREE.Vector3, number[]>;
 export type JsonColor<T> = ReplaceDeep<T, THREE.Color>;
 export type JsonData<T> = JsonColor<JsonVector3<T>>;

package/dist/base/BasePlugin.d.ts

@@ -84,11 +84,11 @@ declare abstract class Controller<PluginState extends State, PluginEventMap exte
     /**
      * 展示UI
      */
-    show?(options?: BaseOptions): Promise<void>;
+    show?(options?: BaseOptions): Promise<void> | void;
     /**
      * 隐藏UI
      */
-    hide?(options?: BaseOptions): Promise<void>;
+    hide?(options?: BaseOptions): Promise<void> | void;
     /**
      * 设置state
      * @param state 插件的目标状态

package/dist/base/BasePluginWithData.d.ts

@@ -15,8 +15,6 @@ declare abstract class Controller<PluginState extends State, PluginEventMap exte
      * @param state 插件 State
      */
     abstract load(serverData: PluginServerData, state?: PluginState, userAction?: boolean): Promise<void>;
-    /** 把原始数据转化为插件数据 */
-    protected abstract formatData?(serverData: PluginServerData): Promise<PluginData> | PluginData;
 }
 export type { State, EventMap, Config };
 export type { BaseOptions } from './BasePlugin';