@realsee/dnalogel 3.48.1 → 3.48.3

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

@@ -1,50 +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 f = (n, t, e) => t in n ? j(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e, w = (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) && f(n, e, t[e]);
-  if (L)
-    for (var e of L(t))
-      D.call(t, e) && f(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) => (f(n, typeof t != "symbol" ? t + "" : t, e), e);
-var b = (n, t, e) => new Promise((i, d) => {
-  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) {
-      d(m);
+      c(e.next(o));
+    } catch (a) {
+      P(a);
     }
-  }, p = (h) => {
+  }, b = (o) => {
     try {
-      y(e.throw(h));
-    } catch (m) {
-      d(m);
+      c(e.throw(o));
+    } catch (a) {
+      P(a);
     }
-  }, y = (h) => h.done ? i(h.value) : Promise.resolve(h.value).then(a, p);
-  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 { PolylineWithDotsMesh as C, PolylineMesh as x } from "../../Meshes/Polyline.js";
-import { BaseObject as F } from "../Base/index.js";
-import * as c from "three";
-import { PolylineEditor as O } from "./Editor.js";
-import { vector3ToArray as T } from "../../../shared-utils/three/vector3ToArray.js";
-const E = new c.Vector3();
-class k extends F {
-  constructor(e, i) {
-    super(e, i);
-    g(this, "type", "Polyline");
-    g(this, "polyLineMesh");
-    e && (this.polyLineMesh = new C(w(w({}, e.style), e)), this.add(this.polyLineMesh)), this.editor = new O(this);
+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(w({}, this.baseData), {
-      points: T(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
       }
@@ -58,41 +60,71 @@ class k extends F {
     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 b(this, null, function* () {
+    return R(this, null, function* () {
       this.removeChildren();
-      const i = new C(e);
-      this.polyLineMesh = i, this.add(this.polyLineMesh), yield U(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 U(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 d = (y = e == null ? void 0 : e.limit) != null ? y : "none", a = new x(n.style);
-  i.add(a);
-  const p = new x(u(w({}, n.style), { dashed: !0, lengthEnable: !1 }));
-  return i.add(p), 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();
-      d === "none" ? (l = r.point, a.setPoints([P, l])) : d === "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]), p.setPoints([l, r.point])) : d === "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]), p.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(p), 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 {
-  k as Polyline
+  Z as Polyline
 };

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

@@ -11,7 +11,7 @@ var p = (i, e, t) => e in i ? E(i, e, { enumerable: !0, configurable: !0, writab
   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));
@@ -63,22 +63,22 @@ class Q extends j {
     (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 P = (a) => {
+      const g = (a) => {
         y(), s();
-      }, f = (a) => {
+      }, P = (a) => {
         if (!(a != null && a.raycaster))
           return;
         const M = A({
@@ -87,11 +87,11 @@ function D(i, e) {
         });
         M && i.setPoints({ heightPoint: M });
       }, y = () => {
-        e.off("select", P), e.off("intersectionUpdate", f), e.off("disable", b), t.remove(o), e.disable();
+        e.off("select", g), e.off("intersectionUpdate", P), e.off("disable", b), t.remove(o), e.disable();
       }, b = () => {
         y(), t.remove(i), h(new Error("Cancelled"));
       };
-      e.on("select", P), e.on("intersectionUpdate", f), e.on("disable", b);
+      e.on("select", g), e.on("intersectionUpdate", P), e.on("disable", b);
     });
   });
 }

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;

package/libs/Sculpt/index.js

@@ -63,14 +63,14 @@ const a = class extends S {
      */
     h(this, "undo", () => {
       var e;
-      (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
+      console.log("undo"), (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
     });
     /**
      * @description: 重做
      */
     h(this, "redo", () => {
       var e;
-      (e = this.creatingItem) == null || e.redo(), this.five.needsRender = !0;
+      console.log("redo"), (e = this.creatingItem) == null || e.redo(), this.five.needsRender = !0;
     });
     this.five = e, this.theme = t, this.group = new z(), this.group.name = "Sculpt", e.scene.add(this.group), a.modules.init(e), p.unbind("ctrl+z", this.undo), p.unbind("ctrl+shift+z", this.redo), p("ctrl+z", this.undo), p("ctrl+shift+z", this.redo), a.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: n }) => {
       var s;

package/libs/base/BasePlugin.js

@@ -17,7 +17,7 @@ let x = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.48.1");
+    i(this, "VERSION", "3.48.3");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/index.js

@@ -458,6 +458,7 @@ import "./Sculpt/Objects/Polyline/Editor.js";
 import "./Sculpt/Objects/Line/Editor.js";
 import "./Sculpt/Objects/Base/Editor.js";
 import "./shared-utils/three/vector3ToArray.js";
+import "./shared-utils/promise/withResolvers.js";
 import "./Sculpt/Objects/Point/index.js";
 import "./Sculpt/Objects/Point/Editor.js";
 import "./Sculpt/Objects/Polygon/index.js";
@@ -488,7 +489,6 @@ import "./Sculpt/Objects/Box/Editor.js";
 import "./Sculpt/Meshes/Box.js";
 import "./shared-utils/forReverseEach.js";
 import "./Sculpt/Objects/Line/index.js";
-import "./shared-utils/promise/withResolvers.js";
 import "./ModelMakerPlugin/Controller.js";
 import "./ModelMakerPlugin/item/boxItem.js";
 import "./ModelMakerPlugin/item/polygonItem.js";

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.48.1",
+    "%c %c@realsee/dnalogel %cv3.48.3",
     [
       "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/vendor/svelte/transition/index.js

@@ -1,5 +1,5 @@
 import { cubicOut as h, cubicInOut as k } from "../easing/index.js";
-import { split_css_unit as y, identity as _ } from "../internal/index.js";
+import { identity as _, split_css_unit as y } from "../internal/index.js";
 function C(s, { delay: o = 0, duration: n = 400, easing: t = _ } = {}) {
   const c = +getComputedStyle(s).opacity;
   return {

package/package.json

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