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

package/libs/PanoMeasurePlugin/Controller/WatchController.js

@@ -8,8 +8,8 @@ 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 w } from "../utils/findAssociatedLines.js";
-import { getPointFromHammerEvent as D } from "../../shared-utils/getPointFromHammerEvent.js";
+import { findAssociatedLines as D } from "../utils/findAssociatedLines.js";
+import { getPointFromHammerEvent as w } from "../../shared-utils/getPointFromHammerEvent.js";
 import j from "../Model/area.js";
 import x from "../Model/polygon.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
@@ -50,14 +50,14 @@ class Pe extends G {
       var a;
       if (this.model.getAllLines().length === 0 || !this.fiveElement)
         return;
-      const i = D(e).point, t = (a = b(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
+      const i = w(e).point, t = (a = b(this.five, this.model.getAllPoints(), i, 20)) == null ? void 0 : a.point;
       if (!t) {
         this.editPointState = void 0;
         return;
       }
       const n = {
         point: t,
-        associatedLines: w(t.lines[0])
+        associatedLines: D(t.lines[0])
       };
       this.hook.emit("wantsDragLine", {
         point: t.id,
@@ -70,7 +70,7 @@ class Pe extends G {
     s(this, "onPan", (e) => {
       if (!this.editPointState || !this.fiveElement)
         return;
-      const i = D(e).ndcPoint, t = new T();
+      const i = w(e).ndcPoint, t = new T();
       t.setFromCamera(i, this.five.camera);
       const [n] = this.five.model.intersectRaycaster(t);
       n && this.onIntersectionUpdate(n);
@@ -129,8 +129,8 @@ class Pe extends G {
     });
     s(this, "chooseLine", (e) => {
       this.choose = "line";
-      const i = w(e);
-      this.deleteDom.setLines(i).updatePosition().show(), this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
+      const i = D(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)
       );

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

@@ -44,6 +44,7 @@ export default class MeasureController {
     private shortcutKeyController?;
     constructor(five: Five, params: PanoMeasureParameterType);
     appendTo(parent: HTMLElement): void;
+    clear(): void;
     dispose(): void;
     /** 加载数据
      * @description 数据加载时会覆盖当前已保存的数据

package/libs/PanoMeasurePlugin/Controller/index.js

@@ -11,10 +11,10 @@ var c = (s, e, t) => e in s ? I(s, e, { enumerable: !0, configurable: !0, writab
 };
 var i = (s, e, t) => (c(s, typeof e != "symbol" ? e + "" : e, t), t);
 import k from "../Modules/FiveHelper.js";
-import h from "./EditController.js";
+import a from "./EditController.js";
 import w from "./ViewController.js";
 import v from "./WatchController.js";
-import a from "./MixedController.js";
+import h from "./MixedController.js";
 import { omit as D } from "../../shared-utils/filter.js";
 import { Group as U } from "three";
 import { Model as x } from "../Model/index.js";
@@ -138,7 +138,7 @@ class xt {
       var e, t, r, o;
       this.hasOpen = !1, this.container.style.opacity = "0", (e = this.controller) == null || e.dispose(), (t = this.useUIController) == null || t.hide(), (r = this.useGuideController) == null || r.hide(), (o = this.shortcutKeyController) == null || o.dispose(), this.controller = null, this.five.helperVisible = !0, this.five.scene.remove(this.group), this.five.needsRender = !0, this.hook.emit("disable", !0);
     });
-    i(this, "getCurrentMode", () => this.controller instanceof h ? "Edit" : this.controller instanceof v ? "Watch" : this.controller instanceof a ? "Mixed" : this.controller instanceof w ? "View" : null);
+    i(this, "getCurrentMode", () => this.controller instanceof a ? "Edit" : this.controller instanceof v ? "Watch" : this.controller instanceof h ? "Mixed" : this.controller instanceof w ? "View" : null);
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动
      */
@@ -150,8 +150,8 @@ class xt {
       const t = {
         View: w,
         Watch: v,
-        Edit: h,
-        Mixed: a
+        Edit: a,
+        Mixed: h
       };
       if (!t[e])
         throw new Error("不存在的 Mode");
@@ -179,9 +179,12 @@ class xt {
   appendTo(e) {
     e.append(this.container);
   }
+  clear() {
+    this.model.clear();
+  }
   dispose() {
     var e, t;
-    this.disable(), (e = this.useUIController) == null || e.dispose(), (t = this.magnifier) == null || t.dispose(), this.five.needsRender = !0;
+    this.disable(), this.clear(), (e = this.useUIController) == null || e.dispose(), (t = this.magnifier) == null || t.dispose(), this.five.needsRender = !0;
   }
   /** 加载数据
    * @description 数据加载时会覆盖当前已保存的数据
@@ -206,7 +209,7 @@ class xt {
   }
   /** 撤销编辑 */
   revoke() {
-    this.controller instanceof h && this.controller.revoke();
+    this.controller instanceof a && this.controller.revoke();
   }
   removePolyline(e) {
     this.model.removePolyline(e);
@@ -240,22 +243,22 @@ class xt {
    */
   save(e) {
     var l;
-    if (!(this.controller instanceof h) && !(this.controller instanceof a))
+    if (!(this.controller instanceof a) && !(this.controller instanceof h))
       return this;
     const t = (l = e == null ? void 0 : e.mode) != null ? l : "View", r = this.controller.model.polylines, o = this.controller.model.areas;
     return r.forEach((n) => {
       this.model.addPolyline(n);
-    }), this.controller instanceof h ? this.controller.complete() : o.forEach((n) => {
+    }), this.controller instanceof a ? this.controller.complete() : o.forEach((n) => {
       n.showArea(), this.model.addArea(n);
     }), this.changeMode(t), this;
   }
   /** Mixed 模式才有用，添加起点 */
   addStartPoint() {
-    this.controller instanceof a && this.hook.emit("willChangeState", "watching", "editing");
+    this.controller instanceof h && this.hook.emit("willChangeState", "watching", "editing");
   }
   /** Mixed 模式才有用，添加终点 */
   addEndPoint() {
-    this.controller instanceof a && this.hook.emit("willChangeState", "editing", "watching");
+    this.controller instanceof h && this.hook.emit("willChangeState", "editing", "watching");
   }
   /** 导出数据 */
   toJson() {

package/libs/PanoMeasurePlugin/Modules/DeleteDom/index.js

@@ -52,7 +52,7 @@ class $ {
   }
   updatePosition(t, e) {
     if (t && e)
-      return this.container.style.left = t, this.container.style.top = e, this.show();
+      return this.container.style.left = t, this.container.style.top = e, this.container.style.transform = "", this.show();
     if (this.lines.length === 0)
       return this;
     const s = this.points.map((i) => i.position), c = s.map((i) => i.clone().project(this.five.camera));
@@ -67,7 +67,7 @@ class $ {
       const i = (a[1] - a[0]) / (o[1] - o[0]), g = -((a[1] + a[0]) / 2 - 1) / 2 * h.clientHeight;
       Math.abs(i) > 0.4 && (m = l + 57, d = g);
     }
-    return this.container.style.top = "0", this.container.style.transform = `translate3d(${m}px, ${d}px, 0)`, this.show();
+    return this.container.style.top = "0", this.container.style.left = "0", this.container.style.transform = `translate3d(${m}px, ${d}px, 0)`, this.show();
   }
   hide() {
     return this.visible = !1, this.masking.style.pointerEvents = "none", this.container.style.opacity = "0", this.container.style.pointerEvents = "none", this;

package/libs/base/BasePlugin.js

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