@realsee/dnalogel 2.22.0-dev.1 → 2.22.0-dev.2

package/libs/PanoMeasurePlugin/Components/Tip.js

@@ -1,46 +1,46 @@
-import { SvelteComponent as D, init as q, safe_not_equal as E, append_styles as N, empty as O, insert as M, transition_in as m, transition_out as _, check_outros as P, detach as w, onMount as W, onDestroy as j, element as b, text as A, attr as g, append as v, set_data as B, add_render_callback as F, create_bidirectional_transition as y, group_outros as G, binding_callbacks as H } from "../../vendor/svelte/internal/index.js";
-import { fade as C } from "../../vendor/svelte/transition/index.js";
+import { SvelteComponent as z, init as D, safe_not_equal as E, append_styles as N, empty as O, insert as M, transition_in as m, transition_out as _, check_outros as P, detach as w, onMount as W, onDestroy as j, element as b, 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 T } from "../../vendor/svelte/transition/index.js";
 import "../../vendor/svelte/easing/index.js";
-function I(s) {
-  N(s, "svelte-1kdvs98", ".Measure-Tips.svelte-1kdvs98.svelte-1kdvs98{box-sizing:border-box;position:absolute;pointer-events:none;top:0;width:100%;padding:0 2.5rem}.Measure-Tips.svelte-1kdvs98 .text.svelte-1kdvs98{text-align:center;position:relative;max-width:100%;top:3.125rem;color:#fff;word-break:break-all;word-wrap:break-word;text-shadow:0 0.0625rem 0.375rem rgba(0, 0, 0, 0.5);font-size:1.25rem}");
+function I(l) {
+  N(l, "svelte-1q8gtp4", ".Measure-Tips.svelte-1q8gtp4.svelte-1q8gtp4{box-sizing:border-box;position:absolute;pointer-events:none;top:0;width:100%;padding:0 2.5rem}.Measure-Tips.svelte-1q8gtp4 .text.svelte-1q8gtp4{text-align:center;position:relative;max-width:100%;top:3.125rem;color:#fff;word-break:break-all;word-wrap:break-word;text-shadow:0 0.0625rem 0.375rem rgba(0, 0, 0, 0.5);font-size:1.25rem;font-weight:bold}");
 }
-function T(s) {
+function v(l) {
   let n, i, e, t, r;
   return {
     c() {
       n = b("div"), i = b("div"), e = A(
         /*tip*/
-        s[2]
-      ), g(i, "class", "text svelte-1kdvs98"), g(n, "class", "Measure-Tips svelte-1kdvs98");
+        l[2]
+      ), k(i, "class", "text svelte-1q8gtp4"), k(n, "class", "Measure-Tips svelte-1q8gtp4");
     },
-    m(l, a) {
-      M(l, n, a), v(n, i), v(i, e), s[6](i), r = !0;
+    m(s, f) {
+      M(s, n, f), y(n, i), y(i, e), l[6](i), r = !0;
     },
-    p(l, a) {
-      (!r || a & /*tip*/
+    p(s, f) {
+      (!r || f & /*tip*/
       4) && B(
         e,
         /*tip*/
-        l[2]
+        s[2]
       );
     },
-    i(l) {
+    i(s) {
       r || (F(() => {
-        r && (t || (t = y(n, C, {}, !0)), t.run(1));
+        r && (t || (t = C(n, T, {}, !0)), t.run(1));
       }), r = !0);
     },
-    o(l) {
-      t || (t = y(n, C, {}, !1)), t.run(0), r = !1;
+    o(s) {
+      t || (t = C(n, T, {}, !1)), t.run(0), r = !1;
     },
-    d(l) {
-      l && w(n), s[6](null), l && t && t.end();
+    d(s) {
+      s && w(n), l[6](null), s && t && t.end();
     }
   };
 }
-function J(s) {
+function J(l) {
   let n, i, e = (
     /*visible*/
-    s[0] && T(s)
+    l[0] && v(l)
   );
   return {
     c() {
@@ -52,7 +52,7 @@ function J(s) {
     p(t, [r]) {
       /*visible*/
       t[0] ? e ? (e.p(t, r), r & /*visible*/
-      1 && m(e, 1)) : (e = T(t), e.c(), m(e, 1), e.m(n.parentNode, n)) : e && (G(), _(e, 1, 1, () => {
+      1 && m(e, 1)) : (e = v(t), e.c(), m(e, 1), e.m(n.parentNode, n)) : e && (G(), _(e, 1, 1, () => {
         e = null;
       }), P());
     },
@@ -67,47 +67,47 @@ function J(s) {
     }
   };
 }
-function K(s, n, i) {
-  let { measureController: e } = n, { tips: t } = n, { tipStyle: r = {} } = n, { visible: l = !0 } = n, a = null;
-  const x = (o) => {
-    const z = e.currentMeasureType;
+function K(l, n, i) {
+  let { measureController: e } = n, { tips: t } = n, { tipStyle: r = {} } = n, { visible: s = !0 } = n, f = null;
+  const q = (o) => {
+    const S = e.currentMeasureType;
     let u = "";
-    return u = t[o], u === void 0 && (u = t[z][o]), u;
+    return u = t[o], u === void 0 && (u = t[S][o]), u;
   }, c = (o) => {
-    i(2, d = x(o));
-  }, f = () => {
-    i(2, d = "");
+    i(2, p = q(o));
+  }, a = () => {
+    i(2, p = "");
   };
-  let d = "";
-  const p = (o) => {
-    o === "Edit" && e.changeMeasureType ? c("start") : f();
+  let p = "";
+  const d = (o) => {
+    o === "Edit" && e.changeMeasureType ? c("start") : a();
   }, h = () => {
-    e.getCurrentMode() === "Watch" && f();
-  }, k = (o) => {
-    e.currentMeasureType === "area" && (o.length >= 2 ? c("close") : o.length === 0 ? c("start") : f());
+    e.getCurrentMode() === "Watch" && a();
+  }, g = (o) => {
+    e.currentMeasureType === "area" && (o.length >= 2 ? c("close") : o.length === 0 ? c("start") : a());
   };
   W(() => {
-    p(e.getCurrentMode()), e.hook.on("modeChange", p), e.hook.on("complete", h), e.hook.on("pointsChange", k), e.hook.on("measureTypeChange", f);
+    d(e.getCurrentMode()), e.hook.on("modeChange", d), e.hook.on("complete", h), e.hook.on("pointsChange", g), e.hook.on("measureTypeChange", a);
   }), j(() => {
-    e.hook.off("modeChange", p), e.hook.off("complete", h), e.hook.off("pointsChange", k), e.hook.off("measureTypeChange", f), f();
+    e.hook.off("modeChange", d), e.hook.off("complete", h), e.hook.off("pointsChange", g), e.hook.off("measureTypeChange", a), a();
   });
-  function S(o) {
+  function x(o) {
     H[o ? "unshift" : "push"](() => {
-      a = o, i(1, a), i(5, r);
+      f = o, i(1, f), i(5, r);
     });
   }
-  return s.$$set = (o) => {
-    "measureController" in o && i(3, e = o.measureController), "tips" in o && i(4, t = o.tips), "tipStyle" in o && i(5, r = o.tipStyle), "visible" in o && i(0, l = o.visible);
-  }, s.$$.update = () => {
-    if (s.$$.dirty & /*textDom, tipStyle*/
-    34 && a)
+  return l.$$set = (o) => {
+    "measureController" in o && i(3, e = o.measureController), "tips" in o && i(4, t = o.tips), "tipStyle" in o && i(5, r = o.tipStyle), "visible" in o && i(0, s = o.visible);
+  }, l.$$.update = () => {
+    if (l.$$.dirty & /*textDom, tipStyle*/
+    34 && f)
       for (const o in r)
-        r.hasOwnProperty(o) && i(1, a.style[o] = r[o], a);
-  }, [l, a, d, e, t, r, S];
+        r.hasOwnProperty(o) && i(1, f.style[o] = r[o], f);
+  }, [s, f, p, e, t, r, x];
 }
-class U extends D {
+class U extends z {
   constructor(n) {
-    super(), q(
+    super(), D(
       this,
       n,
       K,

package/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -1,11 +1,11 @@
 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);
+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 U from "../Model/line.js";
-import S from "../Model/point.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 { Polyline as S } 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";
@@ -66,9 +66,9 @@ 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);
+  constructor(e) {
+    var t;
+    super(e);
     o(this, "type", "edit");
     o(this, "polyline");
     o(this, "area");
@@ -80,8 +80,8 @@ class Xe extends j {
     o(this, "pointSelector");
     o(this, "deleteDom");
     /** 根据 intersection 更新放大镜和吸附点 */
-    o(this, "onIntersectionUpdate", H((t, e) => {
-      this.currentMeasureType === "area" && typeof e == "boolean" && (e ? this.hook.emit("readyComplete") : this.hook.emit("notReadyComplete")), this.updateDashed();
+    o(this, "onIntersectionUpdate", H((e, t) => {
+      this.currentMeasureType === "area" && typeof t == "boolean" && (t ? this.hook.emit("readyComplete") : this.hook.emit("notReadyComplete")), this.updateDashed();
     }, 20));
     /** 撤销编辑 */
     o(this, "revoke", () => {
@@ -96,23 +96,23 @@ class Xe extends j {
           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.lastPoint = new C(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 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);
+      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.hook.emit("pointsChange", t.lines), this.five.needsRender = !0);
     });
     o(this, "onMouseLeave", () => {
       this.dashed.hide(), this.perpendicularDashed.hide(), this.area.hideArea();
@@ -123,8 +123,8 @@ class Xe extends j {
     });
     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)
+        const e = this.area.polygon.isBlank || this.area.polygon.visible === !1;
+        if (this.area.points.length >= 3 && e)
           return !1;
       }
     });
@@ -136,26 +136,26 @@ class Xe extends j {
     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 = (() => {
+      const e = (() => {
         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)
+      if (!e)
         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);
+      const t = new C(e), i = this.lastPoint;
+      if (!(i != null && i.position && t.position.equals(i == null ? void 0 : i.position))) {
+        if (this.lastPoint = t, this.currentMeasureType === "line") {
+          if (t && i) {
+            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 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) {
+          if (this.area.addPoints(t.position), this.area.isClosed) {
             this.complete();
             return;
           }
@@ -163,7 +163,7 @@ class Xe extends j {
           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.updateDashed(), this.five.needsRender = !0, this.hook.emit("anchorChange", t.position);
       }
     });
     /** 移动全景时更新 distanceItem 在屏幕上的位置 */
@@ -175,31 +175,31 @@ class Xe extends j {
       var i;
       if (!this.lastPoint)
         return;
-      const t = this.lastPoint.position, e = (() => {
+      const e = this.lastPoint.position, t = (() => {
         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) {
+      if (!t) {
         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.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 = (i = this.pointSelector.position) == null ? void 0 : i.point;
           if (s) {
-            const n = s, g = e;
+            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: t, end: e }, r), d = T({ start: e, end: this.area.points[0] }, r);
+          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, e];
+            const n = [...this.area.points, t];
             this.area.polygon.updatePoints(n), this.area.areaItem.updateArea(this.five), this.hook.emit("allowAddPointStateChange", "allow");
           }
         } else
@@ -208,19 +208,19 @@ class Xe extends j {
     });
     // ====================================================================================================================================
     // 下面一堆高亮相关
-    o(this, "wantsTapGesture", (t) => {
-      var A, C;
+    o(this, "wantsTapGesture", (e) => {
+      var A, k;
       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;
+      const t = this.model.areas.map((h) => e.intersectObject(h.polygon, !0)[0]).sort((h, p) => h.distance - p.distance), i = (k = (A = t[0]) == null ? void 0 : A.object) == null ? void 0 : k.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}%`;
+          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(t);
+      const [s] = this.five.model.intersectRaycaster(e);
       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) => {
@@ -242,18 +242,19 @@ class Xe extends j {
       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, "chooseLine", (e) => {
+      console.log(e);
+      const t = B(e);
+      this.deleteDom.setTarget(t).setLines(t).updatePosition().show(), this.highlightLines(t), this.hook.emit("selectedChange", t);
     });
-    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, "chooseArea", (e, t) => {
+      console.log("choose area"), this.deleteDom.setTarget(e).updatePosition(t.left, `calc(${t.top} - 1.5rem)`).show(), this.highlightArea(e);
     });
-    o(this, "deleteArea", (t) => {
-      this.unHighlightArea(t), t.dispose(), this.deleteDom.hide();
+    o(this, "deleteArea", (e) => {
+      this.unHighlightArea(e), e.dispose(), this.deleteDom.hide();
     });
-    o(this, "deleteLine", (t) => {
-      const e = t[0], i = this.model.getPolylineByLine(e);
+    o(this, "deleteLine", (e) => {
+      const t = e[0], i = this.model.getPolylineByLine(t);
       i && (this.model.removePolyline(i), i.lines.forEach((s) => this.removeLine(s)), this.deleteDom.setLines([]).hide());
     });
     this.fiveElement = this.five.getElement(), this.deleteDom = new G(this.five, {
@@ -272,24 +273,24 @@ class Xe extends j {
     }).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, {
+    }), this.pointSelector.enable(), this.polyline = new S({ 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);
+      i.distanceItem.appendTo(this.container), i.distanceItem.update(this.five), i.distanceItem.setCanSelect(!0), i.hook.on("selected", this.chooseLine), 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) => {
+      i.areaItem.appendTo(this.container), i.areaItem.updateDomPosition(this.five), i.areaItem.setCanSelect(!0), i.hook.on("selected", this.chooseArea), 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();
+    }), 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();
   }
   dispose() {
-    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;
+    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;
@@ -298,24 +299,26 @@ class Xe extends j {
     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;
+    this.hook.emit("complete"), this.currentMeasureType === "area" ? (this.area.points.length < 3 ? this.deleteArea(this.area) : (this.area.showArea(), this.area.complete(), this.area.hook.on("selected", this.chooseArea)), 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.lines.forEach((e) => {
+      e.hook.on("selected", this.chooseLine), e.distanceItem.setCanSelect(!0);
+    }), this.polyline = new S({ 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;
+  highlightArea(e) {
+    this.highlightLines(e.polyline.lines), this.five.needsRender = !0;
   }
-  unHighlightArea(t) {
-    this.unHighlightLines(t.polyline.lines), this.five.needsRender = !0;
+  unHighlightArea(e) {
+    this.unHighlightLines(e.polyline.lines), this.five.needsRender = !0;
   }
-  highlightLines(t) {
-    t.forEach((e) => this.highlightLine(e));
+  highlightLines(e) {
+    e.forEach((t) => this.highlightLine(t));
   }
-  unHighlightLines(t) {
-    t.forEach((e) => {
-      e.selected = !1, e.distanceItem.unHighlight(), this.group.remove(e.lightMesh), this.five.needsRender = !0;
+  unHighlightLines(e) {
+    e.forEach((t) => {
+      t.selected = !1, t.distanceItem.unHighlight(), this.group.remove(t.lightMesh), this.five.needsRender = !0;
     });
   }
-  highlightLine(t) {
-    t.selected || (t.selected = !0, this.group.add(t.lightMesh), t.distanceItem.highlight(), this.five.needsRender = !0);
+  highlightLine(e) {
+    e.selected || (e.selected = !0, this.group.add(e.lightMesh), e.distanceItem.highlight(), this.five.needsRender = !0);
   }
 }
 export {

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "2.22.0-dev.1");
+    i(this, "VERSION", "2.22.0-dev.2");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv2.22.0-dev.1",
+    "%c %c@realsee/dnalogel %cv2.22.0-dev.2",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/libs/shared-utils/three/PointSelector.d.ts

@@ -43,6 +43,7 @@ export declare class PointSelector {
     private adherePoints;
     /** 吸附点的半径 */
     private adherePointsRadius;
+    private lastFiveHelperVisible?;
     constructor(five: Five, config?: Partial<Config>);
     enable(): void;
     disable(): void;

package/libs/shared-utils/three/PointSelector.js

@@ -12,12 +12,12 @@ var p = (s, e, t) => e in s ? u(s, e, { enumerable: !0, configurable: !0, writab
 }, c = (s, e) => v(s, P(e));
 var i = (s, e, t) => (p(s, typeof e != "symbol" ? e + "" : e, t), t);
 import { Subscribe as H } from "@realsee/five";
-import { PointSelectorHelper as y } from "./PointSelectorHelper.js";
-import { isTouchDevice as b } from "../isTouchDevice.js";
-import U from "hammerjs";
+import { PointSelectorHelper as b } from "./PointSelectorHelper.js";
+import { isTouchDevice as y } from "../isTouchDevice.js";
+import F from "hammerjs";
 import { getIntersectionFromEvent as d } from "../getIntersectionFromEvent.js";
-import { Vector3 as E, Object3D as M, Face3 as F, Vector2 as I, Raycaster as O } from "three";
-import { getIntersectFromRelativePosition as k } from "./getIntersect.js";
+import { Vector3 as U, Object3D as E, Face3 as M, Vector2 as I, Raycaster as O } from "three";
+import { getIntersectFromRelativePosition as V } from "./getIntersect.js";
 const l = () => !1;
 class W {
   constructor(e, t) {
@@ -37,6 +37,7 @@ class W {
     i(this, "adherePoints", null);
     /** 吸附点的半径 */
     i(this, "adherePointsRadius", 0.1);
+    i(this, "lastFiveHelperVisible");
     /**
      * @description: 主动触发一次选点
      * @return: select 是否成功
@@ -102,7 +103,7 @@ class W {
      * @description: 根据鼠标位置更新helper位置
      */
     i(this, "updateByNdcPosition", (e) => {
-      const t = k(this.five, e), o = (() => t ? c(a({}, t), { isVirtual: !1 }) : c(a({}, x(this.five, e)), { isVirtual: !0 }))();
+      const t = V(this.five, e), o = (() => t ? c(a({}, t), { isVirtual: !1 }) : c(a({}, C(this.five, e)), { isVirtual: !0 }))();
       this.updatePointSelectorHelperIntersect(o);
     });
     /**
@@ -134,12 +135,12 @@ class W {
     var n, h;
     this.five = e;
     const o = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
-    o === "auto" ? this.mode = b ? "fixed" : "cursor" : this.mode = o;
+    o === "auto" ? this.mode = y ? "fixed" : "cursor" : this.mode = o;
     const r = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new y(e, c(a({}, t == null ? void 0 : t.pointSelectorHelperParams), {
+    this.pointSelectorHelper = new b(e, c(a({}, t == null ? void 0 : t.pointSelectorHelperParams), {
       magnifierParams: a(a({}, r), (h = t == null ? void 0 : t.pointSelectorHelperParams) == null ? void 0 : h.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
@@ -153,14 +154,14 @@ class W {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.hammer || (this.hammer = new U(e)), this.mode === "cursor" ? (this.five.on("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", l), this.five.on("wantsChangeMode", l), this.five.on("wantsTapGesture", l), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate);
+    this.hammer || (this.hammer = new F(e)), this.mode === "cursor" ? (this.five.on("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", l), this.five.on("wantsChangeMode", l), this.five.on("wantsTapGesture", l), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate);
   }
   disable() {
     if (!this.enabled)
       return;
     this.enabled = !1, this.pointSelectorHelper.disable();
     const e = this.five.getElement();
-    this.five.off("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", l), this.five.off("wantsChangeMode", l), this.five.off("wantsTapGesture", l), e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate);
+    this.five.off("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", l), this.five.off("wantsChangeMode", l), this.five.off("wantsTapGesture", l), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate);
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
@@ -169,17 +170,17 @@ class W {
     e ? this.adherePoints = Array.isArray(e) ? e : [e] : this.adherePoints = null, typeof t == "number" && (this.adherePointsRadius = t);
   }
 }
-function C(s, e) {
+function k(s, e) {
   const { x: t, y: o } = e, r = t * 2 - 1, n = o * 2 - 1, h = new I().fromArray([r, n]), f = new O();
   return f.setFromCamera(h, s.camera), f;
 }
-function x(s, e) {
-  const t = C(s, e), o = 3, r = new E().addVectors(t.ray.origin, t.ray.direction.clone().normalize().multiplyScalar(o)), n = t.ray.direction.clone().negate();
+function C(s, e) {
+  const t = k(s, e), o = 3, r = new U().addVectors(t.ray.origin, t.ray.direction.clone().normalize().multiplyScalar(o)), n = t.ray.direction.clone().negate();
   return {
     distance: o,
     point: r,
-    object: new M(),
-    face: new F(0, 0, 0, n)
+    object: new E(),
+    face: new M(0, 0, 0, n)
   };
 }
 export {

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.22.0-dev.1",
+  "version": "2.22.0-dev.2",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",