@realsee/dnalogel 3.75.0-alpha.1 → 3.75.1

package/libs/Sculpt/index.js

@@ -1,34 +1,34 @@
-var U = Object.defineProperty, D = Object.defineProperties;
-var L = Object.getOwnPropertyDescriptors;
+var O = Object.defineProperty, S = Object.defineProperties;
+var U = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
-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]);
+var D = Object.prototype.hasOwnProperty, L = Object.prototype.propertyIsEnumerable;
+var p = (l, n, e) => n in l ? O(l, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[n] = e, g = (l, n) => {
+  for (var e in n || (n = {}))
+    D.call(n, e) && p(l, e, n[e]);
   if (y)
-    for (var e of y(r))
-      B.call(r, e) && p(o, e, r[e]);
-  return o;
-}, a = (o, r) => D(o, L(r));
-var m = (o, r, e) => (p(o, typeof r != "symbol" ? r + "" : r, e), e);
-var u = (o, r, e) => new Promise((t, i) => {
-  var l = (c) => {
+    for (var e of y(n))
+      L.call(n, e) && p(l, e, n[e]);
+  return l;
+}, a = (l, n) => S(l, U(n));
+var u = (l, n, e) => (p(l, typeof n != "symbol" ? n + "" : n, e), e);
+var m = (l, n, e) => new Promise((t, i) => {
+  var c = (o) => {
     try {
-      n(e.next(c));
+      r(e.next(o));
     } catch (h) {
       i(h);
     }
-  }, s = (c) => {
+  }, s = (o) => {
     try {
-      n(e.throw(c));
+      r(e.throw(o));
     } catch (h) {
       i(h);
     }
-  }, n = (c) => c.done ? t(c.value) : Promise.resolve(c.value).then(l, s);
-  n((e = e.apply(o, r)).next());
+  }, r = (o) => o.done ? t(o.value) : Promise.resolve(o.value).then(c, s);
+  r((e = e.apply(l, n)).next());
 });
-import { globalModules as E } from "./utils/Modules/Global.js";
-import { Subscribe as x } from "../shared-utils/Subscribe.js";
+import { globalModules as B } from "./utils/Modules/Global.js";
+import { Subscribe as E } from "../shared-utils/Subscribe.js";
 import { IObject3D as z } from "../shared-utils/three/IObject3D.js";
 import "../shared-utils/tag.js";
 import "three";
@@ -47,29 +47,29 @@ import "../vendor/earcut/src/earcut.js";
 import "../shared-utils/five/FivePuppet.js";
 import { recurveFindObject as F } from "../shared-utils/three/recurveFindObject.js";
 import { Polyline as I } from "./Objects/Polyline/index.js";
-import { Point as b } from "./Objects/Point/index.js";
+import { Point as _ } 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 R } from "./Objects/Circle/index.js";
+import { Prism as b } from "./Objects/Prism/index.js";
+import { Rectangle as j } from "./Objects/Rectangle/index.js";
+import { Circle as v } from "./Objects/Circle/index.js";
 import { Cylinder as P } from "./Objects/Cylinder/index.js";
-import { Box as C } from "./Objects/Box/index.js";
+import { Box as R } from "./Objects/Box/index.js";
 import { forReverseEach as H } from "../shared-utils/forReverseEach.js";
-import { Line as _ } from "./Objects/Line/index.js";
-import { hotkeys as O } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
+import { Line as C } from "./Objects/Line/index.js";
+import { hotkeys as x } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
 import { withResolvers as M } from "../shared-utils/promise/withResolvers.js";
-const d = class extends x {
+const d = class extends E {
   constructor(e, t, i) {
     super();
-    m(this, "group");
-    m(this, "theme");
-    m(this, "config");
-    m(this, "five");
-    m(this, "creatingItem", null);
+    u(this, "group");
+    u(this, "theme");
+    u(this, "config");
+    u(this, "five");
+    u(this, "creatingItem", null);
     /**
      * @description: 撤销
      */
-    m(this, "undo", () => {
+    u(this, "undo", () => {
       if (this.creatingItem) {
         this.creatingItem.undo(), this.five.needsRender = !0;
         return;
@@ -80,7 +80,7 @@ const d = class extends x {
     /**
      * @description: 重做
      */
-    m(this, "redo", () => {
+    u(this, "redo", () => {
       if (this.creatingItem) {
         this.creatingItem.redo(), this.five.needsRender = !0;
         return;
@@ -90,10 +90,10 @@ const d = class extends x {
     });
     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", 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);
-      return n && !n.editing ? this.emit("click", s, n) : !1;
+    }, i), this.group = new z(), this.group.name = "Sculpt", this.group.__sculpt__ = this, e.scene.add(this.group), d.modules.init(e, this.config), x("ctrl+z, command+z", this.undo), x("ctrl+shift+z, command+shift+z", this.redo), d.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: c, origDomEvent: s }) => {
+      var o;
+      const r = F((o = c == null ? void 0 : c[0]) == null ? void 0 : o.object, (h) => h.isSculptObject);
+      return r && !r.editing ? this.emit("click", s, r) : !1;
     }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = d.modules;
   }
   get data() {
@@ -114,14 +114,14 @@ const d = class extends x {
    * @description: 加载数据 展示
    */
   load(e, t) {
-    var l;
+    var c;
     this.clear();
-    const i = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((s) => {
-      var c;
-      const n = a(g({}, s), {
-        style: g(g({}, (c = this.theme) == null ? void 0 : c[s.type.toLowerCase()]), s.style)
+    const i = (c = e == null ? void 0 : e.items) == null ? void 0 : c.map((s) => {
+      var o;
+      const r = a(g({}, s), {
+        style: g(g({}, (o = this.theme) == null ? void 0 : o[s.type.toLowerCase()]), s.style)
       });
-      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;
+      return s.type === "Point" ? new _(r, t) : s.type === "line" ? new C(r, t) : s.type === "Polyline" ? new I(r, t) : s.type === "Polygon" ? new w(r, t) : s.type === "Prism" ? new b(r, t) : s.type === "Rectangle" ? new j(r, t) : s.type === "Circle" ? new v(r, t) : s.type === "Cylinder" ? new P(r, t) : s.type === "Box" ? new R(r, t) : null;
     });
     this.group.add(...i), this.five.needsRender = !0;
   }
@@ -135,34 +135,34 @@ const d = class extends x {
    * @description: 放置物体
    */
   putObject(e) {
-    var l;
+    var c;
     this.group.add(e);
     const t = d.modules.object3DHelper, i = t.addObject3DHelper(e);
-    return (l = i == null ? void 0 : i.moveController) == null || l.moveByMouse(), t;
+    return (c = i == null ? void 0 : i.moveController) == null || c.moveByMouse(), t;
   }
   /**
    * @description: 开始绘制点
    */
   createPoint(...e) {
-    return u(this, null, function* () {
+    return m(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);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.point, e[0]), this.createItem(_, ...e);
     });
   }
   /**
    * @description: 开始绘制线段
    */
   createLine(...e) {
-    return u(this, null, function* () {
+    return m(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(_, ...e);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.line, e[0]), this.createItem(C, ...e);
     });
   }
   /**
    * @deprecated use createLine instead
    */
   createline(...e) {
-    return u(this, null, function* () {
+    return m(this, null, function* () {
       this.createLine(...e);
     });
   }
@@ -170,7 +170,7 @@ const d = class extends x {
    * @description: 开始绘制空间折线
    */
   createPolyline(...e) {
-    return u(this, null, function* () {
+    return m(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);
     });
@@ -179,43 +179,59 @@ const d = class extends x {
    * @description: 开始绘制平面多边形
    */
   createPolygon(...e) {
-    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);
+    return m(this, null, function* () {
+      var i, c, s;
+      Object.assign((i = e[0]) != null ? i : {}, (c = this.theme) == null ? void 0 : c.polygon, e[0]);
+      const t = (s = e[0]) != null ? s : {};
+      return t.__onSelfIntersect = (r) => {
+        const o = this.creatingItem;
+        this.emit("polygon.experimental_self_intersect", o, r);
+      }, t.__onWillAddPoint = (r, o) => {
+        const h = this.creatingItem;
+        this.emit("polygon.experimental_point_will_add", h, r, o);
+      }, e[0] = t, this.createItem(w, ...e);
     });
   }
   /**
    * @description: 开始绘制多棱柱
    */
   createPrism(...e) {
-    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);
+    return m(this, null, function* () {
+      var i, c, s;
+      Object.assign((i = e[0]) != null ? i : {}, (c = this.theme) == null ? void 0 : c.prism, e[0]);
+      const t = (s = e[0]) != null ? s : {};
+      return t.__onSelfIntersect = (r) => {
+        const o = this.creatingItem;
+        this.emit("prism.experimental_self_intersect", o, r);
+      }, t.__onWillAddPoint = (r, o) => {
+        const h = this.creatingItem;
+        this.emit("prism.experimental_point_will_add", h, r, o);
+      }, e[0] = t, this.createItem(b, ...e);
     });
   }
   /**
    * @description: 开始绘制矩形
    */
   createRectangle(...e) {
-    return u(this, null, function* () {
+    return m(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);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.rectangle, e[0]), this.createItem(j, ...e);
     });
   }
   /**
    * @description: 开始绘制圆形
    */
   createCircle(...e) {
-    return u(this, null, function* () {
+    return m(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(R, ...e);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.circle, e[0]), this.createItem(v, ...e);
     });
   }
   /**
    * @description: 开始绘制圆柱
    */
   createCylinder(...e) {
-    return u(this, null, function* () {
+    return m(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);
     });
@@ -224,9 +240,9 @@ const d = class extends x {
    * @description: 开始绘制 Box
    */
   createBox(...e) {
-    return u(this, null, function* () {
+    return m(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(C, ...e);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.box, e[0]), this.createItem(R, ...e);
     });
   }
   canUndo() {
@@ -248,28 +264,28 @@ const d = class extends x {
     H(this.items, (e) => e.delete()), this.five.needsRender = !0;
   }
   createItem(e, ...t) {
-    return u(this, null, function* () {
+    return m(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, i.select({ only: !0 }), s(i), c)).catch((c) => {
-        n(c), this.group.remove(i);
-      }), l;
+      const { promise: c, resolve: s, reject: r } = M();
+      return yield i.create(...t).then((...o) => (this.creatingItem = null, i.select({ only: !0 }), s(i), o)).catch((o) => {
+        r(o), this.group.remove(i);
+      }), c;
     });
   }
 };
 let f = d;
-m(f, "modules", E);
-const Ie = (o, r, e) => {
-  if (r && typeof r == "object" && ("theme" in r || "config" in r)) {
-    const t = r;
-    return new f(o, t.theme, t.config);
+u(f, "modules", B);
+const Ie = (l, n, e) => {
+  if (n && typeof n == "object" && ("theme" in n || "config" in n)) {
+    const t = n;
+    return new f(l, t.theme, t.config);
   }
-  return new f(o, r, e);
-}, be = (o, r) => new f(o, r == null ? void 0 : r.theme, r == null ? void 0 : r.config);
+  return new f(l, n, e);
+}, _e = (l, n) => new f(l, n == null ? void 0 : n.theme, n == null ? void 0 : n.config);
 export {
   f as Sculpt,
   Ie as SculptPlugin,
-  be as SculptPluginForFive
+  _e as SculptPluginForFive
 };

package/libs/Sculpt/utils/Modules/Global.js

@@ -43,8 +43,7 @@ class D {
     let i = e === null || e === !1 ? { magnifier: null } : { magnifierParams: e };
     return (s = this.config) != null && s.hideCursorCircle && (i = f(h({}, i), { pointHelper: null })), this._pointSelector = new a(this.five, {
       mode: "cursor",
-      helper: i,
-      hitFilter: this.config.hitFilter
+      helper: i
     }), this._pointSelector;
   }
   get fiveDomEvents() {

package/libs/base/BasePlugin.js

@@ -1,7 +1,7 @@
 var e = Object.defineProperty;
 var s = (o, t, i) => t in o ? e(o, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[t] = i;
 var r = (o, t, i) => (s(o, typeof t != "symbol" ? t + "" : t, i), i);
-import { Subscribe as l } from "../shared-utils/Subscribe.js";
+import { Subscribe as m } from "../shared-utils/Subscribe.js";
 import "../shared-utils/tag.js";
 import "three";
 import "../vendor/hammerjs/hammer.js";
@@ -15,7 +15,7 @@ import "../shared-utils/three/blink.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../vendor/earcut/src/earcut.js";
-import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
+import { FiveUtil as l } from "../shared-utils/Utils/FiveUtil.js";
 import { DEFAULT_STATIC_PREFIX as p } from "../shared-utils/url/defaultUrls.js";
 import "../shared-utils/five/FivePuppet.js";
 let I = class {
@@ -23,7 +23,7 @@ let I = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.75.0-alpha.1");
+    r(this, "VERSION", "3.75.1");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");
@@ -31,9 +31,9 @@ let I = class {
     /**
      * @description: 插件事件钩子
      */
-    r(this, "hooks", new l());
+    r(this, "hooks", new m());
     r(this, "staticPrefix", p);
-    this.five = t, this.fiveUtil = new m(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
+    this.five = t, this.fiveUtil = new l(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
   }
   set workCode(t) {
     this.workUtil.workCode = t, this.onWorkCodeChange();