@realsee/dnalogel 3.48.0 → 3.48.2

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

@@ -1,53 +1,52 @@
-var j = Object.defineProperty, W = Object.defineProperties;
-var V = Object.getOwnPropertyDescriptors;
-var L = Object.getOwnPropertySymbols;
-var A = Object.prototype.hasOwnProperty, D = Object.prototype.propertyIsEnumerable;
-var w = (n, t, e) => t in n ? j(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e, f = (n, t) => {
+var F = Object.defineProperty, T = Object.defineProperties;
+var k = Object.getOwnPropertyDescriptors;
+var E = Object.getOwnPropertySymbols;
+var z = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
+var v = (n, t, e) => t in n ? F(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e, p = (n, t) => {
   for (var e in t || (t = {}))
-    A.call(t, e) && w(n, e, t[e]);
-  if (L)
-    for (var e of L(t))
-      D.call(t, e) && w(n, e, t[e]);
+    z.call(t, e) && v(n, e, t[e]);
+  if (E)
+    for (var e of E(t))
+      B.call(t, e) && v(n, e, t[e]);
   return n;
-}, u = (n, t) => W(n, V(t));
-var g = (n, t, e) => (w(n, typeof t != "symbol" ? t + "" : t, e), e);
-var C = (n, t, e) => new Promise((i, p) => {
-  var a = (h) => {
+}, M = (n, t) => T(n, k(t));
+var y = (n, t, e) => (v(n, typeof t != "symbol" ? t + "" : t, e), e);
+var R = (n, t, e) => new Promise((s, P) => {
+  var w = (o) => {
     try {
-      y(e.next(h));
-    } catch (m) {
-      p(m);
+      c(e.next(o));
+    } catch (a) {
+      P(a);
     }
-  }, d = (h) => {
+  }, b = (o) => {
     try {
-      y(e.throw(h));
-    } catch (m) {
-      p(m);
+      c(e.throw(o));
+    } catch (a) {
+      P(a);
     }
-  }, y = (h) => h.done ? i(h.value) : Promise.resolve(h.value).then(a, d);
-  y((e = e.apply(n, t)).next());
+  }, c = (o) => o.done ? s(o.value) : Promise.resolve(o.value).then(w, b);
+  c((e = e.apply(n, t)).next());
 });
-import { hotkeys as F } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { PolylineWithDotsMesh as b, PolylineMesh as x } from "../../Meshes/Polyline.js";
-import { BaseObject as O } from "../Base/index.js";
-import * as c from "three";
-import { PolylineEditor as T } from "./Editor.js";
-import { vector3ToArray as U } from "../../../shared-utils/three/vector3ToArray.js";
-const E = new c.Vector3();
-class G extends O {
-  constructor(e, i) {
-    super(e, i);
-    g(this, "type", "Polyline");
-    g(this, "polyLineMesh");
-    e && (this.polyLineMesh = new b(f(f({}, e.style), e)), this.add(this.polyLineMesh)), this.editor = new T(this), F("esc", () => {
-      this.stopCreating();
-    });
+import { PolylineWithDotsMesh as U, PolylineMesh as W } from "../../Meshes/Polyline.js";
+import { BaseObject as H } from "../Base/index.js";
+import * as d from "three";
+import { PolylineEditor as I } from "./Editor.js";
+import { vector3ToArray as N } from "../../../shared-utils/three/vector3ToArray.js";
+import { withResolvers as _ } from "../../../shared-utils/promise/withResolvers.js";
+const V = new d.Vector3();
+class Z extends H {
+  constructor(e, s) {
+    super(e, s);
+    y(this, "type", "Polyline");
+    y(this, "polyLineMesh");
+    y(this, "creatingObject");
+    e && (this.polyLineMesh = new U(p(p({}, e.style), e)), this.add(this.polyLineMesh)), this.editor = new I(this);
   }
   get data() {
-    return u(f({}, this.baseData), {
-      points: U(this.applyObjectMatrixWorld(this.polyLineMesh.points)),
+    return M(p({}, this.baseData), {
+      points: N(this.applyObjectMatrixWorld(this.polyLineMesh.points)),
       style: {
-        lineColor: new c.Color(this.polyLineMesh.lineColor).getHex(),
+        lineColor: new d.Color(this.polyLineMesh.lineColor).getHex(),
         lineWidth: this.polyLineMesh.lineWidth,
         dashed: this.polyLineMesh.dashed
       }
@@ -61,41 +60,71 @@ class G extends O {
     var e;
     (e = this.polyLineMesh) == null || e.unhighlight();
   }
+  canUndo() {
+    var e;
+    (e = this.creatingObject) == null || e.canUndo();
+  }
+  canRedo() {
+    var e;
+    (e = this.creatingObject) == null || e.canRedo();
+  }
+  undo() {
+    var e;
+    (e = this.creatingObject) == null || e.undo();
+  }
+  redo() {
+    var e;
+    (e = this.creatingObject) == null || e.redo();
+  }
   create(e) {
-    return C(this, null, function* () {
+    return R(this, null, function* () {
       this.removeChildren();
-      const i = new b(e);
-      this.polyLineMesh = i, this.add(this.polyLineMesh), yield k(i, this.pointSelector, e), this.editor.enable();
+      const s = new U(e);
+      this.polyLineMesh = s, this.add(this.polyLineMesh), this.creatingObject = q(s, this.pointSelector, e), yield this.creatingObject.finished, this.editor.enable();
     });
   }
 }
-function k(n, t, e) {
-  var y;
-  const i = n.parent;
-  if (!i)
+function q(n, t, e) {
+  var x;
+  const s = n.parent;
+  if (!s)
     return;
-  const p = (y = e == null ? void 0 : e.limit) != null ? y : "none", a = new x(n.style);
-  i.add(a);
-  const d = new x(u(f({}, n.style), { dashed: !0, lengthEnable: !1 }));
-  return i.add(d), t.enable(), new Promise((h, m) => {
-    const o = [];
-    let l, s;
-    const M = (r) => {
-      const P = o.length === 0 ? r.point : l.clone();
-      o.push(P), n.setPoints(o);
-    }, v = (r) => {
-      if (!(o != null && o.length) || !r)
-        return;
-      const P = o.at(-1).clone();
-      p === "none" ? (l = r.point, a.setPoints([P, l])) : p === "xoz" ? (s = s != null ? s : new c.Plane().setFromNormalAndCoplanarPoint(new c.Vector3(0, 1, 0), o[0]), t.plane = s, l = s.projectPoint(r.point, E), a.setPoints([P, l]), d.setPoints([l, r.point])) : p === "y" && (o.length === 1 ? (l = r.point, a.setPoints([P, l])) : (s = s != null ? s : new c.Plane().setFromCoplanarPoints(o[0], o[1], new c.Vector3(0, 1, 0).add(o[0])), t.plane = s, l = s.projectPoint(r.point, E), a.setPoints([P, l]), d.setPoints([l, r.point])));
+  const { promise: P, resolve: w, reject: b } = _(), c = (x = e == null ? void 0 : e.limit) != null ? x : "none", o = new W(n.style);
+  s.add(o);
+  const a = new W(M(p({}, n.style), { dashed: !0, lengthEnable: !1 }));
+  s.add(a), t.enable();
+  const i = [];
+  let r, l, j;
+  const f = [], O = () => i.length > 0, L = () => f.length > 0, A = () => {
+    O() && (f.push(i.pop()), n.setPoints(i), g(j), t.pointSelectorHelper.magnifier.render());
+  }, D = () => {
+    L() && (i.push(f.pop()), n.setPoints(i), g(j), t.pointSelectorHelper.magnifier.render());
+  }, C = (h) => {
+    f.length = 0;
+    const m = i.length === 0 ? h.point : r.clone();
+    i.push(m), n.setPoints(i);
+  }, g = (h) => {
+    const m = () => {
+      o.setPoints([]), a.setPoints([]), r = null;
     };
-    t.on("select", M), t.on("intersectionUpdate", v), t.on("disable", () => {
-      if (t.off("select", M), t.off("intersectionUpdate", v), t.plane = null, i.remove(a), i.remove(d), o.length < 2)
-        return i.remove(n), m(new Error("Cancelled"));
-      h();
-    });
-  });
+    if (!(i != null && i.length) || !h)
+      return m();
+    j = h;
+    const u = i.at(-1).clone();
+    c === "none" ? (r = h.point, o.setPoints([u, r])) : c === "xoz" ? (l = l != null ? l : new d.Plane().setFromNormalAndCoplanarPoint(new d.Vector3(0, 1, 0), i[0]), t.plane = l, r = l.projectPoint(h.point, V), o.setPoints([u, r]), a.setPoints([r, h.point])) : c === "y" && (i.length === 1 ? (r = h.point, o.setPoints([u, r])) : (l = l != null ? l : new d.Plane().setFromCoplanarPoints(i[0], i[1], new d.Vector3(0, 1, 0).add(i[0])), t.plane = l, r = l.projectPoint(h.point, V), o.setPoints([u, r]), a.setPoints([r, h.point])));
+  };
+  return t.on("select", C), t.on("intersectionUpdate", g), t.on("disable", () => {
+    if (t.off("select", C), t.off("intersectionUpdate", g), t.plane = null, s.remove(o), s.remove(a), i.length < 2)
+      return s.remove(n), b(new Error("Cancelled"));
+    w();
+  }), {
+    finished: P,
+    canUndo: O,
+    canRedo: L,
+    undo: A,
+    redo: D
+  };
 }
 export {
-  G as Polyline
+  Z as Polyline
 };

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

@@ -1,17 +1,17 @@
 var E = Object.defineProperty, L = Object.defineProperties;
 var O = Object.getOwnPropertyDescriptors;
 var u = Object.getOwnPropertySymbols;
-var v = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
+var v = Object.prototype.hasOwnProperty, W = Object.prototype.propertyIsEnumerable;
 var p = (i, e, t) => e in i ? E(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, c = (i, e) => {
   for (var t in e || (e = {}))
     v.call(e, t) && p(i, t, e[t]);
   if (u)
     for (var t of u(e))
-      C.call(e, t) && p(i, t, e[t]);
+      W.call(e, t) && p(i, t, e[t]);
   return i;
 }, w = (i, e) => L(i, O(e));
 var d = (i, e, t) => (p(i, typeof e != "symbol" ? e + "" : e, t), t);
-var g = (i, e, t) => new Promise((o, n) => {
+var f = (i, e, t) => new Promise((o, n) => {
   var l = (s) => {
     try {
       r(t.next(s));
@@ -27,24 +27,21 @@ var g = (i, e, t) => new Promise((o, n) => {
   }, r = (s) => s.done ? o(s.value) : Promise.resolve(s.value).then(l, m);
   r((t = t.apply(i, e)).next());
 });
-import { BaseObject as W } from "../Base/index.js";
-import * as j from "three";
+import { BaseObject as j } from "../Base/index.js";
+import * as C from "three";
 import { createPolygon as T } from "../Polygon/index.js";
 import { PrismMesh as x } from "../../Meshes/Prism.js";
 import { LineMesh as U } from "../../Meshes/Line.js";
-import { PrismEditor as k } from "./Editor.js";
-import { hotkeys as z } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
+import { PrismEditor as z } from "./Editor.js";
 import { rayOnLine as A } from "../../utils/three/rayOnLine.js";
 import { getNormal as B } from "../../../shared-utils/three/getNormal.js";
 import { vector3ToArray as H } from "../../../shared-utils/three/vector3ToArray.js";
-class X extends W {
+class Q extends j {
   constructor(t, o) {
     super(t, o);
     d(this, "type", "Prism");
     d(this, "prismMesh");
-    this.editor = new k(this), t && (this.prismMesh = new x(c(c({}, t.style), t)), this.add(this.prismMesh)), z("esc", () => {
-      this.stopCreating();
-    });
+    this.editor = new z(this), t && (this.prismMesh = new x(c(c({}, t.style), t)), this.add(this.prismMesh));
   }
   get data() {
     return w(c({}, this.baseData), {
@@ -66,38 +63,38 @@ class X extends W {
     (t = this.prismMesh) == null || t.unhighlight();
   }
   create(t) {
-    return g(this, null, function* () {
+    return f(this, null, function* () {
       this.prismMesh = new x(t), this.add(this.prismMesh), yield D(this.prismMesh, this.pointSelector), this.editor.enable();
     });
   }
 }
 function D(i, e) {
-  return g(this, null, function* () {
+  return f(this, null, function* () {
     const t = i.parent;
-    yield T(i.bottomPolygon, e);
+    yield T(i.bottomPolygon, e).finished;
     const o = new U();
     o.name = "LineHelper", t.add(o);
     const n = i.bottomPolygon.points.at(-1), l = B(i.bottomPolygon.points).normalize(), m = n.clone().add(l.clone().multiplyScalar(10)), r = n.clone().sub(l.clone().multiplyScalar(10));
     return o.setPoints([m, r]), e.enable(), new Promise((s, h) => {
-      const f = (a) => {
-        P(), s();
-      }, y = (a) => {
+      const g = (a) => {
+        y(), s();
+      }, P = (a) => {
         if (!(a != null && a.raycaster))
           return;
         const M = A({
           raycaster: a.raycaster,
-          line: new j.Line3(m, r)
+          line: new C.Line3(m, r)
         });
         M && i.setPoints({ heightPoint: M });
-      }, P = () => {
-        e.off("select", f), e.off("intersectionUpdate", y), e.off("disable", b), t.remove(o), e.disable();
+      }, y = () => {
+        e.off("select", g), e.off("intersectionUpdate", P), e.off("disable", b), t.remove(o), e.disable();
       }, b = () => {
-        P(), t.remove(i), h(new Error("Cancelled"));
+        y(), t.remove(i), h(new Error("Cancelled"));
       };
-      e.on("select", f), e.on("intersectionUpdate", y), e.on("disable", b);
+      e.on("select", g), e.on("intersectionUpdate", P), e.on("disable", b);
     });
   });
 }
 export {
-  X as Prism
+  Q as Prism
 };

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

@@ -1,47 +1,44 @@
-var U = Object.defineProperty, k = Object.defineProperties;
-var B = Object.getOwnPropertyDescriptors;
+var U = Object.defineProperty, B = Object.defineProperties;
+var I = Object.getOwnPropertyDescriptors;
 var A = Object.getOwnPropertySymbols;
-var I = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable;
+var _ = Object.prototype.hasOwnProperty, j = Object.prototype.propertyIsEnumerable;
 var E = (s, t, e) => t in s ? U(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, d = (s, t) => {
   for (var e in t || (t = {}))
-    I.call(t, e) && E(s, e, t[e]);
+    _.call(t, e) && E(s, e, t[e]);
   if (A)
     for (var e of A(t))
-      _.call(t, e) && E(s, e, t[e]);
+      j.call(t, e) && E(s, e, t[e]);
   return s;
-}, u = (s, t) => k(s, B(t));
+}, u = (s, t) => B(s, I(t));
 var L = (s, t, e) => (E(s, typeof t != "symbol" ? t + "" : t, e), e);
 var D = (s, t, e) => new Promise((c, p) => {
   var a = (l) => {
     try {
-      g(e.next(l));
+      m(e.next(l));
     } catch (h) {
       p(h);
     }
-  }, m = (l) => {
+  }, g = (l) => {
     try {
-      g(e.throw(l));
+      m(e.throw(l));
     } catch (h) {
       p(h);
     }
-  }, g = (l) => l.done ? c(l.value) : Promise.resolve(l.value).then(a, m);
-  g((e = e.apply(s, t)).next());
+  }, m = (l) => l.done ? c(l.value) : Promise.resolve(l.value).then(a, g);
+  m((e = e.apply(s, t)).next());
 });
-import { hotkeys as j } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { BaseObject as q } from "../Base/index.js";
+import { BaseObject as k } from "../Base/index.js";
 import * as o from "three";
 import { PolylineWithDotsMesh as M } from "../../Meshes/Polyline.js";
-import { RectangleEditor as G } from "./Editor.js";
+import { RectangleEditor as q } from "./Editor.js";
 import { RectangleWithEdgeMesh as H } from "../../Meshes/RectangleWithEdge.js";
 const P = new o.Vector3();
-class S extends q {
+class Z extends k {
   constructor(e, c) {
     super(e, c);
     L(this, "type", "Rectangle");
     L(this, "rectangleMesh");
-    this.config.canEdit && (this.editor = new G(this)), e && (this.rectangleMesh = new H(d(d({}, e.style), e)), this.add(this.rectangleMesh)), j("esc", () => {
-      this.stopCreating();
-    });
+    this.config.canEdit && (this.editor = new q(this)), e && (this.rectangleMesh = new H(d(d({}, e.style), e)), this.add(this.rectangleMesh));
   }
   get data() {
     return u(d({}, this.baseData), {
@@ -65,23 +62,23 @@ class S extends q {
     return D(this, null, function* () {
       this.removeChildren();
       const c = new H(e);
-      this.rectangleMesh = c, this.add(this.rectangleMesh), yield J(this.rectangleMesh, this.pointSelector, e);
+      this.rectangleMesh = c, this.add(this.rectangleMesh), yield G(this.rectangleMesh, this.pointSelector, e);
     });
   }
 }
-function J(s, t, e) {
+function G(s, t, e) {
   return new Promise((c, p) => {
     var N, T;
     const a = s.parent;
     if (!a)
       return p(new Error("No container"));
-    const m = (N = e == null ? void 0 : e.limit) != null ? N : "none", g = (T = e == null ? void 0 : e.drawMethod) != null ? T : "diagonal", l = new M(u(d({}, s.style), { dashed: !0, lengthEnable: !0 })), h = new M(u(d({}, s.style), { dashed: !0, lengthEnable: !1 })), y = new M(u(d({}, s.style), { dashed: !1, lengthEnable: !1 }));
+    const g = (N = e == null ? void 0 : e.limit) != null ? N : "none", m = (T = e == null ? void 0 : e.drawMethod) != null ? T : "diagonal", l = new M(u(d({}, s.style), { dashed: !0, lengthEnable: !0 })), h = new M(u(d({}, s.style), { dashed: !0, lengthEnable: !1 })), y = new M(u(d({}, s.style), { dashed: !1, lengthEnable: !1 }));
     a.add(l, y, h), t.enable();
     const n = [];
     let i = new o.Vector3(), v = new o.Vector3();
-    const f = new o.Plane(), C = () => {
-      n.push(i.clone()), n.length === 1 ? (m === "xoz" && f.setFromNormalAndCoplanarPoint(new o.Vector3(0, 1, 0), n[0]), m === "none" && f.setFromNormalAndCoplanarPoint(v, n[0])) : n.length === 2 ? m === "y" ? (V(), c()) : y.setPoints([n[0], n[1]]) : n.length === 3 && (V(), c());
-    }, x = (r) => {
+    const w = new o.Plane(), x = () => {
+      n.push(i.clone()), n.length === 1 ? (g === "xoz" && w.setFromNormalAndCoplanarPoint(new o.Vector3(0, 1, 0), n[0]), g === "none" && w.setFromNormalAndCoplanarPoint(v, n[0])) : n.length === 2 ? g === "y" ? (V(), c()) : y.setPoints([n[0], n[1]]) : n.length === 3 && (V(), c());
+    }, C = (r) => {
       var W;
       if (!(r != null && r.raycaster))
         return;
@@ -90,36 +87,36 @@ function J(s, t, e) {
         i = r.point.clone(), v = r.face.normal;
         return;
       }
-      if (n.length === 1 && m === "y") {
-        const w = new o.Line3(new o.Vector3(0, 1, 0).add(n[0]), new o.Vector3(0, -1, 0).add(n[0])).closestPointToPoint(r.point, !1, new o.Vector3());
-        s.setPoints([n[0], w, r.point]);
+      if (n.length === 1 && g === "y") {
+        const f = new o.Line3(new o.Vector3(0, 1, 0).add(n[0]), new o.Vector3(0, -1, 0).add(n[0])).closestPointToPoint(r.point, !1, new o.Vector3());
+        s.setPoints([n[0], f, r.point]);
         return;
       }
       if (n.length === 1) {
-        f ? (i = r.raycaster.ray.intersectPlane(f, P), h.setPoints([i, r.point])) : i = r.point.clone(), l.setPoints([O, i]);
+        w ? (i = r.raycaster.ray.intersectPlane(w, P), h.setPoints([i, r.point])) : i = r.point.clone(), l.setPoints([O, i]);
         return;
       }
       if (n.length === 2) {
         a.remove(l);
-        const z = r.raycaster.ray.intersectPlane(f, P);
-        if (g === "diagonal") {
-          const w = n[0].distanceTo(n[1]) / 2, b = new o.Vector3().lerpVectors(n[0], n[1], 0.5), F = new o.Vector3().subVectors(z, b).normalize();
-          i = new o.Vector3().addVectors(b, F.multiplyScalar(w)), s.setPoints([n[0], i, n[1]]);
-        } else if (g === "vertex") {
-          const w = P.crossVectors(n[0].clone().sub(n[1]), f.normal).normalize();
-          i = new o.Line3(n[1].clone().add(w), n[1].clone().sub(w)).closestPointToPoint(r.point, !1, P), s.setPoints([n[0], n[1], i]);
+        const z = r.raycaster.ray.intersectPlane(w, P);
+        if (m === "diagonal") {
+          const f = n[0].distanceTo(n[1]) / 2, b = new o.Vector3().lerpVectors(n[0], n[1], 0.5), F = new o.Vector3().subVectors(z, b).normalize();
+          i = new o.Vector3().addVectors(b, F.multiplyScalar(f)), s.setPoints([n[0], i, n[1]]);
+        } else if (m === "vertex") {
+          const f = P.crossVectors(n[0].clone().sub(n[1]), w.normal).normalize();
+          i = new o.Line3(n[1].clone().add(f), n[1].clone().sub(f)).closestPointToPoint(r.point, !1, P), s.setPoints([n[0], n[1], i]);
         }
         return;
       }
     }, V = () => {
-      t.off("select", C), t.off("intersectionUpdate", x), t.off("disable", R), t.disable(), a == null || a.remove(l, y, h);
+      t.off("select", x), t.off("intersectionUpdate", C), t.off("disable", R), t.disable(), a == null || a.remove(l, y, h);
     }, R = () => {
       V(), a == null || a.remove(s), p(new Error("Cancelled"));
     };
-    t.on("select", C), t.on("intersectionUpdate", x), t.on("disable", R);
+    t.on("select", x), t.on("intersectionUpdate", C), t.on("disable", R);
   });
 }
 export {
-  S as Rectangle,
-  J as createRectangle
+  Z as Rectangle,
+  G as createRectangle
 };

package/libs/Sculpt/index.d.ts

@@ -67,7 +67,11 @@ export declare class Sculpt extends Subscribe<Event> {
             id: string;
             type: string;
         } | {
-            readonly points: [number, number, number][];
+            readonly points: [number, number, number][]; /**
+             * @description: 点击事件
+             * @param {BuiltInItem} item 点击的物体
+             * 返回 false 来禁用 Five 默认行为
+             */
             readonly heightPoint: [number, number, number];
             readonly style: {
                 readonly color: number;
@@ -109,6 +113,7 @@ export declare class Sculpt extends Subscribe<Event> {
     get items(): BuiltInItem[];
     private five;
     private theme;
+    private creatingItem;
     constructor(five: Five, theme?: Theme);
     /**
      * @description: 加载数据 展示
@@ -158,14 +163,16 @@ export declare class Sculpt extends Subscribe<Event> {
      * @description: 开始绘制 Box
      */
     createBox(params?: Parameters<Box['create']>[0]): Promise<Box>;
+    canUndo(): false | void;
+    canRedo(): false | void;
     /**
      * @description: 撤销
      */
-    undo(): void;
+    undo: () => void;
     /**
      * @description: 重做
      */
-    redo(): void;
+    redo: () => void;
     /**
      * @description: 清空数据
      */