@realsee/dnalogel 3.73.0-alpha.2 → 3.73.0-alpha.3

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

@@ -14,6 +14,11 @@ export type PolygonCreateConfig = Partial<PolygonStyle & CreateLimitConfig & Pol
     onPointPlaced?: (points: THREE.Vector3[]) => void;
     onUndo?: () => void;
     onRedo?: () => void;
+    /**
+     * @description 检测是否自相交，如果自交，禁止添加下一个点
+     * @default false
+     */
+    experimental_self_intersect_check?: boolean;
 };
 export declare class Polygon extends BaseObject<PolygonImportData> {
     readonly type = "Polygon";

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

@@ -2,39 +2,39 @@ var pt = 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 = (s, e, t) => e in s ? pt(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, w = (s, e) => {
-  for (var t in e || (e = {}))
-    mt.call(e, t) && A(s, t, e[t]);
+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) => {
+  for (var t in s || (s = {}))
+    mt.call(s, t) && A(e, t, s[t]);
   if (it)
-    for (var t of it(e))
-      ft.call(e, t) && A(s, t, e[t]);
-  return s;
-}, _ = (s, e) => Pt(s, yt(e));
-var C = (s, e, t) => (A(s, typeof e != "symbol" ? e + "" : e, t), t);
-var ot = (s, e, t) => new Promise((o, r) => {
+    for (var t of it(s))
+      ft.call(s, t) && A(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);
+var ot = (e, s, t) => new Promise((o, r) => {
   var f = (u) => {
     try {
-      D(t.next(u));
+      w(t.next(u));
     } catch (h) {
       r(h);
     }
   }, a = (u) => {
     try {
-      D(t.throw(u));
+      w(t.throw(u));
     } catch (h) {
       r(h);
     }
-  }, D = (u) => u.done ? o(u.value) : Promise.resolve(u.value).then(f, a);
-  D((t = t.apply(s, e)).next());
+  }, w = (u) => u.done ? o(u.value) : Promise.resolve(u.value).then(f, a);
+  w((t = t.apply(e, s)).next());
 });
 import { BaseObject as xt } from "../Base/index.js";
-import * as H from "three";
+import * as v 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";
 import { vector3ToArray as Ct } from "../../../shared-utils/three/vector3ToArray.js";
-import { withResolvers as Dt } from "../../../shared-utils/promise/withResolvers.js";
-import { anyPositionToVector3 as wt } from "../../../shared-utils/positionToVector3.js";
+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 {
   constructor(t, o) {
@@ -48,7 +48,7 @@ class Rt extends xt {
     C(this, "maxHistorySize", 50);
     C(this, "_editor");
     C(this, "creatingObject");
-    t && (this.areaMesh = new rt(w(w({}, t.style), t)), this.areaMesh.userData = (r = this.areaMesh.userData) != null ? r : {}, typeof this.areaMesh.userData.dragSelectPixelDistance != "number" && (this.areaMesh.userData.dragSelectPixelDistance = 10), this.add(this.areaMesh));
+    t && (this.areaMesh = new rt(H(H({}, t.style), t)), this.areaMesh.userData = (r = this.areaMesh.userData) != null ? r : {}, typeof this.areaMesh.userData.dragSelectPixelDistance != "number" && (this.areaMesh.userData.dragSelectPixelDistance = 10), this.add(this.areaMesh));
   }
   get editor() {
     return this._editor || (this._editor = new bt(this)), this._editor;
@@ -59,7 +59,7 @@ class Rt extends xt {
     typeof t == "function" && t(), this._editor && this._editor.updatePointMeshes();
   }
   get data() {
-    return this.updateMatrixWorld(), _(w({}, this.baseData), {
+    return this.updateMatrixWorld(), I(H({}, this.baseData), {
       points: Ct(this.applyObjectMatrixWorld(this.areaMesh.points)),
       style: {
         color: this.areaMesh.color.getHex(),
@@ -69,7 +69,7 @@ class Rt extends xt {
     });
   }
   setData(t) {
-    t.points && this.areaMesh.setPoints(this.applyObjectReversalMatrixWorld(t.points.map(wt))), this.areaMesh.setStyle(t.style), this.updateCreationPointMeshes();
+    t.points && this.areaMesh.setPoints(this.applyObjectReversalMatrixWorld(t.points.map(Dt))), this.areaMesh.setStyle(t.style), this.updateCreationPointMeshes();
   }
   highlight() {
     var t;
@@ -137,38 +137,38 @@ class Rt extends xt {
     });
   }
 }
-function vt(s, e, t) {
+function vt(e, s, t) {
   var L, N, $, G, J, K, Q, X, Z;
-  const { promise: o, resolve: r, reject: f } = Dt(), a = s.parent;
+  const { promise: o, resolve: r, reject: f } = wt(), a = e.parent;
   if (!a) {
     f(new Error("No container"));
     return;
   }
-  const D = (L = t == null ? void 0 : t.limit) != null ? L : "none", u = t == null ? void 0 : t.simpleMode, h = (K = (J = ($ = s.five) != null ? $ : (N = s.get) == null ? void 0 : N.call(s, "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;
-  s.userData = (X = s.userData) != null ? X : {}, s.userData.dragSelectPixelDistance = T;
-  let g = 0;
-  u && h && h.model && h.model.bounding && typeof ((Z = h.model.bounding.max) == null ? void 0 : Z.y) == "number" && (g = h.model.bounding.max.y + 1);
-  const P = new nt(s.style);
+  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 P = new nt(e.style);
   a == null || a.add(P);
-  const y = new nt(_(w({}, s.style), { dashed: !0, lengthEnable: !1 }));
+  const y = new nt(I(H({}, e.style), { dashed: !0, lengthEnable: !1 }));
   a == null || a.add(y);
-  let v = [];
+  let j = [];
   const lt = (i = n) => {
-    v.forEach((d, c) => {
+    j.forEach((d, c) => {
       const p = i[c];
       p && d.position.copy(p);
     });
   };
-  function j() {
+  function D() {
     var d, c;
-    v.forEach((p) => {
+    j.forEach((p) => {
       var b;
       return (b = p.parent) == null ? void 0 : b.remove(p);
     });
-    const i = (c = (d = s.line) == null ? void 0 : d.style) != null ? c : s.style;
-    v = n.map((p, b) => {
+    const i = (c = (d = e.line) == null ? void 0 : d.style) != null ? c : e.style;
+    j = n.map((p, b) => {
       var S, k;
-      const x = new Ht(_(w({}, i), {
+      const x = new Ht(I(H({}, i), {
         color: (S = i.pointColor) != null ? S : i.lineColor,
         tip: void 0,
         point: p
@@ -177,38 +177,42 @@ function vt(s, e, t) {
     }), lt();
   }
   function V() {
-    v.forEach((i) => {
+    j.forEach((i) => {
       var d;
       return (d = i.parent) == null ? void 0 : d.remove(i);
-    }), v = [], s.userData && (delete s.userData.creationPointMeshes, delete s.userData.syncCreationPointMeshes, delete s.userData.disposeCreationPointMeshes);
+    }), j = [], e.userData && (delete e.userData.creationPointMeshes, delete e.userData.syncCreationPointMeshes, delete e.userData.disposeCreationPointMeshes);
   }
-  e.enable(), u && e.setAdherePoints([]);
+  s.enable(), u && s.setAdherePoints([]);
   const n = [];
   let l, m, R = !1, U;
-  const E = [], Y = () => n.length > 0, z = () => E.length > 0, at = () => {
+  const O = [], Y = () => n.length > 0, z = () => O.length > 0, at = () => {
     var i;
-    Y() && (E.push(n.pop()), O(U), j(), (i = t == null ? void 0 : t.onUndo) == null || i.call(t), e.pointSelectorHelper && e.pointSelectorHelper.magnifier && e.pointSelectorHelper.magnifier.render());
+    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());
   }, ht = () => {
     var i;
-    z() && (n.push(E.pop()), O(U), j(), (i = t == null ? void 0 : t.onRedo) == null || i.call(t), e.pointSelectorHelper && e.pointSelectorHelper.magnifier && e.pointSelectorHelper.magnifier.render());
-  }, q = (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;
-    E.length = 0;
+    O.length = 0;
     let d = n.length === 0 ? i.point : l.clone();
-    u && (d = d.clone().setY(g)), n.push(d), s.setPoints(n, { closed: !1 }), j(), (c = t == null ? void 0 : t.onPointPlaced) == null || c.call(t, n), R && (B(), r());
-  }, O = (i) => {
+    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;
+    }
+    D(), (c = t == null ? void 0 : t.onPointPlaced) == null || c.call(t, n), R && (q(), r());
+  }, g = (i) => {
     const d = () => {
-      P.setPoints([]), y.setPoints([]), s.setPoints(n), e.pointSelectorHelper && e.pointSelectorHelper.magnifier && e.pointSelectorHelper.magnifier.render();
+      P.setPoints([]), y.setPoints([]), e.setPoints(n), s.pointSelectorHelper && s.pointSelectorHelper.magnifier && s.pointSelectorHelper.magnifier.render();
     };
     if (!i) {
-      d(), j();
+      d(), D();
       return;
     }
     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(g), P.setPoints([c, l]), y.setPoints([])) : D === "none" ? (l = i.point, P.setPoints([c, l]), y.setPoints([])) : D === "xoz" ? (m = m != null ? m : new H.Plane().setFromNormalAndCoplanarPoint(new H.Vector3(0, 1, 0), n[0]), e.plane = m, l = m.projectPoint(i.point, new H.Vector3()), P.setPoints([c, l]), y.setPoints([l, i.point])) : D === "y" && (n.length === 1 ? (l = i.point, P.setPoints([c, l]), y.setPoints([])) : (m = m != null ? m : new H.Plane().setFromCoplanarPoints(n[0], n[1], new H.Vector3(0, 1, 0).add(n[0])), e.plane = m, l = m.projectPoint(i.point, new H.Vector3()), P.setPoints([c, l]), y.setPoints([l, i.point])))), n.length >= 3) {
-      u ? l = i.point.clone().setY(g) : l = s.projectPoint(i.point);
+    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;
       if (typeof (t == null ? void 0 : t.autoClosePixelDistance) == "number") {
@@ -219,20 +223,20 @@ function vt(s, e, t) {
               x: (st.x * 0.5 + 0.5) * S,
               y: (1 - (st.y * 0.5 + 0.5)) * k
             };
-          }, I = W(p), tt = W(l), et = W(i.point), dt = Math.sqrt(M(I.x - tt.x, 2) + M(I.y - tt.y, 2)), ct = Math.sqrt(M(I.x - et.x, 2) + M(I.y - et.y, 2));
+          }, _ = 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);
         }
       } else
         (p.distanceTo(l) < 0.2 || p.distanceTo(i.point) < 0.2) && (b = !0);
-      b ? (l = p, i.point.copy(p), e.pointSelectorHelper.updateWithIntersect(i, { emitEvent: !1 }), R = !0) : R = !1, P.setPoints([c, l]), y.setPoints([l, i.point]);
+      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]);
     }
-    n.length >= 2 ? (s.setPoints([...n, l], { closed: !1 }), s.line.setPoints(s.points.slice(0, -1)), s.isBlank ? (e.cursorError = !0, P.setStyle({ lineColor: 16734553 }), y.setStyle({ lineColor: 16734553 })) : (e.cursorError = !1, P.setStyle({ lineColor: s.lineColor }), y.setStyle({ lineColor: s.lineColor }))) : s.setPoints([]), j();
-  }, B = () => {
-    e.off("select", q), e.off("intersectionUpdate", O), e.off("disable", F), e.plane = null, e.disable(), a == null || a.remove(P, y), V();
+    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 = () => {
-    B(), a == null || a.remove(s, y, P), V(), f(new Error("Cancelled"));
+    q(), a == null || a.remove(e, y, P), V(), f(new Error("Cancelled"));
   };
-  return e.on("select", q), e.on("intersectionUpdate", O), e.on("disable", F), {
+  return s.on("select", B), s.on("intersectionUpdate", g), s.on("disable", F), {
     finished: o,
     canUndo: Y,
     canRedo: z,

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

@@ -4,7 +4,7 @@ import { RectangleMeshEditor } from '../../Editors/RectangleMeshEditor';
 import { RectangleMesh, type RectangleData } from '../../Meshes/Rectangle';
 import { RectangleWithEdgeMesh, type RectangleWithEdgeMeshStyle } from '../../Meshes/RectangleWithEdge';
 import type { LiteralString } from '../../../typings/utils.type';
-import type { DrawMethodConfig, CreateLimitConfig, AbsorbModelConfig } from '../../typings/style';
+import type { DrawMethodConfig, CreateLimitConfig } from '../../typings/style';
 export interface RectangleImportData extends BaseImportData, RectangleData {
     type: LiteralString<'Rectangle'>;
     style?: Partial<RectangleWithEdgeMeshStyle>;
@@ -29,19 +29,17 @@ export declare class Rectangle extends BaseObject<RectangleImportData> {
     setData(data: Partial<RectangleImportData>): void;
     highlight(): void;
     unhighlight(): void;
-    create(config?: Partial<RectangleWithEdgeMeshStyle & CreateLimitConfig & DrawMethodConfig & AbsorbModelConfig>): Promise<void>;
+    create(config?: Partial<RectangleWithEdgeMeshStyle & CreateLimitConfig & DrawMethodConfig>): Promise<void>;
 }
 /**
  * @description 创建矩形
  */
-export declare function createRectangle(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig & DrawMethodConfig & AbsorbModelConfig>): void | Promise<void>;
+export declare function createRectangle(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig & DrawMethodConfig>): void | Promise<void>;
 /**
  * @description 对角线创建矩形（两步）
  */
-export declare function createRectangleByDiagonal(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig & AbsorbModelConfig>): void | Promise<void>;
+export declare function createRectangleByDiagonal(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig>): void | Promise<void>;
 /**
  * @description 正常创建矩形（三步）
  */
-export declare function createRectangleByVertex(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig & {
-    experimental_not_absorb_model_when_xoz_or_y_limit?: boolean;
-}>): void | Promise<void>;
+export declare function createRectangleByVertex(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig>): void | Promise<void>;