@realsee/dnalogel 3.63.2 → 3.63.3

package/dist/index.js

@@ -43,7 +43,7 @@ import { LineGeometry as PA, LineMaterial as IA, THREE_Line2 as EA, Line as MA }
 import { GLTFLoader as xA } from "@realsee/five/gltf-loader";
 function kA() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.63.2",
+    "%c %c@realsee/dnalogel %cv3.63.3",
     [
       "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",
@@ -4144,18 +4144,19 @@ class il extends bt {
     /**
      * @description: 鼠标进入five canvas时
      */
-    d(this, "onEnter", (e) => {
-      var s;
-      const i = (s = e == null ? void 0 : e.emitEvent) != null ? s : !0;
-      this.cursorError || this.pointSelectorHelper.show(), this.outOfFive = !1, i && this.emit("intersectionUpdate", this.position);
+    d(this, "onEnter", () => {
+      this.cursorError || this.pointSelectorHelper.show(), this.outOfFive = !1;
     });
+    /**
+     * @description: 鼠标进入five canvas时
+     */
     d(this, "onMouseEnter", () => {
-      this.onEnter();
+      this.onEnter(), this.emit("intersectionUpdate", this.position);
     });
     /**
      * @description: 鼠标离开five canvas时
      */
-    d(this, "onLeave", () => {
+    d(this, "onMouseLeave", () => {
       this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", null);
     });
     d(this, "onMouseDown", (e) => {
@@ -4281,10 +4282,10 @@ class il extends bt {
     d(this, "updatePointSelectorHelperIntersect", (e) => {
       var s, o, r, a, l, c, h, u;
       if (!e) {
-        this.onLeave(), this.five.getElement().style.cursor = Su;
+        this.onMouseLeave(), this.five.getElement().style.cursor = Su;
         return;
       }
-      this.onEnter({ emitEvent: !1 }), this.cursorError || (this.five.getElement().style.cursor = "");
+      this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
       const i = R({}, e);
       if (this.adhereEnabled && this.mouseNdcPosition && this.five.renderer) {
         const f = {
@@ -4424,14 +4425,14 @@ class il extends bt {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.mode === "cursor" ? (this.five.on("wantsMoveToPano", Ns), this.five.on("wantsChangeMode", Ns), this.five.on("wantsTapGesture", Ns), e.addEventListener("touchstart", this.onTouchStart, { passive: !0 }), e.addEventListener("touchmove", this.onTouchMove), e.addEventListener("touchend", this.onTouchEnd), e.addEventListener("mousedown", this.onMouseDown), e.addEventListener("mouseup", this.onMouseUp), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("mouseenter", this.onMouseEnter), e.addEventListener("mouseout", this.onLeave), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), document.addEventListener("keydown", this.onKeyDown), document.addEventListener("keyup", this.onKeyUp), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
+    this.mode === "cursor" ? (this.five.on("wantsMoveToPano", Ns), this.five.on("wantsChangeMode", Ns), this.five.on("wantsTapGesture", Ns), e.addEventListener("touchstart", this.onTouchStart, { passive: !0 }), e.addEventListener("touchmove", this.onTouchMove), e.addEventListener("touchend", this.onTouchEnd), e.addEventListener("mousedown", this.onMouseDown), e.addEventListener("mouseup", this.onMouseUp), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("mouseenter", this.onMouseEnter), e.addEventListener("mouseout", this.onMouseLeave), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), document.addEventListener("keydown", this.onKeyDown), document.addEventListener("keyup", this.onKeyUp), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
   }
   disable() {
     if (!this.enabled)
       return;
     this.enabled = !1, this.adherePoints = null, this.adhereLine = [], this.adherePlane = [], this.plane = void 0, this.pointSelectorHelper.disable(), this.five.getElement().style.cursor = "";
     const e = this.five.getElement();
-    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", Ns), this.five.off("wantsChangeMode", Ns), this.five.off("wantsTapGesture", Ns), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("touchstart", this.onTouchStart), e == null || e.removeEventListener("touchmove", this.onTouchMove), e == null || e.removeEventListener("touchend", this.onTouchEnd), e == null || e.removeEventListener("mousedown", this.onMouseDown), e == null || e.removeEventListener("mouseup", this.onMouseUp), e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onMouseEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), document.removeEventListener("keydown", this.onKeyDown), document.removeEventListener("keyup", this.onKeyUp), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
+    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", Ns), this.five.off("wantsChangeMode", Ns), this.five.off("wantsTapGesture", Ns), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("touchstart", this.onTouchStart), e == null || e.removeEventListener("touchmove", this.onTouchMove), e == null || e.removeEventListener("touchend", this.onTouchEnd), e == null || e.removeEventListener("mousedown", this.onMouseDown), e == null || e.removeEventListener("mouseup", this.onMouseUp), e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onMouseEnter), e == null || e.removeEventListener("mouseout", this.onMouseLeave), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), document.removeEventListener("keydown", this.onKeyDown), document.removeEventListener("keyup", this.onKeyUp), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
@@ -11646,7 +11647,7 @@ let Xn = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    d(this, "VERSION", "3.63.2");
+    d(this, "VERSION", "3.63.3");
     d(this, "NAME");
     d(this, "five");
     d(this, "workUtil");
@@ -21866,29 +21867,31 @@ class mE extends bt {
      */
     d(this, "measure", () => {
       const e = new iE();
-      this.currentMeasureMesh = e;
+      this.currentMeasureMesh = e, this.updateSelectAdsorbedHelper();
       const i = new Is(), s = new gs(he(R({}, Ma), { dashed: !0 })), o = new jo(Lv), r = new gs(he(R({}, Ma), { lineOpacity: 0.5, dashed: !0 })), a = new gs(he(R({}, Ma), { lineOpacity: 0.5, dashed: !0 }));
       this.group.add(e);
       const l = (u) => {
-        if (u) {
-          if (e.points.length === 0 && (i.parent === null && this.five.scene.add(i), i.position.copy(u.point)), e.points.length >= 1)
-            if (i.removeFromParent(), s.parent === null && this.five.scene.add(s), s.setPoints([e.points.at(-1), u.point]), u.isAdsorbed)
-              r.removeFromParent(), a.removeFromParent();
-            else {
-              const f = e.points.at(-1);
-              if (Math.abs(u.point.y - f.y) > 0.2) {
-                const v = new y.Vector3(u.point.x, f.y, u.point.z);
-                r.setPoints([f, v]), a.setPoints([v, u.point]);
-              } else {
-                let v = new y.Vector3();
-                Math.abs(u.point.x - f.x) < Math.abs(u.point.z - f.z) ? v = new y.Vector3(u.point.x, f.y, f.z) : v = new y.Vector3(f.x, f.y, u.point.z), r.setPoints([f, v]), a.setPoints([v, u.point]);
-              }
-              this.group.addIfNotExists(r, a);
+        if (!u) {
+          i.removeFromParent(), s.removeFromParent(), o.removeFromParent(), r.removeFromParent(), a.removeFromParent();
+          return;
+        }
+        if (e.points.length === 0 && (i.parent === null && this.five.scene.add(i), i.position.copy(u.point)), e.points.length >= 1)
+          if (i.removeFromParent(), s.parent === null && this.five.scene.add(s), s.setPoints([e.points.at(-1), u.point]), u.isAdsorbed)
+            r.removeFromParent(), a.removeFromParent();
+          else {
+            const f = e.points.at(-1);
+            if (Math.abs(u.point.y - f.y) > 0.2) {
+              const v = new y.Vector3(u.point.x, f.y, u.point.z);
+              r.setPoints([f, v]), a.setPoints([v, u.point]);
+            } else {
+              let v = new y.Vector3();
+              Math.abs(u.point.x - f.x) < Math.abs(u.point.z - f.z) ? v = new y.Vector3(u.point.x, f.y, f.z) : v = new y.Vector3(f.x, f.y, u.point.z), r.setPoints([f, v]), a.setPoints([v, u.point]);
             }
-          if (e.points.length >= 2) {
-            const f = [...e.points, u.point];
-            Ev(f) ? (o.setPoints(f), o.parent === null && this.five.scene.add(o)) : o.removeFromParent();
+            this.group.addIfNotExists(r, a);
           }
+        if (e.points.length >= 2) {
+          const f = [...e.points, u.point];
+          Ev(f) ? (o.setPoints(f), o.parent === null && this.five.scene.add(o)) : o.removeFromParent();
         }
       }, c = (u) => {
         e.setPoints([...e.points, u.point]), this.updateSelectAdsorbedHelper(), e.isPolygon && this.pointSelector.disable();
@@ -21908,13 +21911,13 @@ class mE extends bt {
      */
     d(this, "undo", () => {
       var e;
-      (e = this.currentMeasureMesh) == null || e.setPoints(this.currentMeasureMesh.points.slice(0, -1)), this.pointSelector.emit("intersectionUpdate", this.pointSelector.position);
+      (e = this.currentMeasureMesh) == null || e.setPoints(this.currentMeasureMesh.points.slice(0, -1)), this.pointSelector.emit("intersectionUpdate", this.pointSelector.position), this.updateSelectAdsorbedHelper(), this.five.needsRender = !0;
     });
     /**
      * @description 清空所有测量内容
      */
     d(this, "clear", () => {
-      this.group.children.forEach((e) => e.removeFromParent());
+      this.currentMeasureMesh = null, this.pointSelector.disable(), this.group.children.forEach((e) => e.removeFromParent());
     });
     d(this, "dispose", () => {
       jt.unbind("ctrl+z, command+z"), jt.unbind("shift"), this.pointSelector.disable(), this.clear();
@@ -21943,14 +21946,18 @@ class mE extends bt {
       });
     });
     d(this, "updateSelectAdsorbedHelper", () => {
-      if (this.currentMeasureMesh.points.length === 0 && this.pointSelector.setAdherePoints(null), this.currentMeasureMesh.points.length >= 1) {
+      if (!this.currentMeasureMesh || this.currentMeasureMesh.points.length === 0) {
+        this.pointSelector.setAdherePoints(null), this.pointSelector.adhereLine = [], this.pointSelector.adherePlane = [];
+        return;
+      }
+      if (this.currentMeasureMesh.points.length >= 1) {
         this.pointSelector.setAdherePoints([this.currentMeasureMesh.points[0]]);
         const e = this.currentMeasureMesh.points.at(-1);
         this.pointSelector.adhereLine = [
           new y.Line3(new y.Vector3(1, 0, 0).add(e), new y.Vector3(-1, 0, 0).add(e)),
           new y.Line3(new y.Vector3(0, 1, 0).add(e), new y.Vector3(0, -1, 0).add(e)),
           new y.Line3(new y.Vector3(0, 0, 1).add(e), new y.Vector3(0, 0, -1).add(e))
-        ];
+        ], this.pointSelector.adherePlane = [];
       }
       if (this.currentMeasureMesh.points.length >= 3) {
         const e = new y.Plane().setFromCoplanarPoints(