@realsee/dnalogel 3.64.26 → 3.64.28-alpha.0

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# CHANGELOG
+
+## 3.64.28
+
+- chore(ModelMakerPlugin): 支持修改标注的透明度
+
+## 3.64.27
+
+- fix(MapviewFloorplanPlugin): 修正其他类型名称展示逻辑
+
 ## 3.64.26
 
 - fix(MapviewFloorplanPlugin): 修正区域三角viewBox起始点

package/components/index.js

@@ -43,13 +43,13 @@ var b = Object.freeze({
       return t;
     },
     In: function(t) {
-      return this.None(t);
+      return t;
     },
     Out: function(t) {
-      return this.None(t);
+      return t;
     },
     InOut: function(t) {
-      return this.None(t);
+      return t;
     }
   }),
   Quadratic: Object.freeze({

package/dist/ModelMakerPlugin/Controller.d.ts

@@ -1,13 +1,12 @@
 import type { Five, Mode as FiveMode } from '@realsee/five';
 import * as BasePlugin from '../base/BasePluginWithData';
-import type * as PluginType from './typings';
-import * as THREE from 'three';
-import type { ModelMakerBaseItem } from './item/baseItem';
-export declare class Controller extends BasePlugin.Controller<PluginType.State, PluginType.EventMap, PluginType.ServerData, PluginType.ServerData> {
-    state: PluginType.State;
-    items: ModelMakerBaseItem[];
-    group: THREE.Group;
-    protected data: PluginType.ServerData;
+import { Group } from 'three';
+import type { MarkerItem, State, ServerData, ItemType, ElementRenderer, EventMap } from './typings';
+export declare class Controller extends BasePlugin.Controller<State, EventMap, ServerData, ServerData> {
+    state: State;
+    items: MarkerItem[];
+    group: Group;
+    protected data: ServerData;
     private tagRendererMap;
     private fiveDomEvents;
     private zFightingOffset;
@@ -15,6 +14,8 @@ export declare class Controller extends BasePlugin.Controller<PluginType.State,
     private occlusionVisibility;
     private occlusionMode;
     private fiveEveryReadyListenerDisposer?;
+    private originalOpacities;
+    private originalTagOpacities;
     constructor(five: Five, config?: {
         tagContainerZIndex?: number;
         /**
@@ -30,18 +31,43 @@ export declare class Controller extends BasePlugin.Controller<PluginType.State,
          */
         occlusionMode?: 'translucence' | 'depthTest';
     });
-    load(serverData: PluginType.ServerData): Promise<void>;
-    setState(targetState: Partial<PluginType.State>): void;
-    getItemById(id: string | number): ModelMakerBaseItem;
-    registerTagRenderer(map: Partial<Record<PluginType.ItemType, PluginType.ElementRenderer>>): void;
-    hasCustomTagRenderer(map: PluginType.ItemType): boolean;
+    load(serverData: ServerData): Promise<void>;
+    setState(targetState: Partial<State>): void;
+    getItemById(id: string | number): MarkerItem;
+    registerTagRenderer(map: Partial<Record<ItemType, ElementRenderer>>): void;
+    hasCustomTagRenderer(map: ItemType): boolean;
     enable(): void;
     disable(): void;
     show(): void;
     hide(): void;
     clear(): void;
+    /**
+     * 设置所有模型的透明度
+     * @param opacityPercent 透明度系数，范围0-1，1表示保持原始透明度，0表示完全透明
+     * @param options 可选参数
+     * @param options.type 模型类型，可选值为'box'、'prism'、'triangles'
+     * @param options.id 模型id
+     */
+    setModelsOpacity(opacityPercent: number, options?: {
+        type?: ItemType | ItemType[];
+        id?: number;
+    }): void;
     dispose(): void;
     protected onWorkCodeChange(): void;
+    /**
+     * 设置棱柱体模型的透明度
+     * @param id 模型id
+     * @param model 模型对象
+     * @param opacityPercent 透明度系数，范围0-1
+     */
+    private setPrismModelOpacity;
+    /**
+     * 设置多边形模型的透明度
+     * @param id 模型id
+     * @param model 模型对象
+     * @param opacityPercent 透明度系数，范围0-1
+     */
+    private setPolygonModelOpacity;
     private onFiveModeChange;
     private handleShow;
     private handleHide;

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

@@ -1,40 +1,57 @@
 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 { ServerItemData, ItemType } from '../typings';
+interface ModelWithCenter extends Object3D {
+    /** 模型中心点 */
+    center?: Vector3;
+}
+/**
+ * @description 模型标注的事件类型
+ */
+type ModelMakerEvent<ServerData extends ServerItemData> = {
+    /** 启用 */
     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 ServerItemData> extends Subscribe<ModelMakerEvent<ServerData>> {
     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/dist/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 { ServerBoxItemData } from '../typings';
+/**
+ * @description 模型标注的盒子类型标注的构造参数类型
+ */
+type ModelMakerBoxItemArgs = ConstructorParameters<typeof ModelMakerBaseItem<ServerBoxItemData>>;
+/**
+ * @description 模型标注的盒子类型标注，即长方体
+ * @extends ModelMakerBaseItem
+ */
+export declare class ModelMakerBoxItem extends ModelMakerBaseItem<ServerBoxItemData> {
+    constructor(...args: ModelMakerBoxItemArgs);
     enable(): void;
     disable(): void;
     show(): void;
+    updateVisible(): void;
     protected onClick(): boolean;
     private hideTag;
-    updateVisible(): void;
 }
+export {};

package/dist/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 { ServerTrianglesItemData } from '../typings';
+import { ModelMakerBaseItem } from './baseItem';
+/**
+ * @description 模型标注的多边形类型标注的构造参数类型
+ */
+type ModelMakerPolygonItemArgs = ConstructorParameters<typeof ModelMakerBaseItem<ServerTrianglesItemData>>;
+/**
+ * @description 模型标注的多边形类型标注，即多边形
+ * @extends ModelMakerBaseItem
+ */
+export declare class ModelMakerPolygonItem extends ModelMakerBaseItem<ServerTrianglesItemData> {
+    constructor(...args: ModelMakerPolygonItemArgs);
     show(): void;
     private onPanoArrived;
     private onModeChange;
     private updatePanoIndex;
     private updateMode;
 }
+export {};

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

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

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

@@ -1,56 +1,88 @@
-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;
+}
+/**
+ * @description triangles 所带的数据详细类型
+ */
+export interface TrianglesItemObjectData {
+    /** 可见点位 */
+    panoIndex?: number;
+    /** 多边形的顶点坐标数组 */
+    points: number[][];
+    /** 标注颜色 */
+    color?: string;
+    /** 透明度 */
+    opacity?: number;
 }
-export interface ServerBaseItem {
+/**
+ * @description prism 所带的数据详细类型
+ */
+export interface PrismItemObjectData {
+    /** 绘制平面的三维世界坐标点数组 */
+    points: number[][];
+    /** 楼层高度 */
+    height: number;
+    /** 所在楼层 */
+    floorIndex?: number;
+    /** 人工设置的y坐标方向偏移 */
+    fixedY?: number;
+    /** 人工设置的高度修正 */
+    fixedHeight?: number;
+    /** 标注颜色 */
+    color?: string;
+    /** 透明度 */
+    opacity?: number;
+}
+/**
+ * @description 基础数据类型
+ */
+export interface ServerBaseItemData<TObjectData> {
     /** 唯一标识 */
     id?: number;
     /** 标签名 */
     name?: string;
+    /** 类型 */
+    type: 'box' | 'triangles' | 'prism';
+    /** 对象数据 */
+    object_data: TObjectData;
 }
-export interface ServerBoxItem extends ServerBaseItem {
+/**
+ * @description box 数据类型
+ */
+export interface ServerBoxItemData extends ServerBaseItemData<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 ServerTrianglesItemData extends ServerBaseItemData<TrianglesItemObjectData> {
     type: 'triangles';
-    object_data: {
-        /** 可见点位 */
-        panoIndex?: number;
-        /** 多边形的顶点坐标数组 */
-        points: number[][];
-        /** 标注颜色 */
-        color?: string;
-        /** 透明度 */
-        opacity?: number;
-    };
-}
-export interface ServerPrismItem extends ServerBaseItem {
+}
+/**
+ * @description prism 数据类型
+ */
+export interface ServerPrismItemData extends ServerBaseItemData<PrismItemObjectData> {
     type: 'prism';
-    object_data: {
-        /** 绘制平面的三维世界坐标点数组 */
-        points: number[][];
-        /** 楼层高度 */
-        height: number;
-        /** 所在楼层 */
-        floorIndex?: number;
-        /** 人工设置的y坐标方向偏移 */
-        fixedY?: number;
-        /** 人工设置的高度修正 */
-        fixedHeight?: number;
-        /** 标注颜色 */
-        color?: string;
-        /** 透明度 */
-        opacity?: number;
-    };
+}
+/**
+ * @description 所有 item 数据类型
+ */
+export type ServerItemData = ServerBoxItemData | ServerTrianglesItemData | ServerPrismItemData;
+/**
+ * @description 服务端存储数据类型
+ */
+export interface ServerData {
+    list: ServerItemData[];
 }

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

@@ -1,7 +1,9 @@
 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 { Controller as ModelMakerController } from '../Controller';
 export type * from './data';
 /** 插件状态 */
@@ -39,4 +41,5 @@ export interface EventMap extends BasePlugin.EventMap<State, ServerData> {
     }) => 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;

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

@@ -10,7 +10,22 @@ type Style = LineMeshStyle & {
         startPoint?: boolean;
         endPoint?: boolean;
     };
+    /**
+     * 点颜色
+     */
     pointColor?: Color;
+    /**
+     * 点透明度
+     */
+    pointOpacity?: number;
+    /**
+     * 线颜色
+     */
+    lineColor?: Color;
+    /**
+     * 线透明度
+     */
+    lineOpacity?: number;
 };
 /**
  * Represents a mesh that consists of a line with dots at the start and end points.

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

@@ -45,10 +45,10 @@ export declare class PrismMesh extends IObject3D {
         center: THREE.Vector3;
     };
     protected geometryInfoNeedUpdate: boolean;
+    private edgeMesh;
     prismMesh: ColoredMesh & {
         geometry: PrismGeometry;
     };
-    private edgeMesh;
     paramStyle: Partial<PrismStyle>;
     constructor(params?: Partial<PrismData & PrismStyle>);
     setStyle(params?: Partial<PrismStyle>): void;