@realsee/dnalogel 3.58.2 → 3.58.4-alpha.0

package/libs/Sculpt/index.js

@@ -2,30 +2,30 @@ var L = Object.defineProperty, B = Object.defineProperties;
 var U = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
 var _ = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
-var g = (s, i, e) => i in s ? L(s, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[i] = e, a = (s, i) => {
-  for (var e in i || (i = {}))
-    _.call(i, e) && g(s, e, i[e]);
+var g = (c, n, e) => n in c ? L(c, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[n] = e, a = (c, n) => {
+  for (var e in n || (n = {}))
+    _.call(n, e) && g(c, e, n[e]);
   if (y)
-    for (var e of y(i))
-      x.call(i, e) && g(s, e, i[e]);
-  return s;
-}, f = (s, i) => B(s, U(i));
-var h = (s, i, e) => (g(s, typeof i != "symbol" ? i + "" : i, e), e);
-var l = (s, i, e) => new Promise((t, r) => {
-  var c = (m) => {
+    for (var e of y(n))
+      x.call(n, e) && g(c, e, n[e]);
+  return c;
+}, f = (c, n) => B(c, U(n));
+var h = (c, n, e) => (g(c, typeof n != "symbol" ? n + "" : n, e), e);
+var m = (c, n, e) => new Promise((t, r) => {
+  var l = (s) => {
     try {
-      o(e.next(m));
-    } catch (p) {
-      r(p);
+      o(e.next(s));
+    } catch (d) {
+      r(d);
     }
-  }, n = (m) => {
+  }, i = (s) => {
     try {
-      o(e.throw(m));
-    } catch (p) {
-      r(p);
+      o(e.throw(s));
+    } catch (d) {
+      r(d);
     }
-  }, o = (m) => m.done ? t(m.value) : Promise.resolve(m.value).then(c, n);
-  o((e = e.apply(s, i)).next());
+  }, o = (s) => s.done ? t(s.value) : Promise.resolve(s.value).then(l, i);
+  o((e = e.apply(c, n)).next());
 });
 import { globalModules as E } from "./utils/Modules/Global.js";
 import { Subscribe as S } from "../shared-utils/Subscribe.js";
@@ -54,6 +54,7 @@ import { Box as C } from "./Objects/Box/index.js";
 import { forReverseEach as M } from "../shared-utils/forReverseEach.js";
 import { Line as R } from "./Objects/Line/index.js";
 import { hotkeys as D } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
+import { withResolvers as G } from "../shared-utils/promise/withResolvers.js";
 const u = class extends S {
   constructor(e, t) {
     super();
@@ -75,10 +76,10 @@ const u = class extends S {
       var e;
       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), u.modules.init(e), D("ctrl+z, command+z", this.undo), D("ctrl+shift+z, command+shift+z", this.redo), u.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: r, origDomEvent: c }) => {
+    this.five = e, this.theme = t, this.group = new z(), this.group.name = "Sculpt", e.scene.add(this.group), u.modules.init(e), D("ctrl+z, command+z", this.undo), D("ctrl+shift+z, command+shift+z", this.redo), u.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: r, origDomEvent: l }) => {
       var o;
-      const n = H((o = r == null ? void 0 : r[0]) == null ? void 0 : o.object, (m) => m.isSculptObject);
-      return n && !n.editing ? this.emit("click", c, n) : !1;
+      const i = H((o = r == null ? void 0 : r[0]) == null ? void 0 : o.object, (s) => s.isSculptObject);
+      return i && !i.editing ? this.emit("click", l, i) : !1;
     }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = u.modules;
   }
   get data() {
@@ -99,14 +100,14 @@ const u = class extends S {
    * @description: 加载数据 展示
    */
   load(e, t) {
-    var c;
+    var l;
     this.clear();
-    const r = (c = e == null ? void 0 : e.items) == null ? void 0 : c.map((n) => {
-      var m;
-      const o = f(a({}, n), {
-        style: a(a({}, (m = this.theme) == null ? void 0 : m[n.type.toLowerCase()]), n.style)
+    const r = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((i) => {
+      var s;
+      const o = f(a({}, i), {
+        style: a(a({}, (s = this.theme) == null ? void 0 : s[i.type.toLowerCase()]), i.style)
       });
-      return n.type === "Point" ? new b(o, t) : n.type === "line" ? new R(o, t) : n.type === "Polyline" ? new I(o, t) : n.type === "Polygon" ? new w(o, t) : n.type === "Prism" ? new j(o, t) : n.type === "Rectangle" ? new O(o, t) : n.type === "Circle" ? new P(o, t) : n.type === "Cylinder" ? new v(o, t) : n.type === "Box" ? new C(o, t) : null;
+      return i.type === "Point" ? new b(o, t) : i.type === "line" ? new R(o, t) : i.type === "Polyline" ? new I(o, t) : i.type === "Polygon" ? new w(o, t) : i.type === "Prism" ? new j(o, t) : i.type === "Rectangle" ? new O(o, t) : i.type === "Circle" ? new P(o, t) : i.type === "Cylinder" ? new v(o, t) : i.type === "Box" ? new C(o, t) : null;
     });
     this.group.add(...r), this.five.needsRender = !0;
   }
@@ -120,16 +121,16 @@ const u = class extends S {
    * @description: 放置物体
    */
   putObject(e) {
-    var c;
+    var l;
     this.group.add(e);
     const t = u.modules.object3DHelper, r = t.addObject3DHelper(e);
-    return (c = r == null ? void 0 : r.moveController) == null || c.moveByMouse(), t;
+    return (l = r == null ? void 0 : r.moveController) == null || l.moveByMouse(), t;
   }
   /**
    * @description: 开始绘制点
    */
   createPoint(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.point, e[0]), this.createItem(b, ...e);
     });
@@ -138,7 +139,7 @@ const u = class extends S {
    * @description: 开始绘制线段
    */
   createLine(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.line, e[0]), this.createItem(R, ...e);
     });
@@ -147,7 +148,7 @@ const u = class extends S {
    * @deprecated use createLine instead
    */
   createline(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       this.createLine(...e);
     });
   }
@@ -155,7 +156,7 @@ const u = class extends S {
    * @description: 开始绘制空间折线
    */
   createPolyline(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.polyline, e[0]), this.createItem(I, ...e);
     });
@@ -164,7 +165,7 @@ const u = class extends S {
    * @description: 开始绘制平面多边形
    */
   createPolygon(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.polygon, e[0]), this.createItem(w, ...e);
     });
@@ -173,7 +174,7 @@ const u = class extends S {
    * @description: 开始绘制多棱柱
    */
   createPrism(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.prism, e[0]), this.createItem(j, ...e);
     });
@@ -182,7 +183,7 @@ const u = class extends S {
    * @description: 开始绘制矩形
    */
   createRectangle(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.rectangle, e[0]), this.createItem(O, ...e);
     });
@@ -191,7 +192,7 @@ const u = class extends S {
    * @description: 开始绘制圆形
    */
   createCircle(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.circle, e[0]), this.createItem(P, ...e);
     });
@@ -200,7 +201,7 @@ const u = class extends S {
    * @description: 开始绘制圆柱
    */
   createCylinder(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.cylinder, e[0]), this.createItem(v, ...e);
     });
@@ -209,7 +210,7 @@ const u = class extends S {
    * @description: 开始绘制 Box
    */
   createBox(...e) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       var t, r;
       return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.box, e[0]), this.createItem(C, ...e);
     });
@@ -229,19 +230,21 @@ const u = class extends S {
     M(this.items, (e) => e.delete()), this.five.needsRender = !0;
   }
   createItem(e, ...t) {
-    return l(this, null, function* () {
+    return m(this, null, function* () {
       this.creatingItem && (this.creatingItem.stopCreating(), this.creatingItem = null);
       const r = new e();
-      return this.creatingItem = r, this.group.add(r), yield r.create(...t).then((...c) => (this.creatingItem = null, c)).catch((c) => {
-        console.error(c), this.group.remove(r);
-      }), r;
+      this.creatingItem = r, this.group.add(r);
+      const { promise: l, resolve: i, reject: o } = G();
+      return yield r.create(...t).then((...s) => (this.creatingItem = null, i(r), s)).catch((s) => {
+        o(s), this.group.remove(r);
+      }), l;
     });
   }
 };
-let d = u;
-h(d, "modules", E);
-const de = (s) => new d(s);
+let p = u;
+h(p, "modules", E);
+const ge = (c) => new p(c);
 export {
-  d as Sculpt,
-  de as SculptPlugin
+  p as Sculpt,
+  ge as SculptPlugin
 };

package/libs/base/BasePlugin.js

@@ -11,8 +11,8 @@ import "@realsee/five/line";
 import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "animejs";
-import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
-import { absoluteUrl as a } from "../shared-utils/url/absoluteUrl.js";
+import { FiveUtil as a } from "../shared-utils/Utils/FiveUtil.js";
+import { absoluteUrl as m } from "../shared-utils/url/absoluteUrl.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
 let F = class {
@@ -20,7 +20,7 @@ let F = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.58.2");
+    i(this, "VERSION", "3.58.4-alpha.0");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");
@@ -39,7 +39,7 @@ let F = class {
     return this.workUtil.workCode;
   }
   updateFive(t) {
-    this.five = t, this.fiveUtil = new m(t), this.workUtil = this.fiveUtil.workUtil;
+    this.five = t, this.fiveUtil = new a(t), this.workUtil = this.fiveUtil.workUtil;
   }
   /**
    * 获取当前的插件状态，如果当初插件内存在需要通过动画变更的 state 值，则通过此方法可以得到中间状态
@@ -51,7 +51,7 @@ let F = class {
    * @description: 获取静态资源的url
    */
   absoluteUrl(t) {
-    return a(this.staticPrefix, t);
+    return m(this.staticPrefix, t);
   }
   onWorkCodeChange() {
   }

package/libs/index.js

@@ -468,7 +468,6 @@ import "./shared-utils/forReverseEach.js";
 import "./vendor/hotkeys-js/dist/hotkeys.esm.js";
 import "./ModelMakerPlugin/Controller.js";
 import "./ModelMakerPlugin/item/boxItem.js";
-import "./ModelMakerPlugin/item/polygonItem.js";
 import "./ModelMakerPlugin/item/baseItem.js";
 import "./shared-utils/three/addIfNotExists.js";
 import "./ModelMakerPlugin/utils/getFiveDomEvent.js";
@@ -485,6 +484,7 @@ import "./Sculpt/Meshes/Polygon.js";
 import "./ModelMakerPlugin/utils/tagRenderer.js";
 import "./ModelMakerPlugin/utils/Text.js";
 import "./ModelMakerPlugin/item/prismItem.js";
+import "./ModelMakerPlugin/item/polygonItem.js";
 import "./Sculpt/utils/export.js";
 import "./Sculpt/Objects/Base/Editor.js";
 import "./Sculpt/Editors/BoxMeshEditor.js";

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.58.2",
+    "%c %c@realsee/dnalogel %cv3.58.4-alpha.0",
     [
       "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/package.json

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