@realsee/dnalogel 3.73.5 → 3.74.0-alpha.0

package/libs/Sculpt/Objects/Polygon/index.d.ts

@@ -14,11 +14,24 @@ export type PolygonCreateConfig = Partial<PolygonStyle & CreateLimitConfig & Pol
     onPointPlaced?: (points: THREE.Vector3[]) => void;
     onUndo?: () => void;
     onRedo?: () => void;
+    /**
+     * @description 检测到自相交时的回调
+     * @param point 尝试添加但被拒绝的点坐标
+     */
+    __onSelfIntersect?: (point: THREE.Vector3) => void;
+    /**
+     * @description 将要添加的下一个点
+     */
+    __onWillAddPoint?: (point: THREE.Vector3) => void;
     /**
      * @description 检测是否自相交，如果自交，禁止添加下一个点
      * @default false
      */
     experimental_self_intersect_check?: boolean;
+    /**
+     * 最多允许能添加的点数
+     */
+    experimental_max_point_count?: number;
 };
 export declare class Polygon extends BaseObject<PolygonImportData> {
     readonly type = "Polygon";

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

@@ -1,34 +1,34 @@
-var pt = Object.defineProperty, Pt = Object.defineProperties;
+var ct = Object.defineProperty, Pt = Object.defineProperties;
 var yt = Object.getOwnPropertyDescriptors;
 var it = Object.getOwnPropertySymbols;
-var mt = Object.prototype.hasOwnProperty, ft = Object.prototype.propertyIsEnumerable;
-var M = Math.pow, A = (e, s, t) => s in e ? pt(e, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[s] = t, H = (e, s) => {
+var mt = Object.prototype.hasOwnProperty, xt = Object.prototype.propertyIsEnumerable;
+var _ = Math.pow, T = (e, s, t) => s in e ? ct(e, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[s] = t, H = (e, s) => {
   for (var t in s || (s = {}))
-    mt.call(s, t) && A(e, t, s[t]);
+    mt.call(s, t) && T(e, t, s[t]);
   if (it)
     for (var t of it(s))
-      ft.call(s, t) && A(e, t, s[t]);
+      xt.call(s, t) && T(e, t, s[t]);
   return e;
-}, I = (e, s) => Pt(e, yt(s));
-var C = (e, s, t) => (A(e, typeof s != "symbol" ? s + "" : s, t), t);
+}, R = (e, s) => Pt(e, yt(s));
+var C = (e, s, t) => (T(e, typeof s != "symbol" ? s + "" : s, t), t);
 var ot = (e, s, t) => new Promise((o, r) => {
-  var f = (u) => {
+  var x = (c) => {
     try {
-      w(t.next(u));
-    } catch (h) {
-      r(h);
+      w(t.next(c));
+    } catch (u) {
+      r(u);
     }
-  }, a = (u) => {
+  }, a = (c) => {
     try {
-      w(t.throw(u));
-    } catch (h) {
-      r(h);
+      w(t.throw(c));
+    } catch (u) {
+      r(u);
     }
-  }, w = (u) => u.done ? o(u.value) : Promise.resolve(u.value).then(f, a);
+  }, w = (c) => c.done ? o(c.value) : Promise.resolve(c.value).then(x, a);
   w((t = t.apply(e, s)).next());
 });
-import { BaseObject as xt } from "../Base/index.js";
-import * as v from "three";
+import { BaseObject as ft } from "../Base/index.js";
+import * as j from "three";
 import { PolylineMesh as nt } from "../../Meshes/Polyline.js";
 import { AreaMesh as rt } from "../../Meshes/Area.js";
 import { PolygonEditor as bt } from "./Editor.js";
@@ -36,7 +36,7 @@ import { vector3ToArray as Ct } from "../../../shared-utils/three/vector3ToArray
 import { withResolvers as wt } from "../../../shared-utils/promise/withResolvers.js";
 import { anyPositionToVector3 as Dt } from "../../../shared-utils/positionToVector3.js";
 import { PointMesh as Ht } from "../../Meshes/Point.js";
-class Rt extends xt {
+class Wt extends ft {
   constructor(t, o) {
     var r;
     super(t, o);
@@ -59,7 +59,7 @@ class Rt extends xt {
     typeof t == "function" && t(), this._editor && this._editor.updatePointMeshes();
   }
   get data() {
-    return this.updateMatrixWorld(), I(H({}, this.baseData), {
+    return this.updateMatrixWorld(), R(H({}, this.baseData), {
       points: Ct(this.applyObjectMatrixWorld(this.areaMesh.points)),
       style: {
         color: this.areaMesh.color.getHex(),
@@ -80,8 +80,8 @@ class Rt extends xt {
     (t = this.areaMesh) == null || t.unhighlight();
   }
   canUndo() {
-    var o, r, f;
-    return this.creatingObject ? (f = (r = (o = this.creatingObject) == null ? void 0 : o.canUndo) == null ? void 0 : r.call(o)) != null ? f : !1 : this.currentHistoryIndex > 0;
+    var o, r, x;
+    return this.creatingObject ? (x = (r = (o = this.creatingObject) == null ? void 0 : o.canUndo) == null ? void 0 : r.call(o)) != null ? x : !1 : this.currentHistoryIndex > 0;
   }
   canRedo() {
     var t, o, r;
@@ -129,78 +129,81 @@ class Rt extends xt {
   create(t) {
     return ot(this, null, function* () {
       var r;
-      this.children.forEach((f) => {
-        f.parent === this && this.remove(f);
+      this.children.forEach((x) => {
+        x.parent === this && this.remove(x);
       }), this.children.length = 0;
       const o = new rt(t);
-      this.areaMesh = o, this.add(this.areaMesh), this.creatingObject = vt(this.areaMesh, this.pointSelector, t), yield (r = this.creatingObject) == null ? void 0 : r.finished, this.creatingObject = null, this.recordHistory(), this.updateCreationPointMeshes(), this.config.defaultAction && this.editor.enable();
+      this.areaMesh = o, this.add(this.areaMesh), this.creatingObject = jt(this.areaMesh, this.pointSelector, t), yield (r = this.creatingObject) == null ? void 0 : r.finished, this.creatingObject = null, this.recordHistory(), this.updateCreationPointMeshes(), this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function vt(e, s, t) {
-  var L, N, $, G, J, K, Q, X, Z;
-  const { promise: o, resolve: r, reject: f } = wt(), a = e.parent;
+function jt(e, s, t) {
+  var N, $, G, J, K, Q, X, Z, g;
+  const { promise: o, resolve: r, reject: x } = wt(), a = e.parent;
   if (!a) {
-    f(new Error("No container"));
+    x(new Error("No container"));
     return;
   }
-  const w = (L = t == null ? void 0 : t.limit) != null ? L : "none", u = t == null ? void 0 : t.simpleMode, h = (K = (J = ($ = e.five) != null ? $ : (N = e.get) == null ? void 0 : N.call(e, "five")) != null ? J : (G = window.globalModules) == null ? void 0 : G.five) != null ? K : window.$five, T = (Q = t == null ? void 0 : t.autoClosePixelDistance) != null ? Q : 10;
-  e.userData = (X = e.userData) != null ? X : {}, e.userData.dragSelectPixelDistance = T;
-  let E = 0;
-  u && h && h.model && h.model.bounding && typeof ((Z = h.model.bounding.max) == null ? void 0 : Z.y) == "number" && (E = h.model.bounding.max.y + 1);
+  const w = (N = t == null ? void 0 : t.limit) != null ? N : "none", c = t == null ? void 0 : t.simpleMode, u = (Q = (K = (G = e.five) != null ? G : ($ = e.get) == null ? void 0 : $.call(e, "five")) != null ? K : (J = window.globalModules) == null ? void 0 : J.five) != null ? Q : window.$five, V = (X = t == null ? void 0 : t.autoClosePixelDistance) != null ? X : 10;
+  e.userData = (Z = e.userData) != null ? Z : {}, e.userData.dragSelectPixelDistance = V;
+  let M = 0;
+  c && u && u.model && u.model.bounding && typeof ((g = u.model.bounding.max) == null ? void 0 : g.y) == "number" && (M = u.model.bounding.max.y + 1);
   const P = new nt(e.style);
   a == null || a.add(P);
-  const y = new nt(I(H({}, e.style), { dashed: !0, lengthEnable: !1 }));
+  const y = new nt(R(H({}, e.style), { dashed: !0, lengthEnable: !1 }));
   a == null || a.add(y);
-  let j = [];
+  let v = [];
   const lt = (i = n) => {
-    j.forEach((d, c) => {
-      const p = i[c];
-      p && d.position.copy(p);
+    v.forEach((d, p) => {
+      const h = i[p];
+      h && d.position.copy(h);
     });
   };
   function D() {
-    var d, c;
-    j.forEach((p) => {
-      var b;
-      return (b = p.parent) == null ? void 0 : b.remove(p);
+    var d, p;
+    v.forEach((h) => {
+      var f;
+      return (f = h.parent) == null ? void 0 : f.remove(h);
     });
-    const i = (c = (d = e.line) == null ? void 0 : d.style) != null ? c : e.style;
-    j = n.map((p, b) => {
+    const i = (p = (d = e.line) == null ? void 0 : d.style) != null ? p : e.style;
+    v = n.map((h, f) => {
       var S, k;
-      const x = new Ht(I(H({}, i), {
+      const b = new Ht(R(H({}, i), {
         color: (S = i.pointColor) != null ? S : i.lineColor,
         tip: void 0,
-        point: p
+        point: h
       }));
-      return x.name = `PolygonPointMesh_${b}`, x.userData = (k = x.userData) != null ? k : {}, x.userData.dragSelectPixelDistance = T, a == null || a.add(x), x;
+      return b.name = `PolygonPointMesh_${f}`, b.userData = (k = b.userData) != null ? k : {}, b.userData.dragSelectPixelDistance = V, a == null || a.add(b), b;
     }), lt();
   }
-  function V() {
-    j.forEach((i) => {
+  function Y() {
+    v.forEach((i) => {
       var d;
       return (d = i.parent) == null ? void 0 : d.remove(i);
-    }), j = [], e.userData && (delete e.userData.creationPointMeshes, delete e.userData.syncCreationPointMeshes, delete e.userData.disposeCreationPointMeshes);
+    }), v = [], e.userData && (delete e.userData.creationPointMeshes, delete e.userData.syncCreationPointMeshes, delete e.userData.disposeCreationPointMeshes);
   }
-  s.enable(), u && s.setAdherePoints([]);
+  s.enable(), c && s.setAdherePoints([]);
   const n = [];
-  let l, m, R = !1, U;
-  const O = [], Y = () => n.length > 0, z = () => O.length > 0, at = () => {
+  let l, m, W = !1, U;
+  const E = [], z = () => n.length > 0, B = () => E.length > 0, at = () => {
     var i;
-    Y() && (O.push(n.pop()), g(U), D(), (i = t == null ? void 0 : t.onUndo) == null || i.call(t), s.pointSelectorHelper && s.pointSelectorHelper.magnifier && s.pointSelectorHelper.magnifier.render());
+    z() && (E.push(n.pop()), O(U), D(), (i = t == null ? void 0 : t.onUndo) == null || i.call(t), s.pointSelectorHelper && s.pointSelectorHelper.magnifier && s.pointSelectorHelper.magnifier.render());
   }, ht = () => {
     var i;
-    z() && (n.push(O.pop()), g(U), D(), (i = t == null ? void 0 : t.onRedo) == null || i.call(t), s.pointSelectorHelper && s.pointSelectorHelper.magnifier && s.pointSelectorHelper.magnifier.render());
-  }, B = (i) => {
-    var c;
-    O.length = 0;
+    B() && (n.push(E.pop()), O(U), D(), (i = t == null ? void 0 : t.onRedo) == null || i.call(t), s.pointSelectorHelper && s.pointSelectorHelper.magnifier && s.pointSelectorHelper.magnifier.render());
+  }, q = (i) => {
+    var p, h;
+    E.length = 0;
     let d = n.length === 0 ? i.point : l.clone();
-    if (u && (d = d.clone().setY(E)), n.push(d), e.setPoints(n, { closed: !1 }), t != null && t.experimental_self_intersect_check && n.length > 2 && e.isBlank) {
-      n.pop(), e.setPoints(n, { closed: !1 }), D(), console.warn("[Polygon] 检测到自相交，无法添加该点");
-      return;
+    if (c && (d = d.clone().setY(M)), t.__onWillAddPoint(d), !((t == null ? void 0 : t.experimental_max_point_count) != null && n.length === t.experimental_max_point_count)) {
+      if (n.push(d), e.setPoints(n, { closed: !1 }), t != null && t.experimental_self_intersect_check && n.length > 2 && e.isBlank) {
+        const f = n.pop();
+        e.setPoints(n, { closed: !1 }), D(), console.warn("[Polygon] 检测到自相交，无法添加该点"), (p = t == null ? void 0 : t.__onSelfIntersect) == null || p.call(t, f);
+        return;
+      }
+      D(), (h = t == null ? void 0 : t.onPointPlaced) == null || h.call(t, n), W && (F(), r());
     }
-    D(), (c = t == null ? void 0 : t.onPointPlaced) == null || c.call(t, n), R && (q(), r());
-  }, g = (i) => {
+  }, O = (i) => {
     const d = () => {
       P.setPoints([]), y.setPoints([]), e.setPoints(n), s.pointSelectorHelper && s.pointSelectorHelper.magnifier && s.pointSelectorHelper.magnifier.render();
     };
@@ -210,41 +213,41 @@ function vt(e, s, t) {
     }
     if (U = i, !(n != null && n.length))
       return d();
-    const c = n.at(-1).clone();
-    if (n.length < 3 && (u ? (l = i.point.clone().setY(E), P.setPoints([c, l]), y.setPoints([])) : w === "none" ? (l = i.point, P.setPoints([c, l]), y.setPoints([])) : w === "xoz" ? (m = m != null ? m : new v.Plane().setFromNormalAndCoplanarPoint(new v.Vector3(0, 1, 0), n[0]), s.plane = m, l = m.projectPoint(i.point, new v.Vector3()), P.setPoints([c, l]), y.setPoints([l, i.point])) : w === "y" && (n.length === 1 ? (l = i.point, P.setPoints([c, l]), y.setPoints([])) : (m = m != null ? m : new v.Plane().setFromCoplanarPoints(n[0], n[1], new v.Vector3(0, 1, 0).add(n[0])), s.plane = m, l = m.projectPoint(i.point, new v.Vector3()), P.setPoints([c, l]), y.setPoints([l, i.point])))), n.length >= 3) {
-      u ? l = i.point.clone().setY(E) : l = e.projectPoint(i.point);
-      const p = n[0];
-      let b = !1;
+    const p = n.at(-1).clone();
+    if (n.length < 3 && (c ? (l = i.point.clone().setY(M), P.setPoints([p, l]), y.setPoints([])) : w === "none" ? (l = i.point, P.setPoints([p, l]), y.setPoints([])) : w === "xoz" ? (m = m != null ? m : new j.Plane().setFromNormalAndCoplanarPoint(new j.Vector3(0, 1, 0), n[0]), s.plane = m, l = m.projectPoint(i.point, new j.Vector3()), P.setPoints([p, l]), y.setPoints([l, i.point])) : w === "y" && (n.length === 1 ? (l = i.point, P.setPoints([p, l]), y.setPoints([])) : (m = m != null ? m : new j.Plane().setFromCoplanarPoints(n[0], n[1], new j.Vector3(0, 1, 0).add(n[0])), s.plane = m, l = m.projectPoint(i.point, new j.Vector3()), P.setPoints([p, l]), y.setPoints([l, i.point])))), n.length >= 3) {
+      c ? l = i.point.clone().setY(M) : l = e.projectPoint(i.point);
+      const h = n[0];
+      let f = !1;
       if (typeof (t == null ? void 0 : t.autoClosePixelDistance) == "number") {
-        if (h && h.camera && h.getElement) {
-          const x = h.getElement(), S = x.clientWidth, k = x.clientHeight, W = (ut) => {
-            const st = ut.clone().project(h.camera);
+        if (u && u.camera && u.getElement) {
+          const b = u.getElement(), S = b.clientWidth, k = b.clientHeight, A = (pt) => {
+            const st = pt.clone().project(u.camera);
             return {
               x: (st.x * 0.5 + 0.5) * S,
               y: (1 - (st.y * 0.5 + 0.5)) * k
             };
-          }, _ = W(p), tt = W(l), et = W(i.point), dt = Math.sqrt(M(_.x - tt.x, 2) + M(_.y - tt.y, 2)), ct = Math.sqrt(M(_.x - et.x, 2) + M(_.y - et.y, 2));
-          (dt < t.autoClosePixelDistance || ct < t.autoClosePixelDistance) && (b = !0);
+          }, I = A(h), tt = A(l), et = A(i.point), dt = Math.sqrt(_(I.x - tt.x, 2) + _(I.y - tt.y, 2)), ut = Math.sqrt(_(I.x - et.x, 2) + _(I.y - et.y, 2));
+          (dt < t.autoClosePixelDistance || ut < t.autoClosePixelDistance) && (f = !0);
         }
       } else
-        (p.distanceTo(l) < 0.2 || p.distanceTo(i.point) < 0.2) && (b = !0);
-      b ? (l = p, i.point.copy(p), s.pointSelectorHelper.updateWithIntersect(i, { emitEvent: !1 }), R = !0) : R = !1, P.setPoints([c, l]), y.setPoints([l, i.point]);
+        (h.distanceTo(l) < 0.2 || h.distanceTo(i.point) < 0.2) && (f = !0);
+      f ? (l = h, i.point.copy(h), s.pointSelectorHelper.updateWithIntersect(i, { emitEvent: !1 }), W = !0) : W = !1, P.setPoints([p, l]), y.setPoints([l, i.point]);
     }
     n.length >= 2 ? (e.setPoints([...n, l], { closed: !1 }), e.line.setPoints(e.points.slice(0, -1)), e.isBlank ? (s.cursorError = !0, P.setStyle({ lineColor: 16734553 }), y.setStyle({ lineColor: 16734553 })) : (s.cursorError = !1, P.setStyle({ lineColor: e.lineColor }), y.setStyle({ lineColor: e.lineColor }))) : e.setPoints([]), D();
-  }, q = () => {
-    s.off("select", B), s.off("intersectionUpdate", g), s.off("disable", F), s.plane = null, s.disable(), a == null || a.remove(P, y), V();
   }, F = () => {
-    q(), a == null || a.remove(e, y, P), V(), f(new Error("Cancelled"));
+    s.off("select", q), s.off("intersectionUpdate", O), s.off("disable", L), s.plane = null, s.disable(), a == null || a.remove(P, y), Y();
+  }, L = () => {
+    F(), a == null || a.remove(e, y, P), Y(), x(new Error("Cancelled"));
   };
-  return s.on("select", B), s.on("intersectionUpdate", g), s.on("disable", F), {
+  return s.on("select", q), s.on("intersectionUpdate", O), s.on("disable", L), {
     finished: o,
-    canUndo: Y,
-    canRedo: z,
+    canUndo: z,
+    canRedo: B,
     undo: at,
     redo: ht
   };
 }
 export {
-  Rt as Polygon,
-  vt as createPolygon
+  Wt as Polygon,
+  jt as createPolygon
 };

package/libs/Sculpt/index.d.ts

@@ -53,6 +53,18 @@ type Event = {
      * 返回 false 来禁用 Five 默认行为
      */
     click: (e: MouseEvent, item: BuiltInItem) => void | false;
+    /**
+     * @description 当 Polygon 创建时检测到自相交时触发(需开启 experimental_self_intersect_check)
+     * @param item Polygon 实例
+     * @param point 尝试添加但被拒绝的点坐标
+     */
+    'polygon.experimental_self_intersect': (item: Polygon, point: THREE.Vector3) => void;
+    /**
+     * @description polygon 将要添加到下一个点
+     * @param item Polygon 实例
+     * @param point polygon 将要添加到下一个点到坐标
+     */
+    'polygon.experimental_point_will_add': (item: Polygon, point: THREE.Vector3) => void;
 };
 export declare class Sculpt extends Subscribe<Event> {
     static modules: {

package/libs/Sculpt/index.js

@@ -1,34 +1,34 @@
-var U = Object.defineProperty, D = Object.defineProperties;
-var L = Object.getOwnPropertyDescriptors;
+var S = Object.defineProperty, U = Object.defineProperties;
+var x = 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 = (c, n, e) => n in c ? S(c, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[n] = e, g = (c, n) => {
+  for (var e in n || (n = {}))
+    D.call(n, e) && p(c, 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(c, e, n[e]);
+  return c;
+}, a = (c, n) => U(c, x(n));
+var u = (c, n, e) => (p(c, typeof n != "symbol" ? n + "" : n, e), e);
+var m = (c, n, e) => new Promise((t, i) => {
+  var l = (s) => {
     try {
-      n(e.next(c));
+      r(e.next(s));
     } catch (h) {
       i(h);
     }
-  }, s = (c) => {
+  }, o = (s) => {
     try {
-      n(e.throw(c));
+      r(e.throw(s));
     } 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 = (s) => s.done ? t(s.value) : Promise.resolve(s.value).then(l, o);
+  r((e = e.apply(c, 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 { 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 { Cylinder as P } from "./Objects/Cylinder/index.js";
-import { Box as C } from "./Objects/Box/index.js";
+import { Point as w } from "./Objects/Point/index.js";
+import { Polygon as b } from "./Objects/Polygon/index.js";
+import { Prism as _ } 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 R } from "./Objects/Cylinder/index.js";
+import { Box as P } from "./Objects/Box/index.js";
 import { forReverseEach as H } from "../shared-utils/forReverseEach.js";
-import { Line as _ } from "./Objects/Line/index.js";
+import { Line as C } 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 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), 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: o }) => {
+      var s;
+      const r = F((s = l == null ? void 0 : l[0]) == null ? void 0 : s.object, (h) => h.isSculptObject);
+      return r && !r.editing ? this.emit("click", o, r) : !1;
     }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = d.modules;
   }
   get data() {
@@ -116,12 +116,12 @@ const d = class extends x {
   load(e, t) {
     var l;
     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 = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((o) => {
+      var s;
+      const r = a(g({}, o), {
+        style: g(g({}, (s = this.theme) == null ? void 0 : s[o.type.toLowerCase()]), o.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 o.type === "Point" ? new w(r, t) : o.type === "line" ? new C(r, t) : o.type === "Polyline" ? new I(r, t) : o.type === "Polygon" ? new b(r, t) : o.type === "Prism" ? new _(r, t) : o.type === "Rectangle" ? new j(r, t) : o.type === "Circle" ? new v(r, t) : o.type === "Cylinder" ? new R(r, t) : o.type === "Box" ? new P(r, t) : null;
     });
     this.group.add(...i), this.five.needsRender = !0;
   }
@@ -144,25 +144,25 @@ const d = class extends x {
    * @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(w, ...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,54 +179,62 @@ 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, l, o;
+      Object.assign((i = e[0]) != null ? i : {}, (l = this.theme) == null ? void 0 : l.polygon, e[0]);
+      const t = (o = e[0]) != null ? o : {};
+      return t.__onSelfIntersect = (r) => {
+        const s = this.creatingItem;
+        this.emit("polygon.experimental_self_intersect", s, r);
+      }, t.__onWillAddPoint = (r) => {
+        const s = this.creatingItem;
+        this.emit("polygon.experimental_point_will_add", s, r);
+      }, e[0] = t, this.createItem(b, ...e);
     });
   }
   /**
    * @description: 开始绘制多棱柱
    */
   createPrism(...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.prism, e[0]), this.createItem(j, ...e);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.prism, e[0]), this.createItem(_, ...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);
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.cylinder, e[0]), this.createItem(R, ...e);
     });
   }
   /**
    * @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(P, ...e);
     });
   }
   canUndo() {
@@ -248,28 +256,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);
+      const { promise: l, resolve: o, reject: r } = M();
+      return yield i.create(...t).then((...s) => (this.creatingItem = null, i.select({ only: !0 }), o(i), s)).catch((s) => {
+        r(s), this.group.remove(i);
       }), l;
     });
   }
 };
 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 = (c, n, e) => {
+  if (n && typeof n == "object" && ("theme" in n || "config" in n)) {
+    const t = n;
+    return new f(c, 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(c, n, e);
+}, we = (c, n) => new f(c, n == null ? void 0 : n.theme, n == null ? void 0 : n.config);
 export {
   f as Sculpt,
   Ie as SculptPlugin,
-  be as SculptPluginForFive
+  we as SculptPluginForFive
 };