@realsee/dnalogel 2.22.0-dev.3 → 2.22.0-dev.4

package/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -2,17 +2,17 @@ var R = Object.defineProperty;
 var b = (m, c, e) => c in m ? R(m, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[c] = e;
 var o = (m, c, e) => (b(m, typeof c != "symbol" ? c + "" : c, e), e);
 import H from "../Model/line.js";
-import C from "../Model/point.js";
+import S from "../Model/point.js";
 import { throttle as U } from "../../shared-utils/throttle.js";
 import j from "./BaseController.js";
-import { Polyline as S } from "../Model/polyline.js";
-import D from "../Model/area.js";
+import { Polyline as D } from "../Model/polyline.js";
+import w from "../Model/area.js";
 import T from "../utils/isIntersecting.js";
 import { PointSelector as x } from "../../shared-utils/three/PointSelector.js";
 import G from "../Modules/DeleteDom/index.js";
 import { findAssociatedLines as B } from "../utils/findAssociatedLines.js";
-import { Vector2 as y } from "three";
-import w from "../utils/isNDCPointInScreen.js";
+import { Vector2 as P } from "three";
+import E from "../utils/isNDCPointInScreen.js";
 import { closestPointOnLine as W } from "../utils/math.js";
 import "../../shared-utils/uuid.js";
 import "../utils/line.js";
@@ -64,7 +64,7 @@ import "../../shared-utils/three/getIntersect.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
 import "../Modules/DeleteDom/_Assets/delete_bg.png.js";
 import "../Modules/DeleteDom/_Assets/delete_hover_bg.png.js";
-const E = () => !1;
+const v = () => !1;
 class Xe extends j {
   constructor(e) {
     var t;
@@ -96,7 +96,7 @@ 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;
       }
     });
@@ -145,7 +145,7 @@ class Xe extends j {
       })();
       if (!e)
         return;
-      const t = new C(e), i = this.lastPoint;
+      const t = new S(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) {
@@ -209,38 +209,38 @@ class Xe extends j {
     // ====================================================================================================================================
     // 下面一堆高亮相关
     o(this, "wantsTapGesture", (e) => {
-      var A, k;
+      var C, k;
       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 = (k = (A = t[0]) == null ? void 0 : A.object) == null ? void 0 : k.parent;
+      const t = this.model.areas.map((h) => e.intersectObject(h.polygon, !0)[0]).sort((h, p) => h.distance - p.distance), i = (k = (C = t[0]) == null ? void 0 : C.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 } = t[0].point.clone().project(this.five.camera), f = `${(p + 1) / 2 * 100}%`, u = `${(-v + 1) / 2 * 100}%`;
+          const { x: p, y } = t[0].point.clone().project(this.five.camera), f = `${(p + 1) / 2 * 100}%`, u = `${(-y + 1) / 2 * 100}%`;
           return this.chooseArea(h, { left: f, top: u }), !1;
         }
       }
       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) => {
-        const [p, v] = h.points, f = p.position.clone().project(r), u = v.position.clone().project(r);
-        if (!w(f) && !w(u))
+      const r = this.five.camera, l = s.point.clone().project(r), d = this.container.clientWidth, a = this.container.clientHeight, n = new P(l.x * d, l.y * a), g = this.model.getAllLines().map((h) => {
+        const [p, y] = h.points, f = p.position.clone().project(r), u = y.position.clone().project(r);
+        if (!E(f) && !E(u))
           return null;
-        const I = new y(f.x * d, f.y * a), M = new y(u.x * d, u.y * a);
+        const I = new P(f.x * d, f.y * a), M = new P(u.x * d, u.y * a);
         return { id: h.id, points: [I, M] };
       }).filter((h) => !!h);
       if (g.length === 0)
         return;
-      const P = g.map((h) => {
+      const L = g.map((h) => {
         const p = W(n, h.points);
         return { id: h.id, distance: p.distanceTo(n) };
       }).sort((h, p) => h.distance - p.distance)[0];
-      if (P.distance > 20)
+      if (L.distance > 20)
         return;
-      const L = this.model.getAllLines().find(({ id: h }) => h === P.id);
-      if (L)
-        return this.chooseLine(L), !1;
+      const A = this.model.getAllLines().find(({ id: h }) => h === L.id);
+      if (A)
+        return this.chooseLine(A), !1;
     });
     o(this, "chooseLine", (e) => {
       console.log(e);
@@ -273,7 +273,7 @@ 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 S({ model: this.model }), this.area = new D(void 0, {
+    }), this.pointSelector.enable(), this.polyline = new D({ model: this.model }), this.area = new w(void 0, {
       five: this.five,
       model: this.model,
       meshContainer: this.group,
@@ -284,13 +284,13 @@ class Xe extends j {
       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, (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", v), this.five.on("wantsChangeMode", v), this.pointSelector.hook.on("intersectionUpdate", this.onIntersectionUpdate), this.pointSelector.hook.on("select", this.onSelect), this.pointSelector.hook.on("wantsSelect", this.onWantsSelect), this.polyline.hook.on("lineAdded", this.onLineChanged), this.polyline.hook.on("lineRemoved", this.onLineChanged), this.five.helperVisible = !1, (t = this.fiveElement) == null || t.addEventListener("mouseleave", this.onMouseLeave), this.hook.emit("anchorChange", null), this.hook.emit("editedDashedLineChange", null), this.five.refresh();
   }
   dispose() {
     var e;
     super.dispose(), this.model.areas.forEach((t) => {
       (t.points.length < 2 || t.polygon.isBlank) && this.model.removeArea(t);
-    }), this.five.helperVisible = !0, this.pointSelector.disable(), this.dashed.remove(), this.perpendicularDashed.remove(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.wantsTapGesture), this.five.off("wantsToMoveToPano", E), this.pointSelector.hook.off("intersectionUpdate", this.onIntersectionUpdate), this.pointSelector.hook.off("select", this.onSelect), this.polyline.hook.off("lineAdded", this.onLineChanged), this.polyline.hook.off("lineRemoved", this.onLineChanged), (e = this.fiveElement) == null || e.removeEventListener("mouseleave", this.onMouseLeave), this.magnifier.dispose(), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
+    }), this.five.helperVisible = !0, this.pointSelector.disable(), this.dashed.remove(), this.perpendicularDashed.remove(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.wantsTapGesture), this.five.off("wantsToMoveToPano", v), this.five.off("wantsChangeMode", v), 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;
@@ -299,9 +299,9 @@ 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.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) => {
+    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 w(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;
+    }), this.polyline = new D({ model: this.model }), this.model.addPolyline(this.polyline)), this.pointSelector.setAdherePoints(null), this.dashed.hide(), this.perpendicularDashed.hide(), this.lastPoint = void 0;
   }
   highlightArea(e) {
     this.highlightLines(e.polyline.lines), this.five.needsRender = !0;

package/libs/PanoMeasurePlugin/Controller/WatchController.js

@@ -1,15 +1,15 @@
-var H = Object.defineProperty;
-var k = (c, r, e) => r in c ? H(c, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[r] = e;
-var s = (c, r, e) => (k(c, typeof r != "symbol" ? r + "" : r, e), e);
-import I from "hammerjs";
-import R from "../Modules/DeleteDom/index.js";
+var k = Object.defineProperty;
+var I = (c, r, e) => r in c ? k(c, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[r] = e;
+var s = (c, r, e) => (I(c, typeof r != "symbol" ? r + "" : r, e), e);
+import R from "hammerjs";
+import G from "../Modules/DeleteDom/index.js";
 import S from "../utils/isNDCPointInScreen.js";
-import G from "./BaseController.js";
-import { Raycaster as T, Vector2 as u } from "three";
-import { closestPointOnLine as U } from "../utils/math.js";
-import { findClosestPoint as b } from "../utils/findClosestPoint.js";
-import { findAssociatedLines as D } from "../utils/findAssociatedLines.js";
-import { getPointFromHammerEvent as w } from "../../shared-utils/getPointFromHammerEvent.js";
+import T from "./BaseController.js";
+import { Raycaster as U, Vector2 as u } from "three";
+import { closestPointOnLine as b } from "../utils/math.js";
+import { findClosestPoint as M } from "../utils/findClosestPoint.js";
+import { findAssociatedLines as w } from "../utils/findAssociatedLines.js";
+import { getPointFromHammerEvent as C } from "../../shared-utils/getPointFromHammerEvent.js";
 import j from "../Model/area.js";
 import x from "../Model/polygon.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
@@ -34,7 +34,8 @@ import "../utils/geometryUtil.js";
 import "../../shared-utils/three/IObject3D.js";
 import "../utils/generatePolygonGeometry.js";
 import "earcut";
-class Pe extends G {
+const D = () => !1;
+class ve extends T {
   constructor(e) {
     super(e);
     s(this, "type", "watch");
@@ -50,14 +51,14 @@ class Pe extends G {
       var a;
       if (this.model.getAllLines().length === 0 || !this.fiveElement)
         return;
-      const i = w(e).point, t = (a = b(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
+      const i = C(e).point, t = (a = M(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
       if (!t) {
         this.editPointState = void 0;
         return;
       }
       const n = {
         point: t,
-        associatedLines: D(t.lines[0])
+        associatedLines: w(t.lines[0])
       };
       this.hook.emit("wantsDragLine", {
         point: t.id,
@@ -70,7 +71,7 @@ class Pe extends G {
     s(this, "onPan", (e) => {
       if (!this.editPointState || !this.fiveElement)
         return;
-      const i = w(e).ndcPoint, t = new T();
+      const i = C(e).ndcPoint, t = new U();
       t.setFromCamera(i, this.five.camera);
       const [n] = this.five.model.intersectRaycaster(t);
       n && this.onIntersectionUpdate(n);
@@ -112,13 +113,13 @@ class Pe extends G {
         const [h, f] = o.points, p = h.position.clone().project(l), m = f.position.clone().project(l);
         if (!S(p) && !S(m))
           return null;
-        const C = new u(p.x * d, p.y * g), E = new u(m.x * d, m.y * g);
-        return { id: o.id, points: [C, E] };
+        const E = new u(p.x * d, p.y * g), H = new u(m.x * d, m.y * g);
+        return { id: o.id, points: [E, H] };
       }).filter((o) => !!o);
       if (P.length === 0)
         return;
       const v = P.map((o) => {
-        const h = U(L, o.points);
+        const h = b(L, o.points);
         return { id: o.id, distance: h.distanceTo(L) };
       }).sort((o, h) => o.distance - h.distance)[0];
       if (v.distance > 20)
@@ -129,7 +130,7 @@ class Pe extends G {
     });
     s(this, "chooseLine", (e) => {
       this.choose = "line";
-      const i = D(e);
+      const i = w(e);
       this.deleteDom.setLines(i).updatePosition().show(), console.log(this.deleteDom), this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
         "selectedChange",
         i.map((t) => t)
@@ -157,7 +158,7 @@ class Pe extends G {
     s(this, "cancelDeleteClickCallback", () => {
       this.deleteDom.hide(), this.clearHighlightLines(), this.unHighlightArea();
     });
-    this.deleteDom = new R(this.five, {
+    this.deleteDom = new G(this.five, {
       i18n: this.config.i18n,
       onClick: () => {
         console.log(this.choose), this.choose === "line" ? this.deleteLine() : this.choose instanceof j && this.deleteArea(this.choose);
@@ -173,14 +174,14 @@ class Pe extends G {
     const i = this.five.getElement();
     if (i) {
       this.fiveElement = i;
-      const t = new I(i);
+      const t = new R(i);
       this.hammer = t, t.on("pan", this.onPan), t.on("panstart", this.onPanStart), t.on("panend", this.onPanEnd);
     }
-    this.updateDistanceUI(), this.five.needsRender = !0, this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.wantsTapGesture), this.five.on("wantsPanGesture", this.wantsPanGesture), this.model.hook.on("polylineRemoved", this.polylineRemoved);
+    this.updateDistanceUI(), this.five.needsRender = !0, this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.wantsTapGesture), this.five.on("wantsPanGesture", this.wantsPanGesture), this.five.on("wantsChangeMode", D), this.model.hook.on("polylineRemoved", this.polylineRemoved);
   }
   dispose() {
     var e;
-    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();
+    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.off("wantsChangeMode", D), 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);
@@ -207,5 +208,5 @@ class Pe extends G {
   }
 }
 export {
-  Pe as default
+  ve as default
 };

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "2.22.0-dev.3");
+    i(this, "VERSION", "2.22.0-dev.4");
     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.3",
+    "%c %c@realsee/dnalogel %cv2.22.0-dev.4",
     [
       "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.22.0-dev.3",
+  "version": "2.22.0-dev.4",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",