@realsee/dnalogel 3.65.0-alpha.0 → 3.65.0

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

@@ -1,40 +1,59 @@
 import type { Five, Mode } from '@realsee/five';
-import * as THREE from 'three';
+import type { Object3D } from 'three';
+import { Vector3 } from 'three';
 import { Subscribe } from '../../shared-utils/Subscribe';
 import type { LightTag } from '../../shared-utils/tag';
 import type { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
-type Event = {
+import type { ServerItem, ItemType, ElementRenderer } from '../typings';
+interface ModelWithCenter extends Object3D {
+    /** 模型中心点 */
+    center?: Vector3;
+}
+/**
+ * @description 模型标注的事件类型
+ */
+type ModelMakerEvent<ServerData extends ServerItem> = {
+    /** 启用 */
     enable: () => void;
+    /** 禁用 */
     disable: () => void;
+    /** 显示 */
     show: () => void;
+    /** 隐藏 */
     hide: () => void;
-    click: (item: ModelMakerBaseItem) => void | boolean;
+    /** 点击 */
+    click: (item: ModelMakerBaseItem<ServerData>) => void | boolean;
 };
-export declare class ModelMakerBaseItem extends Subscribe<Event> {
+/**
+ * @description 模型标注的基类
+ */
+export declare class ModelMakerBaseItem<ServerData extends ServerItem> extends Subscribe<ModelMakerEvent<ServerData>> {
+    __renderer?: ElementRenderer;
+    __disposeRenderer?: () => void;
     get container(): HTMLDivElement;
-    type: string;
+    type: ItemType;
     tag: LightTag;
-    rawData: any;
-    model: THREE.Object3D;
+    rawData: ServerData;
+    model: ModelWithCenter;
     get state(): {
         visible: boolean;
         enabled: boolean;
     };
     visibles: boolean[];
     protected five: Five;
-    protected group: THREE.Object3D;
+    protected group: Object3D;
     protected fiveDomEvents: FiveDomEvents;
-    protected disposers: (() => any)[];
+    protected disposers: (() => void)[];
     constructor(params: {
         five: Five;
-        model: THREE.Object3D;
-        group: THREE.Object3D;
-        type: string;
+        model: ModelWithCenter;
+        group: Object3D;
+        type: ItemType;
         fiveDomEvents: FiveDomEvents;
-        rawData?: any;
+        rawData?: ServerData;
         tagWrapper?: HTMLElement;
         visibleMode?: Mode[];
-        position?: THREE.Vector3;
+        position?: Vector3;
         tagContainerZIndex?: number;
     });
     show(): void;

package/libs/ModelMakerPlugin/item/baseItem.js

@@ -1,7 +1,7 @@
 var p = Object.defineProperty;
 var h = (o, e, i) => e in o ? p(o, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[e] = i;
 var t = (o, e, i) => (h(o, typeof e != "symbol" ? e + "" : e, i), i);
-import * as l from "three";
+import { Vector3 as l } from "three";
 import { addIfNotExists as d } from "../../shared-utils/three/addIfNotExists.js";
 import { Subscribe as n } from "../../shared-utils/Subscribe.js";
 import { tag as a } from "../../shared-utils/tag.js";
@@ -71,6 +71,8 @@ class Mi extends n {
   constructor(i) {
     var s, m;
     super();
+    t(this, "__renderer");
+    t(this, "__disposeRenderer");
     t(this, "type");
     t(this, "tag");
     t(this, "rawData");
@@ -81,8 +83,8 @@ class Mi extends n {
     t(this, "fiveDomEvents");
     t(this, "disposers", []);
     this.five = i.five, this.model = i.model, this.group = i.group, this.type = i.type, this.rawData = i.rawData, this.fiveDomEvents = i.fiveDomEvents;
-    const r = (m = (s = i.position) != null ? s : this.model.center) != null ? m : v(this.model).getCenter(new l.Vector3());
-    this.tag = a(this.five, r, { wrapper: i.tagWrapper }), this.tag.extraObjectsForIntersectCheck.push(this.group);
+    const r = (m = (s = i.position) != null ? s : this.model.center) != null ? m : v(this.model).getCenter(new l());
+    this.tag = a(this.five, r, { wrapper: i.tagWrapper, disableOpacityTransition: this.type === "prism" }), this.tag.extraObjectsForIntersectCheck.push(this.group);
   }
   get container() {
     return this.tag.container;

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

@@ -1,10 +1,20 @@
 import { ModelMakerBaseItem } from './baseItem';
-export declare class ModelMakerBoxItem extends ModelMakerBaseItem {
-    constructor(...args: ConstructorParameters<typeof ModelMakerBaseItem>);
+import type { ServerBoxItem } from '../typings';
+/**
+ * @description 模型标注的盒子类型标注的构造参数类型
+ */
+type ModelMakerBoxItemArgs = ConstructorParameters<typeof ModelMakerBaseItem<ServerBoxItem>>;
+/**
+ * @description 模型标注的盒子类型标注，即长方体
+ * @extends ModelMakerBaseItem
+ */
+export declare class ModelMakerBoxItem extends ModelMakerBaseItem<ServerBoxItem> {
+    constructor(...args: ModelMakerBoxItemArgs);
     enable(): void;
     disable(): void;
     show(): void;
+    updateVisible(): void;
     protected onClick(): boolean;
     private hideTag;
-    updateVisible(): void;
 }
+export {};

package/libs/ModelMakerPlugin/item/boxItem.js

@@ -80,17 +80,17 @@ class Mi extends s {
     super.enable(), this.five.on("mode.change.request", this.hideTag), this.five.on("pano.request", this.hideTag);
   }
   disable() {
-    super.disable(), this.five.off("mode.change.request", this.hideTag), this.five.off("pano.request", this.hideTag);
+    super.disable(), this.five.needsRender = !0, this.five.off("mode.change.request", this.hideTag), this.five.off("pano.request", this.hideTag);
   }
   show() {
     super.show(), this.tag.hide();
   }
-  onClick() {
-    return this.tag.visible ? this.tag.hide() : this.tag.show({ force: !0 }), super.onClick(), !0;
-  }
   updateVisible() {
     !this.visibles.some((e) => e === !1) ? this.model.visible = !0 : (this.tag.hide(), this.model.visible = !1), this.five.needsRender = !0;
   }
+  onClick() {
+    return this.tag.visible ? this.tag.hide() : this.tag.show({ force: !0 }), super.onClick(), !0;
+  }
 }
 export {
   Mi as ModelMakerBoxItem

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

@@ -1,9 +1,19 @@
-import { ModelMakerBoxItem } from './boxItem';
-export declare class ModelMakerPolygonItem extends ModelMakerBoxItem {
-    constructor(...args: ConstructorParameters<typeof ModelMakerBoxItem>);
+import type { ServerTrianglesItem } from '../typings';
+import { ModelMakerBaseItem } from './baseItem';
+/**
+ * @description 模型标注的多边形类型标注的构造参数类型
+ */
+type ModelMakerPolygonItemArgs = ConstructorParameters<typeof ModelMakerBaseItem<ServerTrianglesItem>>;
+/**
+ * @description 模型标注的多边形类型标注，即多边形
+ * @extends ModelMakerBaseItem
+ */
+export declare class ModelMakerPolygonItem extends ModelMakerBaseItem<ServerTrianglesItem> {
+    constructor(...args: ModelMakerPolygonItemArgs);
     show(): void;
     private onPanoArrived;
     private onModeChange;
     private updatePanoIndex;
     private updateMode;
 }
+export {};

package/libs/ModelMakerPlugin/item/polygonItem.js

@@ -1,8 +1,7 @@
 var e = Object.defineProperty;
 var s = (o, i, t) => i in o ? e(o, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[i] = t;
 var p = (o, i, t) => (s(o, typeof i != "symbol" ? i + "" : i, t), t);
-import { ModelMakerBoxItem as a } from "./boxItem.js";
-import "./baseItem.js";
+import { ModelMakerBaseItem as a } from "./baseItem.js";
 import "three";
 import "../../shared-utils/three/addIfNotExists.js";
 import "../../shared-utils/Subscribe.js";
@@ -69,7 +68,7 @@ import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../../Sculpt/utils/three/rayOnLine.js";
 import "../../shared-utils/three/boundingBox.js";
-class ct extends a {
+class Ct extends a {
   constructor(...t) {
     super(...t);
     p(this, "onPanoArrived", (t) => {
@@ -85,7 +84,7 @@ class ct extends a {
     p(this, "updateMode", (t) => {
       this.visibles[2] = t === "Panorama";
     });
-    this.updatePanoIndex(this.five.state.panoIndex), this.updateMode(this.five.state.mode), this.updateVisible(), this.five.on("panoArrived", this.onPanoArrived), this.five.on("modeChange", this.onModeChange), this.disposers.push(() => {
+    this.updatePanoIndex(this.five.state.panoIndex), this.updateMode(this.five.state.mode), this.enable(), this.updateVisible(), this.five.on("panoArrived", this.onPanoArrived), this.five.on("modeChange", this.onModeChange), this.disposers.push(() => {
       this.five.off("panoArrived", this.onPanoArrived), this.five.off("modeChange", this.onModeChange);
     });
   }
@@ -94,5 +93,5 @@ class ct extends a {
   }
 }
 export {
-  ct as ModelMakerPolygonItem
+  Ct as ModelMakerPolygonItem
 };

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

@@ -1,8 +1,18 @@
+import type { ServerPrismItem } from '../typings';
 import { ModelMakerBaseItem } from './baseItem';
-export declare class ModelMakerPrismItem extends ModelMakerBaseItem {
-    constructor(...args: ConstructorParameters<typeof ModelMakerBaseItem>);
+/**
+ * @description 模型标注的棱柱类型标注的构造参数类型
+ */
+type ModelMakerPrismItemArgs = ConstructorParameters<typeof ModelMakerBaseItem<ServerPrismItem>>;
+/**
+ * @description 模型标注的棱柱类型标注
+ * @extends ModelMakerBaseItem
+ */
+export declare class ModelMakerPrismItem extends ModelMakerBaseItem<ServerPrismItem> {
+    constructor(...args: ModelMakerPrismItemArgs);
     onModelShownFloorChange: (fiveCurrentfloor: number | null) => void;
     show(): void;
     hide(): void;
     private updateFiveCurrentFloorState;
 }
+export {};

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

@@ -1,56 +1,110 @@
-export interface ServerData {
-    list: (ServerBoxItem | ServerTrianglesItem | ServerPrismItem)[];
+/**
+ * @description box 所带的数据详细类型
+ */
+export interface BoxItemObjectData {
+    /** box 的其中一个顶点坐标 */
+    start: number[];
+    /** start 对角位置的顶点坐标 */
+    end: number[];
+    /** box 的欧拉角旋转，旋转顺序是 [XYZ] */
+    rotation?: number[];
+    /** 标注颜色 */
+    color?: string;
+    /** 透明度 */
+    opacity?: number;
+    /** 所在楼层 */
+    floorIndex?: number;
+    /** 绘制平面的三维世界坐标点数组 */
+    points?: number[][];
+    /** 其他信息 */
+    [key: string]: any;
+}
+/**
+ * @description triangles 所带的数据详细类型
+ */
+export interface TrianglesItemObjectData {
+    /** 可见点位 */
+    panoIndex?: number;
+    /** 多边形的顶点坐标数组 */
+    points: number[][];
+    /** 标注颜色 */
+    color?: string;
+    /** 透明度 */
+    opacity?: number;
+    /** 其他信息 */
+    [key: string]: any;
 }
-export interface ServerBaseItem {
+/**
+ * @description prism 所带的数据详细类型
+ */
+export interface PrismItemObjectData {
+    /** 绘制平面的三维世界坐标点数组 */
+    points: number[][];
+    /** 楼层高度 */
+    height: number;
+    /** 所在楼层 */
+    floorIndex?: number;
+    /** 人工设置的y坐标方向偏移 */
+    fixedY?: number;
+    /** 人工设置的高度修正 */
+    fixedHeight?: number;
+    /** 标注颜色 */
+    color?: string;
+    /** 透明度 */
+    opacity?: number;
+    /** 是否是危险区域 */
+    isRiskyArea?: boolean;
+    /** 关联VR ID列表 */
+    related_resource_code_list?: string[];
+    /** 空间编码 */
+    space_code?: string;
+    /** 其他信息 */
+    [key: string]: any;
+}
+/**
+ * @description 基础数据类型
+ */
+export interface ServerBaseItem<TObjectData = any> {
     /** 唯一标识 */
     id?: number;
     /** 标签名 */
     name?: string;
+    /** 类型 */
+    type: ItemType;
+    /** 对象数据 */
+    object_data: TObjectData;
+    /** 其他信息 */
+    [key: string]: any;
 }
-export interface ServerBoxItem extends ServerBaseItem {
+/**
+ * @description 模型类型枚举
+ */
+export type ItemType = 'box' | 'triangles' | 'prism';
+/**
+ * @description box 数据类型
+ */
+export interface ServerBoxItem extends ServerBaseItem<BoxItemObjectData> {
     type: 'box';
-    object_data: {
-        /** box 的其中一个顶点坐标 */
-        start: number[];
-        /** start 对角位置的顶点坐标 */
-        end: number[];
-        /** box 的欧拉角旋转，旋转顺序是 [XYZ] */
-        rotation?: number[];
-        /** 标注颜色 */
-        color?: string;
-        /** 透明度 */
-        opacity?: number;
-    };
-}
-export interface ServerTrianglesItem extends ServerBaseItem {
+}
+/**
+ * @description triangles 数据类型
+ */
+export interface ServerTrianglesItem extends ServerBaseItem<TrianglesItemObjectData> {
     type: 'triangles';
-    object_data: {
-        /** 可见点位 */
-        panoIndex?: number;
-        /** 多边形的顶点坐标数组 */
-        points: number[][];
-        /** 标注颜色 */
-        color?: string;
-        /** 透明度 */
-        opacity?: number;
-    };
-}
-export interface ServerPrismItem extends ServerBaseItem {
+}
+/**
+ * @description prism 数据类型
+ */
+export interface ServerPrismItem extends ServerBaseItem<PrismItemObjectData> {
     type: 'prism';
-    object_data: {
-        /** 绘制平面的三维世界坐标点数组 */
-        points: number[][];
-        /** 楼层高度 */
-        height: number;
-        /** 所在楼层 */
-        floorIndex?: number;
-        /** 人工设置的y坐标方向偏移 */
-        fixedY?: number;
-        /** 人工设置的高度修正 */
-        fixedHeight?: number;
-        /** 标注颜色 */
-        color?: string;
-        /** 透明度 */
-        opacity?: number;
-    };
+}
+/**
+ * @description 所有 item 数据类型
+ */
+export type ServerItem = ServerBoxItem | ServerTrianglesItem | ServerPrismItem;
+/**
+ * @description 服务端存储数据类型
+ */
+export interface ServerData {
+    list: ServerItem[];
 }

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

@@ -1,7 +1,16 @@
 import type { Five } from '@realsee/five';
 import type * as BasePlugin from '../../base/BasePluginWithData';
-import type { ModelMakerBaseItem } from '../item/baseItem';
 import type { ServerData } from './data';
+import type { ModelMakerBoxItem } from '../item/boxItem';
+import type { ModelMakerPolygonItem } from '../item/polygonItem';
+import type { ModelMakerPrismItem } from '../item/prismItem';
+export type { ModelMakerBoxItem } from '../item/boxItem';
+export type { ModelMakerPolygonItem } from '../item/polygonItem';
+export type { ModelMakerPrismItem } from '../item/prismItem';
+export type { ServerBoxItem } from './data';
+export type { ServerTrianglesItem } from './data';
+export type { ServerPrismItem } from './data';
+export type { ItemType } from './data';
 export type { Controller as ModelMakerController } from '../Controller';
 export type * from './data';
 /** 插件状态 */
@@ -38,5 +47,5 @@ export interface EventMap extends BasePlugin.EventMap<State, ServerData> {
         userAction: boolean;
     }) => void;
 }
-export type ItemType = ServerData['list'][number]['type'];
-export type ElementRenderer = (container: HTMLElement, item: ModelMakerBaseItem, five?: Five) => () => void;
+export type MarkerItem = ModelMakerBoxItem | ModelMakerPolygonItem | ModelMakerPrismItem;
+export type ElementRenderer = (container: HTMLElement, item: MarkerItem, five?: Five) => () => void;