@realsee/dnalogel 2.21.0-dev.15 → 2.21.0-dev.16

package/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -1,8 +1,8 @@
 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);
+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);
 import U from "../Model/line.js";
-import C from "../Model/point.js";
+import S 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";
@@ -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(e) {
-    var t;
-    super(e);
+  constructor(t) {
+    var e;
+    super(t);
     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((e, t) => {
-      this.currentMeasureType === "area" && typeof t == "boolean" && (t ? this.hook.emit("readyComplete") : this.hook.emit("notReadyComplete")), this.updateDashed();
+    o(this, "onIntersectionUpdate", H((t, e) => {
+      this.currentMeasureType === "area" && typeof e == "boolean" && (e ? 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 C(this.area.points[this.area.points.length - 1]), this.updateDashed();
+          this.lastPoint = new S(this.area.points[this.area.points.length - 1]), this.updateDashed();
         this.five.needsRender = !0;
       }
     });
     /**
      * @description: 测距的撤销功能
      */
-    o(this, "revokeLine", (e) => {
-      const t = e || this.polyline;
-      if (t.lines.length === 0 && this.lastPoint) {
+    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 (t.lines.length === 0 && !this.lastPoint || !this.lastPoint)
+      if (e.lines.length === 0 && !this.lastPoint || !this.lastPoint)
         return;
-      const i = t.lines[t.lines.length - 1], s = i.findAnotherPoint(this.lastPoint);
-      s && (this.lastPoint = s, this.hook.emit("anchorChange", s.position), this.group.remove(i.mesh), t.removeLine(i), i.distanceItem.remove(), this.updateDashed(), this.five.needsRender = !0);
+      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);
     });
     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 e = this.area.polygon.isBlank || this.area.polygon.visible === !1;
-        if (this.area.points.length >= 3 && e)
+        const t = this.area.polygon.isBlank || this.area.polygon.visible === !1;
+        if (this.area.points.length >= 3 && t)
           return !1;
       }
     });
@@ -136,33 +136,35 @@ 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 e = (() => {
+      const t = (() => {
         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 (!e)
+      if (!t)
         return;
-      const t = new C(e), i = this.lastPoint;
-      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(t.position), this.area.isClosed) {
-          this.complete();
-          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);
+            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) {
+            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.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", e.position);
       }
-      this.updateDashed(), this.five.needsRender = !0, this.hook.emit("anchorChange", t.position);
     });
     /** 移动全景时更新 distanceItem 在屏幕上的位置 */
     o(this, "onCameraUpdate", () => {
@@ -173,31 +175,31 @@ class Xe extends j {
       var i;
       if (!this.lastPoint)
         return;
-      const e = this.lastPoint.position, t = (() => {
+      const t = this.lastPoint.position, e = (() => {
         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 (!t) {
+      if (!e) {
         this.dashed.hide();
         return;
       }
-      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.dashed.show(), this.dashed.setPoints(t, e), 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 = t;
+            const n = s, g = e;
             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);
+          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);
           if (l || d)
             this.area.hideArea(), this.hook.emit("allowAddPointStateChange", "forbid");
           else {
             this.area.showArea();
-            const n = [...this.area.points, t];
+            const n = [...this.area.points, e];
             this.area.polygon.updatePoints(n), this.area.areaItem.updateArea(this.five), this.hook.emit("allowAddPointStateChange", "allow");
           }
         } else
@@ -206,19 +208,19 @@ class Xe extends j {
     });
     // ====================================================================================================================================
     // 下面一堆高亮相关
-    o(this, "wantsTapGesture", (e) => {
-      var A, S;
+    o(this, "wantsTapGesture", (t) => {
+      var A, C;
       if (this.editParams.pointSelectorMode === "cursor" || this.lastPoint)
         return !1;
-      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;
+      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;
       if (i != null && i.isPolygonMesh) {
         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}%`;
+          const { x: p, y: v } = e[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);
+      const [s] = this.five.model.intersectRaycaster(t);
       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) => {
@@ -240,18 +242,18 @@ class Xe extends j {
       if (L)
         return this.chooseLine(L), !1;
     });
-    o(this, "chooseLine", (e) => {
-      const t = B(e);
-      this.deleteDom.setTarget(t).setLines(t).updatePosition().show(), this.highlightLines(t), this.hook.emit("selectedChange", t);
+    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, "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, "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, "deleteArea", (e) => {
-      this.unHighlightArea(e), e.dispose(), this.deleteDom.hide();
+    o(this, "deleteArea", (t) => {
+      this.unHighlightArea(t), t.dispose(), this.deleteDom.hide();
     });
-    o(this, "deleteLine", (e) => {
-      const t = e[0], i = this.model.getPolylineByLine(t);
+    o(this, "deleteLine", (t) => {
+      const e = t[0], i = this.model.getPolylineByLine(e);
       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, {
@@ -281,13 +283,13 @@ class Xe extends j {
       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", 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();
   }
   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;
+    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;
   }
   getEditingLines() {
     return this.polyline.lines;
@@ -298,22 +300,22 @@ class Xe extends j {
   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;
   }
-  highlightArea(e) {
-    this.highlightLines(e.polyline.lines), this.five.needsRender = !0;
+  highlightArea(t) {
+    this.highlightLines(t.polyline.lines), this.five.needsRender = !0;
   }
-  unHighlightArea(e) {
-    this.unHighlightLines(e.polyline.lines), this.five.needsRender = !0;
+  unHighlightArea(t) {
+    this.unHighlightLines(t.polyline.lines), this.five.needsRender = !0;
   }
-  highlightLines(e) {
-    e.forEach((t) => this.highlightLine(t));
+  highlightLines(t) {
+    t.forEach((e) => this.highlightLine(e));
   }
-  unHighlightLines(e) {
-    e.forEach((t) => {
-      t.selected = !1, t.distanceItem.unHighlight(), this.group.remove(t.lightMesh), this.five.needsRender = !0;
+  unHighlightLines(t) {
+    t.forEach((e) => {
+      e.selected = !1, e.distanceItem.unHighlight(), this.group.remove(e.lightMesh), this.five.needsRender = !0;
     });
   }
-  highlightLine(e) {
-    e.selected || (e.selected = !0, this.group.add(e.lightMesh), e.distanceItem.highlight(), this.five.needsRender = !0);
+  highlightLine(t) {
+    t.selected || (t.selected = !0, this.group.add(t.lightMesh), t.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.21.0-dev.15");
+    i(this, "VERSION", "2.21.0-dev.16");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv2.21.0-dev.15",
+    "%c %c@realsee/dnalogel %cv2.21.0-dev.16",
     [
       "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/package.json

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