@realsee/dnalogel 2.21.0-dev.0 → 2.21.0-dev.3

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

@@ -10,11 +10,11 @@ export default class EditController extends BaseController {
     /** 拖动的控制点 */
     private pressPoint?;
     private hasAppendDashed;
-    private hasAppendMouseGroup;
     private fiveElement?;
     /** 上一个端点位置 */
     private lastPoint;
     private hammer?;
+    private pointSelector;
     /** 根据 intersection 更新放大镜和吸附点 */
     private onIntersectionUpdate;
     constructor(params: ControllerParams);
@@ -30,6 +30,7 @@ export default class EditController extends BaseController {
      * @description: 测距的撤销功能
      */
     revokeLine: (_polyline?: Polyline) => void;
+    selectPoint(): void;
     private onMouseLeave;
     /** 编辑线条发生改变时通知外部 */
     private onLineChanged;
@@ -43,12 +44,9 @@ export default class EditController extends BaseController {
     /**
      * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
      * 2. 把上一个点的位置更新为当前点的位置
-     * 3. 清除 mouseGroup 和 magnifier
+     * 3. 清除 pointSelector
      */
     private onTap;
-    private onWantsTapGesture;
-    /** 编辑时取消走点 */
-    private onWantsToMoveToPano;
     /** 存在长按点时不能移动全景 */
     private onWantsPanGesture;
     /** 移动全景时更新 distanceItem 在屏幕上的位置 */

package/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -1,15 +1,16 @@
-var y = Object.defineProperty;
-var T = (r, a, i) => a in r ? y(r, a, { enumerable: !0, configurable: !0, writable: !0, value: i }) : r[a] = i;
-var s = (r, a, i) => (T(r, typeof a != "symbol" ? a + "" : a, i), i);
+var g = Object.defineProperty;
+var y = (h, r, t) => r in h ? g(h, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[r] = t;
+var o = (h, r, t) => (y(h, typeof r != "symbol" ? r + "" : r, t), t);
 import C from "hammerjs";
-import G from "../Model/line.js";
+import k from "../Model/line.js";
 import c from "../Model/point.js";
-import { throttle as A } from "../../shared-utils/throttle.js";
-import M from "./BaseController.js";
+import { throttle as L } from "../../shared-utils/throttle.js";
+import I from "./BaseController.js";
 import { getIntersectionFromEvent as f } from "../utils/getIntersectionFromEvent.js";
-import { Polyline as v } from "../Model/polyline.js";
-import P from "../Model/area.js";
-import g from "../utils/isIntersecting.js";
+import { Polyline as u } from "../Model/polyline.js";
+import v from "../Model/area.js";
+import P from "../utils/isIntersecting.js";
+import { PointSelector as A } from "../../shared-utils/three/PointSelector.js";
 import "../../shared-utils/uuid.js";
 import "../utils/line.js";
 import "@realsee/five/line";
@@ -29,182 +30,210 @@ import "earcut";
 import "../utils/dom/areaDom.js";
 import "../utils/geometryUtil.js";
 import "../../shared-utils/three/centerPoint.js";
-class ee extends M {
-  constructor(i) {
-    var o;
-    super(i);
-    s(this, "type", "edit");
-    s(this, "polyline");
-    s(this, "area");
+import "../../shared-utils/three/PointSelectorHelper.js";
+import "../../shared-utils/three/Magnifier.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";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
+import "../Modules/rangePiece/html.js";
+import "../../CSS3DRenderPlugin/index.js";
+import "../../CSS3DRenderPlugin/Controller.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
+import "three/examples/jsm/renderers/CSS3DRenderer";
+import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
+import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
+import "../../CSS3DRenderPlugin/utils/even.js";
+import "../../shared-utils/Subscribe.js";
+import "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
+import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
+import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../shared-utils/isAbsoluteURL.js";
+import "../../shared-utils/animationFrame/BetterTween.js";
+import "../../shared-utils/animationFrame/index.js";
+import "../../shared-utils/isTouchDevice.js";
+class we extends I {
+  constructor(t) {
+    var s;
+    super(t);
+    o(this, "type", "edit");
+    o(this, "polyline");
+    o(this, "area");
     /** 拖动的控制点 */
-    s(this, "pressPoint");
-    s(this, "hasAppendDashed", !1);
-    s(this, "hasAppendMouseGroup", !1);
-    s(this, "fiveElement");
+    o(this, "pressPoint");
+    o(this, "hasAppendDashed", !1);
+    o(this, "fiveElement");
     /** 上一个端点位置 */
-    s(this, "lastPoint", null);
-    s(this, "hammer");
+    o(this, "lastPoint", null);
+    o(this, "hammer");
+    o(this, "pointSelector");
     /** 根据 intersection 更新放大镜和吸附点 */
-    s(this, "onIntersectionUpdate", A((i, e) => {
-      var t;
-      this.hasAppendMouseGroup === !1 && (this.group.add(this.mouseGroup), this.magnifier.appendTo(this.container), this.magnifier.enable(), this.hasAppendMouseGroup = !0);
-      const o = this.updateMouseGroup(i, e).position;
-      (t = this.pressPoint) == null || t.position.copy(o), this.updateDashed(), requestAnimationFrame(() => this.magnifier.renderWithPoint(this.mouseGroup.position)), this.five.needsRender = !0;
+    o(this, "onIntersectionUpdate", L((t) => {
+      var s;
+      const e = t.point;
+      (s = this.pressPoint) == null || s.position.copy(e), this.updateDashed(), this.five.needsRender = !0;
     }, 20));
     /** 撤销编辑 */
-    s(this, "revoke", () => {
+    o(this, "revoke", () => {
       this.currentMeasureType === "area" ? this.revokeArea() : this.currentMeasureType === "line" && this.revokeLine();
     });
     /**
      * @description: 测面积的撤销功能
      */
-    s(this, "revokeArea", () => {
-      this.area.points.length !== 0 && (this.revokeLine(this.area.polyline), this.area.points.pop(), this.area.refresh());
+    o(this, "revokeArea", () => {
+      this.area.points.length !== 0 && (this.revokeLine(this.area.polyline), this.area.points.pop(), this.area.refresh(), this.five.needsRender = !0);
     });
     /**
      * @description: 测距的撤销功能
      */
-    s(this, "revokeLine", (i) => {
-      const e = i || this.polyline;
+    o(this, "revokeLine", (t) => {
+      const e = t || this.polyline;
       if (e.lines.length === 0 && this.lastPoint) {
         this.lastPoint = null, this.hasAppendDashed = !1, this.dashed.remove(), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.needsRender = !0;
         return;
       }
       if (e.lines.length === 0 && !this.lastPoint || !this.lastPoint)
         return;
-      const o = e.lines[e.lines.length - 1], t = o.findAnotherPoint(this.lastPoint);
-      t && (this.lastPoint = t, this.hook.emit("anchorChange", t.position), this.group.remove(o.mesh), e.removeLine(o), this.hasAppendMouseGroup = !1, this.mouseGroup.position.copy(this.lastPoint.position), this.group.remove(this.mouseGroup), o.distanceItem.remove(), this.updateDashed(), this.magnifier.disable(), this.five.needsRender = !0);
+      const s = e.lines[e.lines.length - 1], i = s.findAnotherPoint(this.lastPoint);
+      i && (this.lastPoint = i, this.hook.emit("anchorChange", i.position), this.group.remove(s.mesh), e.removeLine(s), s.distanceItem.remove(), this.updateDashed(), this.five.needsRender = !0);
     });
-    s(this, "onMouseLeave", () => {
-      this.magnifier.disable(), this.group.remove(this.mouseGroup), this.hasAppendMouseGroup = !1, this.lastPoint && (this.mouseGroup.position.copy(this.lastPoint.position), this.updateDashed()), this.area.hideArea();
+    o(this, "onMouseLeave", () => {
+      this.lastPoint && (this.pointSelector.position.point.copy(this.lastPoint.position), this.updateDashed()), this.area.hideArea();
     });
     /** 编辑线条发生改变时通知外部 */
-    s(this, "onLineChanged", () => {
+    o(this, "onLineChanged", () => {
       this.hook.emit("editedPolylineChange", this.polyline);
     });
-    s(this, "onPress", (i) => {
-      const [e] = f(this.five, i);
+    o(this, "onPress", (t) => {
+      const [e] = f(this.five, t);
       if (!(e != null && e.face))
         return;
-      const o = new c(e.point);
-      this.pressPoint = o, this.onIntersectionUpdate(e);
+      const s = new c(e.point);
+      this.pressPoint = s, this.onIntersectionUpdate(e);
     });
     /**
      * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
      * 2. 如果有长按点，把长按点位置更新为当前位置
      */
-    s(this, "onPan", (i) => {
+    o(this, "onPan", (t) => {
       if (!this.pressPoint)
         return;
-      const [e] = f(this.five, i);
+      const [e] = f(this.five, t);
       e != null && e.face && this.onIntersectionUpdate(e);
     });
-    s(this, "onPanEnd", (i) => {
-      this.pressPoint && this.onTap(i);
+    o(this, "onPanEnd", () => {
+      this.pressPoint && this.onTap();
     });
     /**
      * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
      * 2. 把上一个点的位置更新为当前点的位置
-     * 3. 清除 mouseGroup 和 magnifier
+     * 3. 清除 pointSelector
      */
-    s(this, "onTap", (i) => {
-      var p, l, m, u;
+    o(this, "onTap", () => {
+      var i, a, d, l;
       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] = f(this.five, i);
-      this.updateMouseGroup(e);
-      const o = (() => {
+      const t = (() => {
         if (this.currentMeasureType === "area")
-          return this.area.projectPoint(this.mouseGroup.position);
+          return this.area.projectPoint(this.pointSelector.position.point);
         if (this.currentMeasureType === "line")
-          return this.mouseGroup.position;
+          return this.pointSelector.position.point;
       })();
-      if (!o)
+      if (!t)
         return;
-      const t = new c(o), h = this.lastPoint;
-      if (this.lastPoint = t, this.currentMeasureType === "line") {
-        if (t && h) {
-          const d = new G(h, t, this.model);
-          d.distanceItem.setCanSelect(!1), d.distanceItem.appendTo(this.container), this.polyline.addLine(d), this.group.add(d.mesh), d.distanceItem.update(this.five);
+      const e = new c(t), s = this.lastPoint;
+      if (this.lastPoint = e, this.currentMeasureType === "line") {
+        if (e && s) {
+          const p = new k(s, e, this.model);
+          p.distanceItem.setCanSelect(!1), p.distanceItem.appendTo(this.container), this.polyline.addLine(p), this.group.add(p.mesh), p.distanceItem.update(this.five);
         }
-        const n = (l = (p = this.editParams) == null ? void 0 : p.autoEndConfig) == null ? void 0 : l.line;
-        typeof n == "number" && (this.polyline.getPointLength() >= n ? (this.hook.emit("complete"), this.polyline = new v({ model: this.model }), this.model.addPolyline(this.polyline), this.lastPoint = void 0) : this.polyline.getPointLength() === n - 1 && this.hook.emit("readyComplete"));
+        const n = (a = (i = this.editParams) == null ? void 0 : i.autoEndConfig) == null ? void 0 : a.line;
+        typeof n == "number" && (this.polyline.getPointLength() >= n ? (this.hook.emit("complete"), this.polyline = new u({ model: this.model }), this.model.addPolyline(this.polyline), this.lastPoint = void 0) : this.polyline.getPointLength() === n - 1 && this.hook.emit("readyComplete"));
       } else if (this.currentMeasureType === "area") {
-        this.area.addPoints(t.position);
-        const n = (u = (m = this.editParams) == null ? void 0 : m.autoEndConfig) == null ? void 0 : u.area;
-        typeof n == "number" && (this.area.points.length >= n ? (this.hook.emit("complete"), this.area = new P(void 0, {
+        this.area.addPoints(e.position);
+        const n = (l = (d = this.editParams) == null ? void 0 : d.autoEndConfig) == null ? void 0 : l.area;
+        typeof n == "number" && (this.area.points.length >= n ? (this.hook.emit("complete"), this.area = new v(void 0, {
           five: this.five,
           model: this.model,
           meshContainer: this.group,
           domContainer: this.container
         }), this.model.addArea(this.area), this.lastPoint = void 0) : this.area.points.length === n - 1 && this.hook.emit("readyComplete"));
       }
-      this.pressPoint = void 0, this.hasAppendMouseGroup = !1, this.magnifier.disable(), this.group.remove(this.mouseGroup), this.updateDashed(), this.five.needsRender = !0, this.hook.emit("anchorChange", t.position);
+      this.pressPoint = void 0, this.updateDashed(), this.five.needsRender = !0, this.hook.emit("anchorChange", e.position);
     });
-    s(this, "onWantsTapGesture", () => !1);
-    /** 编辑时取消走点 */
-    s(this, "onWantsToMoveToPano", () => !1);
     /** 存在长按点时不能移动全景 */
-    s(this, "onWantsPanGesture", () => this.pressPoint ? !1 : void 0);
+    o(this, "onWantsPanGesture", () => this.pressPoint ? !1 : void 0);
     /** 移动全景时更新 distanceItem 在屏幕上的位置 */
-    s(this, "onCameraUpdate", () => {
+    o(this, "onCameraUpdate", () => {
       this.updateDistanceUI();
     });
     /** 更新虚线 */
-    s(this, "updateDashed", () => {
+    o(this, "updateDashed", () => {
       if (!this.lastPoint)
         return;
-      const i = this.lastPoint.position, e = (() => {
+      const t = this.lastPoint.position, e = (() => {
         if (this.currentMeasureType === "area")
-          return this.area.projectPoint(this.mouseGroup.position);
+          return this.area.projectPoint(this.pointSelector.position.point);
         if (this.currentMeasureType === "line")
-          return this.mouseGroup.position;
+          return this.pointSelector.position.point;
       })();
-      if (this.dashed.setPoints(i, e), this.dashed.distanceItem.update(this.five), this.hook.emit("editedDashedLineChange", this.dashed), this.currentMeasureType === "area") {
+      if (this.dashed.setPoints(t, e), this.dashed.distanceItem.update(this.five), this.hook.emit("editedDashedLineChange", this.dashed), this.currentMeasureType === "area") {
         this.area.areaItem.setCanSelect(!1);
-        const o = this.mouseGroup.position;
+        const s = this.pointSelector.position.point;
         if (this.area.points.length >= 2) {
-          const p = this.area.polyline.lines.map((n) => ({ start: n.points[0].position, end: n.points[1].position })), l = g({ start: i, end: e }, p), m = g({ start: e, end: this.area.points[0] }, p);
-          if (l || m)
+          const d = this.area.polyline.lines.map((m) => ({ start: m.points[0].position, end: m.points[1].position })), l = P({ start: t, end: e }, d), n = P({ start: e, end: this.area.points[0] }, d);
+          if (l || n)
             this.area.hideArea(), this.hook.emit("allowAddPointStateChange", "forbid");
           else {
             this.area.showArea();
-            const n = [...this.area.points, e];
-            this.area.polygon.updatePoints(n), this.area.areaItem.updateArea(this.five), this.hook.emit("allowAddPointStateChange", "allow");
+            const m = [...this.area.points, e];
+            this.area.polygon.updatePoints(m), this.area.areaItem.updateArea(this.five), this.hook.emit("allowAddPointStateChange", "allow");
           }
         } else
           this.area.hideArea();
-        const t = o, h = e;
-        this.perpendicularDashed.setPoints(t, h), this.perpendicularDashed.distanceItem.update(this.five);
+        const i = s, a = e;
+        this.perpendicularDashed.setPoints(i, a), this.perpendicularDashed.distanceItem.update(this.five);
       }
     });
-    this.polyline = new v({ model: this.model }), this.area = new P(void 0, {
+    this.pointSelector = new A(this.five, {
+      mode: this.editParams.pointSelectorMode,
+      pointSelectorHelperParams: { magnifierParams: this.magnifierParams }
+    }), this.pointSelector.enable(), this.polyline = new u({ model: this.model }), this.area = new v(void 0, {
       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((t) => {
-      t.distanceItem.appendTo(this.container), t.distanceItem.update(this.five), this.group.add(t.mesh);
-    }), this.model.getAllAreas().forEach((t) => {
-      t.areaItem.appendTo(this.container), t.areaItem.updateDomPosition(this.five), t.areaItem.setCanSelect(!0), this.group.add(t.polygon), t.polyline.lines.forEach((h) => {
-        h.distanceItem.appendTo(this.container), h.distanceItem.update(this.five), this.group.add(h.mesh);
+    }), this.model.addPolyline(this.polyline), this.model.addArea(this.area), this.model.getAllLines().forEach((i) => {
+      i.distanceItem.appendTo(this.container), i.distanceItem.update(this.five), this.group.add(i.mesh);
+    }), this.model.getAllAreas().forEach((i) => {
+      i.areaItem.appendTo(this.container), i.areaItem.updateDomPosition(this.five), i.areaItem.setCanSelect(!0), this.group.add(i.polygon), i.polyline.lines.forEach((a) => {
+        a.distanceItem.appendTo(this.container), a.distanceItem.update(this.five), this.group.add(a.mesh);
       });
-    }), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsPanGesture", this.onWantsPanGesture), this.five.on("wantsTapGesture", this.onWantsTapGesture), this.five.on("wantsToMoveToPano", this.onWantsToMoveToPano), this.five.on("intersectionOnModelUpdate", this.onIntersectionUpdate), this.polyline.hook.on("lineAdded", this.onLineChanged), this.polyline.hook.on("lineRemoved", this.onLineChanged);
+    }), this.five.on("cameraUpdate", this.onCameraUpdate), this.pointSelector.hook.on("intersectionUpdate", this.onIntersectionUpdate), this.polyline.hook.on("lineAdded", this.onLineChanged), this.polyline.hook.on("lineRemoved", this.onLineChanged);
     const e = this.five.getElement();
     if (e) {
       this.fiveElement = e;
-      const t = new C(e);
-      this.hammer = t, t.on("tap", this.onTap), t.on("pan", this.onPan), t.on("press", this.onPress), t.on("panend", this.onPanEnd);
+      const i = new C(e);
+      this.hammer = i, i.on("tap", this.onTap), i.on("pan", this.onPan), i.on("press", this.onPress), i.on("panend", this.onPanEnd);
     }
-    this.five.helperVisible = !1, (o = this.fiveElement) == null || o.addEventListener("mouseleave", this.onMouseLeave), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.refresh();
+    this.five.helperVisible = !1, (s = this.fiveElement) == null || s.addEventListener("mouseleave", this.onMouseLeave), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.refresh();
   }
   dispose() {
-    var i, e;
-    super.dispose(), this.five.helperVisible = !0, this.group.remove(this.mouseGroup), this.dashed.remove(), this.perpendicularDashed.remove(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsPanGesture", this.onWantsPanGesture), this.five.off("wantsTapGesture", this.onWantsTapGesture), this.five.off("wantsToMoveToPano", this.onWantsToMoveToPano), this.five.off("intersectionOnModelUpdate", this.onIntersectionUpdate), this.polyline.hook.off("lineAdded", this.onLineChanged), this.polyline.hook.off("lineRemoved", this.onLineChanged), (i = this.hammer) == null || i.destroy(), (e = this.fiveElement) == null || e.removeEventListener("mouseleave", this.onMouseLeave), this.magnifier.dispose(), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
+    var t, e;
+    super.dispose(), this.five.helperVisible = !0, this.pointSelector.disable(), this.dashed.remove(), this.perpendicularDashed.remove(), this.five.off("cameraUpdate", this.onCameraUpdate), this.pointSelector.hook.off("intersectionUpdate", this.onIntersectionUpdate), this.polyline.hook.off("lineAdded", this.onLineChanged), this.polyline.hook.off("lineRemoved", this.onLineChanged), (t = this.hammer) == null || t.destroy(), (e = this.fiveElement) == null || e.removeEventListener("mouseleave", this.onMouseLeave), this.magnifier.dispose(), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
   }
   getEditingLines() {
     return this.polyline.lines;
   }
+  selectPoint() {
+    this.onTap();
+  }
 }
 export {
-  ee as default
+  we as default
 };

package/libs/PanoMeasurePlugin/Controller/WatchController.js

@@ -101,7 +101,7 @@ class Pe extends G {
       if (t instanceof x) {
         const o = this.model.areas.find((h) => h.polygon === t);
         if (o) {
-          const { x: h, y: f } = i[0].point.project(this.five.camera), p = `${(h + 1) / 2 * 100}%`, m = `${(-f + 1) / 2 * 100}%`;
+          const { x: h, y: f } = i[0].point.clone().project(this.five.camera), p = `${(h + 1) / 2 * 100}%`, m = `${(-f + 1) / 2 * 100}%`;
           return this.chooseArea(o, { left: p, top: m }), !1;
         }
       }
@@ -136,7 +136,7 @@ class Pe extends G {
       );
     });
     s(this, "chooseArea", (e, i) => {
-      console.log("choose", e), this.choose = e, this.deleteDom.updatePosition(i.left, `calc(${i.top} - 20px)`).show(), this.highlightArea(e);
+      this.choose = e, this.deleteDom.updatePosition(i.left, `calc(${i.top} - 20px)`).show(), this.highlightArea(e);
     });
     s(this, "polylineRemoved", (e) => {
       e.lines.forEach((i) => this.removeLine(i)), this.hook.emit(
@@ -166,7 +166,7 @@ class Pe extends G {
     }).appendTo(this.container), this.model.getAllLines().forEach((t) => {
       t.distanceItem.appendTo(this.container), t.distanceItem.update(this.five), t.hook.on("selected", this.chooseLine), t.distanceItem.setCanSelect(!0), this.group.add(t.mesh);
     }), this.model.getAllAreas().forEach((t) => {
-      t.areaItem.appendTo(this.container), t.areaItem.updateDomPosition(this.five), t.hook.on("selected", this.chooseArea), t.areaItem.setCanSelect(!0), this.group.add(t.polygon), t.polyline.lines.forEach((n) => {
+      t.areaItem.appendTo(this.container), t.areaItem.updateArea(this.five), t.hook.on("selected", this.chooseArea), t.areaItem.setCanSelect(!0), this.group.add(t.polygon), t.polyline.lines.forEach((n) => {
         n.distanceItem.appendTo(this.container), n.distanceItem.update(this.five), this.group.add(n.mesh);
       });
     });

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

@@ -26,14 +26,14 @@ export default class MeasureController {
     hook: Subscribe<PanoMeasurePluginEvent>;
     magnifier: Magnifier;
     controller: WatchController | EditController | MixedController | ViewController | null;
+    /** 允许的测量类型 */
+    allowMeasureType: Array<MeasureType>;
     /** 当前的测量类型 */
     currentMeasureType: MeasureType | null;
     private five;
     private model;
     private group;
     private config;
-    /** 允许的测量类型 */
-    private allowMeasureType;
     private isMobile;
     private fiveHelper;
     private useUIController?;
@@ -60,7 +60,7 @@ export default class MeasureController {
      * @description 清除标尺线条
      * @description 还原点位展示和默认鼠标 UI
      */
-    disable(): void;
+    disable: () => void;
     getCurrentMode: () => Mode | null;
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动