@realsee/dnalogel 3.63.4-alpha.5 → 3.64.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 3.64.1
+
+- fix(Sculpt): 修复绘制时长度不显示的问题。
+
+## 3.64.0
+
+- BREAKING CHANGE(GuideLinePlugin): 移除 `autoDepthTestEffectDistance` 和 `useAutoDepthTest` 配置，采用 `route_standing_positions` 和 `node_pair_to_route_points` 预跑数据来优化路线生成效果。
+- fix(SculptPlugin): 使用函数调用方式来初始化时支持传入 Theme。
+
 ## 3.63.3
 
 - fix(MeasurePlugin): 修复一些问题。

package/dist/GuideLinePlugin/Controller.d.ts

@@ -6,24 +6,13 @@ import type { Config as BaseConfig } from '../base/BasePlugin';
 import { GuideLineItem } from './GuideLineItem';
 import CruisePluginController from '../CruisePlugin/Work';
 export declare const pluginFlag: (name: string) => string;
-type Config = BaseConfig & {
-    /**
-     * @description 是否自动关闭点位附近路线的深度测试
-     * @default false
-     */
-    useAutoDepthTest?: boolean;
-    /**
-     * @description use_auto_depthtest 开启时，自动关闭深度测试的距离
-     * @default 1~3 之间
-     */
-    autoDepthTestEffectDistance?: number;
-};
+type Config = BaseConfig;
 export default class Controller extends BasePluginWithData.Controller<PluginState, EventMap, PluginServerData, PluginData> {
     readonly name = "GuideLinePlugin";
     readonly cruisePlugin: CruisePluginController;
     /** GuideLineItem 索引 */
     readonly itemMap: Map<string | number, GuideLineItem>;
-    get config(): Config;
+    get config(): BaseConfig;
     state: {
         visible: boolean;
         enabled: boolean;

package/dist/GuideLinePlugin/GuideLineModeItem.d.ts

@@ -30,8 +30,7 @@ declare class GuideLineModeItem {
     materialStyle: PluginType.GuideLineMaterialStyle;
     meshStyle: PluginType.GuideLineMeshStyle;
     readonly group: THREE.Group;
-    readonly meshWithDepthTest: THREE.Mesh<THREE.BufferGeometry, THREE.ShaderMaterial>;
-    readonly meshWithoutDepthTest: THREE.Mesh<THREE.BufferGeometry, THREE.ShaderMaterial>;
+    readonly mesh: THREE.Mesh<THREE.BufferGeometry, THREE.ShaderMaterial>;
     visible: boolean | null;
     private five;
     private mode;
@@ -62,8 +61,6 @@ declare class GuideLineModeItem {
     private cacheLengths;
     /** 为了让多条路线在高度上错开，每个路线都需要有个额外的 offset */
     private heightOffset;
-    private panoMap;
-    private autoDepthTestEffectDistance?;
     constructor(five: Five, options: {
         mode: PluginType.GuideLineModeItemMode;
         plugin: GuideLinePlugin;
@@ -79,16 +76,11 @@ declare class GuideLineModeItem {
     /** 设置缩放 */
     setScale(scale: number): void;
     /** 通过点位设置线条形状 */
-    setGeometryByPanoGroup(_panoGroup: number[], options?: CatmullRomCurve3RestParams & PluginType.GuideLineGeometryStyle & {
+    setGeometryByPanoGroup(_panoGroup: number[], options?: CatmullRomCurve3RestParams & PluginType.ExtraRouteData & PluginType.GuideLineGeometryStyle & {
         skipPanoGroup?: boolean;
-        useAutoDepthTest?: boolean;
-        autoDepthTestEffectDistance?: number;
     }): void;
     /** 通过路径设置线条形状 */
-    setGeometryByPath(path: PluginType.PathItem[], options?: PluginType.GuideLineGeometryStyle & {
-        useAutoDepthTest?: boolean;
-        autoDepthTestEffectDistance?: number;
-    }): void;
+    setGeometryByPath(path: PluginType.PathItem[], options?: PluginType.GuideLineGeometryStyle): void;
     /** 设置线条材质 */
     setMartial(options?: PluginType.GuideLineMaterialStyle): void;
     /** 设置模型状态 */
@@ -136,15 +128,11 @@ declare class GuideLineModeItem {
     private onWalkAnimationEnd;
     /** 模型状态变更 */
     private onFiveModeChange;
-    /** 走点 */
-    private onFivePanoArrived;
     private onFiveModelShownFloorChange;
     /** 更新可见性 */
     private updateVisible;
     private doShow;
     private doHide;
-    /** 通过 panoIndex 数组计算路径 */
-    private getPathFromPanoGroup;
     private onFlowAnimeUpdate;
     private logError;
 }

package/dist/GuideLinePlugin/typing.d.ts

@@ -2,10 +2,29 @@ import type GuideLinePlugin from '.';
 import type { RequireAtLeastOne } from 'type-fest';
 import type * as BasePluginWithData from '../base/BasePluginWithData';
 import type { Tag } from '../PanoTagPlugin';
-export interface RouteConfig {
+export type RouteConfig = {
+    /**
+     * @description 箭头贴图
+     */
     arrowTextureUrl?: string;
+    /**
+     * @description 单位箭头宽度，单位：米
+     */
     unitWidth?: number;
+    /**
+     * @description 单位箭头高度，单位：米
+     */
     unitHeight?: number;
+} & ExtraRouteData;
+export interface ExtraRouteData {
+    /**
+     * @description 预处理数据，用于优化路线生成效果
+     */
+    route_standing_positions?: number[][];
+    /**
+     * @description 预处理数据，用于优化路线生成效果
+     */
+    node_pair_to_route_points?: Record<string, number[][]>;
 }
 export interface Route extends RouteConfig {
     id?: number;
@@ -82,7 +101,7 @@ export type GuideLineItem = RequireAtLeastOne<{
     panorama_style?: PanoramaGuideLineStyle;
     /** 模型态使用的数据 */
     model_style?: ModelGuideLineStyle;
-}, 'id' | 'render_id'>;
+} & ExtraRouteData, 'id' | 'render_id'>;
 /** 全景路径样式 */
 export interface PanoramaGuideLineStyle extends GuideLineStyle {
     start_tag?: Tag;
@@ -177,6 +196,4 @@ export interface CatmullRomCurve3 {
     closed?: boolean;
     curve_type?: string;
     tension?: number;
-    panoIndexList?: number[];
-    panoIndexMap?: Record<number, number>;
 }

package/dist/GuideLinePlugin/utils/createLineGeometry.d.ts

@@ -22,17 +22,7 @@ export declare function createLineGeometry(options: LineGeometryOption): {
     maxV: number;
     curvePath: any;
     curvePoints: any;
-    panoMap: {};
     animationWillError?: undefined;
-    totalLength?: undefined;
-} | {
-    geometry: THREE.BufferGeometry;
-    maxV: number;
-    curvePath: any;
-    curvePoints: any;
-    panoMap?: undefined;
-    animationWillError?: undefined;
-    totalLength?: undefined;
 } | {
     geometry: THREE.BufferGeometry;
     maxV: number;
@@ -42,7 +32,5 @@ export declare function createLineGeometry(options: LineGeometryOption): {
     }[];
     curvePath: THREE.CurvePath<THREE.Vector3>;
     curvePoints: THREE.Vector3[];
-    panoMap: Record<number, number>;
-    totalLength: number;
 };
 export {};

package/dist/GuideLinePlugin/utils/createPath.d.ts

@@ -0,0 +1,3 @@
+import type { Work } from '@realsee/five';
+import type { CatmullRomCurve3, ExtraRouteData } from '../typing';
+export declare function createPath(panoIndexList: number[], work: Work, options?: Omit<CatmullRomCurve3, 'type' | 'points'> & ExtraRouteData): CatmullRomCurve3[];

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

@@ -1,10 +1,3 @@
-import type { GuideLineModeItem } from '../GuideLineModeItem';
-import type * as PluginType from '../typing';
-export declare function updateGuideLineModeItemByData(options: {
-    item: GuideLineModeItem;
-    data: PluginType.GuideLineItem;
-    mode: PluginType.GuideLineModeItemMode;
-}): void;
 /**
  * 筛选出给定数组中，相邻元素不能重复的元素组成的新数组
  * @param array 要筛选的数组

package/dist/MeasurePlugin/Controller.d.ts

@@ -1,5 +1,4 @@
 import type { Five } from '@realsee/five';
-import { PointSelector } from '../shared-utils';
 import { type PolygonStyle } from '../Sculpt/Meshes/Polygon';
 import { Subscribe } from '../shared-utils/Subscribe';
 import type { LineMeshStyle } from '../Sculpt/typings';
@@ -13,13 +12,12 @@ export declare class MeasureController extends Subscribe<Event> {
     private five;
     private group;
     private currentMeasureMesh?;
-    get pointSelector(): PointSelector;
+    private get pointSelector();
     private _pointSelector;
     private get fiveDomEvents();
     private _fiveDomEvents;
     private get cursor();
     private _cursor;
-    private unbindHotKey;
     constructor(five: Five);
     /**
      * @description 开始测量
@@ -29,10 +27,6 @@ export declare class MeasureController extends Subscribe<Event> {
      * @description 结束测量
      */
     endMeasure: () => void;
-    /**
-     * @description 取消本次测量
-     */
-    cancel: () => void;
     /**
      * @description 撤销上一步
      */
@@ -42,11 +36,7 @@ export declare class MeasureController extends Subscribe<Event> {
      */
     clear: () => void;
     dispose: () => void;
-    private addEventListener;
-    private removeEventListener;
     private onClick;
-    private onHover;
-    private onUnHover;
     private updateSelectAdsorbedHelper;
 }
 export {};

package/dist/MeasurePlugin/utils/MeasureMesh.d.ts

@@ -5,15 +5,10 @@ export declare class MeasureMesh extends IObject3D {
     readonly isMeasureMesh = true;
     points: THREE.Vector3[];
     isPolygon: boolean;
-    private selected;
     private line;
     private polygon;
     constructor();
     setPoints(points: THREE.Vector3[]): void;
-    select(): void;
-    unselect(): void;
-    hover(): void;
-    unhover(): void;
-    private highlight;
-    private unhighlight;
+    highlight(): void;
+    unhighlight(): void;
 }

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

@@ -6,12 +6,11 @@ import type { PointsData } from '../utils/data';
 import { LightTag } from '../../shared-utils/tag';
 import { LineGeometry } from '../../shared-utils/three/core/LineGeometry';
 import { THREE_Line2 } from '../../shared-utils/three/core/Line2';
-import { type RenderDomObjectType } from '../utils/renderDom';
 export type LineMeshStyle = LineStyle & {
     dashed?: boolean;
 } & OcclusionStyle & Partial<LengthConfig> & Partial<DisplayInfoConfig>;
 export type LineData = PointsData;
-export declare class LineMesh extends IObject3D implements RenderDomObjectType {
+export declare class LineMesh extends IObject3D {
     name: string;
     type: string;
     object?: THREE.Object3D;
@@ -35,6 +34,7 @@ export declare class LineMesh extends IObject3D implements RenderDomObjectType {
     private colorBeforeHighlight;
     private paramsStyle;
     private lastRenderDomItem;
+    private _visible;
     constructor(params?: Partial<LineMeshStyle & LineData>);
     updateMatrixWorld(force?: boolean): void;
     setPoints(points: AnyPositions): void;
@@ -44,9 +44,5 @@ export declare class LineMesh extends IObject3D implements RenderDomObjectType {
         color?: Color;
     }): void;
     unhighlight(): void;
-    _onAdded: () => void;
-    _onRemoved: () => void;
-    _onShowed: () => void;
-    _onHidden: () => void;
     private updateDomItems;
 }

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

@@ -32,9 +32,5 @@ export declare class PointMesh extends IObject3D {
     highlight(): void;
     unhighlight(): void;
     updateMatrixWorld(force?: boolean): void;
-    _onAdded: () => void;
-    _onRemoved: () => void;
-    _onShowed: () => void;
-    _onHidden: () => void;
     private updateDom;
 }

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

@@ -41,10 +41,6 @@ export declare class PolygonMesh extends ColoredMesh<THREE.BufferGeometry> {
      * @description: 获取一个点投影在当前平面上的点
      */
     projectPoint(point: THREE.Vector3): THREE.Vector3;
-    _onAdded: () => void;
-    _onRemoved: () => void;
-    _onShowed: () => void;
-    _onHidden: () => void;
     private updatePlaneHelper;
     private updateAreaItems;
 }

package/dist/Sculpt/index.d.ts

@@ -11,9 +11,10 @@ import { Rectangle } from './Objects/Rectangle';
 import { Circle } from './Objects/Circle';
 import { Cylinder } from './Objects/Cylinder';
 import { Box } from './Objects/Box';
-import type { BuiltInData, BuiltInItem, Theme } from './typings';
+import type { BuiltInData, BuiltInItem, SculptType } from './typings';
 import { Line } from './Objects/Line';
 export type { SculptData } from './typings';
+export type { SculptType } from './typings';
 export { createPoint } from './Objects/Point';
 export { createLine } from './Objects/Line';
 export { createPolyline } from './Objects/Polyline';
@@ -80,13 +81,14 @@ export declare class Sculpt extends Subscribe<Event> {
             readonly points: [number, number, number][];
             readonly heightPoint: [number, number, number];
             readonly style: {
-                readonly color: number; /**
+                readonly color: number;
+                readonly lineWidth: number;
+                /**
                  * @description: 点击事件
                  * @param {MouseEvent} e 鼠标事件
                  * @param {BuiltInItem} item 点击的物体
                  * 返回 false 来禁用 Five 默认行为
                  */
-                readonly lineWidth: number;
                 readonly lineColor: number;
             };
             readonly id: string;
@@ -112,11 +114,11 @@ export declare class Sculpt extends Subscribe<Event> {
         })[];
     };
     group: IObject3D;
-    theme: Theme;
+    theme: SculptType.Theme;
     get items(): BuiltInItem[];
     private five;
     private creatingItem;
-    constructor(five: Five, theme?: Theme);
+    constructor(five: Five, theme?: SculptType.Theme);
     /**
      * @description: 加载数据 展示
      */
@@ -188,4 +190,4 @@ export declare class Sculpt extends Subscribe<Event> {
 /**
  * @description: Sculpt 插件
  */
-export declare const SculptPlugin: (five: Five) => Sculpt;
+export declare const SculptPlugin: (five: Five, theme?: SculptType.Theme) => Sculpt;

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

@@ -48,14 +48,25 @@ export type { BoxStyle };
 export type { AreaStyle };
 export type BuiltInData = PolylineImportData | PointImportData | PolygonImportData | PrismImportData | RectangleImportData | CircleImportData | CylinderImportData | BoxImportData | LineImportData;
 export type BuiltInItem = Polyline | Point | Polygon | Prism | Rectangle | Circle | Cylinder | Box | Line;
-export type Theme = Partial<{
-    point: Partial<PointStyle>;
-    line: Partial<LineMeshStyle>;
-    polyline: Partial<PolylineStyle>;
-    polygon: Partial<AreaStyle>;
-    prism: Partial<PrismStyle>;
-    rectangle: Partial<RectangleStyle>;
-    circle: Partial<CircleStyle>;
-    cylinder: Partial<CylinderStyle>;
-    box: Partial<BoxStyle>;
-}>;
+export declare namespace SculptType {
+    /**
+     * - color: 颜色
+     * - opacity: 透明度
+     * - lineColor: 边框线颜色
+     * - lineWidth: 线宽
+     * - lineOpacity: 边框线透明度
+     * - occlusionVisibility: 是否以一种半透明的方式显示遮挡的部分
+     * - occlusionMode: 遮挡模式
+     */
+    type Theme = Partial<{
+        point: Partial<PointStyle>;
+        line: Partial<LineMeshStyle>;
+        polyline: Partial<PolylineStyle>;
+        polygon: Partial<AreaStyle>;
+        prism: Partial<PrismStyle>;
+        rectangle: Partial<RectangleStyle>;
+        circle: Partial<CircleStyle>;
+        cylinder: Partial<CylinderStyle>;
+        box: Partial<BoxStyle>;
+    }>;
+}

package/dist/Sculpt/typings/style.d.ts

@@ -77,7 +77,7 @@ export type LengthConfig = {
      * @description 距离/面积 单位
      * @default 'm'
      */
-    lengthUnit: 'm' | 'mm' | 'ft';
+    lengthUnit: 'm' | 'mm';
 };
 export type DisplayInfoConfig = {
     /**