@realsee/dnalogel 2.21.0-dev.10 → 2.21.0-dev.12

package/libs/PanoMeasurePlugin/Components/Tip.js

@@ -0,0 +1,154 @@
+import { SvelteComponent as D, init as q, safe_not_equal as E, append_styles as N, empty as O, insert as w, transition_in as d, transition_out as b, check_outros as P, detach as z, onMount as W, onDestroy as j, element as g, text as A, attr as k, append as y, set_data as B, add_render_callback as F, create_bidirectional_transition as C, group_outros as G, binding_callbacks as H } from "../../vendor/svelte/internal/index.js";
+import { fade as v } from "../../vendor/svelte/transition/index.js";
+import "@realsee/five/line";
+import "../utils/constants.js";
+import "three";
+import "@realsee/five";
+import "../Model/polygon.js";
+import "hammerjs";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../vendor/svelte/easing/index.js";
+import "../../shared-utils/three/IObject3D.js";
+import "../utils/generatePolygonGeometry.js";
+import "earcut";
+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 "../../shared-utils/three/centerPoint.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+function I(l) {
+  N(l, "svelte-18z4ai8", ".Measure-Tips.svelte-18z4ai8.svelte-18z4ai8{box-sizing:border-box;position:absolute;pointer-events:none;width:100%;padding:0 2.5rem}.Measure-Tips.svelte-18z4ai8 .text.svelte-18z4ai8{position:relative;margin:auto;width:-moz-max-content;width:max-content;max-width:100%;top:1.875rem;color:#fff;word-break:break-all;word-wrap:break-word}");
+}
+function T(l) {
+  let o, r, e, i, n;
+  return {
+    c() {
+      o = g("div"), r = g("div"), e = A(
+        /*tip*/
+        l[2]
+      ), k(r, "class", "text svelte-18z4ai8"), k(o, "class", "Measure-Tips svelte-18z4ai8");
+    },
+    m(s, a) {
+      w(s, o, a), y(o, r), y(r, e), l[6](r), n = !0;
+    },
+    p(s, a) {
+      (!n || a & /*tip*/
+      4) && B(
+        e,
+        /*tip*/
+        s[2]
+      );
+    },
+    i(s) {
+      n || (F(() => {
+        n && (i || (i = C(o, v, {}, !0)), i.run(1));
+      }), n = !0);
+    },
+    o(s) {
+      i || (i = C(o, v, {}, !1)), i.run(0), n = !1;
+    },
+    d(s) {
+      s && z(o), l[6](null), s && i && i.end();
+    }
+  };
+}
+function J(l) {
+  let o, r, e = (
+    /*visible*/
+    l[0] && T(l)
+  );
+  return {
+    c() {
+      e && e.c(), o = O();
+    },
+    m(i, n) {
+      e && e.m(i, n), w(i, o, n), r = !0;
+    },
+    p(i, [n]) {
+      /*visible*/
+      i[0] ? e ? (e.p(i, n), n & /*visible*/
+      1 && d(e, 1)) : (e = T(i), e.c(), d(e, 1), e.m(o.parentNode, o)) : e && (G(), b(e, 1, 1, () => {
+        e = null;
+      }), P());
+    },
+    i(i) {
+      r || (d(e), r = !0);
+    },
+    o(i) {
+      b(e), r = !1;
+    },
+    d(i) {
+      e && e.d(i), i && z(o);
+    }
+  };
+}
+function K(l, o, r) {
+  let { measureController: e } = o, { tips: i } = o, { tipStyle: n = {} } = o, { visible: s = !0 } = o, a = null;
+  const M = (t) => {
+    const S = e.currentMeasureType;
+    let p = "";
+    return p = i[t], p === void 0 && (p = i[S][t]), p;
+  }, f = (t) => {
+    r(2, c = M(t));
+  }, m = () => {
+    r(2, c = "");
+  };
+  let c = "";
+  const u = (t) => {
+    t === "Edit" ? e.changeMeasureType ? f("start") : f("select") : t === "Watch" ? f("select") : m();
+  }, h = () => {
+    f("select");
+  }, _ = (t) => {
+    e.currentMeasureType === "area" && (t.length >= 2 ? f("close") : t.length === 0 ? f("start") : m());
+  };
+  W(() => {
+    u(e.getCurrentMode()), e.hook.on("modeChange", u), e.hook.on("complete", h), e.hook.on("pointsChange", _);
+  }), j(() => {
+    e.hook.off("modeChange", u), e.hook.off("complete", h), e.hook.off("pointsChange", _), m();
+  });
+  function x(t) {
+    H[t ? "unshift" : "push"](() => {
+      a = t, r(1, a), r(5, n);
+    });
+  }
+  return l.$$set = (t) => {
+    "measureController" in t && r(3, e = t.measureController), "tips" in t && r(4, i = t.tips), "tipStyle" in t && r(5, n = t.tipStyle), "visible" in t && r(0, s = t.visible);
+  }, l.$$.update = () => {
+    if (l.$$.dirty & /*textDom, tipStyle*/
+    34 && a)
+      for (const t in n)
+        n.hasOwnProperty(t) && r(1, a.style[t] = n[t], a);
+    l.$$.dirty & /*tip*/
+    4 && console.log({ tip: c });
+  }, [s, a, c, e, i, n, x];
+}
+class ge extends D {
+  constructor(o) {
+    super(), q(
+      this,
+      o,
+      K,
+      J,
+      E,
+      {
+        measureController: 3,
+        tips: 4,
+        tipStyle: 5,
+        visible: 0
+      },
+      I
+    );
+  }
+}
+export {
+  ge as default
+};

package/libs/PanoMeasurePlugin/Components/Tip.svelte.d.ts

@@ -0,0 +1 @@
+export { SvelteComponentTyped as default } from 'svelte/internal';

package/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -1,19 +1,19 @@
-var U = Object.defineProperty;
-var b = (m, c, e) => c in m ? U(m, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[c] = e;
+var R = Object.defineProperty;
+var b = (m, c, e) => c in m ? R(m, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[c] = e;
 var o = (m, c, e) => (b(m, typeof c != "symbol" ? c + "" : c, e), e);
-import H from "../Model/line.js";
-import D from "../Model/point.js";
-import { throttle as j } from "../../shared-utils/throttle.js";
-import x from "./BaseController.js";
+import U from "../Model/line.js";
+import C 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 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 W } from "../utils/findAssociatedLines.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 I from "../utils/isNDCPointInScreen.js";
-import { closestPointOnLine as V } from "../utils/math.js";
+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";
@@ -33,7 +33,6 @@ 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";
 import "../../shared-utils/three/PointDomHelper.js";
@@ -61,11 +60,12 @@ 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 x {
+const I = () => !1;
+class Xe extends j {
   constructor(e) {
     var t;
     super(e);
@@ -80,7 +80,9 @@ class Xe extends x {
     o(this, "pointSelector");
     o(this, "deleteDom");
     /** 根据 intersection 更新放大镜和吸附点 */
-    o(this, "onIntersectionUpdate", j(() => this.updateDashed(), 20));
+    o(this, "onIntersectionUpdate", H((e, t) => {
+      typeof t == "boolean" && (t ? this.hook.emit("readyComplete") : this.hook.emit("notReadyComplete")), this.updateDashed();
+    }, 20));
     /** 撤销编辑 */
     o(this, "revoke", () => {
       this.currentMeasureType === "area" ? this.revokeArea() : this.currentMeasureType === "line" && this.revokeLine();
@@ -90,11 +92,11 @@ class Xe extends x {
      */
     o(this, "revokeArea", () => {
       if (this.area.points.length !== 0) {
-        if (this.area.popPoint(), 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 D(this.area.points[this.area.points.length - 1]), this.updateDashed();
+          this.lastPoint = new C(this.area.points[this.area.points.length - 1]), this.updateDashed();
         this.five.needsRender = !0;
       }
     });
@@ -132,29 +134,33 @@ class Xe extends x {
      * 3. 清除 pointSelector
      */
     o(this, "onSelect", () => {
-      var s, h, d, p;
+      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 e = (() => {
-        var n, a;
+        var a, n;
         if (this.currentMeasureType === "area")
-          return this.area.projectPoint((n = this.pointSelector.position) == null ? void 0 : n.point);
+          return this.area.projectPoint((a = this.pointSelector.position) == null ? void 0 : a.point);
         if (this.currentMeasureType === "line")
-          return (a = this.pointSelector.position) == null ? void 0 : a.point;
+          return (n = this.pointSelector.position) == null ? void 0 : n.point;
       })();
       if (!e)
         return;
-      const t = new D(e), i = this.lastPoint;
+      const t = new C(e), i = this.lastPoint;
       if (this.lastPoint = t, this.currentMeasureType === "line") {
         if (t && i) {
-          const a = new H(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 = new U(i, t, 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 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"));
+        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") {
-        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"));
+        if (this.area.addPoints(t.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", t.position);
     });
@@ -168,11 +174,11 @@ class Xe extends x {
       if (!this.lastPoint)
         return;
       const e = this.lastPoint.position, t = (() => {
-        var s, h;
+        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 (h = this.pointSelector.position) == null ? void 0 : h.point;
+          return (r = this.pointSelector.position) == null ? void 0 : r.point;
       })();
       if (!t) {
         this.dashed.hide();
@@ -180,62 +186,62 @@ class Xe extends x {
       }
       if (this.dashed.show(), this.dashed.setPoints(e, t), 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 = 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)
+          const s = (i = this.pointSelector.position) == null ? void 0 : i.point;
+          if (s) {
+            const n = s, g = t;
+            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: e, end: t }, r), d = T({ start: t, 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, 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");
+            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", (e) => {
-      var S, C;
+      var A, S;
       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 = (C = (S = t[0]) == null ? void 0 : S.object) == null ? void 0 : C.parent;
+      const t = this.model.areas.map((h) => e.intersectObject(h.polygon, !0)[0]).sort((h, p) => h.distance - p.distance), i = (S = (A = t[0]) == null ? void 0 : A.object) == null ? void 0 : S.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 h = this.model.areas.find((p) => p.polygon === i);
+        if (h) {
+          const { x: p, y: v } = t[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(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))
+      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 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);
+        const E = new y(f.x * d, f.y * a), M = new y(u.x * d, u.y * a);
+        return { id: h.id, points: [E, M] };
+      }).filter((h) => !!h);
       if (g.length === 0)
         return;
-      const L = g.map((r) => {
-        const l = V(a, r.points);
-        return { id: r.id, distance: l.distanceTo(a) };
-      }).sort((r, l) => r.distance - l.distance)[0];
-      if (L.distance > 20)
+      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 A = this.model.getAllLines().find(({ id: r }) => r === L.id);
-      if (A)
-        return this.chooseLine(A), !1;
+      const L = this.model.getAllLines().find(({ id: h }) => h === P.id);
+      if (L)
+        return this.chooseLine(L), !1;
     });
     o(this, "chooseLine", (e) => {
-      const t = W(e);
+      const t = B(e);
       this.deleteDom.setTarget(t).setLines(t).updatePosition().show(), this.highlightLines(t), this.hook.emit("selectedChange", t);
     });
     o(this, "chooseArea", (e, t) => {
@@ -248,23 +254,23 @@ class Xe extends x {
       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, {
+    this.fiveElement = this.five.getElement(), this.deleteDom = new G(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);
+        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 d;
+        var l;
         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);
+        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 G(this.five, {
+    }).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 T(void 0, {
+    }), 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,
@@ -275,13 +281,13 @@ class Xe extends x {
       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, (t = this.fiveElement) == null || t.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", I), 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, (t = this.fiveElement) == null || t.addEventListener("mouseleave", this.onMouseLeave), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.refresh();
   }
   dispose() {
     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;
+    }), 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", I), 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;
@@ -290,7 +296,7 @@ class Xe extends x {
     this.onSelect();
   }
   complete() {
-    this.hook.emit("complete"), this.currentMeasureType === "area" ? (this.area.points.length < 3 ? this.deleteArea(this.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;
+    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(e) {
     this.highlightLines(e.polyline.lines), this.five.needsRender = !0;

package/libs/PanoMeasurePlugin/Controller/index.js

@@ -54,7 +54,6 @@ 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/getIntersect.js";
 import "../../shared-utils/three/PointHelper.js";
 import "../../shared-utils/three/Assets/index.js";
 import "../../shared-utils/three/PointDomHelper.js";
@@ -79,6 +78,7 @@ 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";
@@ -107,7 +107,9 @@ import "../Components/Common/Switcher1.js";
 import "../Components/Common/CircleButton.js";
 import "../../vendor/svelte/transition/index.js";
 import "../../vendor/svelte/easing/index.js";
-class Dt {
+import "../../vendor/object-assign-deep/objectAssignDeep.js";
+import "../Components/Tip.js";
+class xt {
   constructor(e, t) {
     i(this, "hasOpen", !1);
     i(this, "hook", new G());
@@ -133,18 +135,18 @@ class Dt {
      * @description 还原点位展示和默认鼠标 UI
      */
     i(this, "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);
+      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: w,
         Watch: v,
@@ -153,8 +155,8 @@ class Dt {
       };
       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: 切换测量的类型
@@ -164,13 +166,13 @@ class Dt {
     });
     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 o = (M = (y = t.editParams) == null ? void 0 : y.pointSelectorMode) != null ? M : W ? "fixed" : "cursor", r = (C = this.params.openParams) != null ? C : {};
+    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 = m({ container: this.container, openParams: r, pointSelectorMode: o }, b(this.params.useUIController));
+      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 = m({ container: this.container }, b(this.params.useGuideController));
+      const p = m({ container: this.container, pointSelectorMode: r }, b(this.params.useGuideController));
       this.useGuideController = new L(this, p);
     }
   }
@@ -240,10 +242,10 @@ class Dt {
     var l;
     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);
-    }), this.controller instanceof h ? this.controller.complete() : r.forEach((n) => {
+    }), this.controller instanceof h ? this.controller.complete() : o.forEach((n) => {
       n.showArea(), this.model.addArea(n);
     }), this.changeMode(t), this;
   }
@@ -272,15 +274,15 @@ class Dt {
   }
   /** 设置线段的文本 */
   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,
@@ -300,5 +302,5 @@ class Dt {
   }
 }
 export {
-  Dt as default
+  xt as default
 };

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

@@ -22,6 +22,10 @@ export default class Area {
     readonly lightMesh: FiveLine;
     readonly areaItem: AreaItem;
     readonly hook: Subscribe<AreaHook>;
+    /**
+     * @description: 多边形的端点是否闭合
+     */
+    get isClosed(): boolean;
     /** 多边形mesh */
     polygon: PolygonMesh;
     /** 多边形顶点 */