@realsee/dnalogel 2.21.0 → 2.22.0-dev.0

package/libs/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;
-    /** 拖动的控制点 */
-    private pressPoint?;
+    area: Area;
     private hasAppendDashed;
-    private hasAppendMouseGroup;
     private fiveElement?;
     /** 上一个端点位置 */
     private lastPoint;
-    private hammer?;
+    private pointSelector;
+    private deleteDom;
     /** 根据 intersection 更新放大镜和吸附点 */
     private onIntersectionUpdate;
     constructor(params: ControllerParams);
@@ -20,29 +20,38 @@ 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;
+    private onWantsSelect;
     /**
      * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
      * 2. 把上一个点的位置更新为当前点的位置
-     * 3. 清除 mouseGroup 和 magnifier
+     * 3. 清除 pointSelector
      */
-    private onTap;
-    private onWantsTapGesture;
-    /** 编辑时取消走点 */
-    private onWantsToMoveToPano;
-    /** 存在长按点时不能移动全景 */
-    private onWantsPanGesture;
+    private onSelect;
     /** 移动全景时更新 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/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -1,130 +1,323 @@
-var d = Object.defineProperty;
-var l = (h, n, e) => n in h ? d(h, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[n] = e;
-var i = (h, n, e) => (l(h, typeof n != "symbol" ? n + "" : n, e), e);
-import m from "hammerjs";
-import { Model as u } from "../Model/index.js";
-import f from "../Model/line.js";
-import p from "../Model/point.js";
-import { throttle as v } from "../../shared-utils/throttle.js";
-import c from "./BaseController.js";
-import { getIntersectionFromEvent as r } from "../utils/getIntersectionFromEvent.js";
-import { Polyline as P } from "../Model/polyline.js";
-import "@realsee/five";
+var R = Object.defineProperty;
+var b = (m, c, t) => c in m ? R(m, c, { enumerable: !0, configurable: !0, writable: !0, value: t }) : m[c] = t;
+var o = (m, c, t) => (b(m, typeof c != "symbol" ? c + "" : c, t), t);
+import U from "../Model/line.js";
+import S from "../Model/point.js";
+import { throttle as H } from "../../shared-utils/throttle.js";
+import j from "./BaseController.js";
+import { Polyline as k } from "../Model/polyline.js";
+import D from "../Model/area.js";
+import T from "../utils/isIntersecting.js";
+import { PointSelector as x } from "../../shared-utils/three/PointSelector.js";
+import G from "../Modules/DeleteDom/index.js";
+import { findAssociatedLines as B } from "../utils/findAssociatedLines.js";
+import { Vector2 as y } from "three";
+import w from "../utils/isNDCPointInScreen.js";
+import { closestPointOnLine as W } from "../utils/math.js";
 import "../../shared-utils/uuid.js";
 import "../utils/line.js";
 import "@realsee/five/line";
 import "../utils/constants.js";
-import "three";
-import "../utils/distanceDom.js";
-import "../utils/isNDCPointInScreen.js";
+import "@realsee/five";
+import "../utils/dom/distanceItem.js";
+import "../utils/dom/base.js";
+import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/removeArrayItem.js";
 import "../utils/ironbox.js";
-import "../utils/getPointFromHammerEvent.js";
-class V extends c {
-  constructor(e) {
-    var s;
-    super(e);
-    i(this, "type", "edit");
-    i(this, "polyline");
-    /** 拖动的控制点 */
-    i(this, "pressPoint");
-    i(this, "hasAppendDashed", !1);
-    i(this, "hasAppendMouseGroup", !1);
-    i(this, "fiveElement");
+import "../Model/polygon.js";
+import "../../shared-utils/three/IObject3D.js";
+import "../utils/generatePolygonGeometry.js";
+import "earcut";
+import "../utils/dom/areaDom.js";
+import "../utils/geometryUtil.js";
+import "../../shared-utils/three/PointSelectorHelper.js";
+import "../../shared-utils/three/Magnifier.js";
+import "hammerjs";
+import "../../shared-utils/three/PointHelper.js";
+import "../../shared-utils/three/Assets/index.js";
+import "../../shared-utils/three/PointDomHelper.js";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
+import "../Modules/rangePiece/html.js";
+import "../../CSS3DRenderPlugin/index.js";
+import "../../CSS3DRenderPlugin/Controller.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.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 "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
+import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../shared-utils/absoluteUrl.js";
+import "../../shared-utils/animationFrame/BetterTween.js";
+import "../../shared-utils/animationFrame/index.js";
+import "../../shared-utils/isTouchDevice.js";
+import "../../shared-utils/getIntersectionFromEvent.js";
+import "../../shared-utils/getPointFromHammerEvent.js";
+import "../../shared-utils/three/getIntersect.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";
+const E = () => !1;
+class Xe extends j {
+  constructor(t) {
+    var e;
+    super(t);
+    o(this, "type", "edit");
+    o(this, "polyline");
+    o(this, "area");
+    o(this, "hasAppendDashed", !1);
+    // private deleteDom: DeleteDom
+    o(this, "fiveElement");
     /** 上一个端点位置 */
-    i(this, "lastPoint", null);
-    i(this, "hammer");
+    o(this, "lastPoint", null);
+    o(this, "pointSelector");
+    o(this, "deleteDom");
     /** 根据 intersection 更新放大镜和吸附点 */
-    i(this, "onIntersectionUpdate", v((e, t) => {
-      var o;
-      this.hasAppendMouseGroup === !1 && (this.group.add(this.mouseGroup), this.magnifier.appendTo(this.container), this.magnifier.enable(), this.hasAppendMouseGroup = !0);
-      const s = this.updateMouseGroup(e, t).position;
-      (o = this.pressPoint) == null || o.position.copy(s), this.updateDashed(), requestAnimationFrame(() => this.magnifier.renderWithPoint(this.mouseGroup.position)), this.five.needsRender = !0;
+    o(this, "onIntersectionUpdate", H((t, e) => {
+      this.currentMeasureType === "area" && typeof e == "boolean" && (e ? this.hook.emit("readyComplete") : this.hook.emit("notReadyComplete")), this.updateDashed();
     }, 20));
     /** 撤销编辑 */
-    i(this, "revoke", () => {
-      if (this.polyline.lines.length === 0 && this.lastPoint) {
-        this.lastPoint = null, this.hasAppendDashed = !1, this.dashed.distanceItem.remove(), this.group.remove(this.dashed.mesh), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.needsRender = !0;
+    o(this, "revoke", () => {
+      this.currentMeasureType === "area" ? this.revokeArea() : this.currentMeasureType === "line" && this.revokeLine();
+    });
+    /**
+     * @description: 测面积的撤销功能
+     */
+    o(this, "revokeArea", () => {
+      if (this.area.points.length !== 0) {
+        if (this.area.popPoint(), this.hook.emit("pointsChange", this.area.points), this.area.points.length === 0) {
+          this.lastPoint = null, this.hasAppendDashed = !1, this.dashed.remove(), this.five.needsRender = !0, this.hook.emit("revoke", { isEmpty: !0 });
+          return;
+        } else
+          this.lastPoint = new S(this.area.points[this.area.points.length - 1]), this.updateDashed();
+        this.five.needsRender = !0;
+      }
+    });
+    /**
+     * @description: 测距的撤销功能
+     */
+    o(this, "revokeLine", (t) => {
+      const e = t || this.polyline;
+      if (e.lines.length === 0 && this.lastPoint) {
+        this.lastPoint = null, this.hasAppendDashed = !1, this.dashed.remove(), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.needsRender = !0;
         return;
       }
-      if (this.polyline.lines.length === 0 && !this.lastPoint || !this.lastPoint)
+      if (e.lines.length === 0 && !this.lastPoint || !this.lastPoint)
         return;
-      const e = this.polyline.lines[this.polyline.lines.length - 1], t = e.findAnotherPoint(this.lastPoint);
-      t && (this.lastPoint = t, this.hook.emit("anchorChange", t.position), this.group.remove(e.mesh), this.polyline.removeLine(e), this.hasAppendMouseGroup = !1, this.mouseGroup.position.copy(this.lastPoint.position), this.group.remove(this.mouseGroup), e.distanceItem.remove(), this.updateDashed(), this.magnifier.disable(), this.five.needsRender = !0);
+      const i = e.lines[e.lines.length - 1], s = i.findAnotherPoint(this.lastPoint);
+      s && (this.lastPoint = s, this.hook.emit("anchorChange", s.position), this.group.remove(i.mesh), e.removeLine(i), i.distanceItem.remove(), this.updateDashed(), this.hook.emit("pointsChange", e.lines), this.five.needsRender = !0);
     });
-    i(this, "onMouseLeave", () => {
-      this.magnifier.disable(), this.group.remove(this.mouseGroup), this.hasAppendMouseGroup = !1, this.lastPoint && (this.mouseGroup.position.copy(this.lastPoint.position), this.updateDashed());
+    o(this, "onMouseLeave", () => {
+      this.dashed.hide(), this.perpendicularDashed.hide(), this.area.hideArea();
     });
     /** 编辑线条发生改变时通知外部 */
-    i(this, "onLineChanged", () => {
+    o(this, "onLineChanged", () => {
       this.hook.emit("editedPolylineChange", this.polyline);
     });
-    i(this, "onPress", (e) => {
-      const [t] = r(this.five, e);
-      if (!(t != null && t.face))
-        return;
-      const s = new p(t.point);
-      this.pressPoint = s, this.onIntersectionUpdate(t);
-    });
-    /**
-     * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
-     * 2. 如果有长按点，把长按点位置更新为当前位置
-     */
-    i(this, "onPan", (e) => {
-      if (!this.pressPoint)
-        return;
-      const [t] = r(this.five, e);
-      t != null && t.face && this.onIntersectionUpdate(t);
-    });
-    i(this, "onPanEnd", (e) => {
-      this.pressPoint && this.onTap(e);
+    o(this, "onWantsSelect", () => {
+      if (this.currentMeasureType === "area") {
+        const t = this.area.polygon.isBlank || this.area.polygon.visible === !1;
+        if (this.area.points.length >= 3 && t)
+          return !1;
+      }
     });
     /**
      * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
      * 2. 把上一个点的位置更新为当前点的位置
-     * 3. 清除 mouseGroup 和 magnifier
+     * 3. 清除 pointSelector
      */
-    i(this, "onTap", (e) => {
-      this.hasAppendDashed || (this.dashed.distanceItem.appendTo(this.container), this.group.add(this.dashed.mesh)), this.hasAppendDashed = !0;
-      const [t] = r(this.five, e);
-      this.updateMouseGroup(t);
-      const s = new p(this.mouseGroup.position), o = this.lastPoint;
-      if (s && (this.lastPoint = s), s && o) {
-        const a = new f(o, s, this.model);
-        a.distanceItem.setItemSelectable(!1), a.distanceItem.appendTo(this.container), this.polyline.addLine(a), this.group.add(a.mesh), a.distanceItem.update(this.five);
+    o(this, "onSelect", () => {
+      var s, r, l, d;
+      this.hasAppendDashed || (this.dashed.distanceItem.appendTo(this.container), this.group.add(this.dashed.mesh), this.currentMeasureType === "area" && this.group.add(this.perpendicularDashed.mesh)), this.hasAppendDashed = !0;
+      const t = (() => {
+        var a, n;
+        if (this.currentMeasureType === "area")
+          return this.area.projectPoint((a = this.pointSelector.position) == null ? void 0 : a.point);
+        if (this.currentMeasureType === "line")
+          return (n = this.pointSelector.position) == null ? void 0 : n.point;
+      })();
+      if (!t)
+        return;
+      const e = new S(t), i = this.lastPoint;
+      if (!(i != null && i.position && e.position.equals(i == null ? void 0 : i.position))) {
+        if (this.lastPoint = e, this.currentMeasureType === "line") {
+          if (e && i) {
+            const n = new U(i, e, this.model);
+            n.distanceItem.setCanSelect(!1), n.distanceItem.appendTo(this.container), this.polyline.addLine(n), this.group.add(n.mesh), n.distanceItem.update(this.five);
+          }
+          const a = (r = (s = this.editParams) == null ? void 0 : s.autoEndConfig) == null ? void 0 : r.line;
+          typeof a == "number" && (this.polyline.getPointLength() >= a ? this.complete() : this.polyline.getPointLength() === a - 1 && this.hook.emit("readyComplete")), this.hook.emit("pointsChange", this.polyline.points);
+        } else if (this.currentMeasureType === "area") {
+          if (this.area.addPoints(e.position), this.area.isClosed) {
+            this.complete();
+            return;
+          }
+          this.area.points.length >= 3 ? this.pointSelector.setAdherePoints(this.area.points[0]) : this.pointSelector.setAdherePoints(null);
+          const a = (d = (l = this.editParams) == null ? void 0 : l.autoEndConfig) == null ? void 0 : d.area;
+          typeof a == "number" && (this.area.points.length >= a ? this.complete() : this.area.points.length === a - 1 && this.hook.emit("readyComplete")), this.hook.emit("pointsChange", this.area.points);
+        }
+        this.updateDashed(), this.five.needsRender = !0, this.hook.emit("anchorChange", e.position);
       }
-      this.pressPoint = void 0, this.hasAppendMouseGroup = !1, this.magnifier.disable(), this.group.remove(this.mouseGroup), this.updateDashed(), this.five.needsRender = !0, this.hook.emit("anchorChange", s.position);
     });
-    i(this, "onWantsTapGesture", () => !1);
-    /** 编辑时取消走点 */
-    i(this, "onWantsToMoveToPano", () => !1);
-    /** 存在长按点时不能移动全景 */
-    i(this, "onWantsPanGesture", () => this.pressPoint ? !1 : void 0);
     /** 移动全景时更新 distanceItem 在屏幕上的位置 */
-    i(this, "onCameraUpdate", () => {
-      this.updateDistanceUI(), this.dashed.distanceItem.update(this.five);
+    o(this, "onCameraUpdate", () => {
+      this.updateDistanceUI();
     });
     /** 更新虚线 */
-    i(this, "updateDashed", () => {
-      this.lastPoint && (this.dashed.points[0].position.copy(this.lastPoint.position), this.dashed.points[1].position.copy(this.mouseGroup.position), this.dashed.mesh.setPoints(this.lastPoint.position, this.mouseGroup.position), this.dashed.distanceItem.update(this.five), this.hook.emit("editedDashedLineChange", this.dashed));
+    o(this, "updateDashed", () => {
+      var i;
+      if (!this.lastPoint)
+        return;
+      const t = this.lastPoint.position, e = (() => {
+        var s, r;
+        if (this.currentMeasureType === "area")
+          return this.area.projectPoint((s = this.pointSelector.position) == null ? void 0 : s.point);
+        if (this.currentMeasureType === "line")
+          return (r = this.pointSelector.position) == null ? void 0 : r.point;
+      })();
+      if (!e) {
+        this.dashed.hide();
+        return;
+      }
+      if (this.dashed.show(), this.dashed.setPoints(t, e), this.dashed.distanceItem.update(this.five), this.hook.emit("editedDashedLineChange", this.dashed), this.currentMeasureType === "area")
+        if (this.area.areaItem.setCanSelect(!1), this.area.points.length >= 2) {
+          const s = (i = this.pointSelector.position) == null ? void 0 : i.point;
+          if (s) {
+            const n = s, g = e;
+            this.perpendicularDashed.setPoints(n, g), this.perpendicularDashed.show();
+          } else
+            this.perpendicularDashed.hide();
+          const r = this.area.polyline.lines.map((n) => ({ start: n.points[0].position, end: n.points[1].position })), l = T({ start: t, end: e }, r), d = T({ start: e, end: this.area.points[0] }, r);
+          if (l || d)
+            this.area.hideArea(), this.hook.emit("allowAddPointStateChange", "forbid");
+          else {
+            this.area.showArea();
+            const n = [...this.area.points, e];
+            this.area.polygon.updatePoints(n), this.area.areaItem.updateArea(this.five), this.hook.emit("allowAddPointStateChange", "allow");
+          }
+        } else
+          this.area.hideArea(), this.perpendicularDashed.hide();
+      this.five.needsRender = !0;
+    });
+    // ====================================================================================================================================
+    // 下面一堆高亮相关
+    o(this, "wantsTapGesture", (t) => {
+      var A, C;
+      if (this.editParams.pointSelectorMode === "cursor" || this.lastPoint)
+        return !1;
+      const e = this.model.areas.map((h) => t.intersectObject(h.polygon, !0)[0]).sort((h, p) => h.distance - p.distance), i = (C = (A = e[0]) == null ? void 0 : A.object) == null ? void 0 : C.parent;
+      if (i != null && i.isPolygonMesh) {
+        const h = this.model.areas.find((p) => p.polygon === i);
+        if (h) {
+          const { x: p, y: v } = e[0].point.clone().project(this.five.camera), f = `${(p + 1) / 2 * 100}%`, u = `${(-v + 1) / 2 * 100}%`;
+          return this.chooseArea(h, { left: f, top: u }), !1;
+        }
+      }
+      const [s] = this.five.model.intersectRaycaster(t);
+      if (!s)
+        return;
+      const r = this.five.camera, l = s.point.clone().project(r), d = this.container.clientWidth, a = this.container.clientHeight, n = new y(l.x * d, l.y * a), g = this.model.getAllLines().map((h) => {
+        const [p, v] = h.points, f = p.position.clone().project(r), u = v.position.clone().project(r);
+        if (!w(f) && !w(u))
+          return null;
+        const I = new y(f.x * d, f.y * a), M = new y(u.x * d, u.y * a);
+        return { id: h.id, points: [I, M] };
+      }).filter((h) => !!h);
+      if (g.length === 0)
+        return;
+      const P = g.map((h) => {
+        const p = W(n, h.points);
+        return { id: h.id, distance: p.distanceTo(n) };
+      }).sort((h, p) => h.distance - p.distance)[0];
+      if (P.distance > 20)
+        return;
+      const L = this.model.getAllLines().find(({ id: h }) => h === P.id);
+      if (L)
+        return this.chooseLine(L), !1;
+    });
+    o(this, "chooseLine", (t) => {
+      const e = B(t);
+      this.deleteDom.setTarget(e).setLines(e).updatePosition().show(), this.highlightLines(e), this.hook.emit("selectedChange", e);
+    });
+    o(this, "chooseArea", (t, e) => {
+      console.log("choose area"), this.deleteDom.setTarget(t).updatePosition(e.left, `calc(${e.top} - 1.5rem)`).show(), this.highlightArea(t);
+    });
+    o(this, "deleteArea", (t) => {
+      this.unHighlightArea(t), t.dispose(), this.deleteDom.hide();
+    });
+    o(this, "deleteLine", (t) => {
+      const e = t[0], i = this.model.getPolylineByLine(e);
+      i && (this.model.removePolyline(i), i.lines.forEach((s) => this.removeLine(s)), this.deleteDom.setLines([]).hide());
     });
-    this.model = new u(this.config), this.polyline = new P({ model: this.model }), this.model.addPolyline(this.polyline), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsPanGesture", this.onWantsPanGesture), this.five.on("wantsTapGesture", this.onWantsTapGesture), this.five.on("wantsToMoveToPano", this.onWantsToMoveToPano), this.five.on("intersectionOnModelUpdate", this.onIntersectionUpdate), this.polyline.hook.on("lineAdded", this.onLineChanged), this.polyline.hook.on("lineRemoved", this.onLineChanged);
-    const t = this.five.getElement();
-    if (t) {
-      this.fiveElement = t;
-      const o = new m(t);
-      this.hammer = o, o.on("tap", this.onTap), o.on("pan", this.onPan), o.on("press", this.onPress), o.on("panend", this.onPanEnd);
-    }
-    this.five.helperVisible = !1, (s = this.fiveElement) == null || s.addEventListener("mouseleave", this.onMouseLeave), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.refresh();
+    this.fiveElement = this.five.getElement(), this.deleteDom = new G(this.five, {
+      i18n: this.config.i18n,
+      onClick: (i, s) => {
+        var d;
+        const r = s.type === "area", l = Array.isArray(s) && ((d = s[0]) == null ? void 0 : d.type) === "line";
+        r && this.deleteArea(s), l && this.deleteLine(s);
+      },
+      cancel: (i) => {
+        var l;
+        this.deleteDom.hide();
+        const s = i.type === "area", r = Array.isArray(i) && ((l = i[0]) == null ? void 0 : l.type) === "line";
+        s && this.unHighlightArea(i), r && this.unHighlightLines(i);
+      }
+    }).appendTo(this.container), this.pointSelector = new x(this.five, {
+      mode: this.editParams.pointSelectorMode,
+      pointSelectorHelperParams: { magnifierParams: this.magnifierParams }
+    }), this.pointSelector.enable(), this.polyline = new k({ model: this.model }), this.area = new D(void 0, {
+      five: this.five,
+      model: this.model,
+      meshContainer: this.group,
+      domContainer: this.container
+    }), this.model.addPolyline(this.polyline), this.model.addArea(this.area), this.model.getAllLines().forEach((i) => {
+      i.distanceItem.appendTo(this.container), i.distanceItem.update(this.five), i.distanceItem.setCanSelect(!0), this.group.add(i.mesh);
+    }), this.model.getAllAreas().forEach((i) => {
+      i.areaItem.appendTo(this.container), i.areaItem.updateDomPosition(this.five), i.areaItem.setCanSelect(!0), this.group.add(i.polygon), i.polyline.lines.forEach((s) => {
+        s.distanceItem.appendTo(this.container), s.distanceItem.update(this.five), this.group.add(s.mesh);
+      });
+    }), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.wantsTapGesture), this.five.on("wantsToMoveToPano", E), this.pointSelector.hook.on("intersectionUpdate", this.onIntersectionUpdate), this.pointSelector.hook.on("select", this.onSelect), this.pointSelector.hook.on("wantsSelect", this.onWantsSelect), this.polyline.hook.on("lineAdded", this.onLineChanged), this.polyline.hook.on("lineRemoved", this.onLineChanged), this.five.helperVisible = !1, (e = this.fiveElement) == null || e.addEventListener("mouseleave", this.onMouseLeave), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.refresh();
   }
   dispose() {
-    var e, t;
-    super.dispose(), this.five.helperVisible = !0, this.group.remove(this.mouseGroup, this.dashed.mesh), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsPanGesture", this.onWantsPanGesture), this.five.off("wantsTapGesture", this.onWantsTapGesture), this.five.off("wantsToMoveToPano", this.onWantsToMoveToPano), this.five.off("intersectionOnModelUpdate", this.onIntersectionUpdate), this.polyline.hook.off("lineAdded", this.onLineChanged), this.polyline.hook.off("lineRemoved", this.onLineChanged), (e = this.hammer) == null || e.destroy(), (t = this.fiveElement) == null || t.removeEventListener("mouseleave", this.onMouseLeave), this.magnifier.dispose(), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
+    var t;
+    super.dispose(), this.model.areas.forEach((e) => {
+      (e.points.length < 2 || e.polygon.isBlank) && this.model.removeArea(e);
+    }), this.five.helperVisible = !0, this.pointSelector.disable(), this.dashed.remove(), this.perpendicularDashed.remove(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.wantsTapGesture), this.five.off("wantsToMoveToPano", E), this.pointSelector.hook.off("intersectionUpdate", this.onIntersectionUpdate), this.pointSelector.hook.off("select", this.onSelect), this.polyline.hook.off("lineAdded", this.onLineChanged), this.polyline.hook.off("lineRemoved", this.onLineChanged), (t = this.fiveElement) == null || t.removeEventListener("mouseleave", this.onMouseLeave), this.magnifier.dispose(), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
   }
   getEditingLines() {
     return this.polyline.lines;
   }
+  selectPoint() {
+    this.onSelect();
+  }
+  complete() {
+    this.hook.emit("complete"), this.currentMeasureType === "area" ? (this.area.points.length < 3 ? this.deleteArea(this.area) : (this.area.showArea(), this.area.complete()), this.area = new D(void 0, { five: this.five, model: this.model, meshContainer: this.group, domContainer: this.container }), this.model.addArea(this.area)) : this.currentMeasureType === "line" && (this.polyline = new k({ model: this.model }), this.model.addPolyline(this.polyline)), this.pointSelector.setAdherePoints(null), this.dashed.hide(), this.perpendicularDashed.hide(), this.lastPoint = void 0;
+  }
+  highlightArea(t) {
+    this.highlightLines(t.polyline.lines), this.five.needsRender = !0;
+  }
+  unHighlightArea(t) {
+    this.unHighlightLines(t.polyline.lines), this.five.needsRender = !0;
+  }
+  highlightLines(t) {
+    t.forEach((e) => this.highlightLine(e));
+  }
+  unHighlightLines(t) {
+    t.forEach((e) => {
+      e.selected = !1, e.distanceItem.unHighlight(), this.group.remove(e.lightMesh), this.five.needsRender = !0;
+    });
+  }
+  highlightLine(t) {
+    t.selected || (t.selected = !0, this.group.add(t.lightMesh), t.distanceItem.highlight(), this.five.needsRender = !0);
+  }
 }
 export {
-  V as default
+  Xe as default
 };

package/libs/PanoMeasurePlugin/Controller/MixedController.js

@@ -1,22 +1,24 @@
-var k = Object.defineProperty;
-var S = (n, s, e) => s in n ? k(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e;
+var b = Object.defineProperty;
+var S = (n, s, e) => s in n ? b(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e;
 var t = (n, s, e) => (S(n, typeof s != "symbol" ? s + "" : s, e), e);
-import { Model as y } from "../Model/index.js";
-import D from "../Model/line.js";
+import { Model as D } from "../Model/index.js";
+import y from "../Model/line.js";
 import T from "./BaseController.js";
 import M from "../Modules/DeleteDom/index.js";
 import { findAssociatedLines as G } from "../utils/findAssociatedLines.js";
 import { Vector2 as m } from "three";
-import L from "../utils/isNDCPointInScreen.js";
-import { closestPointOnLine as N } from "../utils/math.js";
-import { Polyline as v } from "../Model/polyline.js";
-import W from "../Modules/rangePiece/index.js";
+import v from "../utils/isNDCPointInScreen.js";
+import { closestPointOnLine as W } from "../utils/math.js";
+import { Polyline as L } from "../Model/polyline.js";
+import E from "../Modules/rangePiece/index.js";
 import "@realsee/five";
 import "../../shared-utils/uuid.js";
 import "../utils/line.js";
 import "@realsee/five/line";
 import "../utils/constants.js";
-import "../utils/distanceDom.js";
+import "../utils/dom/distanceItem.js";
+import "../utils/dom/base.js";
+import "../../shared-utils/three/centerPoint.js";
 import "../Model/point.js";
 import "../../shared-utils/removeArrayItem.js";
 import "../utils/ironbox.js";
@@ -29,7 +31,7 @@ import "../../shared-utils/animationFrame/index.js";
 import "../../shared-utils/noop.js";
 import "../utils/calculateThreeMouse.js";
 import "../utils/mouseGroup.js";
-class re extends T {
+class de extends T {
   constructor(e) {
     super(e);
     t(this, "state", "watching");
@@ -47,19 +49,19 @@ class re extends T {
       const [i] = this.five.model.intersectRaycaster(e);
       if (!i)
         return;
-      const h = this.five.camera, p = i.point.clone().project(h), r = this.container.clientWidth, l = this.container.clientHeight, f = new m(p.x * r, p.y * l), g = this.model.getAllLines().map((o) => {
-        const [a, C] = o.points, d = a.position.clone().project(h), c = C.position.clone().project(h);
-        if (!L(d) && !L(c))
+      const h = this.five.camera, p = i.point.clone().project(h), a = this.container.clientWidth, l = this.container.clientHeight, f = new m(p.x * a, p.y * l), g = this.model.getAllLines().map((o) => {
+        const [r, C] = o.points, d = r.position.clone().project(h), c = C.position.clone().project(h);
+        if (!v(d) && !v(c))
           return null;
-        const w = new m(d.x * r, d.y * l), b = new m(c.x * r, c.y * l);
-        return { id: o.id, points: [w, b] };
+        const w = new m(d.x * a, d.y * l), k = new m(c.x * a, c.y * l);
+        return { id: o.id, points: [w, k] };
       }).filter((o) => !!o);
       if (g.length === 0)
         return;
       const u = g.map((o) => {
-        const a = N(f, o.points);
-        return { id: o.id, distance: a.distanceTo(f) };
-      }).sort((o, a) => o.distance - a.distance)[0];
+        const r = W(f, o.points);
+        return { id: o.id, distance: r.distanceTo(f) };
+      }).sort((o, r) => o.distance - r.distance)[0];
       if (u.distance > 20)
         return;
       const P = this.model.getAllLines().find(({ id: o }) => o === u.id);
@@ -74,19 +76,19 @@ class re extends T {
     });
     /** mobile态时更新虚线 */
     t(this, "updateMobileDashed", () => {
-      !this.mobileStartPoint || !this.mobileNowPoint || (this.dashed.points[0].position.copy(this.mobileStartPoint.position), this.dashed.points[1].position.copy(this.mobileNowPoint.position), this.dashed.mesh.setPoints(this.mobileStartPoint.position, this.mobileNowPoint.position), this.dashed.distanceItem.update(this.five), this.hook.emit("editedDashedLineChange", this.dashed));
+      !this.mobileStartPoint || !this.mobileNowPoint || (this.dashed.setPoints(this.mobileStartPoint.position, this.mobileNowPoint.position), this.dashed.distanceItem.update(this.five), this.hook.emit("editedDashedLineChange", this.dashed));
     });
     /** mobile态时更新放大镜 */
     t(this, "updateMagnifier", (e) => {
       this.magnifier.containerDom !== this.container && this.magnifier.appendTo(this.container), this.magnifier.getCurrentState().enabled || this.magnifier.enable(), requestAnimationFrame(() => this.magnifier.renderWithPoint(e.position)), this.five.needsRender = !0;
     });
     t(this, "onGetStartPoint", (e) => {
-      this.mobileStartPoint = e, this.polyline = new v({ model: this.model }), this.polyline.hook.on("lineAdded", () => this.hook.emit("editedPolylineChange", this.polyline)), this.polyline.hook.on("lineRemoved", () => this.hook.emit("editedPolylineChange", this.polyline));
+      this.mobileStartPoint = e, this.polyline = new L({ model: this.model }), this.polyline.hook.on("lineAdded", () => this.hook.emit("editedPolylineChange", this.polyline)), this.polyline.hook.on("lineRemoved", () => this.hook.emit("editedPolylineChange", this.polyline));
     });
     t(this, "onGetEndPoint", () => {
       const e = this.mobileNowPoint;
       if (this.removeLine(this.dashed), this.hasAppendDashed = !1, this.mobileStartPoint && e) {
-        const i = new D(this.mobileStartPoint, e, this.model);
+        const i = new y(this.mobileStartPoint, e, this.model);
         this.polyline.addLine(i), i.distanceItem.appendTo(this.container), i.distanceItem.update(this.five), i.hook.on("selected", this.chooseLine), this.disposers.push(() => i.hook.off("selected", this.chooseLine)), this.group.add(i.mesh), this.model.addPolyline(this.polyline);
       }
       this.mobileStartPoint = null, this.mobileNowPoint = null, this.five.needsRender = !0;
@@ -118,14 +120,14 @@ class re extends T {
     t(this, "cancelDeleteClickCallback", () => {
       this.clearHighlightLines();
     });
-    this.model = new y(this.config), this.polyline = new v({ model: this.model }), this.rangePieceController = new W(e), this.deleteDom = new M(this.five, {
+    this.model = new D(this.config), this.polyline = new L({ model: this.model }), this.rangePieceController = new E(e), this.deleteDom = new M(this.five, {
       i18n: this.config.i18n,
       onClick: this.deleteDomClickCallback,
-      cancelDelete: this.cancelDeleteClickCallback
+      cancel: this.cancelDeleteClickCallback
     }).appendTo(this.container), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.onWantsTapGesture), this.five.on("wantsToMoveToPano", this.onWantsToMoveToPano), this.five.helperVisible = !1, this.hook.emit("editedDashedLineChange", null), this.hook.on("getStartPoint", this.onGetStartPoint), this.hook.on("getEndPoint", this.onGetEndPoint), this.hook.on("nowPointChange", this.onNowPointChange), this.hook.on("willChangeState", this.onWillChangeState), this.five.refresh();
   }
   dispose() {
-    super.dispose(), this.disposers.forEach((e) => e()), this.five.helperVisible = !0, this.rangePieceController.dispose(), this.group.remove(this.mouseGroup, this.dashed.mesh), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.onWantsTapGesture), this.five.off("wantsToMoveToPano", this.onWantsToMoveToPano), this.hook.off("getStartPoint", this.onGetStartPoint), this.hook.off("getEndPoint", this.onGetEndPoint), this.hook.off("nowPointChange", this.onNowPointChange), this.hook.off("willChangeState", this.onWillChangeState), this.hook.emit("selectedChange", []), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
+    super.dispose(), this.disposers.forEach((e) => e()), this.five.helperVisible = !0, this.rangePieceController.dispose(), this.group.remove(this.mouseGroup), this.dashed.remove(), this.perpendicularDashed.remove(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.onWantsTapGesture), this.five.off("wantsToMoveToPano", this.onWantsToMoveToPano), this.hook.off("getStartPoint", this.onGetStartPoint), this.hook.off("getEndPoint", this.onGetEndPoint), this.hook.off("nowPointChange", this.onNowPointChange), this.hook.off("willChangeState", this.onWillChangeState), this.hook.emit("selectedChange", []), this.five.needsRender = !0;
   }
   highlightLine(e) {
     e.selected || (e.selected = !0, this.group.add(e.lightMesh), e.distanceItem.highlight(), this.five.needsRender = !0);
@@ -143,5 +145,5 @@ class re extends T {
   }
 }
 export {
-  re as default
+  de as default
 };

package/libs/PanoMeasurePlugin/Controller/ShortcutKeyController.js

@@ -25,7 +25,7 @@ class a {
     e && (document.body.removeEventListener("keydown", this.onKeyDown), e.removeEventListener("mousedown", this.onMouseDown));
   }
   escape() {
-    return this.measureController.getCurrentMode() === "Watch" ? this.measureController.disable() : this.measureController.changeMode("Watch");
+    return this.measureController.getCurrentMode() === "Watch" ? this.measureController.disable() : this.measureController.save().changeMode("Watch");
   }
 }
 export {