@realsee/dnalogel 2.21.0-dev.9 → 2.21.1

package/dist/PanoCompassPlugin/typings.d.ts

@@ -1,6 +1,6 @@
 import type { FloorplanServerRoomItem } from '../floorplan/typings/floorplanServerData';
 import type * as BasePlugin from '../base/BasePluginWithData';
-export interface Config {
+export interface Config extends BasePlugin.Config {
     compassImageUrl: string;
     entryDoorImageUrl: string;
 }

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

@@ -1,13 +1,12 @@
-import type FiveHelper from '../Modules/FiveHelper';
-import { type Group } from 'three';
+import type Magnifier from '../Modules/Magnifier';
+import type { Group } from 'three';
 import type { Model } from '../Model';
 import type { Config } from '../typings';
 import type { PanoMeasurePluginEvent } from '../typings/event.type';
-import type { UserDistanceItem } from '../utils/dom/distanceItem';
+import type { UserDistanceItem } from '../utils/distanceDom';
 import type { Five, Intersection, IntersectMeshInterface, Subscribe } from '@realsee/five';
-import type { OpenParameter, EditParameter, MeasureType } from '../typings/data';
+import type { OpenParameter } from '../typings/data';
 import Line from '../Model/line';
-import type { Magnifier } from '../../shared-utils';
 export interface ControllerParams {
     five: Five;
     group: Group;
@@ -16,11 +15,7 @@ export interface ControllerParams {
     mouseGroup: Group;
     container: Element;
     magnifier: Magnifier;
-    fiveHelper: FiveHelper;
     openParams: OpenParameter;
-    editParams: EditParameter;
-    magnifierParams: ConstructorParameters<typeof Magnifier>[1];
-    getMeasureType: () => MeasureType;
     hook: Subscribe<PanoMeasurePluginEvent>;
     userDistanceItemCreator?: () => UserDistanceItem;
 }
@@ -30,19 +25,13 @@ export default class BaseController {
     protected group: Group;
     protected config: Config;
     protected dashed: Line;
-    protected perpendicularDashed: Line;
     protected disposed: boolean;
     protected isMobile: boolean;
     protected mouseGroup: Group;
     protected container: Element;
-    protected fiveHelper: FiveHelper;
-    protected editParams: EditParameter;
-    protected magnifierParams: ConstructorParameters<typeof Magnifier>[1];
     protected hook: ControllerParams['hook'];
     protected magnifier: ControllerParams['magnifier'];
     protected userDistanceItemCreator: ControllerParams['userDistanceItemCreator'];
-    protected get currentMeasureType(): MeasureType;
-    private getMeasureType;
     constructor(params: ControllerParams);
     updateDistanceUI: () => void;
     protected removeLine(line: Line): void;

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

@@ -2,17 +2,17 @@ import Line from '../Model/line';
 import BaseController from './BaseController';
 import type { ControllerParams } from './BaseController';
 import { Polyline } from '../Model/polyline';
-import Area from '../Model/area';
 export default class EditController extends BaseController {
     type: string;
     polyline: Polyline;
-    area: Area;
+    /** 拖动的控制点 */
+    private pressPoint?;
     private hasAppendDashed;
+    private hasAppendMouseGroup;
     private fiveElement?;
     /** 上一个端点位置 */
     private lastPoint;
-    private pointSelector;
-    private deleteDom;
+    private hammer?;
     /** 根据 intersection 更新放大镜和吸附点 */
     private onIntersectionUpdate;
     constructor(params: ControllerParams);
@@ -20,37 +20,29 @@ export default class EditController extends BaseController {
     getEditingLines(): Line[];
     /** 撤销编辑 */
     revoke: () => void;
-    /**
-     * @description: 测面积的撤销功能
-     */
-    revokeArea: () => void;
-    /**
-     * @description: 测距的撤销功能
-     */
-    revokeLine: (_polyline?: Polyline) => void;
-    selectPoint(): void;
-    complete(): void;
     private onMouseLeave;
     /** 编辑线条发生改变时通知外部 */
     private onLineChanged;
+    private onPress;
+    /**
+     * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
+     * 2. 如果有长按点，把长按点位置更新为当前位置
+     */
+    private onPan;
+    private onPanEnd;
     /**
      * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
      * 2. 把上一个点的位置更新为当前点的位置
-     * 3. 清除 pointSelector
+     * 3. 清除 mouseGroup 和 magnifier
      */
-    private onSelect;
+    private onTap;
+    private onWantsTapGesture;
+    /** 编辑时取消走点 */
+    private onWantsToMoveToPano;
+    /** 存在长按点时不能移动全景 */
+    private onWantsPanGesture;
     /** 移动全景时更新 distanceItem 在屏幕上的位置 */
     private onCameraUpdate;
     /** 更新虚线 */
     private updateDashed;
-    private wantsTapGesture;
-    private chooseLine;
-    private chooseArea;
-    private highlightArea;
-    private unHighlightArea;
-    private highlightLines;
-    private unHighlightLines;
-    private highlightLine;
-    private deleteArea;
-    private deleteLine;
 }

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

@@ -3,9 +3,7 @@ import BaseController, { type ControllerParams } from './BaseController';
 export default class WatchController extends BaseController {
     type: string;
     private deleteDom;
-    private choose;
     private highlightedLines;
-    private highlightedArea;
     private fiveElement?;
     private editPointState?;
     private hammer?;
@@ -13,10 +11,6 @@ export default class WatchController extends BaseController {
     dispose(): void;
     highlightLine(line: Line): void;
     clearHighlightLines(): void;
-    private highlightArea;
-    private unHighlightArea;
-    private highlightLines;
-    private unHighlightLines;
     private onPanStart;
     private onPanEnd;
     private onPan;
@@ -24,10 +18,9 @@ export default class WatchController extends BaseController {
     private wantsPanGesture;
     private wantsTapGesture;
     private chooseLine;
-    private chooseArea;
+    private highlightLines;
     private polylineRemoved;
     private onCameraUpdate;
-    private deleteArea;
-    private deleteLine;
+    private deleteDomClickCallback;
     private cancelDeleteClickCallback;
 }

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

@@ -1,23 +1,17 @@
 import type { Config } from '../typings';
-import type { EditParameter, MeasureType, OpenParameter, PluginData } from '../typings/data';
+import type { OpenParameter, PluginData } from '../typings/data';
 import type { PanoMeasurePluginEvent } from '../typings/event.type';
-import type { UserDistanceItem } from '../utils/dom/distanceItem';
+import type { UserDistanceItem } from '../utils/distanceDom';
 import type { Polyline } from '../Model/polyline';
-import EditController from './EditController';
-import ViewController from './ViewController';
-import WatchController from './WatchController';
-import MixedController from './MixedController';
-import { type Five, Subscribe } from '@realsee/five';
+import Magnifier, { type MagnifierParameter } from '../Modules/Magnifier';
+import type { Five } from '@realsee/five';
+import { Subscribe } from '@realsee/five';
 import { type UIControllerParams } from '../Modules/UIController';
 import { type GuideControllerParams } from '../Modules/GuideController';
-import { Magnifier } from '../../shared-utils';
-import type { MagnifierParameter } from '../../shared-utils';
-import type Area from '../Model/area';
 export type Mode = 'Watch' | 'Edit' | 'Mixed' | 'View';
 export interface PanoMeasureParameterType extends Partial<Config> {
-    editParams?: EditParameter;
-    magnifierParams?: MagnifierParameter;
     openParams?: OpenParameter;
+    magnifierParams?: MagnifierParameter;
     useUIController?: boolean | UIControllerParams;
     useGuideController?: boolean | GuideControllerParams;
     userDistanceItemCreator?: () => UserDistanceItem;
@@ -26,22 +20,17 @@ export default class MeasureController {
     hasOpen: boolean;
     hook: Subscribe<PanoMeasurePluginEvent>;
     magnifier: Magnifier;
-    controller: WatchController | EditController | MixedController | ViewController | null;
-    /** 允许的测量类型 */
-    allowMeasureType: Array<MeasureType>;
-    /** 当前的测量类型 */
-    currentMeasureType: MeasureType | null;
     private five;
     private model;
     private group;
     private config;
     private isMobile;
-    private fiveHelper;
     private useUIController?;
     private params;
     private useGuideController?;
     private container;
     private shortcutKeyController?;
+    private controller;
     constructor(five: Five, params: PanoMeasureParameterType);
     appendTo(parent: HTMLElement): void;
     dispose(): void;
@@ -61,22 +50,17 @@ export default class MeasureController {
      * @description 清除标尺线条
      * @description 还原点位展示和默认鼠标 UI
      */
-    disable: () => void;
+    disable(): void;
     getCurrentMode: () => Mode | null;
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动
      */
     changeMode: (mode: Mode) => void;
-    /**
-     * @description: 切换测量的类型
-     */
-    changeMeasureType: (measureType: MeasureType) => void;
     /** 进入编辑模式 */
-    edit(measureType?: MeasureType): void;
+    edit(): void;
     /** 撤销编辑 */
     revoke(): void;
     removePolyline(polyline: Polyline): void;
-    removeArea(area: Area): void;
     removePolylineByID(id: string): void;
     getPolylineByID(id: string): Polyline;
     getEditedPolyline(): void;
@@ -98,7 +82,6 @@ export default class MeasureController {
     /** 导出数据 */
     toJson(): PluginData;
     /**
-     * @deprecated 暂不支持
      * @description 改变插件的模式（pc端模式或移动端模式）
      * @param isMobile true为移动端模式，false为pc端
      */

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

@@ -1,6 +1,5 @@
 import type { Config } from '../typings';
 import type { PluginData } from '../typings/data';
-import type Area from './area';
 import type Line from './line';
 import { Polyline } from './polyline';
 import { Subscribe } from '@realsee/five';
@@ -9,10 +8,6 @@ type IModelEvent = {
      * @param line 被创建的线条
      */
     polylineAdded: (line: Polyline) => void;
-    /** 新增面积
-     * @param area 被创建的面积
-     */
-    areaAdded: (area: Area) => void;
     /** 删除线条
      * @param lines 被删除的线条数组
      */
@@ -21,23 +16,18 @@ type IModelEvent = {
 export declare class Model {
     readonly config?: Config;
     readonly polylines: Polyline[];
-    readonly areas: Area[];
     readonly hook: Subscribe<IModelEvent>;
     constructor(config?: Config);
     addPolyline(polyline: Polyline): void;
-    addArea(area: Area): void;
     replacePolylineByID(id: string, polyline: Polyline): void;
     removePolyline(polyline: Polyline): void;
-    removeArea(area: Area): void;
     getPolylineByID(id: string): Polyline;
     getPolylineByLine(line: Line): Polyline;
     getLineByID(id: string): Line;
     getAllLines(): Line[];
-    getAllAreas(): Area[];
     getAllPoints(): import("./point").default[];
     includes(item: Polyline): boolean;
     clear(): void;
-    dispose(): void;
     getClosestPoint(): void;
     parse(data: PluginData): void;
     toJson(): PluginData;

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

@@ -4,8 +4,7 @@ import type { LineJson } from '../typings/data';
 import type { Line as FiveLine } from '@realsee/five/line';
 import type { Polyline } from './polyline';
 import { Subscribe, type SubscribeEventMap } from '@realsee/five';
-import { DistanceItem } from '../utils/dom/distanceItem';
-import type * as THREE from 'three';
+import { type DistanceItem } from '../utils/distanceDom';
 export interface ILineHook extends SubscribeEventMap {
     selected: (line: Line) => void;
     textChanged: (text: string | undefined) => void;
@@ -22,12 +21,7 @@ export default class Line {
     readonly hook: Subscribe<ILineHook>;
     readonly distanceItem: DistanceItem;
     private polyline?;
-    private visible?;
     constructor(point: Point, anotherPoint: Point, model: Model);
-    hide(): void;
-    show(): void;
-    setPoints(startPoint: THREE.Vector3, endPoint: THREE.Vector3): void;
-    remove(): void;
     clear(): void;
     isEmpty(): boolean;
     getPolyline(): Polyline;

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

@@ -28,10 +28,6 @@ export declare class Polyline {
     removeLine(line: Line): void;
     isLastLine(line: Line): boolean;
     getLastLine(): Line;
-    /**
-     * @description: 获取连续线段的顶点数量
-     */
-    getPointLength(): number;
     clear(): void;
     /** 是否产生重叠 */
     overlapWith(item: Point | Line | Polyline): boolean;

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

@@ -6,25 +6,21 @@ export default class DeleteDom {
     private lines;
     private points;
     private onClick;
-    private cancel;
+    private cancelDelete;
     private content;
     private container;
     private masking;
-    private target;
     constructor(five: Five, opts?: {
-        onClick?: (e: MouseEvent, target: any) => void;
-        cancel?: (target: any) => void;
+        onClick?: (e: MouseEvent) => void;
+        cancelDelete?: (e: MouseEvent) => void;
         i18n?: (key: string) => string;
     });
     dispose(): void;
     appendTo(element: Element): this;
     setLines(lines: Line[]): this;
-    setTarget(target: any): this;
-    updatePosition(left?: string, top?: string): this;
+    updatePosition(): this;
     hide(): this;
     show(): this;
-    private clickHandler;
-    private cancelHandler;
     private onMouseEnter;
     private onMouseLeave;
 }

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

@@ -1,6 +1,6 @@
 import type MeasureController from '../Controller';
 export interface GuideControllerParams {
-    container?: Element;
+    container: Element;
     startTip?: string;
     endTip?: string;
     firstPointTip?: string;

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

@@ -3,7 +3,7 @@ import Hammer from 'hammerjs';
 import * as THREE from 'three';
 import { Subscribe, type SubscribeEventMap } from '@realsee/five';
 interface MagnifierEvent extends SubscribeEventMap {
-    wantsPanGesture: (event: (typeof Hammer)['Input']) => boolean;
+    wantsPanGesture: (event: typeof Hammer['Input']) => boolean;
 }
 /** 放大镜配置参数 */
 export interface MagnifierParameter {

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

@@ -1,19 +1,13 @@
 import type MeasureController from '../../Controller';
-export type UIMode = 'pc' | 'mobile';
 export interface UIControllerParams {
-    container?: Element;
-    mode?: UIMode;
-    pointSelectorMode?: 'fixed' | 'cursor';
-    useNewUI?: boolean;
-    /**
-     * @description: 是否展示退出按钮
-     */
-    showExit?: boolean;
+    container: Element;
+    mode?: 'pc' | 'mobile';
     startButtonText?: string;
     endButtonText?: string;
     revokeButtonText?: string;
     exitButtonText?: string;
 }
+export type UIMode = 'pc' | 'mobile';
 export declare class UIController {
     private revoke?;
     private container;
@@ -21,7 +15,6 @@ export declare class UIController {
     private disposers;
     private measureController;
     private mode;
-    private svelteDom?;
     private _params;
     constructor(measureController: MeasureController, params: UIControllerParams);
     dispose(): void;

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

@@ -2,7 +2,6 @@ import type { Five, Subscribe } from '@realsee/five';
 import type { Group } from 'three';
 import type { Model } from '../../Model';
 import type { PanoMeasurePluginEvent } from '../../typings/event.type';
-import type FiveHelper from '../FiveHelper';
 import type { OpenParameter } from '../../typings/data';
 export interface RangePieceControllerParams {
     openParams: OpenParameter;
@@ -11,7 +10,6 @@ export interface RangePieceControllerParams {
     group: Group;
     model: Model;
     mouseGroup: Group;
-    fiveHelper: FiveHelper;
     hook: Subscribe<PanoMeasurePluginEvent>;
 }
 export default class RangePieceController {
@@ -20,7 +18,6 @@ export default class RangePieceController {
     private group;
     private mouseGroup;
     private hasAppendMouseGroup;
-    private fiveHelper;
     private hook;
     private content;
     private intersectMesh;

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

@@ -21,30 +21,6 @@ export interface OpenParameter {
     isMobile?: boolean;
     crossHairParameter?: CrossHairParameter;
 }
-/** 长度达到一定值时，自动结束线段，null 的话不自动结束 */
-export interface autoEndConfig {
-    line?: number | null;
-    area?: number | null;
-}
-export type MeasureType = 'line' | 'area';
-export type PointSelectorMode = 'fixed' | 'cursor';
-export interface EditParameter {
-    /**
-     * @description 选择测量插件的模式
-     * @default ['line']
-     * @example
-     * ['line']: 传统的测距
-     * ['area']: 新增的测面积功能
-     * ['line', 'area']: 同时开启测距和测面积功能
-     */
-    allowMeasureType?: Array<MeasureType>;
-    /**
-     * @description: 选点的两种模式, 'fixed' 为固定选点为屏幕中心点，拖动five画布来选点，'mouse' 为跟随鼠标移动
-     * @default: 'fixed'
-     */
-    pointSelectorMode?: PointSelectorMode;
-    autoEndConfig?: autoEndConfig;
-}
 export interface CrossHairParameter {
     useNormalVector?: boolean;
     ballColor?: number;

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

@@ -4,7 +4,6 @@ import type { State } from '../Controller/MixedController';
 import type Line from '../Model/line';
 import type Point from '../Model/point';
 import type { Polyline } from '../Model/polyline';
-import type { MeasureType } from './data';
 type ControllerEvent = {
     enable: (userAction: boolean) => void;
     disable: (userAction: boolean) => void;
@@ -17,22 +16,13 @@ type WatchEvent = {
     selectedChange: (lines: Line[]) => void;
 };
 type EditEvent = {
-    /** 编辑线条变更 */
+    /**
+     * 编辑线条变更
+     */
     editedPolylineChange: (polyline: Polyline) => void;
     /** 编辑中的虚线变更 */
     editedDashedLineChange: (line: Line | null) => void;
     anchorChange: (anchor: Vector3 | null) => void;
-    /** 测量类型变更 */
-    measureTypeChange: (measureTpe: MeasureType) => void;
-    revoke: (params: {
-        isEmpty: boolean;
-    }) => void;
-    /** 差最后一次打点就可以完成完成 */
-    readyComplete: () => void;
-    /** 一条线段或者一个面积编辑完成 */
-    complete: () => void;
-    /** 测量面积时，是否可以打点的状态是会一直变的 */
-    allowAddPointStateChange: (state: 'allow' | 'forbid') => void;
 };
 type DragEvent = {
     wantsDragLine: (event: {

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

@@ -1,5 +1,5 @@
 import type { Config as BaseConfig } from '../../base/BasePlugin';
-import type { UserDistanceItem } from '../utils/dom/distanceItem';
+import type { UserDistanceItem } from '../utils/distanceDom';
 export interface Config extends BaseConfig {
     userDistanceItemCreator?: undefined | (() => UserDistanceItem);
     /** 展示 distance DOM 时，使用的转换函数

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

@@ -0,0 +1,30 @@
+import type Line from '../Model/line';
+import type { Five } from '@realsee/five';
+import { Vector3 } from 'three';
+import type { Polyline } from '../Model/polyline';
+export type DistanceItem = ReturnType<typeof createDistanceItem>;
+export interface UserDistanceItem {
+    element: Element;
+    highlight: () => void;
+    unHighlight: () => void;
+    update: (params: {
+        line: Line;
+        polyline: Polyline;
+    }) => void;
+}
+export interface CreateDistanceItemProps {
+    line: Line;
+    userDistanceItem?: UserDistanceItem;
+    clickCallback?: (item: DistanceItem) => unknown;
+}
+export declare function createDistanceItem(props: CreateDistanceItemProps): {
+    lineID: string;
+    ndcPosition: Vector3;
+    update: (five: Five) => void;
+    appendTo: (container: Element) => void;
+    remove: () => void;
+    highlight: () => void;
+    unHighlight: () => void;
+    getCurrentContent: () => string;
+    setItemSelectable: (value: boolean) => void;
+};

package/dist/{shared-utils → PanoMeasurePlugin/utils}/getIntersectionFromEvent.d.ts

@@ -1,4 +1,4 @@
 import type Hammer from 'hammerjs';
 import type { Five, Intersection } from '@realsee/five';
 /** 通过鼠标事件或者触摸事件，获取当前点击屏幕关联的射线与模型的交点 */
-export declare function getIntersectionFromEvent(five: Five, event: (typeof Hammer)['Input']): Intersection[];
+export declare function getIntersectionFromEvent(five: Five, event: typeof Hammer['Input']): Intersection[];

package/{libs/shared-utils → dist/PanoMeasurePlugin/utils}/getPointFromHammerEvent.d.ts

@@ -4,7 +4,7 @@ import { Vector2 } from 'three';
  * 从 Hammer 事件中获取操作的点在交互 DOM 中的位置
  * @ignore TODO: make a suitable name
  */
-export declare function getPointFromHammerEvent(event: (typeof Hammer)['Input']): {
+export declare function getPointFromHammerEvent(event: typeof Hammer['Input']): {
     point: Vector2;
     ndcPoint: Vector2;
 };

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

@@ -1,7 +1,6 @@
 import type Line from '../Model/line';
 import { Line as FiveLine } from '@realsee/five/line';
-import type { Texture, Vector3 } from 'three';
-import { Color } from 'three';
+import { Color, Texture, Vector3 } from 'three';
 type ISetMaterialOpts = Parameters<FiveLine['setMaterial']>[0];
 export interface ICreateLineOpts extends ISetMaterialOpts {
     hasPoint?: boolean;

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

@@ -1,5 +1,4 @@
-import { Vector2 } from 'three';
-import type { Vector3 } from 'three';
+import { Vector2, Vector3 } from 'three';
 export default function ndc2Screen(ndcPosition: Vector3, containerSize: {
     width: number;
     height: number;

package/dist/base/BasePlugin.d.ts

@@ -21,7 +21,7 @@ interface BaseOptions {
     /** 是否是用户行为 */
     userAction?: boolean;
 }
-export interface Config {
+interface Config {
     /** 静态资源前缀 */
     staticPrefix?: string;
     /** 国际化转换函数 */
@@ -96,8 +96,8 @@ declare abstract class Controller<PluginState extends State, PluginEventMap exte
      */
     setState?(state: Partial<PluginState>, options?: BaseOptions): void;
     /**
-       * @description: 获取静态资源的url
-    */
+     * @description: 获取静态资源的url
+     */
     absoluteUrl(url: string): string;
     /**
      * 启用插件，让插件能够响应交互
@@ -112,5 +112,5 @@ declare abstract class Controller<PluginState extends State, PluginEventMap exte
      */
     abstract dispose(): void;
 }
-export type { State, EventMap, BaseOptions };
+export type { State, Config, EventMap, BaseOptions };
 export { Controller };

package/dist/base/BasePluginWithData.d.ts

@@ -1,5 +1,6 @@
 import * as BasePlugin from './BasePlugin';
 type State = BasePlugin.State;
+type Config = BasePlugin.Config;
 interface EventMap<PluginState, PluginData> extends BasePlugin.EventMap<PluginState> {
     /** 数据变更 */
     dataChange: (data: PluginData, prevData?: PluginData) => void;
@@ -30,5 +31,5 @@ declare abstract class Controller<PluginState extends State, PluginEventMap exte
     /** 把原始数据转化为插件数据 */
     protected abstract formatData?(serverData: PluginServerData): Promise<PluginData>;
 }
-export type { State, EventMap, ServerData };
+export type { State, EventMap, ServerData, Config };
 export { Controller };