@realsee/dnalogel 2.21.0-dev.0 → 2.21.0-dev.11

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

@@ -12,6 +12,7 @@ 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;
@@ -26,14 +27,14 @@ export default class MeasureController {
     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 allowMeasureType;
     private isMobile;
     private fiveHelper;
     private useUIController?;
@@ -60,7 +61,7 @@ export default class MeasureController {
      * @description 清除标尺线条
      * @description 还原点位展示和默认鼠标 UI
      */
-    disable(): void;
+    disable: () => void;
     getCurrentMode: () => Mode | null;
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动
@@ -75,6 +76,7 @@ export default class MeasureController {
     /** 撤销编辑 */
     revoke(): void;
     removePolyline(polyline: Polyline): void;
+    removeArea(area: Area): void;
     removePolylineByID(id: string): void;
     getPolylineByID(id: string): Polyline;
     getEditedPolyline(): void;
@@ -96,6 +98,7 @@ export default class MeasureController {
     /** 导出数据 */
     toJson(): PluginData;
     /**
+     * @deprecated 暂不支持
      * @description 改变插件的模式（pc端模式或移动端模式）
      * @param isMobile true为移动端模式，false为pc端
      */

package/libs/PanoMeasurePlugin/Controller/index.js

@@ -1,34 +1,34 @@
-var v = Object.defineProperty;
-var y = Object.getOwnPropertySymbols;
-var I = Object.prototype.hasOwnProperty, b = Object.prototype.propertyIsEnumerable;
-var c = (s, e, t) => e in s ? v(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, h = (s, e) => {
+var I = Object.defineProperty;
+var P = Object.getOwnPropertySymbols;
+var T = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
+var c = (s, e, t) => e in s ? I(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, m = (s, e) => {
   for (var t in e || (e = {}))
-    I.call(e, t) && c(s, t, e[t]);
-  if (y)
-    for (var t of y(e))
-      b.call(e, t) && c(s, t, e[t]);
+    T.call(e, t) && c(s, t, e[t]);
+  if (P)
+    for (var t of P(e))
+      E.call(e, t) && c(s, t, e[t]);
   return s;
 };
 var i = (s, e, t) => (c(s, typeof e != "symbol" ? e + "" : e, t), t);
-import U from "../Modules/FiveHelper.js";
-import m from "./EditController.js";
-import C from "./ViewController.js";
-import M from "./WatchController.js";
+import k from "../Modules/FiveHelper.js";
+import h from "./EditController.js";
+import w from "./ViewController.js";
+import v from "./WatchController.js";
 import a from "./MixedController.js";
-import { omit as T } from "../../shared-utils/filter.js";
-import { Group as E } from "three";
-import { Model as k } from "../Model/index.js";
-import { Subscribe as D } from "@realsee/five";
-import { getMouseGroup as G } from "../utils/mouseGroup.js";
-import { UIController as w } from "../Modules/UIController/index.js";
-import { GuideController as x } from "../Modules/GuideController.js";
-import { ShortcutKeyController as H } from "./ShortcutKeyController.js";
-import { safeObj as P } from "../../shared-utils/safeObj.js";
-import { Magnifier as L } from "../../shared-utils/three/Magnifier.js";
+import { omit as D } from "../../shared-utils/filter.js";
+import { Group as U } from "three";
+import { Model as x } from "../Model/index.js";
+import { Subscribe as G } from "@realsee/five";
+import { getMouseGroup as H } from "../utils/mouseGroup.js";
+import { UIController as S } from "../Modules/UIController/index.js";
+import { GuideController as L } from "../Modules/GuideController.js";
+import { ShortcutKeyController as O } from "./ShortcutKeyController.js";
+import { safeObj as b } from "../../shared-utils/safeObj.js";
+import { Magnifier as B } from "../../shared-utils/three/Magnifier.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "hammerjs";
+import { isTouchDevice as W } from "../../shared-utils/isTouchDevice.js";
 import "../Model/line.js";
 import "../../shared-utils/uuid.js";
 import "../utils/line.js";
@@ -42,8 +42,6 @@ import "../../shared-utils/removeArrayItem.js";
 import "../../shared-utils/throttle.js";
 import "./BaseController.js";
 import "../utils/ironbox.js";
-import "../utils/getIntersectionFromEvent.js";
-import "../utils/getPointFromHammerEvent.js";
 import "../Model/polyline.js";
 import "../Model/area.js";
 import "../Model/polygon.js";
@@ -54,17 +52,42 @@ import "../utils/dom/areaDom.js";
 import "../utils/geometryUtil.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../utils/isIntersecting.js";
+import "../../shared-utils/three/PointSelector.js";
+import "../../shared-utils/three/PointSelectorHelper.js";
+import "../../shared-utils/three/PointHelper.js";
+import "../../shared-utils/three/Assets/index.js";
+import "../../shared-utils/three/PointDomHelper.js";
+import "hammerjs";
+import "../Modules/rangePiece/html.js";
+import "../../CSS3DRenderPlugin/index.js";
+import "../../CSS3DRenderPlugin/Controller.js";
+import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
+import "../../shared-utils/absoluteUrl.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
+import "three/examples/jsm/renderers/CSS3DRenderer";
+import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
+import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
+import "../../CSS3DRenderPlugin/utils/even.js";
+import "../../shared-utils/Subscribe.js";
+import "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
+import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "../../shared-utils/animationFrame/BetterTween.js";
+import "../../shared-utils/animationFrame/index.js";
+import "../../shared-utils/getIntersectionFromEvent.js";
+import "../../shared-utils/getPointFromHammerEvent.js";
+import "../../shared-utils/three/getIntersect.js";
 import "../Modules/DeleteDom/index.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
 import "../Modules/DeleteDom/_Assets/delete_bg.png.js";
 import "../Modules/DeleteDom/_Assets/delete_hover_bg.png.js";
+import "../utils/findAssociatedLines.js";
 import "../utils/math.js";
 import "../utils/findClosestPoint.js";
 import "../utils/ndc2Screen.js";
-import "../utils/findAssociatedLines.js";
 import "../Modules/rangePiece/index.js";
-import "../Modules/rangePiece/html.js";
-import "../../shared-utils/animationFrame/index.js";
 import "../../shared-utils/noop.js";
 import "../utils/calculateThreeMouse.js";
 import "../../shared-utils/tap.js";
@@ -74,35 +97,32 @@ import "../Modules/UIController/style.js";
 import "../Modules/UIController/MainBtnController.js";
 import "../Modules/UIController/mobileMainBtnController.js";
 import "../Modules/UIController/Revoke/index.js";
-import "../Components/Controller1.js";
+import "../Components/Controller0.js";
 import "../../vendor/svelte/internal/index.js";
+import "../Components/Common/Switcher0.js";
+import "../Components/Common/Exit.js";
+import "../Components/Common/icons/index.js";
+import "../Components/Controller1.js";
 import "../Components/Common/Switcher1.js";
 import "../Components/Common/CircleButton.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
-import "three/examples/jsm/renderers/CSS3DRenderer";
-import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
-import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
-import "../../CSS3DRenderPlugin/utils/even.js";
-import "../../shared-utils/Subscribe.js";
-import "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
-import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-class nt {
+import "../../vendor/svelte/transition/index.js";
+import "../../vendor/svelte/easing/index.js";
+import "../../vendor/object-assign-deep/objectAssignDeep.js";
+import "../Components/Tip.js";
+class xt {
   constructor(e, t) {
     i(this, "hasOpen", !1);
-    i(this, "hook", new D());
+    i(this, "hook", new G());
     i(this, "magnifier");
     i(this, "controller", null);
+    /** 允许的测量类型 */
+    i(this, "allowMeasureType");
     /** 当前的测量类型 */
     i(this, "currentMeasureType");
     i(this, "five");
     i(this, "model");
     i(this, "group");
     i(this, "config");
-    /** 允许的测量类型 */
-    i(this, "allowMeasureType");
     i(this, "isMobile");
     i(this, "fiveHelper");
     i(this, "useUIController");
@@ -110,25 +130,33 @@ class nt {
     i(this, "useGuideController");
     i(this, "container", document.createElement("div"));
     i(this, "shortcutKeyController");
-    i(this, "getCurrentMode", () => this.controller instanceof m ? "Edit" : this.controller instanceof M ? "Watch" : this.controller instanceof a ? "Mixed" : this.controller instanceof C ? "View" : null);
+    /** 关闭插件功能
+     * @description 清除标尺线条
+     * @description 还原点位展示和默认鼠标 UI
+     */
+    i(this, "disable", () => {
+      var e, t, r, o;
+      this.hasOpen = !1, this.container.style.opacity = "0", (e = this.controller) == null || e.dispose(), (t = this.useUIController) == null || t.hide(), (r = this.useGuideController) == null || r.hide(), (o = this.shortcutKeyController) == null || o.dispose(), this.controller = null, this.five.helperVisible = !0, this.five.scene.remove(this.group), this.five.needsRender = !0, this.hook.emit("disable", !0);
+    });
+    i(this, "getCurrentMode", () => this.controller instanceof h ? "Edit" : this.controller instanceof v ? "Watch" : this.controller instanceof a ? "Mixed" : this.controller instanceof w ? "View" : null);
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动
      */
     i(this, "changeMode", (e) => {
-      var r;
+      var o;
       if (!this.hasOpen || this.getCurrentMode() === e)
         return;
-      (r = this.controller) == null || r.dispose();
+      (o = this.controller) == null || o.dispose();
       const t = {
-        View: C,
-        Watch: M,
-        Edit: m,
+        View: w,
+        Watch: v,
+        Edit: h,
         Mixed: a
       };
       if (!t[e])
         throw new Error("不存在的 Mode");
-      const o = this.createControllerParams();
-      this.controller = new t[e](o), this.hook.emit("modeChange", e);
+      const r = this.createControllerParams();
+      this.controller = new t[e](r), this.hook.emit("modeChange", e);
     });
     /**
      * @description: 切换测量的类型
@@ -136,16 +164,16 @@ class nt {
     i(this, "changeMeasureType", (e) => {
       this.currentMeasureType = e, this.hook.emit("measureTypeChange", e);
     });
-    var r, l, n, u, d, f, g;
-    this.five = e, this.params = t, this.config = T(t, ["openParams", "magnifierParams"]), this.model = new k(this.config), this.fiveHelper = new U(e), this.isMobile = (l = (r = t == null ? void 0 : t.openParams) == null ? void 0 : r.isMobile) != null ? l : !1, this.magnifier = new L(e, (n = t.magnifierParams) != null ? n : { width: 190, height: 190, scale: 2 }), this.allowMeasureType = Array.from(new Set((d = (u = t.editParams) == null ? void 0 : u.allowMeasureType) != null ? d : ["line"])), this.currentMeasureType = (f = this.allowMeasureType[0]) != null ? f : "line", this.group = new E(), this.group.name = "plugin-measure-group", this.container.classList.add("five-plugin-measure-container"), this.container.style.position = "absolute", this.container.style.left = "0", this.container.style.top = "0", this.container.style.pointerEvents = "none", this.container.style.width = "100%", this.container.style.height = "100%", this.container.style.opacity = "0";
-    const o = (g = this.params.openParams) != null ? g : {};
+    var l, n, u, d, f, g, y, M, C;
+    this.five = e, this.params = t, this.config = D(t, ["openParams", "magnifierParams"]), this.model = new x(this.config), this.fiveHelper = new k(e), this.isMobile = (n = (l = t == null ? void 0 : t.openParams) == null ? void 0 : l.isMobile) != null ? n : !1, this.magnifier = new B(e, (u = t.magnifierParams) != null ? u : { width: 190, height: 190, scale: 2 }), this.allowMeasureType = Array.from(new Set((f = (d = t.editParams) == null ? void 0 : d.allowMeasureType) != null ? f : ["line"])), this.currentMeasureType = (g = this.allowMeasureType[0]) != null ? g : "line", this.group = new U(), this.group.name = "plugin-measure-group", this.container.classList.add("five-plugin-measure-container"), this.container.style.position = "absolute", this.container.style.left = "0", this.container.style.top = "0", this.container.style.pointerEvents = "none", this.container.style.width = "100%", this.container.style.height = "100%", this.container.style.opacity = "0";
+    const r = (M = (y = t.editParams) == null ? void 0 : y.pointSelectorMode) != null ? M : W ? "fixed" : "cursor", o = (C = this.params.openParams) != null ? C : {};
     if (this.params.useUIController !== !1) {
-      const p = h({ container: this.container, openParams: o }, P(this.params.useUIController));
-      this.useUIController = new w(this, p);
+      const p = m({ container: this.container, openParams: o, pointSelectorMode: r }, b(this.params.useUIController));
+      this.useUIController = new S(this, p);
     }
     if (this.params.useGuideController !== !1) {
-      const p = h({ container: this.container }, P(this.params.useGuideController));
-      this.useGuideController = new x(this, p);
+      const p = m({ container: this.container, pointSelectorMode: r }, b(this.params.useGuideController));
+      this.useGuideController = new L(this, p);
     }
   }
   appendTo(e) {
@@ -168,15 +196,7 @@ class nt {
    */
   enable(e) {
     var t;
-    this.hasOpen || (this.hasOpen = !0, this.five.scene.add(this.group), this.container.style.opacity = "1", e != null && e.mode ? this.changeMode(e.mode) : this.isMobile ? this.changeMode("Mixed") : this.changeMode("Watch"), (t = this.useUIController) == null || t.show(), this.shortcutKeyController = new H(this, this.five), this.hook.emit("enable", !0));
-  }
-  /** 关闭插件功能
-   * @description 清除标尺线条
-   * @description 还原点位展示和默认鼠标 UI
-   */
-  disable() {
-    var e, t, o, r;
-    this.hasOpen = !1, this.container.style.opacity = "0", (e = this.controller) == null || e.dispose(), (t = this.useUIController) == null || t.hide(), (o = this.useGuideController) == null || o.hide(), (r = this.shortcutKeyController) == null || r.dispose(), this.controller = null, this.five.helperVisible = !0, this.five.scene.remove(this.group), this.five.needsRender = !0, this.hook.emit("disable", !0);
+    this.hasOpen || (this.hasOpen = !0, this.five.scene.add(this.group), this.container.style.opacity = "1", e != null && e.mode ? this.changeMode(e.mode) : this.isMobile ? this.changeMode("Mixed") : this.changeMode("Watch"), (t = this.useUIController) == null || t.show(), this.shortcutKeyController = new O(this, this.five), this.hook.emit("enable", !0));
   }
   /** 进入编辑模式 */
   edit(e) {
@@ -186,11 +206,14 @@ class nt {
   }
   /** 撤销编辑 */
   revoke() {
-    this.controller instanceof m && this.controller.revoke();
+    this.controller instanceof h && this.controller.revoke();
   }
   removePolyline(e) {
     this.model.removePolyline(e);
   }
+  removeArea(e) {
+    this.model.removeArea(e);
+  }
   removePolylineByID(e) {
     const t = this.model.getPolylineByID(e);
     t && this.model.removePolyline(t);
@@ -217,13 +240,13 @@ class nt {
    */
   save(e) {
     var l;
-    if (!(this.controller instanceof m) && !(this.controller instanceof a))
+    if (!(this.controller instanceof h) && !(this.controller instanceof a))
       return this;
-    const t = (l = e == null ? void 0 : e.mode) != null ? l : "View", o = this.controller.model.polylines, r = this.controller.model.areas;
-    return o.forEach((n) => {
+    const t = (l = e == null ? void 0 : e.mode) != null ? l : "View", r = this.controller.model.polylines, o = this.controller.model.areas;
+    return r.forEach((n) => {
       this.model.addPolyline(n);
-    }), r.forEach((n) => {
-      n.polygon.updatePoints(n.points), n.showArea(), this.model.addArea(n);
+    }), this.controller instanceof h ? this.controller.complete() : o.forEach((n) => {
+      n.showArea(), this.model.addArea(n);
     }), this.changeMode(t), this;
   }
   /** Mixed 模式才有用，添加起点 */
@@ -239,19 +262,11 @@ class nt {
     return this.model.toJson();
   }
   /**
+   * @deprecated 暂不支持
    * @description 改变插件的模式（pc端模式或移动端模式）
    * @param isMobile true为移动端模式，false为pc端
    */
   changeIsMobile(e) {
-    var t;
-    if (this.isMobile = e, this.params.useUIController !== !1) {
-      (t = this.useUIController) == null || t.dispose();
-      const o = h({
-        container: this.container,
-        mode: this.isMobile ? "mobile" : "pc"
-      }, typeof this.params.useUIController == "object" ? this.params.useUIController : {});
-      this.useUIController = new w(this, o);
-    }
   }
   changeConfigs(e) {
     var t;
@@ -259,15 +274,15 @@ class nt {
   }
   /** 设置线段的文本 */
   setCustomText(e, t) {
-    var r;
-    const o = this.model.getLineByID(e);
-    if (!o)
+    var o;
+    const r = this.model.getLineByID(e);
+    if (!r)
       throw new Error("不存在的线段");
-    o.setText(t), (r = this.controller) == null || r.updateDistanceUI();
+    r.setText(t), (o = this.controller) == null || o.updateDistanceUI();
   }
   createControllerParams() {
-    var o, r;
-    const e = (o = this.params.openParams) != null ? o : {}, t = (r = this.params.editParams) != null ? r : {};
+    var r, o;
+    const e = (r = this.params.openParams) != null ? r : {}, t = (o = this.params.editParams) != null ? o : {};
     return e.isMobile = this.isMobile, {
       five: this.five,
       hook: this.hook,
@@ -279,12 +294,13 @@ class nt {
       fiveHelper: this.fiveHelper,
       openParams: e,
       editParams: t,
+      magnifierParams: this.params.magnifierParams,
       getMeasureType: () => this.currentMeasureType,
-      mouseGroup: G(h({}, e.crossHairParameter)),
+      mouseGroup: H(m({}, e.crossHairParameter)),
       userDistanceItemCreator: this.params.userDistanceItemCreator
     };
   }
 }
 export {
-  nt as default
+  xt as default
 };

package/libs/PanoMeasurePlugin/Model/area.d.ts

@@ -18,9 +18,14 @@ export default class Area {
     id: string;
     selected: boolean;
     text?: string;
+    readonly type = "area";
     readonly lightMesh: FiveLine;
     readonly areaItem: AreaItem;
     readonly hook: Subscribe<AreaHook>;
+    /**
+     * @description: 多边形的端点是否闭合
+     */
+    get isClosed(): boolean;
     /** 多边形mesh */
     polygon: PolygonMesh;
     /** 多边形顶点 */
@@ -43,7 +48,14 @@ export default class Area {
         five?: Five;
     });
     addPoints(point: THREE.Vector3): void;
-    refresh(): void;
+    /**
+     * @description: 移除最后一个添加的点
+     */
+    popPoint(): void;
+    /**
+     * @description: 自动补全多边形的各个边
+     */
+    complete(): void;
     hideArea(): void;
     showArea(): void;
     /**

package/libs/PanoMeasurePlugin/Model/area.js

@@ -1,13 +1,13 @@
 var m = Object.defineProperty;
-var d = (o, e, i) => e in o ? m(o, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[e] = i;
-var t = (o, e, i) => (d(o, typeof e != "symbol" ? e + "" : e, i), i);
-import * as r from "three";
+var d = (s, t, i) => t in s ? m(s, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : s[t] = i;
+var e = (s, t, i) => (d(s, typeof t != "symbol" ? t + "" : t, i), i);
+import * as h from "three";
 import { uuid as f } from "../../shared-utils/uuid.js";
 import { Subscribe as c } from "@realsee/five";
 import u from "./line.js";
 import v from "./polygon.js";
 import { Polyline as y } from "./polyline.js";
-import h from "./point.js";
+import p from "./point.js";
 import { AreaItem as C } from "../utils/dom/areaDom.js";
 import "../utils/line.js";
 import "@realsee/five/line";
@@ -21,55 +21,74 @@ import "earcut";
 import "../../shared-utils/removeArrayItem.js";
 import "../utils/geometryUtil.js";
 import "../../shared-utils/three/centerPoint.js";
-class V {
-  constructor(e, i) {
-    t(this, "id", f());
-    t(this, "selected", !1);
-    t(this, "text");
-    t(this, "lightMesh");
-    t(this, "areaItem");
-    t(this, "hook", new c());
+class O {
+  constructor(t, i) {
+    e(this, "id", f());
+    e(this, "selected", !1);
+    e(this, "text");
+    e(this, "type", "area");
+    e(this, "lightMesh");
+    e(this, "areaItem");
+    e(this, "hook", new c());
     /** 多边形mesh */
-    t(this, "polygon");
+    e(this, "polygon");
     /** 多边形顶点 */
-    t(this, "points", []);
+    e(this, "points", []);
     /** 多边形前三个点组成的平面，用来使得后面加的点也落在这个平面上 */
-    t(this, "planeHelper");
+    e(this, "planeHelper");
     /** 多边形边框 */
-    t(this, "polyline");
+    e(this, "polyline");
     /** 多边形mesh容器 */
-    t(this, "meshContainer");
+    e(this, "meshContainer");
     /** 多边形dom容器 */
-    t(this, "domContainer");
-    t(this, "five");
-    t(this, "model");
+    e(this, "domContainer");
+    e(this, "five");
+    e(this, "model");
     /**
      * @description: five camera update 时，更新Dom的位置
      */
-    t(this, "updateDom", () => {
-      this.five && (this.polyline.lines.forEach((e) => e.distanceItem.update(this.five)), this.areaItem.updateDomPosition(this.five));
+    e(this, "updateDom", () => {
+      this.five && (this.polyline.lines.forEach((t) => t.distanceItem.update(this.five)), this.areaItem.updateDomPosition(this.five));
     });
     var n;
-    e && (this.points = e), this.model = i.model, this.polygon = new v(e), this.polyline = new y({ model: i.model }), this.areaItem = new C({
+    t && (this.points = t), this.model = i.model, this.polygon = new v(t), this.polyline = new y({ model: i.model }), this.areaItem = new C({
       area: this,
-      clickCallback: (a, s) => {
-        const l = a.clientX + "px", p = a.clientY + "px";
-        this.hook.emit("selected", this, { left: l, top: p });
+      clickCallback: (a, o) => {
+        const r = a.clientX + "px", l = a.clientY + "px";
+        this.hook.emit("selected", this, { left: r, top: l });
       }
     }), this.domContainer = i.domContainer || null, this.meshContainer = i.meshContainer || null, this.five = i.five || null, this.areaItem.appendTo(this.domContainer), (n = this.five) == null || n.on("cameraUpdate", this.updateDom);
   }
-  addPoints(e) {
+  /**
+   * @description: 多边形的端点是否闭合
+   */
+  get isClosed() {
+    var t;
+    return this.points.length >= 4 && ((t = this.points.at(0)) == null ? void 0 : t.equals(this.points.at(-1)));
+  }
+  addPoints(t) {
     var a;
-    this.points = this.points.concat(e);
+    this.points = this.points.concat(t);
     const i = this.points.at(-2), n = this.points.at(-1);
     if (i && n) {
-      const s = new u(new h(i), new h(n), this.polyline.model);
-      this.polyline.addLine(s), this.meshContainer.add(s.mesh), this.five && (s.distanceItem.setCanSelect(!1), s.distanceItem.appendTo(this.domContainer), s.distanceItem.update(this.five));
+      const o = new u(new p(i), new p(n), this.polyline.model);
+      this.polyline.addLine(o), this.meshContainer.add(o.mesh), this.five && (o.distanceItem.setCanSelect(!1), o.distanceItem.appendTo(this.domContainer), o.distanceItem.update(this.five));
     }
-    (a = this.meshContainer) != null && a.children.includes(this.polygon) || this.meshContainer.add(this.polygon), this.polygon.updatePoints(this.points), this.areaItem.updateArea(this.five), this.points.length === 3 ? this.planeHelper = new r.Plane().setFromCoplanarPoints(this.points[0], this.points[1], this.points[2]) : this.points.length < 3 && (this.planeHelper = null);
+    (a = this.meshContainer) != null && a.children.includes(this.polygon) || this.meshContainer.add(this.polygon), this.polygon.updatePoints(this.points), this.areaItem.updateArea(this.five), this.points.length === 3 ? this.planeHelper = new h.Plane().setFromCoplanarPoints(this.points[0], this.points[1], this.points[2]) : this.points.length < 3 && (this.planeHelper = null);
+  }
+  /**
+   * @description: 移除最后一个添加的点
+   */
+  popPoint() {
+    this.points.pop();
+    const t = this.polyline.lines.pop();
+    t == null || t.remove(), this.polygon.updatePoints(this.points), this.areaItem.updateArea(this.five), this.points.length < 3 && (this.planeHelper = null);
   }
-  refresh() {
-    this.polygon.updatePoints(this.points), this.areaItem.updateArea(this.five);
+  /**
+   * @description: 自动补全多边形的各个边
+   */
+  complete() {
+    this.points.at(-1).equals(this.points[0]) || this.addPoints(this.points[0]);
   }
   hideArea() {
     this.polygon.visible = !1, this.areaItem.hide();
@@ -80,11 +99,11 @@ class V {
   /**
    * @description: 获取一个点投影在当前平面上的点
    */
-  projectPoint(e) {
-    return this.planeHelper ? this.planeHelper.projectPoint(e, new r.Vector3()) : e;
+  projectPoint(t) {
+    return t && (this.planeHelper ? this.planeHelper.projectPoint(t, new h.Vector3()) : t);
   }
   remove() {
-    this.polygon.removeFromParent(), this.areaItem.remove(), this.polyline.lines.forEach((e) => e.remove());
+    this.polygon.removeFromParent(), this.areaItem.remove(), this.polyline.lines.forEach((t) => t.remove());
   }
   /**
    * @todo: 没写完
@@ -94,5 +113,5 @@ class V {
   }
 }
 export {
-  V as default
+  O as default
 };

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

@@ -28,6 +28,7 @@ export declare class Model {
     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;