@realsee/dnalogel 2.3.6 → 2.3.7-0

package/libs/PanoMeasurePlugin/Controller/MixedController.js

@@ -1,30 +1,29 @@
 var b = Object.defineProperty;
-var k = (h, n, e) => n in h ? b(h, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[n] = e;
-var t = (h, n, e) => (k(h, typeof n != "symbol" ? n + "" : n, e), e);
+var k = (h, s, e) => s in h ? b(h, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[s] = e;
+var t = (h, s, e) => (k(h, typeof s != "symbol" ? s + "" : s, e), e);
 import { Model as S } from "../Model/index.js";
-import { Line as T } from "../Model/line.js";
-import { BaseController as D } from "./BaseController.js";
-import { DeleteDom as M } from "../Modules/DeleteDom/index.js";
-import { findAssociatedLines as G } from "../utils/findAssociatedLines.js";
-import { Vector2 as m } from "three";
+import { Line as y } from "../Model/line.js";
+import { BaseController as T } from "./BaseController.js";
+import { DeleteDom as D } from "../Modules/DeleteDom/index.js";
+import { findAssociatedLines as M } from "../utils/findAssociatedLines.js";
+import { Vector2 as p } from "three";
 import { isNDCPointInScreen as v } from "../utils/isNDCPointInScreen.js";
-import { closestPointOnLine as N } from "../utils/math.js";
-class V extends D {
+import { closestPointOnLine as G } from "../utils/math.js";
+import { Polyline as N } from "../Model/polyline.js";
+import { RangePieceController as R } from "../Modules/rangePiece/index.js";
+class O extends T {
   constructor(e) {
     super(e);
     t(this, "state", "watching");
-    t(this, "model", new S(this.config));
+    t(this, "polyline");
     t(this, "hasAppendDashed", !1);
-    t(this, "fiveElement");
     t(this, "mobileStartPoint", null);
     t(this, "mobileNowPoint", null);
     t(this, "highlightedLines", []);
     t(this, "deleteDom");
+    t(this, "rangePieceController");
     t(this, "onLineChanged", () => {
-      this.hook.emit(
-        "editedLineChange",
-        this.model.lines.map((e) => e.toCompletelyJson())
-      );
+      this.hook.emit("editedPolylineChange", this.polyline);
     });
     t(this, "onWantsTapGesture", (e) => {
       if (this.state === "editing")
@@ -32,22 +31,22 @@ class V extends D {
       const [i] = this.five.model.intersectRaycaster(e);
       if (!i)
         return;
-      const o = this.five.camera, f = i.point.clone().project(o), d = this.container.clientWidth, r = this.container.clientHeight, p = new m(f.x * d, f.y * r), g = this.model.lines.map((s) => {
-        const [a, L] = s.points, l = a.position.clone().project(o), c = L.position.clone().project(o);
-        if (!v(l) && !v(c))
+      const n = this.five.camera, f = i.point.clone().project(n), r = this.container.clientWidth, l = this.container.clientHeight, m = new p(f.x * r, f.y * l), g = this.polyline.lines.map((o) => {
+        const [a, C] = o.points, d = a.position.clone().project(n), c = C.position.clone().project(n);
+        if (!v(d) && !v(c))
           return null;
-        const C = new m(l.x * d, l.y * r), w = new m(c.x * d, c.y * r);
-        return { id: s.id, points: [C, w] };
-      }).filter((s) => !!s);
+        const L = new p(d.x * r, d.y * l), w = new p(c.x * r, c.y * l);
+        return { id: o.id, points: [L, w] };
+      }).filter((o) => !!o);
       if (g.length === 0)
         return;
-      const u = g.map((s) => {
-        const a = N(p, s.points);
-        return { id: s.id, distance: a.distanceTo(p) };
-      }).sort((s, a) => s.distance - a.distance)[0];
+      const u = g.map((o) => {
+        const a = G(m, o.points);
+        return { id: o.id, distance: a.distanceTo(m) };
+      }).sort((o, a) => o.distance - a.distance)[0];
       if (u.distance > 20)
         return;
-      const P = this.model.lines.find(({ id: s }) => s === u.id);
+      const P = this.polyline.lines.find(({ id: o }) => o === u.id);
       if (!!P)
         return this.chooseLine(P), !1;
     });
@@ -67,8 +66,8 @@ class V extends D {
     t(this, "onGetEndPoint", (e) => {
       const i = this.mobileNowPoint;
       if (this.removeLine(this.dashed), this.hasAppendDashed = !1, this.mobileStartPoint && i) {
-        const o = new T(this.mobileStartPoint, i, this.model);
-        o.distanceItem.appendTo(this.container), o.distanceItem.update(this.five), o.hook.on("selected", this.chooseLine), this.group.add(o.mesh), this.model.addLine(o);
+        const n = new y(this.mobileStartPoint, i, this.model);
+        n.distanceItem.appendTo(this.container), n.distanceItem.update(this.five), n.hook.on("selected", this.chooseLine), this.group.add(n.mesh), this.polyline.addLine(n);
       }
       this.mobileStartPoint = null, this.mobileNowPoint = null, this.five.needsRender = !0;
     });
@@ -83,43 +82,45 @@ class V extends D {
       this.state = i, this.state === "watching" ? this.five.helperVisible = !0 : this.five.helperVisible = !1;
     });
     t(this, "chooseLine", (e) => {
-      const i = G(e);
+      const i = M(e);
       this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
         "selectedChange",
-        i.map((o) => o.toCompletelyJson())
+        i.map((n) => n)
       );
     });
     t(this, "deleteDomClickCallback", () => {
       this.highlightedLines.forEach((e) => {
-        this.removeLine(e), this.model.removeLine(e);
+        this.removeLine(e), this.polyline.removeLine(e);
       }), this.highlightedLines = [], this.deleteDom.setLines([]).hide();
     });
     t(this, "cancelDeleteClickCallback", () => {
       this.clearHighlightLines();
     });
-    this.deleteDom = new M(this.five, {
+    this.model = new S(this.config), this.polyline = new N({ model: this.model }), this.model.addPolyline(this.polyline), this.rangePieceController = new R(e), this.deleteDom = new D(this.five, {
       onClick: this.deleteDomClickCallback,
       cancelDelete: this.cancelDeleteClickCallback
-    }).appendTo(this.container), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.onWantsTapGesture), this.five.on("wantsToMoveToPano", this.onWantsToMoveToPano), this.model.hook.on("lineAdded", this.onLineChanged), this.model.hook.on("lineRemoved", this.onLineChanged), 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();
+    }).appendTo(this.container), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.onWantsTapGesture), this.five.on("wantsToMoveToPano", this.onWantsToMoveToPano), this.polyline.hook.on("lineAdded", this.onLineChanged), this.polyline.hook.on("lineRemoved", this.onLineChanged), this.five.helperVisible = !1, this.hook.on("getStartPoint", this.onGetStartPoint), this.hook.on("getEndPoint", this.onGetEndPoint), this.hook.on("nowPointChange", this.onNowPointChange), this.hook.on("willChangeState", this.onWillChangeState), this.five.refresh();
   }
   dispose() {
-    super.dispose(), this.group.remove(this.mouseGroup, this.dashed.mesh), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.onWantsTapGesture), this.five.off("wantsToMoveToPano", this.onWantsToMoveToPano), this.model.hook.off("lineAdded", this.onLineChanged), this.model.hook.off("lineRemoved", this.onLineChanged), this.hook.off("getStartPoint", this.onGetStartPoint), this.hook.off("getEndPoint", this.onGetEndPoint), this.hook.off("nowPointChange", this.onNowPointChange), this.hook.off("willChangeState", this.onWillChangeState), this.hook.emit("selectedChange", []), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
+    super.dispose(), this.five.helperVisible = !0, this.rangePieceController.dispose(), this.group.remove(this.mouseGroup, this.dashed.mesh), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.onWantsTapGesture), this.five.off("wantsToMoveToPano", this.onWantsToMoveToPano), this.polyline.hook.off("lineAdded", this.onLineChanged), this.polyline.hook.off("lineRemoved", this.onLineChanged), this.hook.off("getStartPoint", this.onGetStartPoint), this.hook.off("getEndPoint", this.onGetEndPoint), this.hook.off("nowPointChange", this.onNowPointChange), this.hook.off("willChangeState", this.onWillChangeState), this.hook.emit("selectedChange", []), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
   }
   highlightLine(e) {
     e.selected || (e.selected = !0, this.group.add(e.lightMesh), e.distanceItem.highlight(), this.five.needsRender = !0);
   }
   clearHighlightLines() {
-    this.group.children.length !== 0 && (this.deleteDom.setLines([]).hide(), this.model.lines.forEach((e) => {
+    this.group.children.length !== 0 && (this.deleteDom.setLines([]).hide(), this.polyline.lines.forEach((e) => {
       e.selected = !1, e.distanceItem.unHighlight(), this.group.remove(e.lightMesh);
     }), this.highlightedLines = [], this.five.needsRender = !0);
   }
   getEditingLines() {
-    return this.model.lines;
+    return this.polyline.lines;
+  }
+  addStartPoint() {
   }
   highlightLines(e) {
     this.clearHighlightLines(), this.highlightedLines = e, this.deleteDom.setLines(e).updatePosition().show(), e.forEach((i) => this.highlightLine(i));
   }
 }
 export {
-  V as MixedController
+  O as MixedController
 };

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

@@ -1,16 +1,19 @@
 import type Line from '../Model/line';
-import BaseController, { IControllerParams } from './BaseController';
+import BaseController, { ControllerParams } from './BaseController';
 export default class ViewController extends BaseController {
     type: string;
     private highlightedLines;
     private hammer?;
-    constructor(params: IControllerParams);
+    constructor(params: ControllerParams);
     dispose(): void;
     highlightLine(line: Line): void;
     clearHighlightLines(): void;
     private wantsTapGesture;
     private chooseLine;
     private highlightLines;
-    private lineRemoved;
+    private polylineRemoved;
+    private polylineAdded;
     private onCameraUpdate;
+    private onFivePanoWillArrive;
+    private onFivePanoArrived;
 }

package/libs/PanoMeasurePlugin/Controller/ViewController.js

@@ -1,88 +1,104 @@
-var P = Object.defineProperty;
-var y = (h, n, e) => n in h ? P(h, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[n] = e;
-var o = (h, n, e) => (y(h, typeof n != "symbol" ? n + "" : n, e), e);
-import T from "hammerjs";
-import { Vector2 as g } from "three";
-import { closestPointOnLine as H } from "../utils/math.js";
+var I = Object.defineProperty;
+var E = (h, o, e) => o in h ? I(h, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[o] = e;
+var n = (h, o, e) => (E(h, typeof o != "symbol" ? o + "" : o, e), e);
+import w from "hammerjs";
+import { Vector2 as f } from "three";
+import { closestPointOnLine as R } from "../utils/math.js";
 import { isNDCPointInScreen as L } from "../utils/isNDCPointInScreen.js";
 import { findAssociatedLines as k } from "../utils/findAssociatedLines.js";
-import { BaseController as E } from "./BaseController.js";
-class M extends E {
+import { BaseController as x } from "./BaseController.js";
+import "@realsee/five/line";
+import "../utils/constants.js";
+import "@realsee/five";
+class M extends x {
   constructor(e) {
     super(e);
-    o(this, "type", "view");
-    o(this, "highlightedLines", []);
-    o(this, "hammer");
-    o(this, "wantsTapGesture", (e) => {
-      if (this.model.lines.length === 0)
+    n(this, "type", "view");
+    n(this, "highlightedLines", []);
+    n(this, "hammer");
+    n(this, "wantsTapGesture", (e) => {
+      if (this.model.getAllLines().length === 0)
         return;
-      const [t] = this.five.model.intersectRaycaster(e);
-      if (!t)
+      const [i] = this.five.model.intersectRaycaster(e);
+      if (!i)
         return;
-      const i = this.five.camera, f = t.point.clone().project(i), c = this.container.clientWidth, a = this.container.clientHeight, p = new g(f.x * c, f.y * a), u = this.model.lines.map((s) => {
-        const [r, w] = s.points, l = r.position.clone().project(i), m = w.position.clone().project(i);
-        if (!L(l) && !L(m))
+      const t = this.five.camera, p = i.point.clone().project(t), d = this.container.clientWidth, a = this.container.clientHeight, g = new f(p.x * d, p.y * a), v = this.model.getAllLines().map((s) => {
+        const [r, A] = s.points, c = r.position.clone().project(t), m = A.position.clone().project(t);
+        if (!L(c) && !L(m))
           return null;
-        const C = new g(
-          l.x * c,
-          l.y * a
-        ), R = new g(
-          m.x * c,
-          m.y * a
-        );
-        return { id: s.id, points: [C, R] };
+        const P = new f(c.x * d, c.y * a), y = new f(m.x * d, m.y * a);
+        return { id: s.id, points: [P, y] };
       }).filter((s) => !!s);
-      if (u.length === 0)
+      if (v.length === 0)
         return;
-      const v = u.map((s) => {
-        const r = H(p, s.points);
-        return { id: s.id, distance: r.distanceTo(p) };
-      }).sort((s, r) => s.distance - r.distance)[0], d = v.distance > 20 ? void 0 : this.model.lines.find(({ id: s }) => s === v.id);
-      if (this.highlightedLines.length > 0 && !d)
+      const u = v.map((s) => {
+        const r = R(g, s.points);
+        return { id: s.id, distance: r.distanceTo(g) };
+      }).sort((s, r) => s.distance - r.distance)[0], l = u.distance > 20 ? void 0 : this.model.getAllLines().find(({ id: s }) => s === u.id);
+      if (this.highlightedLines.length > 0 && !l)
         return this.clearHighlightLines(), !1;
-      if (d)
-        return this.chooseLine(d), !1;
+      if (l)
+        return this.chooseLine(l), !1;
     });
-    o(this, "chooseLine", (e) => {
-      const t = k(e);
-      this.highlightLines(t), this.five.needsRender = !0, this.hook.emit(
+    n(this, "chooseLine", (e) => {
+      const i = k(e);
+      this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
         "selectedChange",
-        t.map((i) => i.toCompletelyJson())
+        i.map((t) => t)
       );
     });
-    o(this, "lineRemoved", (e) => {
-      this.removeLine(e), this.hook.emit(
+    n(this, "polylineRemoved", (e) => {
+      e.lines.forEach((i) => this.removeLine(i)), this.hook.emit(
         "selectedChange",
-        this.model.lines.filter((t) => t.selected).map((t) => t.toCompletelyJson())
+        this.model.getAllLines().filter((i) => i.selected).map((i) => i)
       );
     });
-    o(this, "onCameraUpdate", () => {
+    n(this, "polylineAdded", (e) => {
+      e.lines.forEach((i) => {
+        i.distanceItem.appendTo(this.container), i.distanceItem.update(this.five), i.hook.on("selected", this.chooseLine), this.group.add(i.mesh);
+      });
+    });
+    n(this, "onCameraUpdate", () => {
       this.updateDistanceUI();
     });
-    this.model.lines.forEach((i) => {
-      i.distanceItem.appendTo(this.container), i.distanceItem.update(this.five), i.hook.on("selected", this.chooseLine), this.group.add(i.mesh);
+    n(this, "onFivePanoWillArrive", (e) => {
+      this.model.polylines.forEach((i) => {
+        !i.visiblePanoIndexes || i.visiblePanoIndexes.includes(e) || i.lines.forEach((t) => {
+          t.mesh.visible = !1, t.distanceItem.update(this.five);
+        });
+      });
+    });
+    n(this, "onFivePanoArrived", (e) => {
+      this.model.polylines.forEach((i) => {
+        !i.visiblePanoIndexes || i.visiblePanoIndexes.includes(e) && i.lines.forEach((t) => {
+          t.mesh.visible = !0, t.distanceItem.update(this.five);
+        });
+      });
+    });
+    this.model.getAllLines().forEach((t) => {
+      t.distanceItem.appendTo(this.container), t.distanceItem.update(this.five), t.hook.on("selected", this.chooseLine), this.group.add(t.mesh);
     });
-    const t = this.five.getElement();
-    if (t) {
-      const i = new T(t);
-      this.hammer = i;
+    const i = this.five.getElement();
+    if (i) {
+      const t = new w(i);
+      this.hammer = t;
     }
-    this.model.hook.on("lineRemoved", this.lineRemoved), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.wantsTapGesture), this.five.needsRender = !0;
+    this.model.hook.on("polylineAdded", this.polylineAdded), this.model.hook.on("polylineRemoved", this.polylineRemoved), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.wantsTapGesture), this.five.on("panoArrived", this.onFivePanoArrived), this.five.on("panoWillArrive", this.onFivePanoWillArrive), this.five.needsRender = !0;
   }
   dispose() {
     var e;
-    super.dispose(), this.model.hook.off("lineRemoved", this.lineRemoved), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.wantsTapGesture), this.five.needsRender = !0, this.hook.emit("selectedChange", []), (e = this.hammer) == null || e.destroy();
+    super.dispose(), this.model.hook.off("polylineAdded", this.polylineAdded), this.model.hook.off("polylineRemoved", this.polylineRemoved), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.wantsTapGesture), this.five.off("panoArrived", this.onFivePanoArrived), this.five.off("panoWillArrive", this.onFivePanoWillArrive), this.five.needsRender = !0, this.hook.emit("selectedChange", []), (e = this.hammer) == null || e.destroy();
   }
   highlightLine(e) {
     e.selected || (e.selected = !0, this.group.add(e.lightMesh), e.distanceItem.highlight(), this.five.needsRender = !0);
   }
   clearHighlightLines() {
-    this.group.children.length !== 0 && (this.model.lines.forEach((e) => {
+    this.group.children.length !== 0 && (this.model.getAllLines().forEach((e) => {
       e.selected = !1, e.distanceItem.unHighlight(), this.group.remove(e.lightMesh);
     }), this.highlightedLines = [], this.five.needsRender = !0);
   }
   highlightLines(e) {
-    this.clearHighlightLines(), this.highlightedLines = e, e.forEach((t) => this.highlightLine(t));
+    this.clearHighlightLines(), this.highlightedLines = e, e.forEach((i) => this.highlightLine(i));
   }
 }
 export {

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

@@ -1,5 +1,5 @@
 import type Line from '../Model/line';
-import BaseController, { IControllerParams } from './BaseController';
+import BaseController, { ControllerParams } from './BaseController';
 export default class WatchController extends BaseController {
     type: string;
     private deleteDom;
@@ -7,7 +7,7 @@ export default class WatchController extends BaseController {
     private fiveElement?;
     private editPointState?;
     private hammer?;
-    constructor(params: IControllerParams);
+    constructor(params: ControllerParams);
     dispose(): void;
     highlightLine(line: Line): void;
     clearHighlightLines(): void;
@@ -19,7 +19,7 @@ export default class WatchController extends BaseController {
     private wantsTapGesture;
     private chooseLine;
     private highlightLines;
-    private lineRemoved;
+    private polylineRemoved;
     private onCameraUpdate;
     private deleteDomClickCallback;
     private cancelDeleteClickCallback;

package/libs/PanoMeasurePlugin/Controller/WatchController.js

@@ -1,16 +1,19 @@
-var w = Object.defineProperty;
-var y = (r, h, e) => h in r ? w(r, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[h] = e;
-var s = (r, h, e) => (y(r, typeof h != "symbol" ? h + "" : h, e), e);
+var D = Object.defineProperty;
+var w = (r, h, e) => h in r ? D(r, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[h] = e;
+var s = (r, h, e) => (w(r, typeof h != "symbol" ? h + "" : h, e), e);
 import E from "hammerjs";
 import { DeleteDom as G } from "../Modules/DeleteDom/index.js";
-import { isNDCPointInScreen as L } from "../utils/isNDCPointInScreen.js";
+import { isNDCPointInScreen as P } from "../utils/isNDCPointInScreen.js";
 import { BaseController as R } from "./BaseController.js";
-import { Raycaster as T, Vector2 as f } from "three";
-import { closestPointOnLine as H } from "../utils/math.js";
-import { findClosestPoint as I } from "../utils/findClosestPoint.js";
+import { Raycaster as A, Vector2 as f } from "three";
+import { closestPointOnLine as T } from "../utils/math.js";
+import { findClosestPoint as H } from "../utils/findClosestPoint.js";
 import { findAssociatedLines as v } from "../utils/findAssociatedLines.js";
-import { getPointFromHammerEvent as C } from "../utils/getPointFromHammerEvent.js";
-class B extends R {
+import { getPointFromHammerEvent as S } from "../utils/getPointFromHammerEvent.js";
+import "@realsee/five/line";
+import "../utils/constants.js";
+import "@realsee/five";
+class J extends R {
   constructor(e) {
     super(e);
     s(this, "type", "watch");
@@ -21,9 +24,9 @@ class B extends R {
     s(this, "hammer");
     s(this, "onPanStart", (e) => {
       var a;
-      if (this.model.points.length === 0 || !this.fiveElement)
+      if (this.model.getAllLines().length === 0 || !this.fiveElement)
         return;
-      const i = C(e).point, t = (a = I(this.five, this.model.points, i, 20)) == null ? void 0 : a.point;
+      const i = S(e).point, t = (a = H(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
       if (!t) {
         this.editPointState = void 0;
         return;
@@ -34,7 +37,7 @@ class B extends R {
       };
       this.hook.emit("wantsDragLine", {
         point: t.id,
-        lines: n.associatedLines.map(({ id: l }) => l)
+        lines: n.associatedLines.map(({ id: d }) => d)
       }) || (this.editPointState = n, this.magnifier.appendTo(this.container), this.group.add(this.mouseGroup));
     });
     s(this, "onPanEnd", () => {
@@ -43,7 +46,7 @@ class B extends R {
     s(this, "onPan", (e) => {
       if (!this.editPointState || !this.fiveElement)
         return;
-      const i = C(e).ndcPoint, t = new T();
+      const i = S(e).ndcPoint, t = new A();
       t.setFromCamera(i, this.five.camera);
       const [n] = this.five.model.intersectRaycaster(t);
       !n || this.onIntersectionUpdate(n);
@@ -60,7 +63,7 @@ class B extends R {
         }
         this.five.needsRender = !0, this.hook.emit(
           "selectedChange",
-          this.editPointState.associatedLines.map((t) => t.toCompletelyJson())
+          this.editPointState.associatedLines.map((t) => t)
         );
       }
     });
@@ -72,49 +75,44 @@ class B extends R {
       const [i] = this.five.model.intersectRaycaster(e);
       if (!i)
         return;
-      const t = this.five.camera, n = i.point.clone().project(t), c = this.container.clientWidth, a = this.container.clientHeight, l = new f(n.x * c, n.y * a), g = this.model.lines.map((o) => {
-        const [d, S] = o.points, m = d.position.clone().project(t), p = S.position.clone().project(t);
-        if (!L(m) && !L(p))
+      const t = this.five.camera, n = i.point.clone().project(t), c = this.container.clientWidth, a = this.container.clientHeight, d = new f(n.x * c, n.y * a), g = this.model.getAllLines().map((o) => {
+        const [l, y] = o.points, m = l.position.clone().project(t), p = y.position.clone().project(t);
+        if (!P(m) && !P(p))
           return null;
-        const k = new f(
-          m.x * c,
-          m.y * a
-        ), D = new f(
-          p.x * c,
-          p.y * a
-        );
-        return { id: o.id, points: [k, D] };
+        const C = new f(m.x * c, m.y * a), k = new f(p.x * c, p.y * a);
+        return { id: o.id, points: [C, k] };
       }).filter((o) => !!o);
       if (g.length === 0)
         return;
       const u = g.map((o) => {
-        const d = H(l, o.points);
-        return { id: o.id, distance: d.distanceTo(l) };
-      }).sort((o, d) => o.distance - d.distance)[0];
+        const l = T(d, o.points);
+        return { id: o.id, distance: l.distanceTo(d) };
+      }).sort((o, l) => o.distance - l.distance)[0];
       if (u.distance > 20)
         return;
-      const P = this.model.lines.find(({ id: o }) => o === u.id);
-      if (!!P)
-        return this.chooseLine(P), !1;
+      const L = this.model.getAllLines().find(({ id: o }) => o === u.id);
+      if (!!L)
+        return this.chooseLine(L), !1;
     });
     s(this, "chooseLine", (e) => {
       const i = v(e);
       this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
         "selectedChange",
-        i.map((t) => t.toCompletelyJson())
+        i.map((t) => t)
       );
     });
-    s(this, "lineRemoved", (e) => {
-      this.removeLine(e), this.hook.emit(
+    s(this, "polylineRemoved", (e) => {
+      e.lines.forEach((i) => this.removeLine(i)), this.hook.emit(
         "selectedChange",
-        this.model.lines.filter((i) => i.selected).map((i) => i.toCompletelyJson())
+        this.model.getAllLines().filter((i) => i.selected).map((i) => i)
       );
     });
     s(this, "onCameraUpdate", () => {
       this.updateDistanceUI(), this.highlightedLines.length > 0 && this.deleteDom.updatePosition();
     });
     s(this, "deleteDomClickCallback", () => {
-      this.highlightedLines[0].getPolyline().lines.slice().reverse().forEach((i) => this.model.removeLine(i)), this.highlightedLines = [], this.deleteDom.setLines([]).hide();
+      const e = this.highlightedLines[0], i = this.model.getPolylineByLine(e);
+      !i || (this.model.removePolyline(i), this.highlightedLines = [], this.deleteDom.setLines([]).hide());
     });
     s(this, "cancelDeleteClickCallback", () => {
       this.clearHighlightLines();
@@ -122,7 +120,7 @@ class B extends R {
     this.deleteDom = new G(this.five, {
       onClick: this.deleteDomClickCallback,
       cancelDelete: this.cancelDeleteClickCallback
-    }).appendTo(this.container), this.model.lines.forEach((t) => {
+    }).appendTo(this.container), this.model.getAllLines().forEach((t) => {
       t.distanceItem.appendTo(this.container), t.distanceItem.update(this.five), t.hook.on("selected", this.chooseLine), this.group.add(t.mesh);
     });
     const i = this.five.getElement();
@@ -131,17 +129,17 @@ class B extends R {
       const t = new E(i);
       this.hammer = t, t.on("pan", this.onPan), t.on("panstart", this.onPanStart), t.on("panend", this.onPanEnd);
     }
-    this.model.hook.on("lineRemoved", this.lineRemoved), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.wantsTapGesture), this.five.on("wantsPanGesture", this.wantsPanGesture), this.five.needsRender = !0;
+    this.model.hook.on("polylineRemoved", this.polylineRemoved), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.wantsTapGesture), this.five.on("wantsPanGesture", this.wantsPanGesture), this.five.needsRender = !0;
   }
   dispose() {
     var e;
-    super.dispose(), this.deleteDom.dispose(), this.model.hook.off("lineRemoved", this.lineRemoved), this.model.lines.forEach((i) => i.hook.off("selected", this.chooseLine)), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsPanGesture", this.wantsPanGesture), this.five.off("wantsTapGesture", this.wantsTapGesture), this.five.needsRender = !0, this.hook.emit("selectedChange", []), (e = this.hammer) == null || e.destroy();
+    super.dispose(), this.deleteDom.dispose(), this.model.hook.off("polylineRemoved", this.polylineRemoved), this.model.getAllLines().forEach((i) => i.hook.off("selected", this.chooseLine)), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsPanGesture", this.wantsPanGesture), this.five.off("wantsTapGesture", this.wantsTapGesture), this.five.needsRender = !0, this.hook.emit("selectedChange", []), (e = this.hammer) == null || e.destroy();
   }
   highlightLine(e) {
     e.selected || (e.selected = !0, this.group.add(e.lightMesh), e.distanceItem.highlight(), this.five.needsRender = !0);
   }
   clearHighlightLines() {
-    this.group.children.length !== 0 && (this.deleteDom.setLines([]).hide(), this.model.lines.forEach((e) => {
+    this.group.children.length !== 0 && (this.deleteDom.setLines([]).hide(), this.model.getAllLines().forEach((e) => {
       e.selected = !1, e.distanceItem.unHighlight(), this.group.remove(e.lightMesh);
     }), this.highlightedLines = [], this.five.needsRender = !0);
   }
@@ -150,5 +148,5 @@ class B extends R {
   }
 }
 export {
-  B as WatchController
+  J as WatchController
 };

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

@@ -6,6 +6,7 @@ import Magnifier, { MagnifierParameter } from '../Modules/Magnifier';
 import { Five, Subscribe } from '@realsee/five';
 import { UIControllerParams } from '../Modules/UIController';
 import { GuideControllerParams } from '../Modules/GuideController';
+import { Polyline } from '../Model/polyline';
 export declare type Mode = 'Watch' | 'Edit' | 'Mixed' | 'View';
 export interface PanoMeasureParameterType extends Partial<Config> {
     openParams?: OpenParameter;
@@ -22,15 +23,14 @@ export default class MeasureController {
     private model;
     private group;
     private config;
+    private isMobile;
     private fiveHelper;
     private useUIController?;
     private params;
     private useGuideController?;
-    private rangePieceController?;
     private container;
     private shortcutKeyController?;
     private controller;
-    private controllerParams;
     constructor(five: Five, params: PanoMeasureParameterType);
     appendTo(parent: HTMLElement): void;
     dispose(): void;
@@ -43,7 +43,9 @@ export default class MeasureController {
      * @description 会隐藏鼠标的默认聚焦环
      * @description 会隐藏当前 VR 内的点位展示
      */
-    enable(): void;
+    enable(config?: {
+        mode: Mode;
+    }): void;
     /** 关闭插件功能
      * @description 清除标尺线条
      * @description 还原点位展示和默认鼠标 UI
@@ -53,23 +55,39 @@ export default class MeasureController {
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动
      */
-    changeMode: (mode: Mode) => Error;
+    changeMode: (mode: Mode) => void;
+    /** 进入编辑模式 */
+    edit(): void;
     /** 撤销编辑 */
     revoke(): void;
-    removeLineByID(lineID: string): void;
+    removePolyline(polyline: Polyline): void;
+    removePolylineByID(id: string): void;
+    getPolylineByID(id: string): Polyline;
+    getEditedPolyline(): void;
     /**
      * 高亮当前线段
      */
     highlightLine(lineID: string): boolean;
     clearHighlightLines(): boolean;
-    /** 保存编辑 */
-    save(): this;
-    /** 把当前以保存的数据转换成 JSON 对象 */
+    /** 保存编辑
+     * @description 以下情况可能报错
+     */
+    save(config?: {
+        mode?: Mode;
+    }): this;
+    /** Mixed 模式才有用，添加起点 */
+    addStartPoint(): void;
+    /** Mixed 模式才有用，添加终点 */
+    addEndPoint(): void;
+    /** 导出数据 */
     toJson(): PluginData;
     /**
      * @description 改变插件的模式（pc端模式或移动端模式）
      * @param isMobile true为移动端模式，false为pc端
      */
     changeIsMobile(isMobile: boolean): void;
-    changeConfigs(config: Partial<Config>): void;
+    changeConfigs(config: Config): void;
+    /** 设置线段的文本 */
+    setCustomText(lineID: string, text: string): void;
+    private createControllerParams;
 }