@realsee/dnalogel 3.64.8 → 3.64.9-alpha.1

package/libs/MeasurePlugin/Controller.js

@@ -1,38 +1,39 @@
-var w = Object.defineProperty, _ = Object.defineProperties;
+var D = Object.defineProperty, _ = Object.defineProperties;
 var L = Object.getOwnPropertyDescriptors;
-var b = Object.getOwnPropertySymbols;
+var w = Object.getOwnPropertySymbols;
 var k = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
-var g = (a, s, e) => s in a ? w(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, f = (a, s) => {
+var E = (c, s, e) => s in c ? D(c, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[s] = e, y = (c, s) => {
   for (var e in s || (s = {}))
-    k.call(s, e) && g(a, e, s[e]);
-  if (b)
-    for (var e of b(s))
-      F.call(s, e) && g(a, e, s[e]);
-  return a;
-}, v = (a, s) => _(a, L(s));
-var o = (a, s, e) => (g(a, typeof s != "symbol" ? s + "" : s, e), e);
-import * as h from "three";
+    k.call(s, e) && E(c, e, s[e]);
+  if (w)
+    for (var e of w(s))
+      F.call(s, e) && E(c, e, s[e]);
+  return c;
+}, P = (c, s) => _(c, L(s));
+var i = (c, s, e) => (E(c, typeof s != "symbol" ? s + "" : s, e), e);
+import * as a from "three";
 import "../shared-utils/tag.js";
 import "../vendor/hammerjs/hammer.js";
 import { Subscribe as H } from "../shared-utils/Subscribe.js";
 import { PointSelector as C } from "../shared-utils/three/PointSelector/index.js";
 import "../shared-utils/three/CSS3DRenderer/index.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { IObject3D as U } from "../shared-utils/three/IObject3D.js";
+import { IObject3D as I } from "../shared-utils/three/IObject3D.js";
 import "@realsee/five/line";
 import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../vendor/animejs/lib/anime.es.js";
-import { FiveDomEvents as I } from "../shared-utils/five/FiveDomEvents.js";
+import { FiveDomEvents as x } from "../shared-utils/five/FiveDomEvents.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
-import { MeasureMesh as V } from "./utils/MeasureMesh.js";
-import { PointMesh as x } from "../Sculpt/Meshes/Point.js";
-import { LineWithDotsMesh as M } from "../Sculpt/Meshes/LineWithDots.js";
-import { hotkeys as p } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { PolygonMesh as z } from "../Sculpt/Meshes/Polygon.js";
-import { validatePolygon as A } from "./utils/validatePolygon.js";
-import { Cursor as N } from "../Sculpt/utils/Modules/Cursor.js";
+import { MeasureMesh as U } from "./utils/MeasureMesh.js";
+import { PointMesh as T } from "../Sculpt/Meshes/Point.js";
+import { LineWithDotsMesh as b } from "../Sculpt/Meshes/LineWithDots.js";
+import { hotkeys as d } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
+import { PolygonMesh as V } from "../Sculpt/Meshes/Polygon.js";
+import { validatePolygon as z } from "./utils/validatePolygon.js";
+import { Cursor as A } from "../Sculpt/utils/Modules/Cursor.js";
+import { THREERaycaster as R } from "../shared-utils/three/core/Raycaster.js";
 import "../shared-utils/positionToVector3.js";
 import "../shared-utils/five/vector3ToScreen.js";
 import "../shared-utils/five/getFiveModel.js";
@@ -41,7 +42,6 @@ import "../shared-utils/Utils/BaseUtil.js";
 import "../shared-utils/Utils/WorkUtil.js";
 import "../shared-utils/five/transformPosition.js";
 import "../shared-utils/three/temp.js";
-import "../shared-utils/three/core/Raycaster.js";
 import "../shared-utils/dom/resizeObserver.js";
 import "../shared-utils/five/fiveEveryReadyListener.js";
 import "../shared-utils/throttle.js";
@@ -88,23 +88,23 @@ import "../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../Sculpt/utils/three/ColoredMesh.js";
 import "../shared-utils/three/geometryUtil.js";
 import "../shared-utils/three/vectorIsEqual.js";
-class ht extends H {
+class ct extends H {
   constructor(e, t) {
     super();
-    o(this, "name", "MeasurePlugin");
-    o(this, "currentMeasureMesh");
-    o(this, "five");
-    o(this, "group");
-    o(this, "_pointSelector");
-    o(this, "_fiveDomEvents");
-    o(this, "_cursor");
-    o(this, "_config");
-    o(this, "lineStyle", {
+    i(this, "name", "MeasurePlugin");
+    i(this, "currentMeasureMesh");
+    i(this, "five");
+    i(this, "group");
+    i(this, "_pointSelector");
+    i(this, "_fiveDomEvents");
+    i(this, "_cursor");
+    i(this, "_config");
+    i(this, "lineStyle", {
       lengthEnable: !0,
       occlusionVisibility: !0,
       lengthUnit: "m"
     });
-    o(this, "polygonStyle", {
+    i(this, "polygonStyle", {
       lengthEnable: !0,
       occlusionVisibility: !0,
       opacity: 0.2,
@@ -113,148 +113,168 @@ class ht extends H {
     /**
      * @description 开始测量
      */
-    o(this, "measure", () => {
-      this.listener.addMeasureListener(), this.listener.removeClickListener(), this.group.children.forEach((r) => r.unselect()), this.cursor.removeDeleteButton();
-      const e = new V({
+    i(this, "measure", () => {
+      this.listener.addMeasureListener(), this.listener.removeClickListener(), this.group.children.forEach((n) => n.unselect()), this.cursor.removeDeleteButton();
+      const e = new U({
         lineStyle: this.lineStyle,
         polygonStyle: this.polygonStyle
       });
       this.currentMeasureMesh = e, this.pointSelector.actionIfNoIntersection = "disable", this.updateSelectAdsorbedHelper();
-      const t = new x(), i = new M(v(f({}, this.lineStyle), { dashed: !0 })), n = new z(this.polygonStyle), c = new M(v(f({}, this.lineStyle), { lineOpacity: 0.5, dashed: !0 })), u = new M(v(f({}, this.lineStyle), { lineOpacity: 0.5, dashed: !0 })), d = () => {
-        t.removeFromParent(), i.removeFromParent(), n.removeFromParent(), c.removeFromParent(), u.removeFromParent();
+      const t = new T(), r = new b(P(y({}, this.lineStyle), { dashed: !0 })), o = new V(this.polygonStyle), h = new b(P(y({}, this.lineStyle), { lineOpacity: 0.5, dashed: !0 })), p = new b(P(y({}, this.lineStyle), { lineOpacity: 0.5, dashed: !0 })), m = () => {
+        t.removeFromParent(), r.removeFromParent(), o.removeFromParent(), h.removeFromParent(), p.removeFromParent();
       };
       this.group.add(e);
-      const S = (r) => {
-        if (!r) {
-          d();
+      const v = (n) => {
+        if (!n) {
+          m();
           return;
         }
-        if (e.points.length === 0 && (this.pointSelector.actionIfNoIntersection = "disable", this.group.addIfNotExists(t), t.position.copy(r.point)), e.points.length >= 1)
-          if (this.pointSelector.actionIfNoIntersection = "virtualPoint", t.removeFromParent(), this.group.addIfNotExists(i), i.setPoints([e.points.at(-1), r.point]), r.isAdsorbed)
-            c.removeFromParent(), u.removeFromParent();
+        if (e.points.length === 0 && (this.pointSelector.actionIfNoIntersection = "disable", this.group.addIfNotExists(t), t.position.copy(n.point)), e.points.length >= 1)
+          if (this.pointSelector.actionIfNoIntersection = "virtualPoint", t.removeFromParent(), this.group.addIfNotExists(r), r.setPoints([e.points.at(-1), n.point]), n.isAdsorbed)
+            h.removeFromParent(), p.removeFromParent();
           else {
             const l = e.points.at(-1);
-            if (Math.abs(r.point.y - l.y) > 0.2) {
-              const m = new h.Vector3(r.point.x, l.y, r.point.z);
-              c.setPoints([l, m]), u.setPoints([m, r.point]);
+            if (Math.abs(n.point.y - l.y) > 0.2) {
+              const u = new a.Vector3(n.point.x, l.y, n.point.z);
+              h.setPoints([l, u]), p.setPoints([u, n.point]);
             } else {
-              let m = new h.Vector3();
-              Math.abs(r.point.x - l.x) < Math.abs(r.point.z - l.z) ? m = new h.Vector3(r.point.x, l.y, l.z) : m = new h.Vector3(l.x, l.y, r.point.z), c.setPoints([l, m]), u.setPoints([m, r.point]);
+              let u = new a.Vector3();
+              Math.abs(n.point.x - l.x) < Math.abs(n.point.z - l.z) ? u = new a.Vector3(n.point.x, l.y, l.z) : u = new a.Vector3(l.x, l.y, n.point.z), h.setPoints([l, u]), p.setPoints([u, n.point]);
             }
-            this.group.addIfNotExists(c, u);
+            this.group.addIfNotExists(h, p);
           }
         if (e.points.length >= 2) {
-          const l = [...e.points, r.point];
-          A(l) ? (n.setPoints(l), this.group.addIfNotExists(n)) : n.removeFromParent();
+          const l = [...e.points, n.point];
+          z(l) ? (o.setPoints(l), this.group.addIfNotExists(o)) : o.removeFromParent();
         }
-      }, y = (r) => {
-        r && (d(), e.setPoints([...e.points, r.point]), this.updateSelectAdsorbedHelper(), e.isPolygon && this.pointSelector.disable());
-      }, P = () => {
-        var r, l;
-        e == null || e.setPoints(e.points.slice(0, -1)), d(), (l = (r = this.pointSelector.pointSelectorHelper) == null ? void 0 : r.magnifier) == null || l.render(), this.updateSelectAdsorbedHelper(), this.five.needsRender = !0;
-      }, E = () => {
-        this.pointSelector.off("intersectionUpdate", S), this.pointSelector.off("select", y), this.pointSelector.off("disable", E), this.off("undo", P), d(), e.points.length < 2 && e.removeFromParent(), this.currentMeasureMesh = null, this.listener.addClickListener(), this.listener.removeMeasureListener(), this.emit("measureEnd");
+      }, f = (n) => {
+        n && (m(), e.setPoints([...e.points, n.point]), this.updateSelectAdsorbedHelper(), e.isPolygon && this.pointSelector.disable());
+      }, M = () => {
+        var n, l;
+        e == null || e.setPoints(e.points.slice(0, -1)), m(), (l = (n = this.pointSelector.pointSelectorHelper) == null ? void 0 : n.magnifier) == null || l.render(), this.updateSelectAdsorbedHelper(), this.five.needsRender = !0;
+      }, g = () => {
+        this.pointSelector.off("intersectionUpdate", v), this.pointSelector.off("select", f), this.pointSelector.off("disable", g), this.off("undo", M), m(), e.points.length < 2 && e.removeFromParent(), e.__five_pano_index = this.five.panoIndex, this.currentMeasureMesh = null, this.listener.addClickListener(), this.listener.removeMeasureListener(), this.emit("measureEnd");
       };
-      this.on("undo", P), this.pointSelector.on("intersectionUpdate", S), this.pointSelector.on("select", y), this.pointSelector.on("disable", E), this.pointSelector.enable();
+      this.on("undo", M), this.pointSelector.on("intersectionUpdate", v), this.pointSelector.on("select", f), this.pointSelector.on("disable", g), this.pointSelector.enable();
     });
     /**
      * @description 结束测量
      */
-    o(this, "endMeasure", () => {
+    i(this, "endMeasure", () => {
       this.pointSelector.disable();
     });
     /**
      * @description 取消本次测量
      */
-    o(this, "cancel", () => {
+    i(this, "cancel", () => {
       var e;
       (e = this.currentMeasureMesh) == null || e.removeFromParent(), this.pointSelector.disable();
     });
     /**
      * @description 撤销上一步
      */
-    o(this, "undo", () => {
+    i(this, "undo", () => {
       this.emit("undo");
     });
     /**
      * @description 清空正在测量的内容
      */
-    o(this, "clearCurrentMeasure", () => {
+    i(this, "clearCurrentMeasure", () => {
       var e;
       (e = this.currentMeasureMesh) == null || e.removeFromParent(), this.currentMeasureMesh = null, this.pointSelector.disable();
     });
     /**
      * @description 清空所有测量内容
      */
-    o(this, "clear", () => {
+    i(this, "clear", () => {
       this.currentMeasureMesh = null, this.pointSelector.disable(), this.group.removeChildren(), this.cursor.removeDeleteButton();
     });
-    o(this, "dispose", () => {
+    i(this, "dispose", () => {
       this.listener.removeMeasureListener(), this.listener.removeClickListener(), this.pointSelector.disable(), this.clear();
     });
     // eslint-disable-next-line @typescript-eslint/member-ordering
-    o(this, "listener", {
+    i(this, "listener", {
       // 点击事件
       addClickListener: () => {
         this.group.children.forEach((e) => {
           var t;
-          (t = e.line.doms) == null || t.forEach((i) => {
-            i.container.onclick = (n) => this.onClick({ origDomEvent: n, target: e }), i.container.onmouseenter = () => this.onHover({ target: e }), i.container.onmouseleave = () => this.onUnHover({ target: e });
-          }), e.polygon.areaDom && (e.polygon.areaDom.container.onclick = (i) => this.onClick({ origDomEvent: i, target: e }), e.polygon.areaDom.container.onmouseenter = () => this.onHover({ target: e }), e.polygon.areaDom.container.onmouseleave = () => this.onUnHover({ target: e })), this.fiveDomEvents.addEventListener(e, "click", this.onClick), this.fiveDomEvents.addEventListener(e, "hover", this.onHover), this.fiveDomEvents.addEventListener(e, "unHover", this.onUnHover), p("delete, backspace", this.deleteSelectedMesh);
+          (t = e.line.doms) == null || t.forEach((r) => {
+            r.container.onclick = (o) => this.onClick({ origDomEvent: o, target: e }), r.container.onmouseenter = () => this.onHover({ target: e }), r.container.onmouseleave = () => this.onUnHover({ target: e });
+          }), e.polygon.areaDom && (e.polygon.areaDom.container.onclick = (r) => this.onClick({ origDomEvent: r, target: e }), e.polygon.areaDom.container.onmouseenter = () => this.onHover({ target: e }), e.polygon.areaDom.container.onmouseleave = () => this.onUnHover({ target: e })), this.fiveDomEvents.addEventListener(e, "click", this.onClick), this.fiveDomEvents.addEventListener(e, "hover", this.onHover), this.fiveDomEvents.addEventListener(e, "unHover", this.onUnHover), this.five.on("panoArrived", this.onMoveToPano), d("delete, backspace", this.deleteSelectedMesh);
         });
       },
       removeClickListener: () => {
         this.group.children.forEach((e) => {
-          var t, i;
-          (t = e.line.doms) == null || t.forEach((n) => {
-            n != null && n.container && (n.container.onclick = null, n.container.onmouseenter = null, n.container.onmouseleave = null);
-          }), (i = e.polygon.areaDom) != null && i.container && (e.polygon.areaDom.container.onclick = null, e.polygon.areaDom.container.onmouseenter = null, e.polygon.areaDom.container.onmouseleave = null);
-        }), this.fiveDomEvents.clear(), p.unbind("delete, backspace");
+          var t, r;
+          (t = e.line.doms) == null || t.forEach((o) => {
+            o != null && o.container && (o.container.onclick = null, o.container.onmouseenter = null, o.container.onmouseleave = null);
+          }), (r = e.polygon.areaDom) != null && r.container && (e.polygon.areaDom.container.onclick = null, e.polygon.areaDom.container.onmouseenter = null, e.polygon.areaDom.container.onmouseleave = null);
+        }), this.fiveDomEvents.clear(), this.five.off("panoArrived", this.onMoveToPano), d.unbind("delete, backspace");
       },
       // 绘制快捷键
       addMeasureListener: () => {
-        p("ctrl+z, command+z", this.undo), p("esc", this.cancel), p("enter", this.endMeasure), this.five.on("mode.change", this.endMeasure), this.five.on("model.changeShownFloor", this.endMeasure);
+        d("ctrl+z, command+z", this.undo), d("esc", this.cancel), d("enter", this.endMeasure), this.five.on("mode.change", this.endMeasure), this.five.on("model.changeShownFloor", this.endMeasure);
       },
       removeMeasureListener: () => {
-        p.unbind("ctrl+z, command+z"), p.unbind("esc"), p.unbind("enter"), this.five.off("mode.change", this.endMeasure), this.five.off("model.changeShownFloor", this.endMeasure);
+        d.unbind("ctrl+z, command+z"), d.unbind("esc"), d.unbind("enter"), this.five.off("mode.change", this.endMeasure), this.five.off("model.changeShownFloor", this.endMeasure);
       }
     });
-    o(this, "onClick", ({ origDomEvent: e, target: t }) => {
-      const i = t;
-      if (!i)
+    i(this, "onMoveToPano", (e) => {
+      const t = this.group.children.filter((o) => o !== this.currentMeasureMesh), r = new R();
+      t.forEach((o) => {
+        var p;
+        if (o.unselect(), o.__five_pano_index === e) {
+          o.visible = !0;
+          return;
+        }
+        ((p = o.line.points) == null ? void 0 : p.some((m) => {
+          var S, u;
+          const v = m.clone().sub(this.five.camera.position).normalize();
+          r.set(this.five.camera.position, v);
+          const f = (u = (S = this.five.model.intersectRaycaster(r, void 0, !0)) == null ? void 0 : S[0]) == null ? void 0 : u.point;
+          if (!f)
+            return !0;
+          const M = 0.01, g = m.distanceTo(this.five.camera.position);
+          return f.distanceTo(this.five.camera.position) + M > g;
+        })) ? o.visible = !0 : o.visible = !1, this.five.needsRender = !0;
+      });
+    });
+    i(this, "onClick", ({ origDomEvent: e, target: t }) => {
+      const r = t;
+      if (!r)
         return;
-      let n, c;
-      if (e instanceof TouchEvent ? (n = e.touches[0].clientX, c = e.touches[0].clientY) : e instanceof MouseEvent && (n = e.clientX, c = e.clientY), n === void 0 || c === void 0)
+      let o, h;
+      if (e instanceof TouchEvent ? (o = e.touches[0].clientX, h = e.touches[0].clientY) : e instanceof MouseEvent && (o = e.clientX, h = e.clientY), o === void 0 || h === void 0)
         return;
-      this.group.children.forEach((d) => d.unselect()), i.select();
-      const u = () => {
-        i.removeFromParent(), this.cursor.removeDeleteButton(), this.five.needsRender = !0, p.unbind("delete, backspace");
+      this.group.children.forEach((m) => m.unselect()), r.select();
+      const p = () => {
+        r.removeFromParent(), this.cursor.removeDeleteButton(), this.five.needsRender = !0, d.unbind("delete, backspace");
       };
       this.cursor.showDeleteButton({
-        clientX: n,
-        clientY: c,
+        clientX: o,
+        clientY: h,
         container: this.five.getElement().parentElement,
-        onClick: u
+        onClick: p
       }), this.five.once("cameraUpdate", () => {
-        i.unselect(), this.cursor.removeDeleteButton();
+        r.unselect(), this.cursor.removeDeleteButton();
       });
     });
-    o(this, "onHover", ({ target: e }) => {
+    i(this, "onHover", ({ target: e }) => {
       if (this.currentMeasureMesh)
         return;
       const t = e;
       t && t.hover();
     });
-    o(this, "onUnHover", ({ target: e }) => {
+    i(this, "onUnHover", ({ target: e }) => {
       if (this.currentMeasureMesh)
         return;
       const t = e;
       t && t.unhover();
     });
-    o(this, "deleteSelectedMesh", () => {
+    i(this, "deleteSelectedMesh", () => {
       this.group.children.filter((t) => t.selected).forEach((t) => t.removeFromParent()), this.five.needsRender = !0;
     });
-    o(this, "updateSelectAdsorbedHelper", () => {
+    i(this, "updateSelectAdsorbedHelper", () => {
       if (!this.currentMeasureMesh || this.currentMeasureMesh.points.length === 0) {
         this.pointSelector.setAdherePoints(null), this.pointSelector.adhereLine = [], this.pointSelector.adherePlane = [];
         return;
@@ -263,13 +283,13 @@ class ht extends H {
         this.pointSelector.setAdherePoints([this.currentMeasureMesh.points[0]]);
         const e = this.currentMeasureMesh.points.at(-1);
         this.pointSelector.adhereLine = [
-          new h.Line3(new h.Vector3(1, 0, 0).add(e), new h.Vector3(-1, 0, 0).add(e)),
-          new h.Line3(new h.Vector3(0, 1, 0).add(e), new h.Vector3(0, -1, 0).add(e)),
-          new h.Line3(new h.Vector3(0, 0, 1).add(e), new h.Vector3(0, 0, -1).add(e))
+          new a.Line3(new a.Vector3(1, 0, 0).add(e), new a.Vector3(-1, 0, 0).add(e)),
+          new a.Line3(new a.Vector3(0, 1, 0).add(e), new a.Vector3(0, -1, 0).add(e)),
+          new a.Line3(new a.Vector3(0, 0, 1).add(e), new a.Vector3(0, 0, -1).add(e))
         ], this.pointSelector.adherePlane = [];
       }
       if (this.currentMeasureMesh.points.length >= 3) {
-        const e = new h.Plane().setFromCoplanarPoints(
+        const e = new a.Plane().setFromCoplanarPoints(
           this.currentMeasureMesh.points[0],
           this.currentMeasureMesh.points[1],
           this.currentMeasureMesh.points[2]
@@ -278,25 +298,25 @@ class ht extends H {
       } else
         this.pointSelector.adherePlane = [];
     });
-    this.five = e, this.config = t != null ? t : { unit: "ft" }, this.group = new U(), this.group.name = "MeasureGroup", this.five.scene.add(this.group);
+    this.five = e, this.config = t != null ? t : { unit: "m" }, this.group = new I(), this.group.name = "MeasureGroup", this.five.scene.add(this.group);
   }
   get pointSelector() {
     return this._pointSelector ? this._pointSelector : (this._pointSelector = new C(this.five, { mode: "cursor", helper: { pointHelper: "highlight" } }), this._pointSelector);
   }
   get fiveDomEvents() {
-    return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new I(this.five, { fiveModels: null }), this._fiveDomEvents);
+    return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new x(this.five, { fiveModels: null }), this._fiveDomEvents);
   }
   get cursor() {
-    return this._cursor ? this._cursor : (this._cursor = new N(), this._cursor);
+    return this._cursor ? this._cursor : (this._cursor = new A(), this._cursor);
   }
   get config() {
     return this._config;
   }
   set config(e) {
-    var t, i;
-    this._config = e, this.lineStyle.lengthUnit = e.unit, this.polygonStyle.lengthUnit = e.unit, (i = (t = this.group) == null ? void 0 : t.children) == null || i.forEach((n) => n.changeConfig({ lineStyle: this.lineStyle, polygonStyle: this.polygonStyle }));
+    var t, r;
+    this._config = e, this.lineStyle.lengthUnit = e.unit, this.polygonStyle.lengthUnit = e.unit, (r = (t = this.group) == null ? void 0 : t.children) == null || r.forEach((o) => o.changeConfig({ lineStyle: this.lineStyle, polygonStyle: this.polygonStyle }));
   }
 }
 export {
-  ht as MeasureController
+  ct as MeasureController
 };

package/libs/Sculpt/Meshes/Line.js

@@ -31,12 +31,12 @@ import { transformUnit as A } from "../utils/unit.js";
 import { RenderDom as u } from "../utils/renderDom.js";
 import "../../shared-utils/three/core/Sphere.js";
 import "../../vendor/animejs/lib/anime.es.js";
-import { notNil as d } from "../../shared-utils/isNil.js";
+import { notNil as c } from "../../shared-utils/isNil.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../shared-utils/five/FivePuppet.js";
 class ae extends B {
   constructor(e) {
-    var h, m, c, a;
+    var h, m, d, a;
     super();
     o(this, "name", "LineMesh");
     o(this, "type", "Line2");
@@ -67,8 +67,10 @@ class ae extends B {
     const s = {
       color: new y.Color((h = e == null ? void 0 : e.lineColor) != null ? h : I),
       linewidth: (m = e == null ? void 0 : e.lineWidth) != null ? m : C,
-      dashScale: 40,
-      opacity: (c = e == null ? void 0 : e.lineOpacity) != null ? c : 1,
+      dashScale: 1,
+      dashSize: 0.02,
+      gapSize: 0.02,
+      opacity: (d = e == null ? void 0 : e.lineOpacity) != null ? d : 1,
       depthWrite: !1,
       transparent: !0
     }, i = new P(S(f({}, s), { dashed: !1, depthTest: !0 })), t = new j(S(f({}, s), { dashed: !0, depthTest: !1 }));
@@ -137,7 +139,7 @@ class ae extends B {
   setPoints(e) {
     if (this.points.length === 0 && e.length === 0)
       return;
-    const s = e.map(R).filter(d);
+    const s = e.map(R).filter(c);
     if (this.points = s, s.length < 2) {
       const t = new H();
       this.line1.geometry = t, this.line2.geometry = t, this.updateDomItems();
@@ -158,13 +160,13 @@ class ae extends B {
     (t.x !== e || t.y !== s) && (t.set(e, s), this.needsRender = !0);
   }
   setStyle(e) {
-    var t, h, m, c;
-    if (this.paramsStyle = f(f({}, this.paramsStyle), e), d(e.lineColor)) {
+    var t, h, m, d;
+    if (this.paramsStyle = f(f({}, this.paramsStyle), e), c(e.lineColor)) {
       const a = new y.Color(e.lineColor);
       this.line1.material.three_color = a, this.line2.material.three_color = a;
     }
-    d(e.lineWidth) && (this.line1.material.linewidth = e.lineWidth, this.line2.material.linewidth = e.lineWidth), d(e.dashed) && (this.line1.material.dashed = e.dashed), d(e.lineOpacity) && (this.line1.material.opacity = e.lineOpacity, this.line2.material.opacity = e.lineOpacity), this.updateDomItems();
-    const s = (h = (t = e.occlusionVisibility) != null ? t : this.paramsStyle.occlusionVisibility) != null ? h : !0, i = (c = (m = e.occlusionMode) != null ? m : this.paramsStyle.occlusionMode) != null ? c : "translucence";
+    c(e.lineWidth) && (this.line1.material.linewidth = e.lineWidth, this.line2.material.linewidth = e.lineWidth), c(e.dashed) && (this.line1.material.dashed = e.dashed), c(e.lineOpacity) && (this.line1.material.opacity = e.lineOpacity, this.line2.material.opacity = e.lineOpacity), this.updateDomItems();
+    const s = (h = (t = e.occlusionVisibility) != null ? t : this.paramsStyle.occlusionVisibility) != null ? h : !0, i = (d = (m = e.occlusionMode) != null ? m : this.paramsStyle.occlusionMode) != null ? d : "translucence";
     s ? this.dashed ? (this.remove(this.line2), this.line1.material.dashed = !0, this.line1.material.depthTest = !1) : i === "depthTest" ? (this.remove(this.line2), this.line1.material.dashed = !1, this.line1.material.depthTest = !1) : i === "translucence" && (this.line1.material.depthTest = !0, this.line2.material.depthTest = !1, this.line1.material.dashed = !0, this.line2.material.dashed = !0, this.addIfNotExists(this.line2)) : (this.remove(this.line2), this.line1.material.depthTest = !0, this.line1.material.dashed = this.paramsStyle.dashed), this.doms.forEach((a) => a.intersectCheck = !s), this.needsRender = !0;
   }
   highlight(e) {
@@ -180,7 +182,7 @@ class ae extends B {
     this.needsRender = !0;
   }
   unhighlight() {
-    this.highlighted && (this.highlighted = !1, d(this.opacityBeforeHighlight) && (this.line1.material.opacity = this.opacityBeforeHighlight, this.line2.material.opacity = this.line1.material.opacity, this.opacityBeforeHighlight = void 0), d(this.colorBeforeHighlight) && (this.line1.material.three_color = this.colorBeforeHighlight, this.line2.material.three_color = this.colorBeforeHighlight, this.colorBeforeHighlight = void 0), this.needsRender = !0);
+    this.highlighted && (this.highlighted = !1, c(this.opacityBeforeHighlight) && (this.line1.material.opacity = this.opacityBeforeHighlight, this.line2.material.opacity = this.line1.material.opacity, this.opacityBeforeHighlight = void 0), c(this.colorBeforeHighlight) && (this.line1.material.three_color = this.colorBeforeHighlight, this.line2.material.three_color = this.colorBeforeHighlight, this.colorBeforeHighlight = void 0), this.needsRender = !0);
   }
   updateDomItems() {
     const e = () => {
@@ -193,7 +195,7 @@ class ae extends B {
     const s = this.points.map((i, t) => {
       if (t !== 0)
         return [this.points[t - 1], i];
-    }).filter(d).map((i) => L(this, i));
+    }).filter(c).map((i) => L(this, i));
     s.forEach(([i, t], h) => {
       var a;
       const m = x(i, t);
@@ -202,17 +204,17 @@ class ae extends B {
         const n = new W(this.five), g = (_ = this.paramsStyle.occlusionVisibility) != null ? _ : !0;
         return n.intersectCheck = !g, n.simulate3D = !0, n;
       })(), this.doms[h].setPosition(m, [i, t]);
-      const c = (n) => {
+      const d = (n) => {
         var g;
         this.doms[h].__text !== n && (this.doms[h].__text = n, n instanceof HTMLElement ? (this.doms[h].container.innerHTML = "", this.doms[h].container.appendChild(n)) : n ? this.doms[h].container.innerHTML = V(n, {
-          style: `color: #${d((g = this.style) == null ? void 0 : g.lineColor) ? new y.Color(this.style.lineColor).getHexString() : "ffffff"}`
+          style: `color: #${c((g = this.style) == null ? void 0 : g.lineColor) ? new y.Color(this.style.lineColor).getHexString() : "ffffff"}`
         }) : this.doms[h].container.innerHTML = "");
       };
       if (this.paramsStyle.tip)
-        c(this.paramsStyle.tip);
+        d(this.paramsStyle.tip);
       else {
         const n = A(i.distanceTo(t), this.paramsStyle.lengthUnit);
-        c(n || null);
+        d(n || null);
       }
     }), this.doms.length > s.length && (this.doms.slice(s.length).forEach((i) => i.destroy()), this.doms.length = s.length);
   }

package/libs/Sculpt/utils/renderDom.d.ts

@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import type * as THREE from 'three';
 export type RenderDomObjectType = THREE.Object3D & {
     _onAdded: () => void;
     _onRemoved: () => void;

package/libs/base/BasePlugin.js

@@ -13,7 +13,7 @@ import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../vendor/animejs/lib/anime.es.js";
 import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
-import { absoluteUrl as p } from "../shared-utils/url/absoluteUrl.js";
+import { absoluteUrl as a } from "../shared-utils/url/absoluteUrl.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
 let E = class {
@@ -21,7 +21,7 @@ let E = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.64.8");
+    i(this, "VERSION", "3.64.9-alpha.1");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");
@@ -52,7 +52,7 @@ let E = class {
    * @description: 获取静态资源的url
    */
   absoluteUrl(t) {
-    return p(this.staticPrefix, t);
+    return a(this.staticPrefix, t);
   }
   onWorkCodeChange() {
   }

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.64.8",
+    "%c %c@realsee/dnalogel %cv3.64.9-alpha.1",
     [
       "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/libs/shared-utils/tag.js

@@ -5,16 +5,16 @@ var u = (p, e, t) => new Promise((o, n) => {
   var a = (i) => {
     try {
       s(t.next(i));
-    } catch (l) {
-      n(l);
+    } catch (h) {
+      n(h);
     }
-  }, h = (i) => {
+  }, l = (i) => {
     try {
       s(t.throw(i));
-    } catch (l) {
-      n(l);
+    } catch (h) {
+      n(h);
     }
-  }, s = (i) => i.done ? o(i.value) : Promise.resolve(i.value).then(a, h);
+  }, s = (i) => i.done ? o(i.value) : Promise.resolve(i.value).then(a, l);
   s((t = t.apply(p, e)).next());
 });
 import { anyPositionToVector3 as f } from "./positionToVector3.js";
@@ -110,7 +110,7 @@ class M {
       this.visibles[3] === !0 || this.visibles.every((t) => t !== !1) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
     });
     r(this, "updateIntersectCheckVisible", () => {
-      var i, l;
+      var i, h;
       if (!this.position)
         return;
       if (!this.intersectCheck) {
@@ -121,11 +121,11 @@ class M {
       this.fiveUtil.workUtil.fromType === "poincare" && (t = 0.05);
       const o = this.transformedPosition.clone().sub(this.five.camera.position).normalize();
       v.set(this.five.camera.position, o);
-      const n = (i = U(this.five).intersectRaycaster(v)) != null ? i : [], a = (l = v.intersectObjects(this.extraObjectsForIntersectCheck, !0)) != null ? l : [], s = [...n, ...a].sort((c, d) => c.distance - d.distance)[0];
+      const n = (i = U(this.five).intersectRaycaster(v)) != null ? i : [], a = (h = v.intersectObjects(this.extraObjectsForIntersectCheck, !0)) != null ? h : [], s = [...n, ...a].sort((c, d) => c.distance - d.distance)[0];
       s ? e = (s == null ? void 0 : s.distance) + t > this.transformedPosition.distanceTo(this.five.camera.position) : e = !0, this.visibles[1] = e;
     });
-    var n, a, h;
-    this.five = e, this.fiveUtil = (n = e.__fiveUtil__) != null ? n : e.__fiveUtil__ = new w(e), this.originPosition = t ? f(t).clone() : void 0, this.transformedPosition = (a = this.originPosition) == null ? void 0 : a.clone(), this.positionsForRotate = (h = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : h.map((s) => f(s).clone()), this.config = o != null ? o : {}, this.container = (() => {
+    var n, a, l;
+    this.five = e, this.fiveUtil = (n = e.__fiveUtil__) != null ? n : e.__fiveUtil__ = new w(e), this.originPosition = t ? f(t).clone() : void 0, this.transformedPosition = (a = this.originPosition) == null ? void 0 : a.clone(), this.positionsForRotate = (l = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : l.map((s) => f(s).clone()), this.config = o != null ? o : {}, this.container = (() => {
       const s = document.createElement("div");
       return s.classList.add("light-tag"), s.style.width = "0", s.style.height = "0", s.style.position = "absolute", s.style.transition = "opacity 0.2s linear", s;
     })(), this.addResizeListener(), this.show(), this.enable(), setTimeout(() => {
@@ -155,14 +155,14 @@ class M {
    */
   enable() {
     return u(this, null, function* () {
-      var o, n, a, h;
+      var o, n, a, l;
       if (this.enabled || (this.enabled = !0, yield F(this.five), !this.enabled))
         return;
       if (this.wrapper = (n = this.config.wrapper) != null ? n : (o = this.five.getElement()) == null ? void 0 : o.parentElement, !this.wrapper) {
         console.error("lighttag: wrapper is required");
         return;
       }
-      const e = `light-tag-wrapper-${(h = (a = this.config) == null ? void 0 : a.namespace) != null ? h : "default"}`;
+      const e = `light-tag-wrapper-${(l = (a = this.config) == null ? void 0 : a.namespace) != null ? l : "default"}`;
       if (!this.tagWrapper) {
         let s = Array.from(this.wrapper.children).find((i) => i.id === e);
         if (!s) {
@@ -222,15 +222,15 @@ class M {
     const o = (() => {
       if (!this.simulate3D)
         return 1;
-      const h = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), s = this.transformedPosition.distanceTo(this.five.camera.position);
-      return Math.max(Math.min(1 - h * s / 40, 1), 0.5);
+      const s = 3 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), i = this.transformedPosition.distanceTo(this.five.camera.position);
+      return Math.max(Math.min(1 - s * i / 40, 1), 0.5);
     })(), n = (() => {
       if (this.positionsForRotate === void 0 || this.positionsForRotate.length !== 2)
         return 0;
-      const [h, s] = this.positionsForRotate, i = m(this.five.camera, h, e), l = m(this.five.camera, s, e);
-      if (!i || !l)
+      const [l, s] = this.positionsForRotate, i = m(this.five.camera, l, e), h = m(this.five.camera, s, e);
+      if (!i || !h)
         return 0;
-      const c = i.leftPx > l.leftPx ? l : i, d = i.leftPx > l.leftPx ? i : l, y = d.leftPx - c.leftPx, b = d.topPx - c.topPx;
+      const c = i.leftPx > h.leftPx ? h : i, d = i.leftPx > h.leftPx ? i : h, y = d.leftPx - c.leftPx, b = d.topPx - c.topPx;
       return Math.atan2(b, y) * (180 / Math.PI);
     })();
     this.container.style.left = t.leftPx + "px", this.container.style.top = t.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${o})`, n && (this.container.style.transform += ` rotate(${n}deg)`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.64.8",
+  "version": "3.64.9-alpha.1",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",