@realsee/dnalogel 3.48.6 → 3.49.0

package/libs/shared-utils/Object3DHelper/Controller/RotateController.js

@@ -1,155 +1,149 @@
-var v = Object.defineProperty;
-var w = (u, h, n) => h in u ? v(u, h, { enumerable: !0, configurable: !0, writable: !0, value: n }) : u[h] = n;
-var d = (u, h, n) => (w(u, typeof h != "symbol" ? h + "" : h, n), n);
-import { BaseController as C } from "../Base/BaseController.js";
-import * as a from "three";
-import { getMouseRaycaster as D } from "../utils/getMouseRaycaster.js";
-import { setObjectQuaternion as O } from "../utils/setObjectQuaternion.js";
-import { rad2Deg as k } from "../../math/rad2Deg.js";
+var j = Object.defineProperty;
+var w = (g, h, t) => h in g ? j(g, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : g[h] = t;
+var d = (g, h, t) => (w(g, typeof h != "symbol" ? h + "" : h, t), t);
+import { BaseController as D } from "../Base/BaseController.js";
+import * as c from "three";
+import { getMouseRaycaster as O } from "../utils/getMouseRaycaster.js";
+import { setObjectQuaternion as C } from "../utils/setObjectQuaternion.js";
+import { rad2Deg as L } from "../../math/rad2Deg.js";
 import { deg2Rad as f } from "../../math/deg2Rad.js";
-const y = new a.Quaternion();
-class P extends C {
-  constructor(...n) {
-    var l, c, m;
-    super(...n);
+const y = new c.Quaternion();
+class x extends D {
+  constructor(...t) {
+    var l, a, m;
+    super(...t);
     d(this, "name", "RotateController");
     d(this, "startInfo");
     d(this, "removeListener");
-    const e = this.helperObject3D;
-    this.hoverListener([(l = e.xCircle) == null ? void 0 : l.circle, (c = e.yCircle) == null ? void 0 : c.circle, (m = e.zCircle) == null ? void 0 : m.circle].filter(Boolean));
-    const t = this.dragStart.bind(this), i = this.dragging.bind(this), s = this.dragEnd.bind(this), r = this.show.bind(this), o = this.hide.bind(this);
-    this.domEvents.addEventListener(this.helperObject3D, "mousedown", t), document.addEventListener("mousemove", i), document.addEventListener("mouseup", s), this.hooks.on("moveStart", o), this.hooks.on("moveEnd", r), this.hooks.on("scaleStart", o), this.hooks.on("scaleEnd", r), this.hooks.on("moveByMouseEnable", o), this.hooks.on("moveByMouseDisable", r), this.removeListener = () => {
-      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", t), document.removeEventListener("mousemove", i), document.removeEventListener("mouseup", s), this.hooks.off("moveStart", o), this.hooks.off("moveEnd", r), this.hooks.off("scaleStart", o), this.hooks.off("scaleEnd", r), this.hooks.off("moveByMouseEnable", o), this.hooks.off("moveByMouseDisable", r);
-    };
+    const n = this.helperObject3D;
+    this.hoverListener([(l = n.xCircle) == null ? void 0 : l.circle, (a = n.yCircle) == null ? void 0 : a.circle, (m = n.zCircle) == null ? void 0 : m.circle].filter(Boolean));
+    const e = this.dragStart.bind(this), o = this.dragging.bind(this), s = this.dragEnd.bind(this), i = this.show.bind(this), r = this.hide.bind(this);
+    this.domEvents.addEventListener(this.helperObject3D, "mousedown", e), document.addEventListener("mousemove", o), document.addEventListener("mouseup", s), this.domEvents.addEventListener(this.helperObject3D, "touchstart", e), document.addEventListener("touchmove", o), document.addEventListener("touchend", s), this.hooks.on("moveStart", r), this.hooks.on("moveEnd", i), this.hooks.on("scaleStart", r), this.hooks.on("scaleEnd", i), this.hooks.on("moveByMouseEnable", r), this.hooks.on("moveByMouseDisable", i), this.disposers.push(() => {
+      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", e), document.removeEventListener("mousemove", o), document.removeEventListener("mouseup", s), this.domEvents.removeEventListener(this.helperObject3D, "touchstart", e), document.removeEventListener("touchmove", o), document.removeEventListener("touchend", s), this.hooks.off("moveStart", r), this.hooks.off("moveEnd", i), this.hooks.off("scaleStart", r), this.hooks.off("scaleEnd", i), this.hooks.off("moveByMouseEnable", r), this.hooks.off("moveByMouseDisable", i);
+    });
   }
   get rotateCenter() {
     return this.helperObject3D.position.clone();
   }
-  // public initialHelperQuaternion() {
-  //   this.helperObject3D.applyHelperQuaternion(this.originObject3D.quaternion)
-  // }
-  setRotateAngle(n) {
-    const { x: e = 0, y: t = 0, z: i = 0 } = n, s = new a.Euler(f(e), f(t), f(i)), r = new a.Quaternion().setFromEuler(s);
-    if (this.hooks.emit("wantToRotate", r))
+  setRotateAngle(t) {
+    const { x: n = 0, y: e = 0, z: o = 0 } = t, s = new c.Euler(f(n), f(e), f(o)), i = new c.Quaternion().setFromEuler(s);
+    if (this.hooks.emit("wantToRotate", i))
       return;
-    const { originObject3D: l, rotateCenter: c } = this;
-    O(l, r, c), this.internalHooks.emit("setObjectRotate", r, c), this.hooks.emit("rotate", r), this.render();
+    const { originObject3D: l, rotateCenter: a } = this;
+    C(l, i, a), this.internalHooks.emit("setObjectRotate", i, a), this.hooks.emit("rotate", i), this.render();
   }
-  dispose() {
-    this.removeListener(), super.dispose();
+  onApplyOriginObjectRotate(t) {
+    this.isDragging || super.onApplyOriginObjectRotate(t);
   }
-  onApplyOriginObjectRotate(n) {
-    this.isDragging || super.onApplyOriginObjectRotate(n);
-  }
-  onApplyOriginObjectScale(n) {
+  onApplyOriginObjectScale(t) {
   }
   /**
    * @description: 拖动开始，找出拖的Direction
    */
-  dragStart(n) {
+  dragStart(t) {
     if (this.isDragging)
       return;
-    const e = n == null ? void 0 : n.intersect;
-    if (!e)
+    const n = t == null ? void 0 : t.intersect;
+    if (!n)
       return this.dragEnd();
-    const t = (e == null ? void 0 : e.object).direction;
-    if (!t)
+    const e = (n == null ? void 0 : n.object).direction;
+    if (!e)
       return this.dragEnd();
-    const i = e.point, s = this.getAngleHelper(t);
+    const o = n.point, s = this.getAngleHelper(e);
     this.setTipsAngle(0);
-    const r = i.clone();
-    r.y += 0.2, this.setTipsPosition(r);
-    const o = this.helperObject3D.quaternion.clone(), l = (() => {
-      if (t === "x")
-        return new a.Vector3(1, 0, 0).applyQuaternion(o);
-      if (t === "y")
-        return new a.Vector3(0, 1, 0).applyQuaternion(o);
-      if (t === "z")
-        return new a.Vector3(0, 0, 1).applyQuaternion(o);
-    })(), c = new a.Plane().setFromNormalAndCoplanarPoint(l, i), p = c.projectPoint(i.clone(), new a.Vector3()).clone().sub(this.rotateCenter), g = p.angleTo(s.baseAxes.clone().applyQuaternion(o));
-    this.setAngleHelperStart(t, g), this.setAngleHelperLength(t, 0), this.startInfo = { direction: t, startVector: p, plane: c, angleHelper: s, angle: 0, helperQuaternion: o.clone() }, y.copy(o), this.helperObject3D.showDraggingHelper([t]), this.hooks.emit("rotateStart"), this.isDragging = !0;
+    const i = o.clone();
+    i.y += 0.2, this.setTipsPosition(i);
+    const r = this.helperObject3D.quaternion.clone(), l = (() => {
+      if (e === "x")
+        return new c.Vector3(1, 0, 0).applyQuaternion(r);
+      if (e === "y")
+        return new c.Vector3(0, 1, 0).applyQuaternion(r);
+      if (e === "z")
+        return new c.Vector3(0, 0, 1).applyQuaternion(r);
+    })(), a = new c.Plane().setFromNormalAndCoplanarPoint(l, o), p = a.projectPoint(o.clone(), new c.Vector3()).clone().sub(this.rotateCenter), u = p.angleTo(s.baseAxes.clone().applyQuaternion(r));
+    this.setAngleHelperStart(e, u), this.setAngleHelperLength(e, 0), this.startInfo = { direction: e, startVector: p, plane: a, angleHelper: s, angle: 0, helperQuaternion: r.clone() }, y.copy(r), this.helperObject3D.showDraggingHelper([e]), this.hooks.emit("rotateStart"), this.isDragging = !0;
   }
-  dragging(n) {
+  dragging(t) {
     if (!this.isDragging)
       return;
-    const e = D(this.camera, n, this.container);
-    return e ? (this.rotate(e), !1) : this.dragEnd();
+    const n = "touches" in t ? t.touches[0].clientX : t.x, e = "touches" in t ? t.touches[0].clientY : t.y, o = O(this.camera, { x: n, y: e }, this.container);
+    return o ? (this.rotate(o), !1) : this.dragEnd();
   }
-  rotate(n) {
+  rotate(t) {
     if (!this.startInfo)
       return this.dragEnd();
-    const { startVector: e, plane: t, angleHelper: i, direction: s, helperQuaternion: r } = this.startInfo, { originObject3D: o } = this, l = n.ray.intersectPlane(t, new a.Vector3());
+    const { startVector: n, plane: e, angleHelper: o, direction: s, helperQuaternion: i } = this.startInfo, { originObject3D: r } = this, l = t.ray.intersectPlane(e, new c.Vector3());
     if (!l)
       return;
-    const c = this.rotateCenter.clone(), p = t.projectPoint(l.clone(), new a.Vector3()).clone().sub(c);
-    if (e.angleTo(p) === 0)
+    const a = this.rotateCenter.clone(), p = e.projectPoint(l.clone(), new c.Vector3()).clone().sub(a);
+    if (n.angleTo(p) === 0)
       return;
-    const g = new a.Quaternion().setFromUnitVectors(e.clone().normalize(), p.clone().normalize()), b = o.quaternion.clone().premultiply(g);
-    if (this.hooks.emit("wantToRotate", b))
+    const u = new c.Quaternion().setFromUnitVectors(n.clone().normalize(), p.clone().normalize()), v = r.quaternion.clone().premultiply(u);
+    if (this.hooks.emit("wantToRotate", v))
       return;
-    const E = new a.Euler().setFromQuaternion(
-      new a.Quaternion().setFromUnitVectors(
-        e.clone().normalize().applyQuaternion(r.clone().inverse()),
-        p.clone().normalize().applyQuaternion(r.clone().inverse())
+    const E = new c.Euler().setFromQuaternion(
+      new c.Quaternion().setFromUnitVectors(
+        n.clone().normalize().applyQuaternion(i.clone().inverse()),
+        p.clone().normalize().applyQuaternion(i.clone().inverse())
       ),
       `${s.toUpperCase()}${"XZY".replace(s.toUpperCase(), "")}`
-    )[s] * i.angleDirection;
-    if (this.startInfo.angle += E, this.setAngleHelperLength(s, this.startInfo.angle), this.setTipsAngle(k(this.startInfo.angle)), c) {
-      const j = new a.Vector3().subVectors(o.position, c).applyQuaternion(g).add(c);
-      o.position.copy(j);
+    )[s] * o.angleDirection;
+    if (this.startInfo.angle += E, this.setAngleHelperLength(s, this.startInfo.angle), this.setTipsAngle(L(this.startInfo.angle)), a) {
+      const b = new c.Vector3().subVectors(r.position, a).applyQuaternion(u).add(a);
+      r.position.copy(b);
     }
-    o.applyQuaternion(g), y.premultiply(g), this.internalHooks.emit("applyObjectRotate", { quaternion: g, origin: c }), this.hooks.emit("rotate", o.quaternion), this.startInfo.startVector = p;
+    r.applyQuaternion(u), y.premultiply(u), this.internalHooks.emit("applyObjectRotate", { quaternion: u, origin: a }), this.hooks.emit("rotate", r.quaternion), this.startInfo.startVector = p;
   }
   dragEnd() {
     this.isDragging && (this.internalHooks.emit("setObjectRotate", y, this.rotateCenter), this.startInfo = void 0, this.isDragging = !1, this.helperObject3D.show(), this.hooks.emit("rotateEnd"));
   }
-  getAngleHelper(n) {
-    var e, t, i;
-    switch (n) {
+  getAngleHelper(t) {
+    var n, e, o;
+    switch (t) {
       case "x":
-        return (e = this.helperObject3D.xCircle) == null ? void 0 : e.angleSector;
+        return (n = this.helperObject3D.xCircle) == null ? void 0 : n.angleSector;
       case "y":
-        return (t = this.helperObject3D.yCircle) == null ? void 0 : t.angleSector;
+        return (e = this.helperObject3D.yCircle) == null ? void 0 : e.angleSector;
       case "z":
-        return (i = this.helperObject3D.zCircle) == null ? void 0 : i.angleSector;
+        return (o = this.helperObject3D.zCircle) == null ? void 0 : o.angleSector;
     }
   }
-  setAngleHelperStart(n, e) {
-    const t = this.getAngleHelper(n);
-    if (!t) {
+  setAngleHelperStart(t, n) {
+    const e = this.getAngleHelper(t);
+    if (!e) {
       console.warn("angleHelper is undefined");
       return;
     }
-    if (t instanceof a.Mesh && t.geometry instanceof a.CircleGeometry) {
-      const { radius: i, segments: s, thetaLength: r } = t.geometry.parameters;
-      t.geometry = new a.CircleGeometry(i, s, e, r);
+    if (e instanceof c.Mesh && e.geometry instanceof c.CircleGeometry) {
+      const { radius: o, segments: s, thetaLength: i } = e.geometry.parameters;
+      e.geometry = new c.CircleGeometry(o, s, n, i);
     } else
       console.warn("only support THREE.CircleGeometry");
   }
-  setAngleHelperLength(n, e) {
-    const i = e >= 0 ? Math.max(e, 1e-3) : Math.min(e, -1e-3), s = this.getAngleHelper(n);
-    if (s instanceof a.Mesh && s.geometry instanceof a.CircleGeometry) {
-      const { radius: r, thetaStart: o } = s.geometry.parameters, l = Math.ceil(Math.abs(i) * (40 / (2 * Math.PI)));
-      s.geometry = new a.CircleGeometry(r, l, o, i);
+  setAngleHelperLength(t, n) {
+    const o = n >= 0 ? Math.max(n, 1e-3) : Math.min(n, -1e-3), s = this.getAngleHelper(t);
+    if (s instanceof c.Mesh && s.geometry instanceof c.CircleGeometry) {
+      const { radius: i, thetaStart: r } = s.geometry.parameters, l = Math.ceil(Math.abs(o) * (40 / (2 * Math.PI)));
+      s.geometry = new c.CircleGeometry(i, l, r, o);
     } else
       console.warn("only support THREE.CircleGeometry");
   }
-  setTipsAngle(n) {
-    var t;
-    const e = (t = this.helperObject3D.angleTips) == null ? void 0 : t.element;
-    e && (e.innerText = `${n.toFixed(0)}°`);
+  setTipsAngle(t) {
+    var e;
+    const n = (e = this.helperObject3D.angleTips) == null ? void 0 : e.element;
+    n && (n.innerText = `${t.toFixed(0)}°`);
   }
-  setTipsPosition(n) {
-    const e = this.helperObject3D.angleTips;
-    if (!e)
+  setTipsPosition(t) {
+    const n = this.helperObject3D.angleTips;
+    if (!n)
       return;
-    const t = n.project(this.camera), { x: i, y: s, z: r } = t;
-    if (r > 1)
+    const e = t.project(this.camera), { x: o, y: s, z: i } = e;
+    if (i > 1)
       return;
-    const o = (i + 1) / 2 * 100 + "%", l = (-s + 1) / 2 * 100 + "%";
-    e.setLeftTop(o, l);
+    const r = (o + 1) / 2 * 100 + "%", l = (-s + 1) / 2 * 100 + "%";
+    n.setLeftTop(r, l);
   }
 }
 export {
-  P as RotateController
+  x as RotateController
 };

package/libs/shared-utils/Object3DHelper/Controller/ScaleController.d.ts

@@ -13,7 +13,7 @@ export declare class ScaleController<T extends ScaleHelperAbstract = ScaleHelper
     dragging: (point: {
         x: number;
         y: number;
-    }) => false | void;
+    } | TouchEvent) => false | void;
     setScale(scale: number | {
         x?: number;
         y?: number;

package/libs/shared-utils/Object3DHelper/Controller/ScaleController.js

@@ -1,45 +1,48 @@
-var p = Object.defineProperty;
-var u = (h, r, t) => r in h ? p(h, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[r] = t;
-var l = (h, r, t) => (u(h, typeof r != "symbol" ? r + "" : r, t), t);
-import { BaseController as b } from "../Base/BaseController.js";
-import * as g from "three";
-import { getMouseRaycaster as P } from "../utils/getMouseRaycaster.js";
-import { rayOnLine as f } from "../../../Sculpt/utils/three/rayOnLine.js";
-class H extends b {
+var f = Object.defineProperty;
+var v = (d, a, t) => a in d ? f(d, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[a] = t;
+var c = (d, a, t) => (v(d, typeof a != "symbol" ? a + "" : a, t), t);
+import { BaseController as p } from "../Base/BaseController.js";
+import * as m from "three";
+import { getMouseRaycaster as E } from "../utils/getMouseRaycaster.js";
+import { rayOnLine as g } from "../../../Sculpt/utils/three/rayOnLine.js";
+class S extends p {
   constructor(...t) {
     super(...t);
-    l(this, "name", "ScaleController");
-    l(this, "startInfo");
-    l(this, "dragStart", (t) => {
+    c(this, "name", "ScaleController");
+    c(this, "startInfo");
+    c(this, "dragStart", (t) => {
       if (this.isDragging)
         return;
       this.isDragging = !0;
-      const { intersect: e } = t, a = this.camera.position, o = e.object, i = o.scalePosition.basePosition.clone(), s = o.scalePosition.handlePosition.clone().clone().sub(i).clone(), n = new g.Line3(i, i.clone().add(s.normalize().multiplyScalar(5)));
+      const { intersect: e } = t, o = this.camera.position, s = e.object, i = s.scalePosition.basePosition.clone(), r = s.scalePosition.handlePosition.clone().clone().sub(i).clone(), n = new m.Line3(i, i.clone().add(r.normalize().multiplyScalar(5)));
       n.applyMatrix4(this.helperObject3D.matrixWorld);
-      const c = new g.Raycaster(a, e.point.clone().sub(a)), m = f({ raycaster: c, line: n });
-      this.startInfo = { line: n, scaleStartPoint: m, draggingObject: o }, this.hooks.emit("scaleStart");
+      const h = new m.Raycaster(o, e.point.clone().sub(o)), u = g({ raycaster: h, line: n });
+      this.startInfo = { line: n, scaleStartPoint: u, draggingObject: s }, this.hooks.emit("scaleStart");
     });
-    l(this, "dragging", (t) => {
+    c(this, "dragging", (t) => {
       if (!this.isDragging || !this.startInfo)
         return;
-      const e = P(this.camera, t, this.container);
-      return e ? (this.scale(e), !1) : this.dragEnd();
+      const e = "touches" in t ? t.touches[0].clientX : t.x, o = "touches" in t ? t.touches[0].clientY : t.y, s = E(this.camera, { x: e, y: o }, this.container);
+      return s ? (this.scale(s), !1) : this.dragEnd();
     });
-    l(this, "scale", (t) => {
-      var n, c;
+    c(this, "scale", (t) => {
+      var n, h;
       if (!this.startInfo)
         return;
-      const { line: e, scaleStartPoint: a, draggingObject: o } = this.startInfo, { scalePosition: i } = o, { basePosition: d } = i, s = f({ raycaster: t, line: e });
-      s.applyMatrix4(new g.Matrix4().getInverse(this.helperObject3D.matrixWorld.clone())), (c = (n = this.config) == null ? void 0 : n.scaleCallback) == null || c.call(n, {
-        ratio: s.distanceTo(d) / a.distanceTo(d),
-        intersectPoint: s,
+      const { line: e, scaleStartPoint: o, draggingObject: s } = this.startInfo, { scalePosition: i } = s, { basePosition: l } = i, r = g({ raycaster: t, line: e });
+      r.applyMatrix4(new m.Matrix4().getInverse(this.helperObject3D.matrixWorld.clone())), (h = (n = this.config) == null ? void 0 : n.scaleCallback) == null || h.call(n, {
+        ratio: r.distanceTo(l) / o.distanceTo(l),
+        intersectPoint: r,
         scalePosition: i
-      }), o.position.copy(s.clone());
+      }), s.position.copy(r.clone());
     });
-    l(this, "dragEnd", () => {
+    c(this, "dragEnd", () => {
       this.isDragging && (this.startInfo = void 0, this.isDragging = !1, this.internalHooks.emit("initialHelperPosition"), this.hooks.emit("scaleEnd"));
     });
-    this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd);
+    const e = this.show.bind(this), o = this.hide.bind(this);
+    this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd), this.domEvents.addEventListener(this.helperObject3D, "touchstart", this.dragStart), document.addEventListener("touchmove", this.dragging), document.addEventListener("touchend", this.dragEnd), this.hooks.on("rotateStart", o), this.hooks.on("rotateEnd", e), this.hooks.on("moveStart", o), this.hooks.on("moveEnd", e), this.hooks.on("moveByMouseEnable", o), this.hooks.on("moveByMouseDisable", e), this.disposers.push(() => {
+      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", this.dragStart), document.removeEventListener("mousemove", this.dragging), document.removeEventListener("mouseup", this.dragEnd), this.domEvents.removeEventListener(this.helperObject3D, "touchstart", this.dragStart), document.removeEventListener("touchmove", this.dragging), document.removeEventListener("touchend", this.dragEnd), this.hooks.off("rotateStart", o), this.hooks.off("rotateEnd", e), this.hooks.off("moveStart", o), this.hooks.off("moveEnd", e), this.hooks.off("moveByMouseEnable", o), this.hooks.off("moveByMouseDisable", e);
+    });
   }
   initialHelperQuaternion() {
     this.helperObject3D.initQuaternion();
@@ -50,13 +53,13 @@ class H extends b {
     t.offHoverListener && t.offHoverListener(), t.offHoverListener = this.hoverListener(this.helperObject3D.scaleMeshes);
   }
   setScale(t) {
-    var s, n, c;
-    let e = 1, a = 1, o = 1;
-    typeof t == "number" ? (e = t, a = t, o = t) : typeof t == "object" && (e = (s = t.x) != null ? s : 1, a = (n = t.y) != null ? n : 1, o = (c = t.z) != null ? c : 1);
-    const i = new g.Vector3(e, a, o);
+    var r, n, h;
+    let e = 1, o = 1, s = 1;
+    typeof t == "number" ? (e = t, o = t, s = t) : typeof t == "object" && (e = (r = t.x) != null ? r : 1, o = (n = t.y) != null ? n : 1, s = (h = t.z) != null ? h : 1);
+    const i = new m.Vector3(e, o, s);
     this.hooks.emit("wantToScale", i) || (this.originObject3D.scale.copy(i), this.internalHooks.emit("setObjectScale", i), this.hooks.emit("scale", i), this.render());
   }
 }
 export {
-  H as ScaleController
+  S as ScaleController
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.48.6",
+    "%c %c@realsee/dnalogel %cv3.49.0",
     [
       "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/three/PointSelector/index.d.ts

@@ -6,12 +6,13 @@ import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
 export type { PointIntersection };
 export type ActionIfNoModelUnderMouse = LiteralString<'virtualPoint' | 'lastPoint' | 'disable'>;
+type PointerSelectorMode = 'fixed' | 'cursor';
 interface Config {
     /**
      * @description: 选点的两种模式, 'fixed' 为固定选点为屏幕中心点，拖动five画布来更新点，'cursor' 为跟随鼠标移动来更新点, 'auto' 则根据设备类型自动选择
      * @default: 'auto'
      */
-    mode: 'fixed' | 'cursor' | 'auto';
+    mode: PointerSelectorMode | 'auto';
     /**
      * @description 当鼠标位置没有模型时的行为
      * ```markdown

package/libs/shared-utils/three/generatePolygonGeometry.d.ts

@@ -1,7 +1,7 @@
 import type { Vector3 } from 'three';
 import * as THREE from 'three';
 /**
- * @description: 根据多边形的顶点数组生成多边形的 BufferGeometry
+ * @description 根据多边形的顶点数组生成多边形的 BufferGeometry
  * @param checkLinesIntersect 检查多边形边线是否相交,需要保证传入的顶点是有序的
  */
 export default function generatePolygonGeometry(_points: Vector3[], config?: {

package/libs/shared-utils/three/generatePolygonGeometry.js

@@ -1,23 +1,21 @@
 import * as i from "three";
-import { earcut3D as c } from "./earcut3D.js";
+import { earcut3D as f } from "./earcut3D.js";
 import { isIntersecting as m } from "../../PanoMeasurePlugin/utils/isIntersecting.js";
 function h(a, s) {
   const t = [...new Set(a)];
   if (t.length < 3)
     return;
   if (t.at(-1).equals(t[0]) || t.push(t[0]), s != null && s.checkLinesIntersect && t.length >= 5) {
-    const e = t.map((r, n) => {
-      if (n !== 0)
-        return { start: t[n - 1], end: t[n] };
+    const e = t.map((r, o) => {
+      if (o !== 0)
+        return { start: t[o - 1], end: t[o] };
     }).filter(Boolean);
-    for (let r = 0; r < e.length; r++) {
-      const n = m(e[r], e.slice(r));
-      if (n && console.log("多边形边线相交", r, t), n)
+    for (let r = 0; r < e.length; r++)
+      if (m(e[r], e.slice(r)))
         return;
-    }
   }
-  const l = t.flatMap((e) => [e.x, e.y, e.z]), u = new i.Float32BufferAttribute(l, 3), f = c(t), o = new i.BufferGeometry();
-  return o.setAttribute("position", u), o.setIndex(f), o.name = "PolygonGeometry", o;
+  const u = t.flatMap((e) => [e.x, e.y, e.z]), l = new i.Float32BufferAttribute(u, 3), c = f(t), n = new i.BufferGeometry();
+  return n.setAttribute("position", l), n.setIndex(c), n.name = "PolygonGeometry", n;
 }
 export {
   h as generatePolygonGeometry

package/package.json

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