@realsee/dnalogel 3.64.31 → 3.65.0-alpha.1

package/CHANGELOG.md

@@ -1,27 +1,3 @@
-# CHANGELOG
-
-## 3.64.31
-
-- fix(floorplan): 修复户型图插件MapviewFloorplanPlugin、ModelFloorplanPlugin、TopviewFloorplanPlugin在沙盘中observers取值
-
-## 3.64.30
-
-- fix(modelMarkerPlugin): 修复2d标注初始没有enable
-
-## 3.64.29
-
-- fix(PanoTagPlugin): 优化营销标签渲染和性能逻辑
-
-## 3.64.28
-
-- chore(ModelMakerPlugin): 支持修改标注的透明度
-- feat(ModelMakerPlugin): 增强模型透明度控制和类型定义
-- fix(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 t;
+      return this.None(t);
     },
     Out: function(t) {
-      return t;
+      return this.None(t);
     },
     InOut: function(t) {
-      return t;
+      return this.None(t);
     }
   }),
   Quadratic: Object.freeze({

package/dist/ModelMakerPlugin/Controller.d.ts

@@ -1,12 +1,13 @@
 import type { Five, Mode as FiveMode } from '@realsee/five';
 import * as BasePlugin from '../base/BasePluginWithData';
-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;
+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;
     private tagRendererMap;
     private fiveDomEvents;
     private zFightingOffset;
@@ -14,8 +15,6 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, S
     private occlusionVisibility;
     private occlusionMode;
     private fiveEveryReadyListenerDisposer?;
-    private originalOpacities;
-    private originalTagOpacities;
     constructor(five: Five, config?: {
         tagContainerZIndex?: number;
         /**
@@ -31,53 +30,18 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, S
          */
         occlusionMode?: 'translucence' | 'depthTest';
     });
-    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;
+    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;
     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;
-    /**
-     * 隐藏指定类型的模型
-     * @param itemTypes 模型类型数组
-     */
-    hideItemsByType(itemTypes: ItemType[] | ItemType): void;
-    /**
-     * 显示指定类型的模型
-     * @param itemTypes 模型类型数组
-     */
-    showItemsByType(itemTypes: ItemType[] | ItemType): 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;
@@ -85,7 +49,4 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, S
     private handleDisable;
     private onFiveEveryReady;
     private updateTagRenderer;
-    getPrismItems(): MarkerItem[];
-    getPolygonItems(): MarkerItem[];
-    getBoxItems(): MarkerItem[];
 }

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

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

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

@@ -1,20 +1,10 @@
 import { ModelMakerBaseItem } from './baseItem';
-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);
+export declare class ModelMakerBoxItem extends ModelMakerBaseItem {
+    constructor(...args: ConstructorParameters<typeof ModelMakerBaseItem>);
     enable(): void;
     disable(): void;
     show(): void;
-    updateVisible(): void;
     protected onClick(): boolean;
     private hideTag;
+    updateVisible(): void;
 }
-export {};

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

@@ -1,19 +1,9 @@
-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);
+import { ModelMakerBoxItem } from './boxItem';
+export declare class ModelMakerPolygonItem extends ModelMakerBoxItem {
+    constructor(...args: ConstructorParameters<typeof ModelMakerBoxItem>);
     show(): void;
     private onPanoArrived;
     private onModeChange;
     private updatePanoIndex;
     private updateMode;
 }
-export {};

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

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

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

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

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

@@ -1,16 +1,7 @@
 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';
 /** 插件状态 */
@@ -47,5 +38,5 @@ export interface EventMap extends BasePlugin.EventMap<State, ServerData> {
         userAction: boolean;
     }) => void;
 }
-export type MarkerItem = ModelMakerBoxItem | ModelMakerPolygonItem | ModelMakerPrismItem;
-export type ElementRenderer = (container: HTMLElement, item: MarkerItem, five?: Five) => () => void;
+export type ItemType = ServerData['list'][number]['type'];
+export type ElementRenderer = (container: HTMLElement, item: ModelMakerBaseItem, five?: Five) => () => void;

package/dist/PanoTagPlugin/Components/Common/Icon/PanoramaIcon.svelte.d.ts

@@ -0,0 +1 @@
+export { SvelteComponentTyped as default } from 'svelte/internal';

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

@@ -10,22 +10,7 @@ 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;