@realsee/dnalogel 2.21.0-dev.6 → 2.21.0-dev.8

package/libs/PanoMeasurePlugin/Controller/EditController.js

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

package/libs/PanoMeasurePlugin/Controller/MixedController.js

@@ -1,7 +1,7 @@
 var b = Object.defineProperty;
-var D = (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) => (D(n, typeof s != "symbol" ? s + "" : s, e), e);
-import { Model as S } from "../Model/index.js";
+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 D } from "../Model/index.js";
 import y from "../Model/line.js";
 import T from "./BaseController.js";
 import M from "../Modules/DeleteDom/index.js";
@@ -119,10 +119,10 @@ class le extends T {
     t(this, "cancelDeleteClickCallback", () => {
       this.clearHighlightLines();
     });
-    this.model = new S(this.config), this.polyline = new L({ model: this.model }), this.rangePieceController = new E(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() {

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

@@ -14,9 +14,9 @@ export default class WatchController extends BaseController {
     highlightLine(line: Line): void;
     clearHighlightLines(): void;
     private highlightArea;
+    private unHighlightArea;
     private highlightLines;
     private unHighlightLines;
-    private unHighlightArea;
     private onPanStart;
     private onPanEnd;
     private onPan;

package/libs/PanoMeasurePlugin/Controller/WatchController.js

@@ -8,8 +8,8 @@ import G from "./BaseController.js";
 import { Raycaster as T, Vector2 as u } from "three";
 import { closestPointOnLine as U } from "../utils/math.js";
 import { findClosestPoint as b } from "../utils/findClosestPoint.js";
-import { findAssociatedLines as D } from "../utils/findAssociatedLines.js";
-import { getPointFromHammerEvent as w } from "../utils/getPointFromHammerEvent.js";
+import { findAssociatedLines as w } from "../utils/findAssociatedLines.js";
+import { getPointFromHammerEvent as D } from "../../shared-utils/getPointFromHammerEvent.js";
 import j from "../Model/area.js";
 import x from "../Model/polygon.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
@@ -50,14 +50,14 @@ class Pe extends G {
       var a;
       if (this.model.getAllLines().length === 0 || !this.fiveElement)
         return;
-      const i = w(e).point, t = (a = b(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
+      const i = D(e).point, t = (a = b(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
       if (!t) {
         this.editPointState = void 0;
         return;
       }
       const n = {
         point: t,
-        associatedLines: D(t.lines[0])
+        associatedLines: w(t.lines[0])
       };
       this.hook.emit("wantsDragLine", {
         point: t.id,
@@ -70,7 +70,7 @@ class Pe extends G {
     s(this, "onPan", (e) => {
       if (!this.editPointState || !this.fiveElement)
         return;
-      const i = w(e).ndcPoint, t = new T();
+      const i = D(e).ndcPoint, t = new T();
       t.setFromCamera(i, this.five.camera);
       const [n] = this.five.model.intersectRaycaster(t);
       n && this.onIntersectionUpdate(n);
@@ -129,14 +129,14 @@ class Pe extends G {
     });
     s(this, "chooseLine", (e) => {
       this.choose = "line";
-      const i = D(e);
+      const i = w(e);
       this.deleteDom.setLines(i).updatePosition().show(), this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
         "selectedChange",
         i.map((t) => t)
       );
     });
     s(this, "chooseArea", (e, i) => {
-      this.choose = e, this.deleteDom.updatePosition(i.left, `calc(${i.top} - 20px)`).show(), this.highlightArea(e);
+      this.deleteDom.setTarget(e).updatePosition(i.left, `calc(${i.top} - 20px)`).show(), this.highlightArea(e);
     });
     s(this, "polylineRemoved", (e) => {
       e.lines.forEach((i) => this.removeLine(i)), this.hook.emit(
@@ -162,7 +162,7 @@ class Pe extends G {
       onClick: () => {
         this.choose === "line" ? this.deleteLine() : this.choose instanceof j && this.deleteArea(this.choose);
       },
-      cancelDelete: this.cancelDeleteClickCallback
+      cancel: this.cancelDeleteClickCallback
     }).appendTo(this.container), this.model.getAllLines().forEach((t) => {
       t.distanceItem.appendTo(this.container), t.distanceItem.update(this.five), t.hook.on("selected", this.chooseLine), t.distanceItem.setCanSelect(!0), this.group.add(t.mesh);
     }), this.model.getAllAreas().forEach((t) => {
@@ -191,19 +191,20 @@ class Pe extends G {
   highlightArea(e) {
     this.unHighlightLines(), this.unHighlightArea(), this.highlightLines(e.polyline.lines), this.five.needsRender = !0;
   }
+  unHighlightArea(e) {
+    const i = e != null ? e : this.highlightedArea;
+    i && (this.unHighlightLines(i.polyline.lines), this.five.needsRender = !0);
+  }
   highlightLines(e) {
     this.unHighlightLines(), this.highlightedLines = e, e.forEach((i) => this.highlightLine(i));
   }
   unHighlightLines(e) {
+    this.unHighlightArea();
     const i = e != null ? e : this.highlightedLines;
     i && i.forEach((t) => {
       t.selected = !1, t.distanceItem.unHighlight(), this.group.remove(t.lightMesh), this.five.needsRender = !0;
     });
   }
-  unHighlightArea(e) {
-    const i = e != null ? e : this.highlightedArea;
-    i && (this.unHighlightLines(i.polyline.lines), this.five.needsRender = !0);
-  }
 }
 export {
   Pe as default

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;
@@ -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端
      */