@realsee/dnalogel 2.3.6 → 2.3.7-1

package/dist/PanoMeasurePlugin/Controller/BaseController.d.ts

@@ -8,7 +8,7 @@ import type { UserDistanceItem } from '../utils/distanceDom';
 import type { Five, Intersection, IntersectMeshInterface, Subscribe } from '@realsee/five';
 import type { OpenParameter } from '../typings/data';
 import Line from '../Model/line';
-export interface IControllerParams {
+export interface ControllerParams {
     five: Five;
     group: Group;
     model: Model;
@@ -32,10 +32,10 @@ export default class BaseController {
     protected mouseGroup: Group;
     protected container: Element;
     protected fiveHelper: FiveHelper;
-    protected hook: IControllerParams['hook'];
-    protected magnifier: IControllerParams['magnifier'];
-    protected userDistanceItemCreator: IControllerParams['userDistanceItemCreator'];
-    constructor(params: IControllerParams);
+    protected hook: ControllerParams['hook'];
+    protected magnifier: ControllerParams['magnifier'];
+    protected userDistanceItemCreator: ControllerParams['userDistanceItemCreator'];
+    constructor(params: ControllerParams);
     updateDistanceUI: () => void;
     protected removeLine(line: Line): void;
     protected updateMouseGroup(intersection: Intersection, mesh?: IntersectMeshInterface): Group;

package/dist/PanoMeasurePlugin/Controller/EditController.d.ts

@@ -1,11 +1,10 @@
-import type { LineJson } from '../typings/data';
 import Line from '../Model/line';
-import BaseController, { IControllerParams } from './BaseController';
-export interface EditEvent {
-    editedLineChange: (lines: LineJson[]) => void;
-}
+import BaseController, { ControllerParams } from './BaseController';
+import { Polyline } from '../Model/polyline';
 export default class EditController extends BaseController {
     type: string;
+    polyline: Polyline;
+    /** 拖动的控制点 */
     private pressPoint?;
     private hasAppendDashed;
     private hasAppendMouseGroup;
@@ -15,7 +14,7 @@ export default class EditController extends BaseController {
     private hammer?;
     /** 根据 intersection 更新放大镜和吸附点 */
     private onIntersectionUpdate;
-    constructor(params: IControllerParams);
+    constructor(params: ControllerParams);
     dispose(): void;
     getEditingLines(): Line[];
     /** 撤销编辑 */

package/dist/PanoMeasurePlugin/Controller/MixedController.d.ts

@@ -1,25 +1,22 @@
-import type { LineJson } from '../typings/data';
-import { Model } from '../Model';
 import Line from '../Model/line';
-import BaseController, { IControllerParams } from './BaseController';
+import BaseController, { ControllerParams } from './BaseController';
+import { Polyline } from '../Model/polyline';
 export declare type State = 'watching' | 'editing';
-export interface EditEvent {
-    editedLineChange: (lines: LineJson[]) => void;
-}
 export default class MixedController extends BaseController {
     state: State;
-    model: Model;
+    polyline: Polyline;
     private hasAppendDashed;
-    private fiveElement?;
     private mobileStartPoint;
     private mobileNowPoint;
     private highlightedLines;
     private deleteDom;
-    constructor(params: IControllerParams);
+    private rangePieceController;
+    constructor(params: ControllerParams);
     dispose(): void;
     highlightLine(line: Line): void;
     clearHighlightLines(): void;
     getEditingLines(): Line[];
+    addStartPoint(): void;
     /** 编辑线条发生改变时通知外部 */
     private onLineChanged;
     private onWantsTapGesture;

package/dist/PanoMeasurePlugin/Controller/ViewController.d.ts

@@ -1,16 +1,19 @@
 import type Line from '../Model/line';
-import BaseController, { IControllerParams } from './BaseController';
+import BaseController, { ControllerParams } from './BaseController';
 export default class ViewController extends BaseController {
     type: string;
     private highlightedLines;
     private hammer?;
-    constructor(params: IControllerParams);
+    constructor(params: ControllerParams);
     dispose(): void;
     highlightLine(line: Line): void;
     clearHighlightLines(): void;
     private wantsTapGesture;
     private chooseLine;
     private highlightLines;
-    private lineRemoved;
+    private polylineRemoved;
+    private polylineAdded;
     private onCameraUpdate;
+    private onFivePanoWillArrive;
+    private onFivePanoArrived;
 }

package/dist/PanoMeasurePlugin/Controller/WatchController.d.ts

@@ -1,5 +1,5 @@
 import type Line from '../Model/line';
-import BaseController, { IControllerParams } from './BaseController';
+import BaseController, { ControllerParams } from './BaseController';
 export default class WatchController extends BaseController {
     type: string;
     private deleteDom;
@@ -7,7 +7,7 @@ export default class WatchController extends BaseController {
     private fiveElement?;
     private editPointState?;
     private hammer?;
-    constructor(params: IControllerParams);
+    constructor(params: ControllerParams);
     dispose(): void;
     highlightLine(line: Line): void;
     clearHighlightLines(): void;
@@ -19,7 +19,7 @@ export default class WatchController extends BaseController {
     private wantsTapGesture;
     private chooseLine;
     private highlightLines;
-    private lineRemoved;
+    private polylineRemoved;
     private onCameraUpdate;
     private deleteDomClickCallback;
     private cancelDeleteClickCallback;

package/dist/PanoMeasurePlugin/Controller/index.d.ts

@@ -6,6 +6,7 @@ import Magnifier, { MagnifierParameter } from '../Modules/Magnifier';
 import { Five, Subscribe } from '@realsee/five';
 import { UIControllerParams } from '../Modules/UIController';
 import { GuideControllerParams } from '../Modules/GuideController';
+import { Polyline } from '../Model/polyline';
 export declare type Mode = 'Watch' | 'Edit' | 'Mixed' | 'View';
 export interface PanoMeasureParameterType extends Partial<Config> {
     openParams?: OpenParameter;
@@ -22,15 +23,14 @@ export default class MeasureController {
     private model;
     private group;
     private config;
+    private isMobile;
     private fiveHelper;
     private useUIController?;
     private params;
     private useGuideController?;
-    private rangePieceController?;
     private container;
     private shortcutKeyController?;
     private controller;
-    private controllerParams;
     constructor(five: Five, params: PanoMeasureParameterType);
     appendTo(parent: HTMLElement): void;
     dispose(): void;
@@ -43,7 +43,9 @@ export default class MeasureController {
      * @description 会隐藏鼠标的默认聚焦环
      * @description 会隐藏当前 VR 内的点位展示
      */
-    enable(): void;
+    enable(config?: {
+        mode: Mode;
+    }): void;
     /** 关闭插件功能
      * @description 清除标尺线条
      * @description 还原点位展示和默认鼠标 UI
@@ -53,23 +55,39 @@ export default class MeasureController {
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动
      */
-    changeMode: (mode: Mode) => Error;
+    changeMode: (mode: Mode) => void;
+    /** 进入编辑模式 */
+    edit(): void;
     /** 撤销编辑 */
     revoke(): void;
-    removeLineByID(lineID: string): void;
+    removePolyline(polyline: Polyline): void;
+    removePolylineByID(id: string): void;
+    getPolylineByID(id: string): Polyline;
+    getEditedPolyline(): void;
     /**
      * 高亮当前线段
      */
     highlightLine(lineID: string): boolean;
     clearHighlightLines(): boolean;
-    /** 保存编辑 */
-    save(): this;
-    /** 把当前以保存的数据转换成 JSON 对象 */
+    /** 保存编辑
+     * @description 以下情况可能报错
+     */
+    save(config?: {
+        mode?: Mode;
+    }): this;
+    /** Mixed 模式才有用，添加起点 */
+    addStartPoint(): void;
+    /** Mixed 模式才有用，添加终点 */
+    addEndPoint(): void;
+    /** 导出数据 */
     toJson(): PluginData;
     /**
      * @description 改变插件的模式（pc端模式或移动端模式）
      * @param isMobile true为移动端模式，false为pc端
      */
     changeIsMobile(isMobile: boolean): void;
-    changeConfigs(config: Partial<Config>): void;
+    changeConfigs(config: Config): void;
+    /** 设置线段的文本 */
+    setCustomText(lineID: string, text: string): void;
+    private createControllerParams;
 }

package/dist/PanoMeasurePlugin/Model/index.d.ts

@@ -1,35 +1,35 @@
 import type { Config } from '../typings';
 import type { PluginData } from '../typings/data';
 import Line from './line';
-import Point from './point';
-import { Subscribe, SubscribeEventMap } from '@realsee/five';
 import { Polyline } from './polyline';
-interface IModelEvent extends SubscribeEventMap {
+import { Subscribe } from '@realsee/five';
+declare type IModelEvent = {
     /** 新增线条
      * @param line 被创建的线条
      */
-    lineAdded: (line: Line) => void;
+    polylineAdded: (line: Polyline) => void;
     /** 删除线条
      * @param lines 被删除的线条数组
      */
-    lineRemoved: (lines: Line) => void;
-}
+    polylineRemoved: (lines: Polyline) => void;
+};
 export declare class Model {
-    readonly lines: Line[];
-    readonly points: Point[];
-    readonly params: Config;
+    readonly config?: Config;
     readonly polylines: Polyline[];
     readonly hook: Subscribe<IModelEvent>;
-    constructor(params: Config);
-    addLine(line: Line): this;
-    removeLineByID(lineID: string): void;
-    removeLine(line: Line): this;
-    mergeModel(model: Model): void;
-    includes(item: Point | Line): boolean;
-    getPointByID(id: string): Point;
+    constructor(config?: Config);
+    addPolyline(polyline: Polyline): void;
+    replacePolylineByID(id: string, polyline: Polyline): void;
+    removePolyline(polyline: Polyline): void;
+    getPolylineByID(id: string): Polyline;
+    getPolylineByLine(line: Line): Polyline;
     getLineByID(id: string): Line;
+    getAllLines(): Line[];
+    getAllPoints(): import("./point").default[];
+    includes(item: Polyline): boolean;
+    clear(): void;
     getClosestPoint(): void;
-    parse(data: PluginData): this;
+    parse(data: PluginData): void;
     toJson(): PluginData;
 }
 export {};

package/dist/PanoMeasurePlugin/Model/line.d.ts

@@ -1,17 +1,18 @@
 import type { Model } from '.';
-import type Point from './point';
-import type { LineJson } from '..';
-import type { LineCompletelyJson } from '../typings/data';
+import Point from './point';
+import type { LineJson } from '../typings/data';
 import type { Line as FiveLine } from '@realsee/five/line';
 import { Polyline } from './polyline';
 import { Subscribe, SubscribeEventMap } from '@realsee/five';
 import { DistanceItem } from '../utils/distanceDom';
 export interface ILineHook extends SubscribeEventMap {
     selected: (line: Line) => void;
+    textChanged: (text: string | undefined) => void;
 }
 export default class Line {
     id: string;
     selected: boolean;
+    text?: string;
     readonly type = "line";
     readonly model: Model;
     readonly mesh: FiveLine;
@@ -22,9 +23,10 @@ export default class Line {
     private polyline?;
     constructor(point: Point, anotherPoint: Point, model: Model);
     clear(): void;
+    isEmpty(): boolean;
     getPolyline(): Polyline;
     findAnotherPoint(point: Point): Point;
+    setText(text: string | null): void;
     toJson(): LineJson;
-    toCompletelyJson(): LineCompletelyJson;
     clone(): Line;
 }

package/dist/PanoMeasurePlugin/Model/point.d.ts

@@ -1,16 +1,14 @@
 import type Line from './line';
-import type { PluginData } from '../typings/data';
+import type { PointJson } from '../typings/data';
 import { Vector3 } from 'three';
-declare type IPointData = PluginData['points'][0];
 export default class Point {
     id: string;
     lines: Line[];
     position: Vector3;
     readonly type = "point";
     constructor(position: Vector3 | number[]);
-    toJson(): IPointData;
+    toJson(): PointJson;
     addLine(line: Line): void;
     removeLine(line: Line): void;
     clone(): Point;
 }
-export {};

package/dist/PanoMeasurePlugin/Model/polyline.d.ts

@@ -1,16 +1,41 @@
-import type Line from './line';
-import type Point from './point';
-import type { PolylineJson, PolylineCompletelyJson } from '../typings/data';
+import type { PolylineJson } from '../typings/data';
+import Line from './line';
+import Point from './point';
+import { Subscribe } from '@realsee/five';
+import { Model } from '.';
+export declare type PolylineEventMap = {
+    /** 新增线条
+     * @param line 被创建的线条
+     */
+    lineAdded: (line: Line) => void;
+    /** 删除线条
+     * @param lines 被删除的线条数组
+     */
+    lineRemoved: (lines: Line) => void;
+};
 export declare class Polyline {
-    readonly id: string;
+    id: string;
+    lines: Line[];
     points: Point[];
-    readonly lines: Line[];
-    push(line: Line): number;
-    pop(): Line;
-    getNext(line: Line): {
-        line: Line;
-        points: Point[];
-    };
+    visiblePanoIndexes?: number[];
+    readonly model: Model;
+    readonly type = "polyline";
+    readonly hook: Subscribe<PolylineEventMap>;
+    constructor(config: {
+        model: Model;
+    });
+    addLine(line: Line): void;
+    removeLine(line: Line): void;
+    isLastLine(line: Line): boolean;
+    getLastLine(): Line;
+    clear(): void;
+    /** 是否产生重叠 */
+    overlapWith(item: Point | Line | Polyline): boolean;
+    includes(item: Point | Line): boolean;
+    isEmpty(): boolean;
+    getLastPoint(): Point;
     toJson(): PolylineJson;
-    toCompletelyJson(): PolylineCompletelyJson;
+    getPointByID(id: string): Point;
+    fromJson(data: PolylineJson): this;
+    replace(polyline: Polyline): void;
 }

package/dist/PanoMeasurePlugin/Modules/GuideController.d.ts

@@ -11,6 +11,8 @@ export declare class GuideController {
     private textDom;
     private container;
     private hasAnchor;
+    /** 是否曾经切换到 Watch 模式过 */
+    private hasChangedToWatch;
     private _params;
     constructor(measureController: MeasureController, params: GuideControllerParams);
     dispose(): void;

package/dist/PanoMeasurePlugin/Modules/UIController/Revoke/index.d.ts

@@ -1,4 +1,3 @@
-import type { Mode } from '../../../Controller';
 import type MeasureController from '../../../Controller';
 export default class Revoke {
     private container;
@@ -7,7 +6,7 @@ export default class Revoke {
     private measureController;
     constructor(measureController: MeasureController, container: Element);
     dispose(): void;
-    onClick: () => void;
-    onModeChange: (mode: Mode) => void;
-    handleRevoke: () => () => void;
+    private onClick;
+    private onModeChange;
+    private onAnchorChange;
 }

package/dist/PanoMeasurePlugin/Modules/UIController/index.d.ts

@@ -1,8 +1,7 @@
 import type MeasureController from '../../Controller';
-import type { OpenParameter } from '../../typings/data';
 export interface UIControllerParams {
     container: Element;
-    openParams?: OpenParameter;
+    mode?: 'pc' | 'mobile';
     startButtonText?: string;
     endButtonText?: string;
     revokeButtonText?: string;

package/dist/PanoMeasurePlugin/index.d.ts

@@ -3,8 +3,12 @@ import MeasureController, { PanoMeasureParameterType } from './Controller';
 import Magnifier from './Modules/Magnifier';
 export declare const PanoMeasurePlugin: FivePlugin<PanoMeasureParameterType, PanoMeasureReturnType>;
 export default PanoMeasurePlugin;
+export { Magnifier };
+export { Model as PanoMeasurePluginModel } from './Model';
+export { default as PanoMeasurePluginPoint } from './Model/point';
+export { default as PanoMeasurePluginLine } from './Model/line';
+export { Polyline as PanoMeasurePluginPolyline } from './Model/polyline';
 export declare type PanoMeasureReturnType = MeasureController;
 export type { PanoMeasurePluginEvent } from './typings/event.type';
-export type { LineJson, PointJson, OpenParameter } from './typings/data';
+export type { LineJson as PanoMeasurePluginLineJson, PointJson as PanoMeasurePluginPointJson, PolylineJson as PanoMeasurePluginPolylineJson, OpenParameter as PanoMeasurePluginOpenParameter, } from './typings/data';
 export type { PanoMeasureParameterType } from './Controller';
-export { Magnifier };

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

@@ -1,29 +1,19 @@
-export interface LineCompletelyJson {
-    id: string;
-    points: PointJson[];
-}
-export interface PolylineCompletelyJson {
+export interface PolylineJson {
     id: string;
-    points: PointJson[];
-    lines: LineCompletelyJson[];
+    lines: LineJson[];
+    /** 当前折线在哪个点位上可见，字段不存在时，不做限制 */
+    visiblePanoIndexes?: number[];
 }
 export interface LineJson {
     id: string;
-    points: string[];
-}
-export interface PolylineJson {
-    id: string;
-    points: string[];
-    lines: string[];
+    text?: string;
+    points: PointJson[];
 }
 export interface PointJson {
     id: string;
-    lines: string[];
     position: number[];
 }
 export interface PluginData {
-    lines: LineJson[];
-    points: PointJson[];
     polylines: PolylineJson[];
 }
 /** 开放可配置参数 */

package/dist/PanoMeasurePlugin/typings/event.type.d.ts

@@ -1,37 +1,41 @@
-import type { SubscribeEventMap } from '@realsee/five';
 import type { Vector3 } from 'three';
 import type { Mode } from '../Controller';
 import type { State } from '../Controller/MixedController';
+import Line from '../Model/line';
 import type Point from '../Model/point';
-import type { LineCompletelyJson } from './data';
-interface ControllerEvent extends SubscribeEventMap {
+import { Polyline } from '../Model/polyline';
+declare type ControllerEvent = {
+    enable: (userAction: boolean) => void;
+    disable: (userAction: boolean) => void;
     /**
      * Mode 变更
      */
     modeChange: (mode: Mode) => void;
-}
-interface WatchEvent extends SubscribeEventMap {
-    selectedChange: (lines: LineCompletelyJson[]) => void;
-}
-interface EditEvent {
+};
+declare type WatchEvent = {
+    selectedChange: (lines: Line[]) => void;
+};
+declare type EditEvent = {
     /**
      * 编辑线条变更
      */
-    editedLineChange: (lines: LineCompletelyJson[]) => void;
+    editedPolylineChange: (polyline: Polyline) => void;
+    /** 编辑中的虚线变更 */
+    editedDashedLineChange: (line: Line | null) => void;
     anchorChange: (anchor: Vector3 | null) => void;
-}
-interface DragEvent extends SubscribeEventMap {
+};
+declare type DragEvent = {
     wantsDragLine: (event: {
         point: string;
         lines: string[];
     }) => boolean;
-}
+};
 /** 移动端专用事件 */
-interface MobileEvent extends SubscribeEventMap {
+declare type MobileEvent = {
     getStartPoint: (point: Point) => void;
     getEndPoint: (point: Point) => void;
     willChangeState: (state: State, newState: State) => void;
     nowPointChange: (point: Point) => void;
-}
+};
 export declare type PanoMeasurePluginEvent = ControllerEvent & EditEvent & WatchEvent & DragEvent & MobileEvent;
 export {};

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

@@ -1,8 +1,10 @@
 import type { UserDistanceItem } from '../utils/distanceDom';
 export interface Config {
-    userDistanceItemCreator: undefined | (() => UserDistanceItem);
+    userDistanceItemCreator?: undefined | (() => UserDistanceItem);
     /** 展示 distance DOM 时，使用的转换函数
      * @param distance 单位是 m
      */
-    getDistanceText: (distance: number) => string;
+    getDistanceText?: (distance: number) => string;
+    /** 默认的 distance DOM 文本 */
+    defaultText?: string | null;
 }

package/dist/PanoMeasurePlugin/utils/distanceDom.d.ts

@@ -1,15 +1,15 @@
 import type Line from '../Model/line';
 import type { Five } from '@realsee/five';
-import type { LineCompletelyJson, PolylineCompletelyJson } from '../typings/data';
 import { Vector3 } from 'three';
+import { Polyline } from '../Model/polyline';
 export declare type DistanceItem = ReturnType<typeof createDistanceItem>;
 export interface UserDistanceItem {
     element: Element;
     highlight: () => void;
     unHighlight: () => void;
     update: (params: {
-        line: LineCompletelyJson;
-        polyline: PolylineCompletelyJson;
+        line: Line;
+        polyline: Polyline;
     }) => void;
 }
 export interface CreateDistanceItemProps {
@@ -25,4 +25,6 @@ export declare function createDistanceItem(props: CreateDistanceItemProps): {
     remove: () => void;
     highlight: () => void;
     unHighlight: () => void;
+    getCurrentContent: () => string;
+    setItemSelectable: (value: boolean) => void;
 };