@realsee/dnalogel 3.61.1-alpha.0 → 3.61.2

package/libs/Sculpt/Objects/Base/index.js

@@ -1,21 +1,21 @@
 var m = Object.defineProperty;
 var p = Object.getOwnPropertySymbols;
 var g = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
-var c = (r, i, e) => i in r ? m(r, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[i] = e, a = (r, i) => {
+var h = (n, i, e) => i in n ? m(n, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[i] = e, a = (n, i) => {
   for (var e in i || (i = {}))
-    g.call(i, e) && c(r, e, i[e]);
+    g.call(i, e) && h(n, e, i[e]);
   if (p)
     for (var e of p(i))
-      y.call(i, e) && c(r, e, i[e]);
-  return r;
+      y.call(i, e) && h(n, e, i[e]);
+  return n;
 };
-var s = (r, i, e) => (c(r, typeof i != "symbol" ? i + "" : i, e), e);
-import { hotkeys as h } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { Sculpt as n } from "../../index.js";
+var s = (n, i, e) => (h(n, typeof i != "symbol" ? i + "" : i, e), e);
+import { hotkeys as c } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
+import { Sculpt as r } from "../../index.js";
 import { IObject3D as v } from "../../../shared-utils/three/IObject3D.js";
 import { localToWorld as M, worldToLocal as w } from "../../../shared-utils/three/applyObjectMatrixWorld.js";
 import { removeAllTag as E } from "../../utils/removeAllTag.js";
-const u = /* @__PURE__ */ new Map();
+const d = /* @__PURE__ */ new Map();
 class f extends v {
   constructor(e, t) {
     super();
@@ -30,9 +30,8 @@ class f extends v {
      * @description 配置
      */
     s(this, "config");
-    s(this, "_currentPointSelector");
-    s(this, "on", (e, t, o) => n.modules.fiveDomEvents.addEventListener(this, e, t, o));
-    s(this, "off", (...e) => n.modules.fiveDomEvents.removeEventListener(this, ...e));
+    s(this, "on", (e, t, o) => r.modules.fiveDomEvents.addEventListener(this, e, t, o));
+    s(this, "off", (...e) => r.modules.fiveDomEvents.removeEventListener(this, ...e));
     s(this, "applyObjectMatrixWorld", (e, t) => {
       const o = t != null ? t : this;
       return o.updateMatrixWorld(), M(o, e);
@@ -43,22 +42,22 @@ class f extends v {
     });
     e != null && e.id && (this.uuid = e.id), this.config = a({ defaultAction: !0, occlusionVisibility: !0, occlusionMode: "translucence" }, t), e != null && e.style && (e.style.occlusionVisibility = this.config.occlusionVisibility, e.style.occlusionMode = this.config.occlusionMode), this.addEventListener("removed", () => {
       E(this);
-    }), h("esc", () => {
+    }), c("esc", () => {
       this.stopCreating();
-    }), this.config.defaultAction && (h("backspace, delete", () => {
+    }), this.config.defaultAction && (c("backspace, delete", () => {
       this.selected && this.delete();
     }), this.on("click", () => {
       var o;
       this.editing || (this.select({ only: !0 }), this.editor.enable(), (o = this.parent) == null || o.children.forEach((l) => {
-        var d;
-        l instanceof f && l !== this && ((d = l._editor) == null || d.disable());
+        var u;
+        l instanceof f && l !== this && ((u = l._editor) == null || u.disable());
       }));
-    }), h("esc", () => {
+    }), c("esc", () => {
       this.selected && this.unselect();
     }));
   }
   get editing() {
-    return this.currentPointSelector.enabled;
+    return this.pointSelector.enabled;
   }
   get baseData() {
     return {
@@ -66,11 +65,8 @@ class f extends v {
       type: this.type
     };
   }
-  get currentPointSelector() {
-    return this._currentPointSelector;
-  }
-  set currentPointSelector(e) {
-    this._currentPointSelector = e;
+  get pointSelector() {
+    return r.modules.pointSelector;
   }
   /**
    * @description 撤销
@@ -100,7 +96,7 @@ class f extends v {
    * @description 停止创建当前物体，等同于`esc`
    */
   stopCreating() {
-    n.modules.pointSelector.disable();
+    r.modules.pointSelector.disable();
   }
   /**
    * @description 从场景中删除当前物体，并且移除事件监听
@@ -117,8 +113,8 @@ class f extends v {
   select(e = { only: !1 }) {
     if (this.selected)
       return;
-    this.selected = !0, this.highlight(), u.has(this.parent.uuid) || u.set(this.parent.uuid, []);
-    const t = u.get(this.parent.uuid);
+    this.selected = !0, this.highlight(), d.has(this.parent.uuid) || d.set(this.parent.uuid, []);
+    const t = d.get(this.parent.uuid);
     t.push(this), e.only && (t == null || t.forEach((o) => {
       o !== this && o.unselect();
     }));
@@ -144,8 +140,8 @@ class f extends v {
    * @description 显示删除按钮
    */
   showDeleteButton(e, t) {
-    n.modules.cursor.showDeleteButton({ clientX: e, clientY: t, container: document.body, onClick: () => this.delete() }), n.modules.five.once("cameraUpdate", () => {
-      n.modules.cursor.removeDeleteButton();
+    r.modules.cursor.showDeleteButton({ clientX: e, clientY: t, container: document.body, onClick: () => this.delete() }), r.modules.five.once("cameraUpdate", () => {
+      r.modules.cursor.removeDeleteButton();
     });
   }
 }

package/libs/Sculpt/Objects/Box/index.d.ts

@@ -3,7 +3,7 @@ import type { PointSelector } from '../../../shared-utils/three/PointSelector';
 import { BoxMeshEditor } from '../../Editors/BoxMeshEditor';
 import { BoxMesh, type BoxData, type BoxStyle } from '../../Meshes/Box';
 import type { LiteralString } from '../../../typings/utils.type';
-import type { CreateLimitConfig, CreateUtils, DrawMethodConfig } from '../../typings/style';
+import type { CreateLimitConfig, DrawMethodConfig } from '../../typings/style';
 export interface BoxImportData extends BaseImportData, BoxData {
     type: LiteralString<'Box'>;
     style?: Partial<BoxStyle>;
@@ -29,6 +29,6 @@ export declare class Box extends BaseObject<BoxImportData> {
     setData(data: Partial<BoxImportData>): void;
     highlight(): void;
     unhighlight(): void;
-    create(params?: Partial<BoxStyle & CreateLimitConfig & DrawMethodConfig & CreateUtils>): Promise<void>;
+    create(params?: Partial<BoxStyle & CreateLimitConfig & DrawMethodConfig>): Promise<void>;
 }
 export declare function createBox(boxMesh: BoxMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig & DrawMethodConfig>): Promise<void>;

package/libs/Sculpt/Objects/Box/index.js

@@ -2,30 +2,30 @@ var H = Object.defineProperty, R = Object.defineProperties;
 var _ = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
 var C = Object.prototype.hasOwnProperty, j = Object.prototype.propertyIsEnumerable;
-var p = (e, o, t) => o in e ? H(e, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[o] = t, d = (e, o) => {
+var b = (e, o, t) => o in e ? H(e, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[o] = t, m = (e, o) => {
   for (var t in o || (o = {}))
-    C.call(o, t) && p(e, t, o[t]);
+    C.call(o, t) && b(e, t, o[t]);
   if (w)
     for (var t of w(o))
-      j.call(o, t) && p(e, t, o[t]);
+      j.call(o, t) && b(e, t, o[t]);
   return e;
 }, v = (e, o) => R(e, _(o));
-var m = (e, o, t) => (p(e, typeof o != "symbol" ? o + "" : o, t), t);
-var b = (e, o, t) => new Promise((n, c) => {
+var d = (e, o, t) => (b(e, typeof o != "symbol" ? o + "" : o, t), t);
+var p = (e, o, t) => new Promise((l, a) => {
   var i = (s) => {
     try {
-      r(t.next(s));
-    } catch (h) {
-      c(h);
+      n(t.next(s));
+    } catch (r) {
+      a(r);
     }
-  }, l = (s) => {
+  }, h = (s) => {
     try {
-      r(t.throw(s));
-    } catch (h) {
-      c(h);
+      n(t.throw(s));
+    } catch (r) {
+      a(r);
     }
-  }, r = (s) => s.done ? n(s.value) : Promise.resolve(s.value).then(i, l);
-  r((t = t.apply(e, o)).next());
+  }, n = (s) => s.done ? l(s.value) : Promise.resolve(s.value).then(i, h);
+  n((t = t.apply(e, o)).next());
 });
 import { BaseObject as L } from "../Base/index.js";
 import * as T from "three";
@@ -34,25 +34,24 @@ import { BoxMesh as E } from "../../Meshes/Box.js";
 import { createRectangle as D } from "../Rectangle/index.js";
 import { LineMesh as N } from "../../Meshes/Line.js";
 import { getNormal as U } from "../../../shared-utils/three/getNormal.js";
-import { rayOnLine as S } from "../../utils/three/rayOnLine.js";
+import { rayOnLine as V } from "../../utils/three/rayOnLine.js";
 import { vector3ToArray as O } from "../../../shared-utils/three/vector3ToArray.js";
-import { RectangleWithEdgeMesh as V } from "../../Meshes/RectangleWithEdge.js";
-import { centerPoint as k } from "../../../shared-utils/three/centerPoint.js";
+import { RectangleWithEdgeMesh as k } from "../../Meshes/RectangleWithEdge.js";
+import { centerPoint as q } from "../../../shared-utils/three/centerPoint.js";
 import { anyPositionToVector3 as W } from "../../../shared-utils/positionToVector3.js";
-import { Sculpt as q } from "../../index.js";
-class it extends L {
-  constructor(t, n) {
-    super(t, n);
-    m(this, "type", "Box");
-    m(this, "boxMesh");
-    m(this, "_editor");
-    t && (this.boxMesh = new E(d(d({}, t.style), t)), this.add(this.boxMesh));
+class ot extends L {
+  constructor(t, l) {
+    super(t, l);
+    d(this, "type", "Box");
+    d(this, "boxMesh");
+    d(this, "_editor");
+    t && (this.boxMesh = new E(m(m({}, t.style), t)), this.add(this.boxMesh));
   }
   get editor() {
     return this._editor || (this._editor = new A(this.boxMesh)), this._editor;
   }
   get data() {
-    return v(d({}, this.baseData), {
+    return v(m({}, this.baseData), {
       points: O(this.applyObjectMatrixWorld(this.boxMesh.bottomPositions, this.boxMesh)),
       heightPoint: O(this.applyObjectMatrixWorld(this.boxMesh.topPosition, this.boxMesh)),
       style: {
@@ -78,47 +77,46 @@ class it extends L {
     (t = this.boxMesh) == null || t.unhighlight();
   }
   create(t) {
-    return b(this, null, function* () {
-      var n;
-      this.removeChildren(), this.currentPointSelector = (n = t == null ? void 0 : t.pointSelector) != null ? n : q.modules.pointSelector, this.boxMesh = new E(t), this.add(this.boxMesh), yield z(this.boxMesh, this.currentPointSelector, t), this.config.defaultAction && this.editor.enable();
+    return p(this, null, function* () {
+      this.removeChildren(), this.boxMesh = new E(t), this.add(this.boxMesh), yield z(this.boxMesh, this.pointSelector, t), this.config.defaultAction && this.editor.enable();
     });
   }
 }
 function z(e, o, t) {
-  return b(this, null, function* () {
-    return new Promise((n, c) => b(this, null, function* () {
+  return p(this, null, function* () {
+    return new Promise((l, a) => p(this, null, function* () {
       const i = e.parent;
       if (!i) {
-        c(new Error("No container"));
+        a(new Error("No container"));
         return;
       }
-      const l = new V(e.style);
-      i.add(l), yield D(l, o, t), i.remove(l), e.setPoints({ points: l.points });
-      const r = new N(), s = U(e.bottomPositions), h = k(...e.bottomPositions), f = h.clone().add(s.clone().multiplyScalar(100)), x = h.clone().sub(s.clone().multiplyScalar(100));
-      r.setPoints([f, x]), i.add(r), o.enable();
-      const g = (a) => {
-        M(), n();
-      }, y = (a) => {
-        if (!(a != null && a.raycaster))
+      const h = new k(e.style);
+      i.add(h), yield D(h, o, t), i.remove(h), e.setPoints({ points: h.points });
+      const n = new N(), s = U(e.bottomPositions), r = q(...e.bottomPositions), f = r.clone().add(s.clone().multiplyScalar(100)), x = r.clone().sub(s.clone().multiplyScalar(100));
+      n.setPoints([f, x]), i.add(n), o.enable();
+      const g = (c) => {
+        M(), l();
+      }, y = (c) => {
+        if (!(c != null && c.raycaster))
           return;
-        const u = S({
-          raycaster: a.raycaster,
+        const u = V({
+          raycaster: c.raycaster,
           line: new T.Line3(f, x)
         });
         if (u) {
-          const B = u.clone().sub(h);
+          const B = u.clone().sub(r);
           e.setPoints({ heightPoint: e.bottomPositions[0].clone().add(B) });
         }
       }, M = () => {
-        o.off("select", g), o.off("intersectionUpdate", y), o.off("disable", P), o.disable(), i == null || i.remove(r);
+        o.off("select", g), o.off("intersectionUpdate", y), o.off("disable", P), o.disable(), i == null || i.remove(n);
       }, P = () => {
-        M(), i == null || i.remove(e), c(new Error("Cancelled"));
+        M(), i == null || i.remove(e), a(new Error("Cancelled"));
       };
       o.on("select", g), o.on("intersectionUpdate", y), o.on("disable", P);
     }));
   });
 }
 export {
-  it as Box,
+  ot as Box,
   z as createBox
 };

package/libs/Sculpt/Objects/Circle/index.d.ts

@@ -4,7 +4,6 @@ import { CircleMeshEditor } from '../../Editors/CircleMeshEditor';
 import type { CircleData, CircleMesh } from '../../Meshes/Circle';
 import { CircleWithEdgeMesh, type CircleWithEdgeMeshStyle } from '../../Meshes/CircleWithEdge';
 import type { LiteralString } from '../../../typings/utils.type';
-import type { CreateUtils } from '../../typings/style';
 export interface CircleImportData extends BaseImportData, CircleData {
     type: LiteralString<'Circle'>;
     style?: Partial<CircleWithEdgeMeshStyle>;
@@ -28,6 +27,6 @@ export declare class Circle extends BaseObject<CircleImportData> {
     setData(data: Partial<CircleImportData>): void;
     highlight(): void;
     unhighlight(): void;
-    create(params?: Partial<CircleWithEdgeMeshStyle & CreateUtils>): Promise<void>;
+    create(params?: Partial<CircleWithEdgeMeshStyle>): Promise<void>;
 }
 export declare function createCircle(circleMesh: CircleMesh, pointSelector: PointSelector): Promise<void>;

package/libs/Sculpt/Objects/Circle/index.js

@@ -1,55 +1,54 @@
 var x = Object.defineProperty, _ = Object.defineProperties;
 var T = Object.getOwnPropertyDescriptors;
-var p = Object.getOwnPropertySymbols;
+var u = Object.getOwnPropertySymbols;
 var A = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
-var m = (t, i, e) => i in t ? x(t, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[i] = e, d = (t, i) => {
+var m = (r, i, e) => i in r ? x(r, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[i] = e, d = (r, i) => {
   for (var e in i || (i = {}))
-    A.call(i, e) && m(t, e, i[e]);
-  if (p)
-    for (var e of p(i))
-      H.call(i, e) && m(t, e, i[e]);
-  return t;
-}, g = (t, i) => _(t, T(i));
-var f = (t, i, e) => (m(t, typeof i != "symbol" ? i + "" : i, e), e);
-var y = (t, i, e) => new Promise((n, r) => {
-  var c = (o) => {
+    A.call(i, e) && m(r, e, i[e]);
+  if (u)
+    for (var e of u(i))
+      H.call(i, e) && m(r, e, i[e]);
+  return r;
+}, g = (r, i) => _(r, T(i));
+var f = (r, i, e) => (m(r, typeof i != "symbol" ? i + "" : i, e), e);
+var y = (r, i, e) => new Promise((o, t) => {
+  var a = (n) => {
     try {
-      l(e.next(o));
+      c(e.next(n));
     } catch (h) {
-      r(h);
+      t(h);
     }
-  }, s = (o) => {
+  }, s = (n) => {
     try {
-      l(e.throw(o));
+      c(e.throw(n));
     } catch (h) {
-      r(h);
+      t(h);
     }
-  }, l = (o) => o.done ? n(o.value) : Promise.resolve(o.value).then(c, s);
-  l((e = e.apply(t, i)).next());
+  }, c = (n) => n.done ? o(n.value) : Promise.resolve(n.value).then(a, s);
+  c((e = e.apply(r, i)).next());
 });
 import { BaseObject as O } from "../Base/index.js";
 import * as w from "three";
 import { PolylineMesh as W } from "../../Meshes/Polyline.js";
 import { CircleMeshEditor as j } from "../../Editors/CircleMeshEditor.js";
-import { CircleWithEdgeMesh as P } from "../../Meshes/CircleWithEdge.js";
-import { vector3ToArray as v } from "../../../shared-utils/three/vector3ToArray.js";
+import { CircleWithEdgeMesh as v } from "../../Meshes/CircleWithEdge.js";
+import { vector3ToArray as P } from "../../../shared-utils/three/vector3ToArray.js";
 import { anyPositionToVector3 as b } from "../../../shared-utils/positionToVector3.js";
-import { Sculpt as D } from "../../index.js";
-class k extends O {
-  constructor(e, n) {
-    super(e, n);
+class L extends O {
+  constructor(e, o) {
+    super(e, o);
     f(this, "type", "Circle");
     f(this, "circleMesh");
     f(this, "_editor");
-    e && (this.circleMesh = new P(d(d({}, e.style), e)), this.add(this.circleMesh));
+    e && (this.circleMesh = new v(d(d({}, e.style), e)), this.add(this.circleMesh));
   }
   get editor() {
     return this._editor || (this._editor = new j(this.circleMesh)), this._editor;
   }
   get data() {
     return g(d({}, this.baseData), {
-      center: v(this.applyObjectMatrixWorld(this.circleMesh.center, this.circleMesh)),
-      normal: v(this.circleMesh.normal.clone().applyQuaternion(this.circleMesh.quaternion)),
+      center: P(this.applyObjectMatrixWorld(this.circleMesh.center, this.circleMesh)),
+      normal: P(this.circleMesh.normal.clone().applyQuaternion(this.circleMesh.quaternion)),
       radius: this.circleMesh.radius,
       style: {
         color: this.circleMesh.color.getHex()
@@ -73,53 +72,52 @@ class k extends O {
   }
   create(e) {
     return y(this, null, function* () {
-      var r;
-      this.children.forEach((c) => {
-        c.parent === this && this.remove(c);
-      }), this.children.length = 0, this.currentPointSelector = (r = e == null ? void 0 : e.pointSelector) != null ? r : D.modules.pointSelector;
-      const n = new P(e);
-      this.circleMesh = n, this.add(this.circleMesh), yield N(this.circleMesh, this.currentPointSelector), this.config.defaultAction && this.editor.enable();
+      this.children.forEach((t) => {
+        t.parent === this && this.remove(t);
+      }), this.children.length = 0;
+      const o = new v(e);
+      this.circleMesh = o, this.add(this.circleMesh), yield D(this.circleMesh, this.pointSelector), this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function N(t, i) {
-  return new Promise((e, n) => {
-    const r = t.parent;
-    if (!r) {
-      n(new Error("No container"));
+function D(r, i) {
+  return new Promise((e, o) => {
+    const t = r.parent;
+    if (!t) {
+      o(new Error("No container"));
       return;
     }
-    const c = new W({ dashed: !0 });
-    r.add(c), i.enable();
-    let s, l;
-    const o = (a) => {
-      if (a) {
+    const a = new W({ dashed: !0 });
+    t.add(a), i.enable();
+    let s, c;
+    const n = (l) => {
+      if (l) {
         if (!s) {
           s = {
-            point: a.point,
-            normal: a.face.normal
+            point: l.point,
+            normal: l.face.normal
           };
           return;
         }
-        s && l && (u(), e());
+        s && c && (p(), e());
       }
-    }, h = (a) => {
-      if (!a || !s)
+    }, h = (l) => {
+      if (!l || !s)
         return;
       const E = new w.Plane().setFromNormalAndCoplanarPoint(s.normal, s.point);
-      if (l = a.raycaster.ray.intersectPlane(E, new w.Vector3()), l) {
-        const C = s.point.distanceTo(l);
-        t.setPoints({ center: s.point, normal: s.normal, radius: C });
+      if (c = l.raycaster.ray.intersectPlane(E, new w.Vector3()), c) {
+        const C = s.point.distanceTo(c);
+        r.setPoints({ center: s.point, normal: s.normal, radius: C });
       }
-    }, u = () => {
-      i.off("select", o), i.off("intersectionUpdate", h), i.off("disable", M), i.disable(), r == null || r.remove(c);
+    }, p = () => {
+      i.off("select", n), i.off("intersectionUpdate", h), i.off("disable", M), i.disable(), t == null || t.remove(a);
     }, M = () => {
-      u(), r == null || r.remove(t, c), n(new Error("Cancelled"));
+      p(), t == null || t.remove(r, a), o(new Error("Cancelled"));
     };
-    i.on("select", o), i.on("intersectionUpdate", h), i.on("disable", M);
+    i.on("select", n), i.on("intersectionUpdate", h), i.on("disable", M);
   });
 }
 export {
-  k as Circle,
-  N as createCircle
+  L as Circle,
+  D as createCircle
 };

package/libs/Sculpt/Objects/Cylinder/index.d.ts

@@ -4,7 +4,6 @@ import { CylinderMesh, type CylinderData } from '../../Meshes/Cylinder';
 import { BaseObject, type BaseImportData, type BaseObjectConfig } from '../Base';
 import type { LiteralString } from '../../../typings/utils.type';
 import { CylinderMeshEditor } from '../../Editors/CylinderMeshEditor';
-import type { CreateUtils } from '../../typings/style';
 type CylinderStyle = CircleStyle;
 export interface CylinderImportData extends BaseImportData, CylinderData {
     type: LiteralString<'Cylinder'>;
@@ -29,7 +28,7 @@ export declare class Cylinder extends BaseObject<CylinderImportData> {
     setData(data: Partial<CylinderImportData>): void;
     highlight(): void;
     unhighlight(): void;
-    create(params?: Partial<CylinderStyle & CreateUtils>): Promise<void>;
+    create(params?: Partial<CylinderStyle>): Promise<void>;
 }
 export declare function createCylinder(cylinderMesh: CylinderMesh, pointSelector: PointSelector): Promise<void>;
 export {};

package/libs/Sculpt/Objects/Cylinder/index.js

@@ -12,32 +12,31 @@ var p = (i, t, e) => t in i ? E(i, t, { enumerable: !0, configurable: !0, writab
 }, w = (i, t) => L(i, T(t));
 var m = (i, t, e) => (p(i, typeof t != "symbol" ? t + "" : t, e), e);
 var f = (i, t, e) => new Promise((o, s) => {
-  var h = (r) => {
+  var c = (r) => {
     try {
       n(e.next(r));
     } catch (l) {
       s(l);
     }
-  }, a = (r) => {
+  }, h = (r) => {
     try {
       n(e.throw(r));
     } catch (l) {
       s(l);
     }
-  }, n = (r) => r.done ? o(r.value) : Promise.resolve(r.value).then(h, a);
+  }, n = (r) => r.done ? o(r.value) : Promise.resolve(r.value).then(c, h);
   n((e = e.apply(i, t)).next());
 });
-import { Sculpt as R } from "../../index.js";
 import { CylinderMesh as v } from "../../Meshes/Cylinder.js";
-import { LineMesh as D } from "../../Meshes/Line.js";
-import { rayOnLine as U } from "../../utils/three/rayOnLine.js";
-import { BaseObject as V } from "../Base/index.js";
-import { createCircle as z } from "../Circle/index.js";
+import { LineMesh as R } from "../../Meshes/Line.js";
+import { rayOnLine as D } from "../../utils/three/rayOnLine.js";
+import { BaseObject as U } from "../Base/index.js";
+import { createCircle as V } from "../Circle/index.js";
 import * as b from "three";
 import { vector3ToArray as x } from "../../../shared-utils/three/vector3ToArray.js";
-import { CylinderMeshEditor as B } from "../../Editors/CylinderMeshEditor.js";
+import { CylinderMeshEditor as z } from "../../Editors/CylinderMeshEditor.js";
 import { anyPositionToVector3 as O } from "../../../shared-utils/positionToVector3.js";
-class Z extends V {
+class Y extends U {
   constructor(e, o) {
     super(e, o);
     m(this, "type", "Cylinder");
@@ -46,7 +45,7 @@ class Z extends V {
     e && (this.cylinderMesh = new v(d(d({}, e.style), e)), this.add(this.cylinderMesh));
   }
   get editor() {
-    return this._editor || (this._editor = new B(this.cylinderMesh)), this._editor;
+    return this._editor || (this._editor = new z(this.cylinderMesh)), this._editor;
   }
   get data() {
     return w(d({}, this.baseData), {
@@ -74,39 +73,38 @@ class Z extends V {
   }
   create(e) {
     return f(this, null, function* () {
-      var o;
-      this.currentPointSelector = (o = e == null ? void 0 : e.pointSelector) != null ? o : R.modules.pointSelector, this.cylinderMesh = new v(e), this.add(this.cylinderMesh), yield F(this.cylinderMesh, this.currentPointSelector), this.config.defaultAction && this.editor.enable();
+      this.cylinderMesh = new v(e), this.add(this.cylinderMesh), yield B(this.cylinderMesh, this.pointSelector), this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function F(i, t) {
+function B(i, t) {
   return f(this, null, function* () {
     const e = i.parent;
-    yield z(i.bottomCircle, t);
-    const o = new D();
+    yield V(i.bottomCircle, t);
+    const o = new R();
     o.name = "LineHelper", e.add(o);
-    const s = t.position.point, h = i.normal.clone().normalize(), a = s.clone().add(h.clone().multiplyScalar(100)), n = s.clone().sub(h.clone().multiplyScalar(100));
-    return o.setPoints([a, n]), t.enable(), new Promise((r, l) => {
-      const C = (c) => {
-        M(), r();
-      }, u = (c) => {
-        if (!(c != null && c.raycaster))
+    const s = t.position.point, c = i.normal.clone().normalize(), h = s.clone().add(c.clone().multiplyScalar(100)), n = s.clone().sub(c.clone().multiplyScalar(100));
+    return o.setPoints([h, n]), t.enable(), new Promise((r, l) => {
+      const C = (a) => {
+        u(), r();
+      }, M = (a) => {
+        if (!(a != null && a.raycaster))
           return;
-        const y = U({
-          raycaster: c.raycaster,
-          line: new b.Line3(a, n)
+        const y = D({
+          raycaster: a.raycaster,
+          line: new b.Line3(h, n)
         }), j = new b.Plane().setFromNormalAndCoplanarPoint(i.normal, i.bottomCenter).projectPoint(y, new b.Vector3()), H = y.clone().sub(j), _ = i.bottomCenter.clone().add(H);
         y && i.setTopCenter(_);
-      }, M = () => {
-        t.off("select", C), t.off("intersectionUpdate", u), t.off("disable", P), e.remove(o), t.disable();
+      }, u = () => {
+        t.off("select", C), t.off("intersectionUpdate", M), t.off("disable", P), e.remove(o), t.disable();
       }, P = () => {
-        M(), e.remove(i), l(new Error("Cancelled"));
+        u(), e.remove(i), l(new Error("Cancelled"));
       };
-      t.on("select", C), t.on("intersectionUpdate", u), t.on("disable", P);
+      t.on("select", C), t.on("intersectionUpdate", M), t.on("disable", P);
     });
   });
 }
 export {
-  Z as Cylinder,
-  F as createCylinder
+  Y as Cylinder,
+  B as createCylinder
 };

package/libs/Sculpt/Objects/Line/index.d.ts

@@ -3,7 +3,7 @@ import { BaseObject, type BaseImportData, type BaseObjectConfig } from '../Base'
 import { LineEditor } from './Editor';
 import type { PointSelector } from '../../../shared-utils/three/PointSelector';
 import type { LiteralString } from '../../../typings/utils.type';
-import type { CreateLimitConfig, CreateUtils } from '../../typings/style';
+import type { CreateLimitConfig } from '../../typings/style';
 import { LineWithDotsMesh } from '../../Meshes/LineWithDots';
 export interface LineImportData extends BaseImportData, LineData {
     type: LiteralString<'Line'>;
@@ -33,7 +33,7 @@ export declare class Line extends BaseObject<LineImportData> {
     canRedo(): void;
     undo(): void;
     redo(): void;
-    create(params?: Partial<LineMeshStyle & CreateLimitConfig & CreateUtils>): Promise<void>;
+    create(params?: Partial<LineMeshStyle & CreateLimitConfig>): Promise<void>;
 }
 /**
  * @description 绘制线段