@realsee/dnalogel 3.61.0 → 3.61.1-alpha.0

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

@@ -12,31 +12,32 @@ 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 c = (r) => {
+  var h = (r) => {
     try {
       n(e.next(r));
     } catch (l) {
       s(l);
     }
-  }, h = (r) => {
+  }, a = (r) => {
     try {
       n(e.throw(r));
     } catch (l) {
       s(l);
     }
-  }, n = (r) => r.done ? o(r.value) : Promise.resolve(r.value).then(c, h);
+  }, n = (r) => r.done ? o(r.value) : Promise.resolve(r.value).then(h, a);
   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 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 { 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 * as b from "three";
 import { vector3ToArray as x } from "../../../shared-utils/three/vector3ToArray.js";
-import { CylinderMeshEditor as z } from "../../Editors/CylinderMeshEditor.js";
+import { CylinderMeshEditor as B } from "../../Editors/CylinderMeshEditor.js";
 import { anyPositionToVector3 as O } from "../../../shared-utils/positionToVector3.js";
-class Y extends U {
+class Z extends V {
   constructor(e, o) {
     super(e, o);
     m(this, "type", "Cylinder");
@@ -45,7 +46,7 @@ class Y extends U {
     e && (this.cylinderMesh = new v(d(d({}, e.style), e)), this.add(this.cylinderMesh));
   }
   get editor() {
-    return this._editor || (this._editor = new z(this.cylinderMesh)), this._editor;
+    return this._editor || (this._editor = new B(this.cylinderMesh)), this._editor;
   }
   get data() {
     return w(d({}, this.baseData), {
@@ -73,38 +74,39 @@ class Y extends U {
   }
   create(e) {
     return f(this, null, function* () {
-      this.cylinderMesh = new v(e), this.add(this.cylinderMesh), yield B(this.cylinderMesh, this.pointSelector), this.config.defaultAction && this.editor.enable();
+      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();
     });
   }
 }
-function B(i, t) {
+function F(i, t) {
   return f(this, null, function* () {
     const e = i.parent;
-    yield V(i.bottomCircle, t);
-    const o = new R();
+    yield z(i.bottomCircle, t);
+    const o = new D();
     o.name = "LineHelper", e.add(o);
-    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))
+    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))
           return;
-        const y = D({
-          raycaster: a.raycaster,
-          line: new b.Line3(h, n)
+        const y = U({
+          raycaster: c.raycaster,
+          line: new b.Line3(a, 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(_);
-      }, u = () => {
-        t.off("select", C), t.off("intersectionUpdate", M), t.off("disable", P), e.remove(o), t.disable();
+      }, M = () => {
+        t.off("select", C), t.off("intersectionUpdate", u), t.off("disable", P), e.remove(o), t.disable();
       }, P = () => {
-        u(), e.remove(i), l(new Error("Cancelled"));
+        M(), e.remove(i), l(new Error("Cancelled"));
       };
-      t.on("select", C), t.on("intersectionUpdate", M), t.on("disable", P);
+      t.on("select", C), t.on("intersectionUpdate", u), t.on("disable", P);
     });
   });
 }
 export {
-  Y as Cylinder,
-  B as createCylinder
+  Z as Cylinder,
+  F 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 } from '../../typings/style';
+import type { CreateLimitConfig, CreateUtils } 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>): Promise<void>;
+    create(params?: Partial<LineMeshStyle & CreateLimitConfig & CreateUtils>): Promise<void>;
 }
 /**
  * @description 绘制线段

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

@@ -2,7 +2,7 @@ var A = Object.defineProperty, D = Object.defineProperties;
 var k = Object.getOwnPropertyDescriptors;
 var R = Object.getOwnPropertySymbols;
 var z = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var j = (n, t, e) => t in n ? A(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e, f = (n, t) => {
+var j = (n, t, e) => t in n ? A(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e, p = (n, t) => {
   for (var e in t || (t = {}))
     z.call(t, e) && j(n, e, t[e]);
   if (R)
@@ -10,48 +10,49 @@ var j = (n, t, e) => t in n ? A(n, t, { enumerable: !0, configurable: !0, writab
       B.call(t, e) && j(n, e, t[e]);
   return n;
 }, v = (n, t) => D(n, k(t));
-var p = (n, t, e) => (j(n, typeof t != "symbol" ? t + "" : t, e), e);
-var U = (n, t, e) => new Promise((s, m) => {
-  var P = (o) => {
+var u = (n, t, e) => (j(n, typeof t != "symbol" ? t + "" : t, e), e);
+var U = (n, t, e) => new Promise((s, d) => {
+  var w = (o) => {
     try {
-      c(e.next(o));
+      a(e.next(o));
     } catch (l) {
-      m(l);
+      d(l);
     }
   }, b = (o) => {
     try {
-      c(e.throw(o));
+      a(e.throw(o));
     } catch (l) {
-      m(l);
+      d(l);
     }
-  }, c = (o) => o.done ? s(o.value) : Promise.resolve(o.value).then(P, b);
-  c((e = e.apply(n, t)).next());
+  }, a = (o) => o.done ? s(o.value) : Promise.resolve(o.value).then(w, b);
+  a((e = e.apply(n, t)).next());
 });
 import { LineMesh as H } from "../../Meshes/Line.js";
 import { BaseObject as F } from "../Base/index.js";
-import * as a from "three";
+import * as c from "three";
 import { LineEditor as I } from "./Editor.js";
 import { vector3ToArray as N } from "../../../shared-utils/three/vector3ToArray.js";
 import { LineWithDotsMesh as T } from "../../Meshes/LineWithDots.js";
 import { rayOnLine as q } from "../../utils/three/rayOnLine.js";
 import { withResolvers as G } from "../../../shared-utils/promise/withResolvers.js";
-class ne extends F {
+import { Sculpt as J } from "../../index.js";
+class se extends F {
   constructor(e, s) {
     super(e, s);
-    p(this, "type", "Line");
-    p(this, "lineMesh");
-    p(this, "_editor");
-    p(this, "creatingObject");
-    e && (this.lineMesh = new T(f(f({}, e.style), e)), this.add(this.lineMesh));
+    u(this, "type", "Line");
+    u(this, "lineMesh");
+    u(this, "_editor");
+    u(this, "creatingObject");
+    e && (this.lineMesh = new T(p(p({}, e.style), e)), this.add(this.lineMesh));
   }
   get editor() {
     return this._editor || (this._editor = new I(this)), this._editor;
   }
   get data() {
-    return v(f({}, this.baseData), {
+    return v(p({}, this.baseData), {
       points: N(this.applyObjectMatrixWorld(this.lineMesh.points)),
       style: {
-        lineColor: new a.Color(this.lineMesh.color).getHex(),
+        lineColor: new c.Color(this.lineMesh.color).getHex(),
         lineWidth: this.lineMesh.lineWidth,
         dashed: this.lineMesh.dashed
       }
@@ -86,53 +87,54 @@ class ne extends F {
   }
   create(e) {
     return U(this, null, function* () {
-      this.removeChildren();
+      var d;
+      this.removeChildren(), this.currentPointSelector = (d = e == null ? void 0 : e.pointSelector) != null ? d : J.modules.pointSelector;
       const s = new T(e);
-      this.lineMesh = s, this.add(this.lineMesh), this.creatingObject = J(s, this.pointSelector, e), yield this.creatingObject.finished, this.config.defaultAction && this.editor.enable();
+      this.lineMesh = s, this.add(this.lineMesh), this.creatingObject = K(s, this.currentPointSelector, e), yield this.creatingObject.finished, this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function J(n, t, e) {
+function K(n, t, e) {
   var C;
   const s = n.parent;
   if (!s)
     return;
-  const { promise: m, resolve: P, reject: b } = G(), c = (C = e == null ? void 0 : e.limit) != null ? C : "none", o = new H(n.style);
+  const { promise: d, resolve: w, reject: b } = G(), a = (C = e == null ? void 0 : e.limit) != null ? C : "none", o = new H(n.style);
   s.add(o);
-  const l = new H(v(f({}, n.style), { dashed: !0, lengthEnable: !1 }));
+  const l = new H(v(p({}, n.style), { dashed: !0, lengthEnable: !1 }));
   s.add(l), t.enable();
   const i = [];
-  let h, d, y;
+  let h, f, y;
   const g = [], M = () => i.length > 0, O = () => g.length > 0, W = () => {
-    M() && (g.push(i.pop()), n.setPoints(i), u(y), t.pointSelectorHelper.magnifier.render());
+    M() && (g.push(i.pop()), n.setPoints(i), m(y), t.pointSelectorHelper.magnifier.render());
   }, _ = () => {
-    O() && (i.push(g.pop()), n.setPoints(i), u(y), t.pointSelectorHelper.magnifier.render());
+    O() && (i.push(g.pop()), n.setPoints(i), m(y), t.pointSelectorHelper.magnifier.render());
   }, E = (r) => {
     if (!r)
       return;
     g.length = 0;
-    const w = i.length === 0 ? r.point : h.clone();
-    i.push(w), n.setPoints(i), i.length === 2 && (V(), P());
-  }, u = (r) => {
-    const w = () => {
+    const P = i.length === 0 ? r.point : h.clone();
+    i.push(P), n.setPoints(i), i.length === 2 && (V(), w());
+  }, m = (r) => {
+    const P = () => {
       o.setPoints([]), l.setPoints([]), t.pointSelectorHelper.magnifier.render();
     };
     if (!(i != null && i.length) || !r)
-      return w();
+      return P();
     y = r;
     const L = i.at(-1).clone();
-    c === "none" ? (h = r.point, o.setPoints([L, h])) : c === "xoz" ? (t.plane = d, d = d != null ? d : new a.Plane().setFromNormalAndCoplanarPoint(new a.Vector3(0, 1, 0), i[0]), h = d.projectPoint(r.point, new a.Vector3()), o.setPoints([L, h]), l.setPoints([h, r.point])) : c === "y" && (r.isVirtual ? (h = q({
+    a === "none" ? (h = r.point, o.setPoints([L, h])) : a === "xoz" ? (t.plane = f, f = f != null ? f : new c.Plane().setFromNormalAndCoplanarPoint(new c.Vector3(0, 1, 0), i[0]), h = f.projectPoint(r.point, new c.Vector3()), o.setPoints([L, h]), l.setPoints([h, r.point])) : a === "y" && (r.isVirtual ? (h = q({
       raycaster: r.raycaster,
-      line: new a.Line3(i[0].clone(), new a.Vector3(0, 1, 0).add(i[0])),
+      line: new c.Line3(i[0].clone(), new c.Vector3(0, 1, 0).add(i[0])),
       clampToLine: !1
-    }), l.setPoints([])) : (h = new a.Line3(i[0].clone(), new a.Vector3(0, 1, 0).add(i[0])).closestPointToPoint(r.point, !1, new a.Vector3()), l.setPoints([h, r.point])), o.setPoints([L, h]));
+    }), l.setPoints([])) : (h = new c.Line3(i[0].clone(), new c.Vector3(0, 1, 0).add(i[0])).closestPointToPoint(r.point, !1, new c.Vector3()), l.setPoints([h, r.point])), o.setPoints([L, h]));
   }, V = () => {
-    t.off("select", E), t.off("intersectionUpdate", u), t.off("disable", x), t.plane = null, t.disable(), s == null || s.remove(o, l);
+    t.off("select", E), t.off("intersectionUpdate", m), t.off("disable", x), t.plane = null, t.disable(), s == null || s.remove(o, l);
   }, x = () => {
     V(), i.length !== 2 && (s == null || s.remove(n)), b(new Error("Cancelled"));
   };
-  return t.on("select", E), t.on("intersectionUpdate", u), t.on("disable", x), {
-    finished: m,
+  return t.on("select", E), t.on("intersectionUpdate", m), t.on("disable", x), {
+    finished: d,
     canUndo: M,
     canRedo: O,
     undo: W,
@@ -140,6 +142,6 @@ function J(n, t, e) {
   };
 }
 export {
-  ne as Line,
-  J as createLine
+  se as Line,
+  K as createLine
 };

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

@@ -3,6 +3,7 @@ import { BaseObject, type BaseImportData, type BaseObjectConfig } from '../Base'
 import { PointEditor } from './Editor';
 import type { PointSelector } from '../../../shared-utils/three/PointSelector';
 import type { LiteralString } from '../../../typings/utils.type';
+import type { CreateUtils } from '../../typings/style';
 export interface PointImportData extends BaseImportData, PointData {
     type: LiteralString<'Point'>;
     style?: Partial<PointStyle>;
@@ -34,6 +35,6 @@ export declare class Point extends BaseObject<PointImportData> {
     /**
      * @description: 创建点
      */
-    create(params?: Partial<PointStyle>): Promise<void>;
+    create(params?: Partial<PointStyle & CreateUtils>): Promise<void>;
 }
 export declare function createPoint(pointMesh: PointMesh, pointSelector: PointSelector): Promise<void>;

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

@@ -1,50 +1,51 @@
-var b = Object.defineProperty, g = Object.defineProperties;
+var g = Object.defineProperty, m = Object.defineProperties;
 var M = Object.getOwnPropertyDescriptors;
-var d = Object.getOwnPropertySymbols;
+var u = Object.getOwnPropertySymbols;
 var P = Object.prototype.hasOwnProperty, v = Object.prototype.propertyIsEnumerable;
-var c = (e, i, t) => i in e ? b(e, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[i] = t, f = (e, i) => {
+var d = (e, i, t) => i in e ? g(e, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[i] = t, l = (e, i) => {
   for (var t in i || (i = {}))
-    P.call(i, t) && c(e, t, i[t]);
-  if (d)
-    for (var t of d(i))
-      v.call(i, t) && c(e, t, i[t]);
+    P.call(i, t) && d(e, t, i[t]);
+  if (u)
+    for (var t of u(i))
+      v.call(i, t) && d(e, t, i[t]);
   return e;
-}, m = (e, i) => g(e, M(i));
-var p = (e, i, t) => (c(e, typeof i != "symbol" ? i + "" : i, t), t);
-var y = (e, i, t) => new Promise((h, n) => {
-  var r = (s) => {
+}, a = (e, i) => m(e, M(i));
+var c = (e, i, t) => (d(e, typeof i != "symbol" ? i + "" : i, t), t);
+var y = (e, i, t) => new Promise((s, h) => {
+  var r = (o) => {
     try {
-      o(t.next(s));
-    } catch (a) {
-      n(a);
+      n(t.next(o));
+    } catch (p) {
+      h(p);
     }
-  }, l = (s) => {
+  }, f = (o) => {
     try {
-      o(t.throw(s));
-    } catch (a) {
-      n(a);
+      n(t.throw(o));
+    } catch (p) {
+      h(p);
     }
-  }, o = (s) => s.done ? h(s.value) : Promise.resolve(s.value).then(r, l);
-  o((t = t.apply(e, i)).next());
+  }, n = (o) => o.done ? s(o.value) : Promise.resolve(o.value).then(r, f);
+  n((t = t.apply(e, i)).next());
 });
-import { PointMesh as u } from "../../Meshes/Point.js";
+import { PointMesh as b } from "../../Meshes/Point.js";
 import { BaseObject as w } from "../Base/index.js";
 import { PointEditor as x } from "./Editor.js";
 import { vector3ToArray as _ } from "../../../shared-utils/three/vector3ToArray.js";
 import { anyPositionToVector3 as E } from "../../../shared-utils/positionToVector3.js";
-class B extends w {
-  constructor(t, h) {
-    super(t, h);
-    p(this, "type", "Point");
-    p(this, "pointMesh");
-    p(this, "_editor");
-    t && (this.pointMesh = new u(f(f({}, t.style), t)), this.add(this.pointMesh));
+import { Sculpt as U } from "../../index.js";
+class F extends w {
+  constructor(t, s) {
+    super(t, s);
+    c(this, "type", "Point");
+    c(this, "pointMesh");
+    c(this, "_editor");
+    t && (this.pointMesh = new b(l(l({}, t.style), t)), this.add(this.pointMesh));
   }
   get editor() {
     return this._editor || (this._editor = new x(this)), this._editor;
   }
   get data() {
-    return m(f({}, this.baseData), {
+    return a(l({}, this.baseData), {
       point: _(this.applyObjectMatrixWorld(this.pointMesh.position)),
       style: {
         color: this.pointMesh.color.getHex(),
@@ -76,26 +77,27 @@ class B extends w {
    */
   create(t) {
     return y(this, null, function* () {
-      this.pointMesh && this.remove(this.pointMesh), this.add(this.pointMesh = new u(t)), yield U(this.pointMesh, this.pointSelector), this.config.defaultAction && this.editor.enable();
+      var s;
+      this.pointMesh && this.remove(this.pointMesh), this.currentPointSelector = (s = t == null ? void 0 : t.pointSelector) != null ? s : U.modules.pointSelector, this.add(this.pointMesh = new b(t)), yield j(this.pointMesh, this.currentPointSelector), this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function U(e, i) {
-  return new Promise((t, h) => {
+function j(e, i) {
+  return new Promise((t, s) => {
     i.enable(), e.visible = !1;
-    const n = (s) => {
-      s && (e.visible = !0, e.position.copy(s.point));
-    }, r = (s) => {
-      s && (e.visible = !0, e.position.copy(s.point), l());
-    }, l = () => {
-      i.off("select", r), i.off("disable", o), i.off("intersectionUpdate", n), i.disable(), t();
-    }, o = () => {
-      i.off("select", r), i.off("disable", o), i.off("intersectionUpdate", n), e.removeFromParent(), h(new Error("Cancelled"));
+    const h = (o) => {
+      o && (e.visible = !0, e.position.copy(o.point));
+    }, r = (o) => {
+      o && (e.visible = !0, e.position.copy(o.point), f());
+    }, f = () => {
+      i.off("select", r), i.off("disable", n), i.off("intersectionUpdate", h), i.disable(), t();
+    }, n = () => {
+      i.off("select", r), i.off("disable", n), i.off("intersectionUpdate", h), e.removeFromParent(), s(new Error("Cancelled"));
     };
-    i.on("intersectionUpdate", n), i.on("disable", o), i.once("select", r);
+    i.on("intersectionUpdate", h), i.on("disable", n), i.once("select", r);
   });
 }
 export {
-  B as Point,
-  U as createPoint
+  F as Point,
+  j as createPoint
 };

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

@@ -4,7 +4,7 @@ import { PolygonEditor } from './Editor';
 import type { PointSelector } from '../../../shared-utils/three/PointSelector';
 import type { LiteralString } from '../../../typings/utils.type';
 import type { PolygonData, PolygonStyle } from '../../Meshes/Polygon';
-import type { CreateLimitConfig } from '../../typings/style';
+import type { CreateLimitConfig, CreateUtils } from '../../typings/style';
 export interface PolygonImportData extends BaseImportData, PolygonData {
     type: LiteralString<'Polygon'>;
     style?: Partial<AreaStyle>;
@@ -33,7 +33,7 @@ export declare class Polygon extends BaseObject<PolygonImportData> {
     canRedo(): void;
     undo(): void;
     redo(): void;
-    create(params?: Partial<PolygonStyle & CreateLimitConfig>): Promise<void>;
+    create(params?: Partial<PolygonStyle & CreateLimitConfig & CreateUtils>): Promise<void>;
 }
 export declare function createPolygon(areaMesh: AreaMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig>): {
     finished: Promise<void>;