@realsee/dnalogel 3.75.0-alpha.0 → 3.75.0

package/dist/shared-utils/three/PointSelector/index.d.ts

@@ -1,6 +1,6 @@
 import type { Five } from '@realsee/five';
 import { PointSelectorHelper, type PointIntersection, type PointSelectorHelperConfig } from './utils/PointSelectorHelper';
-import type { Intersection, Vector3 } from 'three';
+import type { Vector3 } from 'three';
 import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
@@ -39,10 +39,6 @@ interface Config {
      * @default false
      */
     skipPanorama: boolean;
-    /**
-     * five 6.7.0 特性，可配置是否自定义拾取点过滤函数
-     */
-    hitFilter: (intersect: Intersection) => boolean;
 }
 export type PointSelectorConfig = Partial<Config>;
 type EventMap = {

package/libs/PanoMeasurePlugin/utils/isIntersecting.js

@@ -1,48 +1,52 @@
-function a(n, t) {
-  const s = Array.isArray(t) ? t : [t];
-  for (let u = 0; u < s.length; u++) {
-    const r = n.start, e = n.end, c = s[u].start, o = s[u].end;
-    if (!(f(r, c) || f(r, o) || f(e, c) || f(e, o) || f(r, e)) && d([r.x, r.y, r.z], [e.x, e.y, e.z], [c.x, c.y, c.z], [o.x, o.y, o.z]))
+function m(n, s) {
+  const o = Array.isArray(s) ? s : [s];
+  for (let u = 0; u < o.length; u++) {
+    const t = n.start, c = n.end, r = o[u].start, e = o[u].end;
+    if (!(f(t, r) || f(t, e) || f(c, r) || f(c, e) || f(t, c)) && M([t.x, t.y, t.z], [c.x, c.y, c.z], [r.x, r.y, r.z], [e.x, e.y, e.z]))
       return !0;
   }
   return !1;
 }
-function d(n, t, s, u) {
-  const r = [t[0] - n[0], t[1] - n[1], t[2] - n[2]], e = [u[0] - s[0], u[1] - s[1], u[2] - s[2]], c = [
-    [r[0], -e[0]],
-    [r[1], -e[1]],
-    [r[2], -e[2]]
-  ], o = [s[0] - n[0], s[1] - n[1], s[2] - n[2]], i = g(c, o);
-  if (i === null)
-    return !1;
-  const [x, z] = i;
-  return !!(y(x) && y(z));
-}
-function g(n, t) {
-  if (q(n) === 0)
-    return null;
-  const u = I(n);
-  return V(u, t);
+function M(n, s, o, u) {
+  const t = [s[0] - n[0], s[1] - n[1], s[2] - n[2]], c = [u[0] - o[0], u[1] - o[1], u[2] - o[2]], r = [
+    { a: [t[0], -c[0]], b: o[0] - n[0] },
+    { a: [t[1], -c[1]], b: o[1] - n[1] },
+    { a: [t[2], -c[2]], b: o[2] - n[2] }
+  ], e = [
+    [0, 1],
+    // X 和 Y
+    [0, 2],
+    // X 和 Z
+    [1, 2]
+    // Y 和 Z
+  ];
+  for (const [i, y] of e) {
+    const b = [r[i].a, r[y].a], z = [r[i].b, r[y].b], a = V(b);
+    if (Math.abs(a) < 1e-10)
+      continue;
+    const g = h(b, a), [q, I] = j(g, z);
+    return !!(x(q) && x(I));
+  }
+  return !1;
 }
-function q(n) {
+function V(n) {
   return n[0][0] * n[1][1] - n[0][1] * n[1][0];
 }
-function I(n) {
-  const t = n[0][0] * n[1][1] - n[0][1] * n[1][0];
+function h(n, s) {
   return [
-    [n[1][1] / t, -n[0][1] / t],
-    [-n[1][0] / t, n[0][0] / t]
+    [n[1][1] / s, -n[0][1] / s],
+    [-n[1][0] / s, n[0][0] / s]
   ];
 }
-function V(n, t) {
-  return [n[0][0] * t[0] + n[0][1] * t[1], n[1][0] * t[0] + n[1][1] * t[1]];
+function j(n, s) {
+  return [n[0][0] * s[0] + n[0][1] * s[1], n[1][0] * s[0] + n[1][1] * s[1]];
 }
-function y(n) {
+function x(n) {
   return n >= 0 && n <= 1;
 }
-function f(n, t) {
-  return n.x === t.x && n.y === t.y && n.z === t.z;
+function f(n, s) {
+  return n.x === s.x && n.y === s.y && n.z === s.z;
 }
 export {
-  a as isIntersecting
+  m as isIntersecting
 };

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, points: 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);
-var ot = (e, s, t) => new Promise((o, r) => {
-  var f = (u) => {
+}, 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((n, r) => {
+  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 ? n(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,10 +36,10 @@ 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 {
-  constructor(t, o) {
+class Wt extends ft {
+  constructor(t, n) {
     var r;
-    super(t, o);
+    super(t, n);
     C(this, "type", "Polygon");
     C(this, "areaMesh");
     // 新增：Polygon 专属的历史记录
@@ -54,12 +54,12 @@ class Rt extends xt {
     return this._editor || (this._editor = new bt(this)), this._editor;
   }
   updateCreationPointMeshes() {
-    var o, r;
-    const t = (r = (o = this.areaMesh) == null ? void 0 : o.userData) == null ? void 0 : r.syncCreationPointMeshes;
+    var n, r;
+    const t = (r = (n = this.areaMesh) == null ? void 0 : n.userData) == null ? void 0 : r.syncCreationPointMeshes;
     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,17 +80,17 @@ 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 n, r, x;
+    return this.creatingObject ? (x = (r = (n = this.creatingObject) == null ? void 0 : n.canUndo) == null ? void 0 : r.call(n)) != null ? x : !1 : this.currentHistoryIndex > 0;
   }
   canRedo() {
-    var t, o, r;
-    return this.creatingObject ? (r = (o = (t = this.creatingObject) == null ? void 0 : t.canRedo) == null ? void 0 : o.call(t)) != null ? r : !1 : this.currentHistoryIndex < this.historyStack.length - 1;
+    var t, n, r;
+    return this.creatingObject ? (r = (n = (t = this.creatingObject) == null ? void 0 : t.canRedo) == null ? void 0 : n.call(t)) != null ? r : !1 : this.currentHistoryIndex < this.historyStack.length - 1;
   }
   undo() {
-    var t, o;
+    var t, n;
     if (this.creatingObject)
-      return (o = (t = this.creatingObject) == null ? void 0 : t.undo) == null ? void 0 : o.call(t);
+      return (n = (t = this.creatingObject) == null ? void 0 : t.undo) == null ? void 0 : n.call(t);
     if (this.canUndo()) {
       this.currentHistoryIndex--;
       const r = this.historyStack[this.currentHistoryIndex];
@@ -99,9 +99,9 @@ class Rt extends xt {
       console.log("[Polygon] undo: 无法撤销", { uuid: this.uuid });
   }
   redo() {
-    var t, o;
+    var t, n;
     if (this.creatingObject)
-      return (o = (t = this.creatingObject) == null ? void 0 : t.redo) == null ? void 0 : o.call(t);
+      return (n = (t = this.creatingObject) == null ? void 0 : t.redo) == null ? void 0 : n.call(t);
     if (this.canRedo()) {
       this.currentHistoryIndex++;
       const r = this.historyStack[this.currentHistoryIndex];
@@ -116,7 +116,7 @@ class Rt extends xt {
       return;
     this.historyStack = this.historyStack.slice(0, this.currentHistoryIndex + 1);
     const t = {
-      points: this.areaMesh.points.map((o) => o.clone())
+      points: this.areaMesh.points.map((n) => n.clone())
     };
     this.historyStack.push(t), this.historyStack.length > this.maxHistorySize ? this.historyStack.shift() : this.currentHistoryIndex++;
   }
@@ -124,127 +124,130 @@ class Rt extends xt {
    * 恢复快照
    */
   restoreSnapshot(t) {
-    this.areaMesh.setPoints(t.points.map((o) => o.clone())), this.updateCreationPointMeshes(), this._editor && this._editor.updatePointMeshes();
+    this.areaMesh.setPoints(t.points.map((n) => n.clone())), this.updateCreationPointMeshes(), this._editor && this._editor.updatePointMeshes();
   }
   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();
+      const n = new rt(t);
+      this.areaMesh = n, 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: n, 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 = [];
-  const lt = (i = n) => {
-    j.forEach((d, c) => {
-      const p = i[c];
-      p && d.position.copy(p);
+  let v = [];
+  const lt = (i = o) => {
+    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 = o.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([]);
-  const n = [];
-  let l, m, R = !1, U;
-  const O = [], Y = () => n.length > 0, z = () => O.length > 0, at = () => {
+  s.enable(), c && s.setAdherePoints([]);
+  const o = [];
+  let l, m, W = !1, U;
+  const E = [], z = () => o.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(o.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;
-    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;
+    B() && (o.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 = o.length === 0 ? i.point : l.clone();
+    if (c && (d = d.clone().setY(M)), t.__onWillAddPoint(d, o), !((t == null ? void 0 : t.experimental_max_point_count) != null && o.length === t.experimental_max_point_count)) {
+      if (o.push(d), e.setPoints(o, { closed: !1 }), t != null && t.experimental_self_intersect_check && o.length > 2 && e.isBlank) {
+        const f = o.pop();
+        e.setPoints(o, { 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, o), 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();
+      P.setPoints([]), y.setPoints([]), e.setPoints(o), s.pointSelectorHelper && s.pointSelectorHelper.magnifier && s.pointSelectorHelper.magnifier.render();
     };
     if (!i) {
       d(), D();
       return;
     }
-    if (U = i, !(n != null && n.length))
+    if (U = i, !(o != null && o.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 = o.at(-1).clone();
+    if (o.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), o[0]), s.plane = m, l = m.projectPoint(i.point, new j.Vector3()), P.setPoints([p, l]), y.setPoints([l, i.point])) : w === "y" && (o.length === 1 ? (l = i.point, P.setPoints([p, l]), y.setPoints([])) : (m = m != null ? m : new j.Plane().setFromCoplanarPoints(o[0], o[1], new j.Vector3(0, 1, 0).add(o[0])), s.plane = m, l = m.projectPoint(i.point, new j.Vector3()), P.setPoints([p, l]), y.setPoints([l, i.point])))), o.length >= 3) {
+      c ? l = i.point.clone().setY(M) : l = e.projectPoint(i.point);
+      const h = o[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();
+    o.length >= 2 ? (e.setPoints([...o, 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();
   }, 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), {
-    finished: o,
-    canUndo: Y,
-    canRedo: z,
+  return s.on("select", q), s.on("intersectionUpdate", O), s.on("disable", L), {
+    finished: n,
+    canUndo: z,
+    canRedo: B,
     undo: at,
     redo: ht
   };
 }
 export {
-  Rt as Polygon,
-  vt as createPolygon
+  Wt as Polygon,
+  jt as createPolygon
 };

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

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

package/libs/Sculpt/index.d.ts

@@ -32,7 +32,7 @@ export interface SculptConfig {
     /**
      * @description 放大镜配置
      * 设置为 null 或 false 可禁用放大镜功能
-     * @default *{ width: 190, height: 190, scale: 2, dragEnabled: true }*
+     * @default { width: 190, height: 190, scale: 2, dragEnabled: true }
      */
     magnifier?: MagnifierParameter | null | false;
     /**
@@ -41,11 +41,6 @@ export interface SculptConfig {
      * @default false
      */
     hideCursorCircle?: boolean;
-    /**
-     * @description 是否自定义拾取点过滤函数
-     * @default false
-     */
-    hitFilter?: () => boolean;
 }
 interface Data {
     items: Array<BuiltInData>;
@@ -58,6 +53,32 @@ 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 将要添加到下一个点到坐标
+     * @param points 当前已经绘制的点坐标（不包括即将添加的点）
+     */
+    'polygon.experimental_point_will_add': (item: Polygon, point: THREE.Vector3, points: THREE.Vector3[]) => void;
+    /**
+     * @description prism 将要添加到下一个点
+     * @param item Prism 实例
+     * @param point prism 将要添加到下一个点到坐标
+     * @param points 当前已经绘制的点坐标（不包括即将添加的点）
+     */
+    'prism.experimental_point_will_add': (item: Prism, point: THREE.Vector3, points: THREE.Vector3[]) => void;
+    /**
+     * @description prism 检测到自相交时的回调
+     * @param item Prism 实例
+     * @param point 尝试添加但被拒绝的点坐标
+     */
+    'prism.experimental_self_intersect': (item: Prism, point: THREE.Vector3) => void;
 };
 export declare class Sculpt extends Subscribe<Event> {
     static modules: {