@realsee/dnalogel 3.71.8-dev.1 → 3.72.0-alpha.2

package/libs/Sculpt/index.js

@@ -1,33 +1,33 @@
-var L = Object.defineProperty, B = Object.defineProperties;
-var E = Object.getOwnPropertyDescriptors;
+var U = Object.defineProperty, D = Object.defineProperties;
+var L = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
-var S = Object.prototype.hasOwnProperty, U = Object.prototype.propertyIsEnumerable;
-var p = (o, r, e) => r in o ? L(o, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[r] = e, f = (o, r) => {
+var S = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
+var p = (o, r, e) => r in o ? U(o, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[r] = e, g = (o, r) => {
   for (var e in r || (r = {}))
     S.call(r, e) && p(o, e, r[e]);
   if (y)
     for (var e of y(r))
-      U.call(r, e) && p(o, e, r[e]);
+      B.call(r, e) && p(o, e, r[e]);
   return o;
-}, a = (o, r) => B(o, E(r));
-var u = (o, r, e) => (p(o, typeof r != "symbol" ? r + "" : r, e), e);
-var m = (o, r, e) => new Promise((t, i) => {
+}, a = (o, r) => D(o, L(r));
+var h = (o, r, e) => (p(o, typeof r != "symbol" ? r + "" : r, e), e);
+var u = (o, r, e) => new Promise((t, i) => {
   var l = (c) => {
     try {
       n(e.next(c));
-    } catch (h) {
-      i(h);
+    } catch (m) {
+      i(m);
     }
   }, s = (c) => {
     try {
       n(e.throw(c));
-    } catch (h) {
-      i(h);
+    } catch (m) {
+      i(m);
     }
   }, n = (c) => c.done ? t(c.value) : Promise.resolve(c.value).then(l, s);
   n((e = e.apply(o, r)).next());
 });
-import { globalModules as _ } from "./utils/Modules/Global.js";
+import { globalModules as E } from "./utils/Modules/Global.js";
 import { Subscribe as x } from "../shared-utils/Subscribe.js";
 import { IObject3D as z } from "../shared-utils/three/IObject3D.js";
 import "../shared-utils/tag.js";
@@ -50,42 +50,50 @@ import { Point as b } from "./Objects/Point/index.js";
 import { Polygon as w } from "./Objects/Polygon/index.js";
 import { Prism as j } from "./Objects/Prism/index.js";
 import { Rectangle as v } from "./Objects/Rectangle/index.js";
-import { Circle as C } from "./Objects/Circle/index.js";
+import { Circle as R } from "./Objects/Circle/index.js";
 import { Cylinder as P } from "./Objects/Cylinder/index.js";
-import { Box as R } from "./Objects/Box/index.js";
+import { Box as C } from "./Objects/Box/index.js";
 import { forReverseEach as H } from "../shared-utils/forReverseEach.js";
-import { Line as O } from "./Objects/Line/index.js";
-import { hotkeys as D } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
+import { Line as _ } from "./Objects/Line/index.js";
+import { hotkeys as O } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
 import { withResolvers as M } from "../shared-utils/promise/withResolvers.js";
-const g = class extends x {
+const d = class extends x {
   constructor(e, t, i) {
     super();
-    u(this, "group");
-    u(this, "theme");
-    u(this, "config");
-    u(this, "five");
-    u(this, "creatingItem", null);
+    h(this, "group");
+    h(this, "theme");
+    h(this, "config");
+    h(this, "five");
+    h(this, "creatingItem", null);
     /**
      * @description: 撤销
      */
-    u(this, "undo", () => {
-      var e;
-      (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
+    h(this, "undo", () => {
+      if (this.creatingItem) {
+        this.creatingItem.undo(), this.five.needsRender = !0;
+        return;
+      }
+      const e = this.items.find((t) => t.selected && t.type === "Polygon");
+      e && typeof e.undo == "function" && (e.undo(), console.log("[Sculpt] 撤销操作已执行", e), this.five.needsRender = !0);
     });
     /**
      * @description: 重做
      */
-    u(this, "redo", () => {
-      var e;
-      console.log("redo"), (e = this.creatingItem) == null || e.redo(), this.five.needsRender = !0;
+    h(this, "redo", () => {
+      if (this.creatingItem) {
+        this.creatingItem.redo(), this.five.needsRender = !0;
+        return;
+      }
+      const e = this.items.find((t) => t.selected && t.type === "Polygon");
+      e && typeof e.redo == "function" && (e.redo(), this.five.needsRender = !0);
     });
-    this.five = e, this.theme = t, this.config = f({
+    this.five = e, this.theme = t, this.config = g({
       magnifier: { width: 190, height: 190, scale: 2, dragEnabled: !0 }
-    }, i), this.group = new z(), this.group.name = "Sculpt", e.scene.add(this.group), g.modules.init(e, this.config), D("ctrl+z, command+z", this.undo), D("ctrl+shift+z, command+shift+z", this.redo), g.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: l, origDomEvent: s }) => {
+    }, i), this.group = new z(), this.group.name = "Sculpt", this.group.__sculpt__ = this, e.scene.add(this.group), d.modules.init(e, this.config), O("ctrl+z, command+z", this.undo), O("ctrl+shift+z, command+shift+z", this.redo), d.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: l, origDomEvent: s }) => {
       var c;
-      const n = F((c = l == null ? void 0 : l[0]) == null ? void 0 : c.object, (h) => h.isSculptObject);
+      const n = F((c = l == null ? void 0 : l[0]) == null ? void 0 : c.object, (m) => m.isSculptObject);
       return n && !n.editing ? this.emit("click", s, n) : !1;
-    }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = g.modules;
+    }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = d.modules;
   }
   get data() {
     return {
@@ -109,10 +117,10 @@ const g = class extends x {
     this.clear();
     const i = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((s) => {
       var c;
-      const n = a(f({}, s), {
-        style: f(f({}, (c = this.theme) == null ? void 0 : c[s.type.toLowerCase()]), s.style)
+      const n = a(g({}, s), {
+        style: g(g({}, (c = this.theme) == null ? void 0 : c[s.type.toLowerCase()]), s.style)
       });
-      return s.type === "Point" ? new b(n, t) : s.type === "line" ? new O(n, t) : s.type === "Polyline" ? new I(n, t) : s.type === "Polygon" ? new w(n, t) : s.type === "Prism" ? new j(n, t) : s.type === "Rectangle" ? new v(n, t) : s.type === "Circle" ? new C(n, t) : s.type === "Cylinder" ? new P(n, t) : s.type === "Box" ? new R(n, t) : null;
+      return s.type === "Point" ? new b(n, t) : s.type === "line" ? new _(n, t) : s.type === "Polyline" ? new I(n, t) : s.type === "Polygon" ? new w(n, t) : s.type === "Prism" ? new j(n, t) : s.type === "Rectangle" ? new v(n, t) : s.type === "Circle" ? new R(n, t) : s.type === "Cylinder" ? new P(n, t) : s.type === "Box" ? new C(n, t) : null;
     });
     this.group.add(...i), this.five.needsRender = !0;
   }
@@ -128,14 +136,14 @@ const g = class extends x {
   putObject(e) {
     var l;
     this.group.add(e);
-    const t = g.modules.object3DHelper, i = t.addObject3DHelper(e);
+    const t = d.modules.object3DHelper, i = t.addObject3DHelper(e);
     return (l = i == null ? void 0 : i.moveController) == null || l.moveByMouse(), t;
   }
   /**
    * @description: 开始绘制点
    */
   createPoint(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
       return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.point, e[0]), this.createItem(b, ...e);
     });
@@ -144,16 +152,16 @@ const g = class extends x {
    * @description: 开始绘制线段
    */
   createLine(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
-      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.line, e[0]), this.createItem(O, ...e);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.line, e[0]), this.createItem(_, ...e);
     });
   }
   /**
    * @deprecated use createLine instead
    */
   createline(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       this.createLine(...e);
     });
   }
@@ -161,7 +169,7 @@ const g = class extends x {
    * @description: 开始绘制空间折线
    */
   createPolyline(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
       return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.polyline, e[0]), this.createItem(I, ...e);
     });
@@ -170,7 +178,7 @@ const g = class extends x {
    * @description: 开始绘制平面多边形
    */
   createPolygon(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
       return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.polygon, e[0]), this.createItem(w, ...e);
     });
@@ -179,7 +187,7 @@ const g = class extends x {
    * @description: 开始绘制多棱柱
    */
   createPrism(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
       return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.prism, e[0]), this.createItem(j, ...e);
     });
@@ -188,7 +196,7 @@ const g = class extends x {
    * @description: 开始绘制矩形
    */
   createRectangle(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
       return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.rectangle, e[0]), this.createItem(v, ...e);
     });
@@ -197,16 +205,16 @@ const g = class extends x {
    * @description: 开始绘制圆形
    */
   createCircle(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
-      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.circle, e[0]), this.createItem(C, ...e);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.circle, e[0]), this.createItem(R, ...e);
     });
   }
   /**
    * @description: 开始绘制圆柱
    */
   createCylinder(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
       return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.cylinder, e[0]), this.createItem(P, ...e);
     });
@@ -215,18 +223,22 @@ const g = class extends x {
    * @description: 开始绘制 Box
    */
   createBox(...e) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       var t, i;
-      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.box, e[0]), this.createItem(R, ...e);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.box, e[0]), this.createItem(C, ...e);
     });
   }
   canUndo() {
-    var e;
-    return this.creatingItem ? (e = this.creatingItem) == null ? void 0 : e.canUndo() : !1;
+    if (this.creatingItem)
+      return this.creatingItem.canUndo();
+    const e = this.items.find((t) => t.selected);
+    return e && typeof e.canUndo == "function" ? e.canUndo() : !1;
   }
   canRedo() {
-    var e;
-    return this.creatingItem ? (e = this.creatingItem) == null ? void 0 : e.canRedo() : !1;
+    if (this.creatingItem)
+      return this.creatingItem.canRedo();
+    const e = this.items.find((t) => t.selected);
+    return e && typeof e.canRedo == "function" ? e.canRedo() : !1;
   }
   /**
    * @description: 清空数据
@@ -235,28 +247,28 @@ const g = class extends x {
     H(this.items, (e) => e.delete()), this.five.needsRender = !0;
   }
   createItem(e, ...t) {
-    return m(this, null, function* () {
+    return u(this, null, function* () {
       this.creatingItem && (this.creatingItem.stopCreating(), this.creatingItem = null);
       const i = new e();
       this.creatingItem = i, this.group.add(i);
       const { promise: l, resolve: s, reject: n } = M();
-      return yield i.create(...t).then((...c) => (this.creatingItem = null, s(i), c)).catch((c) => {
+      return yield i.create(...t).then((...c) => (this.creatingItem = null, i.select({ only: !0 }), s(i), c)).catch((c) => {
         n(c), this.group.remove(i);
       }), l;
     });
   }
 };
-let d = g;
-u(d, "modules", _);
+let f = d;
+h(f, "modules", E);
 const ae = (o, r, e) => {
   if (r && typeof r == "object" && ("theme" in r || "config" in r)) {
     const t = r;
-    return new d(o, t.theme, t.config);
+    return new f(o, t.theme, t.config);
   }
-  return new d(o, r, e);
-}, Ie = (o, r) => new d(o, r == null ? void 0 : r.theme, r == null ? void 0 : r.config);
+  return new f(o, r, e);
+}, Ie = (o, r) => new f(o, r == null ? void 0 : r.theme, r == null ? void 0 : r.config);
 export {
-  d as Sculpt,
+  f as Sculpt,
   ae as SculptPlugin,
   Ie as SculptPluginForFive
 };

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let A = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.71.8-dev.1");
+    r(this, "VERSION", "3.72.0-alpha.2");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.71.8-dev.1",
+    "%c %c@realsee/dnalogel %cv3.72.0-alpha.2",
     [
       "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",