@realsee/dnalogel 3.79.3 → 3.80.1-alpha.0

package/libs/PanoTagPlugin/controller/Tag/BoxTag.js

@@ -1,30 +1,30 @@
 var P = Object.defineProperty;
 var b = Object.getOwnPropertySymbols;
 var E = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var S = (a, n, t) => n in a ? P(a, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[n] = t, y = (a, n) => {
-  for (var t in n || (n = {}))
-    E.call(n, t) && S(a, t, n[t]);
+var S = (a, p, t) => p in a ? P(a, p, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[p] = t, y = (a, p) => {
+  for (var t in p || (p = {}))
+    E.call(p, t) && S(a, t, p[t]);
   if (b)
-    for (var t of b(n))
-      B.call(n, t) && S(a, t, n[t]);
+    for (var t of b(p))
+      B.call(p, t) && S(a, t, p[t]);
   return a;
 };
-var f = (a, n, t) => (S(a, typeof n != "symbol" ? n + "" : n, t), t);
-var g = (a, n, t) => new Promise((i, o) => {
-  var e = (p) => {
+var f = (a, p, t) => (S(a, typeof p != "symbol" ? p + "" : p, t), t);
+var g = (a, p, t) => new Promise((i, o) => {
+  var e = (n) => {
     try {
-      l(t.next(p));
+      l(t.next(n));
     } catch (h) {
       o(h);
     }
-  }, s = (p) => {
+  }, s = (n) => {
     try {
-      l(t.throw(p));
+      l(t.throw(n));
     } catch (h) {
       o(h);
     }
-  }, l = (p) => p.done ? i(p.value) : Promise.resolve(p.value).then(e, s);
-  l((t = t.apply(a, n)).next());
+  }, l = (n) => n.done ? i(n.value) : Promise.resolve(n.value).then(e, s);
+  l((t = t.apply(a, p)).next());
 });
 import { BaseTag as z } from "./BaseTag.js";
 import * as r from "three";
@@ -187,6 +187,7 @@ import "../../../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../../../Sculpt/utils/three/ColoredMesh.js";
 import "../../../shared-utils/three/geometryUtil.js";
 import "../../../Sculpt/Objects/Polygon/Editor.js";
+import "../../../Sculpt/utils/isIntersecting.js";
 import "../../../Sculpt/Objects/Prism/index.js";
 import "../../../Sculpt/Meshes/Prism.js";
 import "../../../shared-utils/three/core/PrismGeometry.js";
@@ -261,8 +262,8 @@ class ne extends z {
     const t = this.position;
     if (!(t != null && t.start) || !(t != null && t.end))
       return [0, 0, 0];
-    const i = t.end.map((h) => Number(h)), o = t.start.map((h) => Number(h)), e = i[0] / 2 + o[0] / 2, s = i[1] / 2 + o[1] / 2, l = i[2] / 2 + o[2] / 2, p = new r.Vector3(e, s, l);
-    return x(p, this.workUtil.transform).toArray();
+    const i = t.end.map((h) => Number(h)), o = t.start.map((h) => Number(h)), e = i[0] / 2 + o[0] / 2, s = i[1] / 2 + o[1] / 2, l = i[2] / 2 + o[2] / 2, n = new r.Vector3(e, s, l);
+    return x(n, this.workUtil.transform).toArray();
   }
   /**
    * 获取盒子的8个角点坐标
@@ -394,15 +395,15 @@ class ne extends z {
    * 将 BoxPosition 转换为 Sculpt 需要的数据格式
    */
   boxPositionToSculptData(t) {
-    const i = u(t.start), o = u(t.end), e = new r.Euler().fromArray(t.rotation), s = new r.Vector3((i.x + o.x) / 2, (i.y + o.y) / 2, (i.z + o.z) / 2), l = new r.Vector3(Math.abs(o.x - i.x) / 2, Math.abs(o.y - i.y) / 2, Math.abs(o.z - i.z) / 2), p = new r.Matrix4().makeRotationFromEuler(e), h = [
+    const i = u(t.start), o = u(t.end), e = new r.Euler().fromArray(t.rotation), s = new r.Vector3((i.x + o.x) / 2, (i.y + o.y) / 2, (i.z + o.z) / 2), l = new r.Vector3(Math.abs(o.x - i.x) / 2, Math.abs(o.y - i.y) / 2, Math.abs(o.z - i.z) / 2), n = new r.Matrix4().makeRotationFromEuler(e), h = [
       new r.Vector3(-0.5, -0.5, -0.5),
       new r.Vector3(0.5, -0.5, -0.5),
       new r.Vector3(0.5, -0.5, 0.5),
       new r.Vector3(-0.5, -0.5, 0.5)
     ], d = new r.Vector3(-0.5, 0.5, -0.5), c = l.clone().multiplyScalar(2), m = this.workUtil.transform, v = h.map((V) => {
-      const C = V.clone().multiply(c).applyMatrix4(p).add(s);
+      const C = V.clone().multiply(c).applyMatrix4(n).add(s);
       return x(C, m);
-    }), w = d.clone().multiply(c).applyMatrix4(p).add(s), k = x(w, m);
+    }), w = d.clone().multiply(c).applyMatrix4(n).add(s), k = x(w, m);
     return { bottomPoints: v, heightPoint: k };
   }
   /**
@@ -466,9 +467,9 @@ class ne extends z {
       new r.Vector3(e.x, o.y, e.z),
       new r.Vector3(o.x, e.y, e.z),
       new r.Vector3(e.x, e.y, e.z)
-    ], p = new r.Vector3().addVectors(o, e).multiplyScalar(0.5), h = this.workUtil.transform;
+    ], n = new r.Vector3().addVectors(o, e).multiplyScalar(0.5), h = this.workUtil.transform;
     l.forEach((m) => {
-      m.sub(p).applyEuler(s).add(p), m.copy(x(m, h));
+      m.sub(n).applyEuler(s).add(n), m.copy(x(m, h));
     });
     let d = l[0];
     l.forEach((m) => {

package/libs/PanoTagPlugin/controller/Tag/PlaneTag.js

@@ -276,6 +276,7 @@ import "../../../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../../../Sculpt/utils/three/ColoredMesh.js";
 import "../../../shared-utils/three/geometryUtil.js";
 import "../../../Sculpt/Objects/Polygon/Editor.js";
+import "../../../Sculpt/utils/isIntersecting.js";
 import "../../../Sculpt/Objects/Prism/index.js";
 import "../../../Sculpt/Meshes/Prism.js";
 import "../../../shared-utils/three/core/PrismGeometry.js";
@@ -301,7 +302,7 @@ import "../../../Sculpt/Objects/Line/index.js";
 import "../../../Sculpt/Editors/RectangleMeshEditor.js";
 import "../../../Sculpt/utils/sortPositionsByCameraPosition.js";
 const Z = /* @__PURE__ */ new Map(), z = /* @__PURE__ */ new Map();
-class Yr extends N {
+class tn extends N {
   constructor(t, e) {
     super(t, e);
     v(this, "_floorIndex");
@@ -557,5 +558,5 @@ class Yr extends N {
   }
 }
 export {
-  Yr as PlaneTag
+  tn as PlaneTag
 };

package/libs/PanoTagPlugin/controller/Tag/PolygonTag.js

@@ -210,7 +210,8 @@ import "../../../Sculpt/Meshes/Box.js";
 import "../../../shared-utils/forReverseEach.js";
 import "../../../Sculpt/Objects/Line/index.js";
 import "../../../Sculpt/Objects/Polygon/Editor.js";
-class Ii extends v {
+import "../../../Sculpt/utils/isIntersecting.js";
+class Ji extends v {
   constructor(t, o) {
     super(t, o);
     c(this, "tagStyle");
@@ -476,5 +477,5 @@ class Ii extends v {
   }
 }
 export {
-  Ii as PolygonTag
+  Ji as PolygonTag
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -291,6 +291,7 @@ import "../../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../../Sculpt/utils/three/ColoredMesh.js";
 import "../../shared-utils/three/geometryUtil.js";
 import "../../Sculpt/Objects/Polygon/Editor.js";
+import "../../Sculpt/utils/isIntersecting.js";
 import "../../Sculpt/Objects/Prism/index.js";
 import "../../Sculpt/Meshes/Prism.js";
 import "../../shared-utils/three/core/PrismGeometry.js";
@@ -335,8 +336,8 @@ import "../Components/Common/TagPopover/TagPopoverToolBar.js";
 import "../Components/Common/TagPopover/ArrowRightIcon.js";
 import "../Components/Common/TagPopover/ShareIcon.js";
 import "../utils/popoverContainer.js";
-const I = "Dnalogel-PanoTagPlugin", Vs = (l) => `${I}--${l}`;
-class zs extends $ {
+const I = "Dnalogel-PanoTagPlugin", zs = (l) => `${I}--${l}`;
+class $s extends $ {
   constructor(e, t) {
     super(e);
     /** state */
@@ -917,7 +918,7 @@ class zs extends $ {
   }
 }
 export {
-  zs as PanoTagPluginController,
-  zs as default,
-  Vs as pluginFlag
+  $s as PanoTagPluginController,
+  $s as default,
+  zs as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,7 @@
 import r from "./controller/index.js";
-import { pluginFlag as Si } from "./controller/index.js";
-import { defaultGlobalConfig as Vi } from "./typings/tag/TagConfig.js";
-import { ContentType as Xi, DimensionType as Yi, PointType as Zi } from "./Archive/deprecated.js";
+import { pluginFlag as Ui } from "./controller/index.js";
+import { defaultGlobalConfig as Wi } from "./typings/tag/TagConfig.js";
+import { ContentType as Yi, DimensionType as Zi, PointType as _i } from "./Archive/deprecated.js";
 import "three";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../shared-utils/positionToVector3.js";
@@ -260,6 +260,7 @@ import "../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../Sculpt/utils/three/ColoredMesh.js";
 import "../shared-utils/three/geometryUtil.js";
 import "../Sculpt/Objects/Polygon/Editor.js";
+import "../Sculpt/utils/isIntersecting.js";
 import "../Sculpt/Objects/Prism/index.js";
 import "../Sculpt/Meshes/Prism.js";
 import "../shared-utils/three/core/PrismGeometry.js";
@@ -309,14 +310,14 @@ import "./Components/Common/TagPopover/ArrowRightIcon.js";
 import "./Components/Common/TagPopover/ShareIcon.js";
 import "./utils/popoverContainer.js";
 import "../shared-utils/animationFrame/BetterTween.js";
-const Oi = (o, t) => new r(o, t);
+const Qi = (o, t) => new r(o, t);
 export {
-  Xi as ContentType,
-  Yi as DimensionType,
-  Oi as PanoTagPlugin,
+  Yi as ContentType,
+  Zi as DimensionType,
+  Qi as PanoTagPlugin,
   r as PanoTagPluginController,
-  Zi as PointType,
-  Oi as default,
-  Vi as defaultGlobalConfig,
-  Si as pluginFlag
+  _i as PointType,
+  Qi as default,
+  Wi as defaultGlobalConfig,
+  Ui as pluginFlag
 };

package/libs/PanoTagPlugin/tag.config.js

@@ -30,7 +30,8 @@ const e = {
         showMore: !0,
         showShare: !0
       },
-      viewMoreText: "查看更多"
+      viewMoreText: "查看更多",
+      showMedia: !1
     },
     tagNormalLineConfig: {
       enabled: !0,

package/libs/PanoTagPlugin/typings/tag/TagConfig.d.ts

@@ -351,6 +351,11 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
          * @default '查看更多'
          */
         viewMoreText?: string;
+        /**
+         * @description 营销标签展开卡片中是否展示媒体区域（需同时提供 data.mediaData，与 popoverConfig.enabled 无关）
+         * @default false
+         */
+        showMedia?: boolean;
         /**
          * @description 鼠标悬停前的拦截函数，返回 true 允许 hover，false 阻止 hover
          */

package/libs/PanoTagPlugin/typings/tag/TagData.d.ts

@@ -109,6 +109,10 @@ export interface ContentTypeMapInterface {
             /** 单位 */
             unit: string;
         };
+        /** 卡片内媒体（需 config.popoverConfig.showMedia 为 true 时展示） */
+        mediaData?: (MediaData & {
+            name?: string;
+        })[];
     };
     /** 营销贴片 */
     MediaPlane: {

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

@@ -1,45 +1,46 @@
-var ct = Object.defineProperty, Pt = Object.defineProperties;
-var yt = Object.getOwnPropertyDescriptors;
+var Pt = Object.defineProperty, yt = Object.defineProperties;
+var mt = Object.getOwnPropertyDescriptors;
 var it = Object.getOwnPropertySymbols;
-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) && T(e, t, s[t]);
+var xt = Object.prototype.hasOwnProperty, ft = Object.prototype.propertyIsEnumerable;
+var v = Math.pow, T = (s, e, t) => e in s ? Pt(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, _ = (s, e) => {
+  for (var t in e || (e = {}))
+    xt.call(e, t) && T(s, t, e[t]);
   if (it)
-    for (var t of it(s))
-      xt.call(s, t) && T(e, t, s[t]);
-  return e;
-}, 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) => {
+    for (var t of it(e))
+      ft.call(e, t) && T(s, t, e[t]);
+  return s;
+}, R = (s, e) => yt(s, mt(e));
+var C = (s, e, t) => (T(s, typeof e != "symbol" ? e + "" : e, t), t);
+var ot = (s, e, t) => new Promise((r, n) => {
   var x = (c) => {
     try {
       w(t.next(c));
     } catch (u) {
-      r(u);
+      n(u);
     }
   }, a = (c) => {
     try {
       w(t.throw(c));
     } catch (u) {
-      r(u);
+      n(u);
     }
-  }, w = (c) => c.done ? n(c.value) : Promise.resolve(c.value).then(x, a);
-  w((t = t.apply(e, s)).next());
+  }, w = (c) => c.done ? r(c.value) : Promise.resolve(c.value).then(x, a);
+  w((t = t.apply(s, e)).next());
 });
-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";
-import { vector3ToArray as Ct } from "../../../shared-utils/three/vector3ToArray.js";
-import { withResolvers as wt } from "../../../shared-utils/promise/withResolvers.js";
-import { anyPositionToVector3 as Dt } from "../../../shared-utils/positionToVector3.js";
+import { BaseObject as bt } from "../Base/index.js";
+import * as H from "three";
+import { PolylineMesh as rt } from "../../Meshes/Polyline.js";
+import { AreaMesh as nt } from "../../Meshes/Area.js";
+import { PolygonEditor as Ct } from "./Editor.js";
+import { vector3ToArray as wt } from "../../../shared-utils/three/vector3ToArray.js";
+import { withResolvers as Dt } from "../../../shared-utils/promise/withResolvers.js";
+import { anyPositionToVector3 as _t } from "../../../shared-utils/positionToVector3.js";
 import { PointMesh as Ht } from "../../Meshes/Point.js";
-class Wt extends ft {
-  constructor(t, n) {
-    var r;
-    super(t, n);
+import { isPolygenIntersecting as lt } from "../../utils/isIntersecting.js";
+class At extends bt {
+  constructor(t, r) {
+    var n;
+    super(t, r);
     C(this, "type", "Polygon");
     C(this, "areaMesh");
     // 新增：Polygon 专属的历史记录
@@ -48,19 +49,19 @@ class Wt extends ft {
     C(this, "maxHistorySize", 50);
     C(this, "_editor");
     C(this, "creatingObject");
-    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));
+    t && (this.areaMesh = new nt(_(_({}, t.style), t)), this.areaMesh.userData = (n = this.areaMesh.userData) != null ? n : {}, 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;
+    return this._editor || (this._editor = new Ct(this)), this._editor;
   }
   updateCreationPointMeshes() {
-    var n, r;
-    const t = (r = (n = this.areaMesh) == null ? void 0 : n.userData) == null ? void 0 : r.syncCreationPointMeshes;
+    var r, n;
+    const t = (n = (r = this.areaMesh) == null ? void 0 : r.userData) == null ? void 0 : n.syncCreationPointMeshes;
     typeof t == "function" && t(), this._editor && this._editor.updatePointMeshes();
   }
   get data() {
-    return this.updateMatrixWorld(), R(H({}, this.baseData), {
-      points: Ct(this.applyObjectMatrixWorld(this.areaMesh.points)),
+    return this.updateMatrixWorld(), R(_({}, this.baseData), {
+      points: wt(this.applyObjectMatrixWorld(this.areaMesh.points)),
       style: {
         color: this.areaMesh.color.getHex(),
         lineColor: this.areaMesh.lineColor.getHex(),
@@ -69,7 +70,7 @@ class Wt extends ft {
     });
   }
   setData(t) {
-    t.points && this.areaMesh.setPoints(this.applyObjectReversalMatrixWorld(t.points.map(Dt))), this.areaMesh.setStyle(t.style), this.updateCreationPointMeshes();
+    t.points && this.areaMesh.setPoints(this.applyObjectReversalMatrixWorld(t.points.map(_t))), this.areaMesh.setStyle(t.style), this.updateCreationPointMeshes();
   }
   highlight() {
     var t;
@@ -80,32 +81,32 @@ class Wt extends ft {
     (t = this.areaMesh) == null || t.unhighlight();
   }
   canUndo() {
-    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;
+    var r, n, x;
+    return this.creatingObject ? (x = (n = (r = this.creatingObject) == null ? void 0 : r.canUndo) == null ? void 0 : n.call(r)) != null ? x : !1 : this.currentHistoryIndex > 0;
   }
   canRedo() {
-    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;
+    var t, r, n;
+    return this.creatingObject ? (n = (r = (t = this.creatingObject) == null ? void 0 : t.canRedo) == null ? void 0 : r.call(t)) != null ? n : !1 : this.currentHistoryIndex < this.historyStack.length - 1;
   }
   undo() {
-    var t, n;
+    var t, r;
     if (this.creatingObject)
-      return (n = (t = this.creatingObject) == null ? void 0 : t.undo) == null ? void 0 : n.call(t);
+      return (r = (t = this.creatingObject) == null ? void 0 : t.undo) == null ? void 0 : r.call(t);
     if (this.canUndo()) {
       this.currentHistoryIndex--;
-      const r = this.historyStack[this.currentHistoryIndex];
-      this.restoreSnapshot(r);
+      const n = this.historyStack[this.currentHistoryIndex];
+      this.restoreSnapshot(n);
     } else
       console.log("[Polygon] undo: 无法撤销", { uuid: this.uuid });
   }
   redo() {
-    var t, n;
+    var t, r;
     if (this.creatingObject)
-      return (n = (t = this.creatingObject) == null ? void 0 : t.redo) == null ? void 0 : n.call(t);
+      return (r = (t = this.creatingObject) == null ? void 0 : t.redo) == null ? void 0 : r.call(t);
     if (this.canRedo()) {
       this.currentHistoryIndex++;
-      const r = this.historyStack[this.currentHistoryIndex];
-      this.restoreSnapshot(r);
+      const n = this.historyStack[this.currentHistoryIndex];
+      this.restoreSnapshot(n);
     }
   }
   /**
@@ -116,7 +117,7 @@ class Wt extends ft {
       return;
     this.historyStack = this.historyStack.slice(0, this.currentHistoryIndex + 1);
     const t = {
-      points: this.areaMesh.points.map((n) => n.clone())
+      points: this.areaMesh.points.map((r) => r.clone())
     };
     this.historyStack.push(t), this.historyStack.length > this.maxHistorySize ? this.historyStack.shift() : this.currentHistoryIndex++;
   }
@@ -124,88 +125,88 @@ class Wt extends ft {
    * 恢复快照
    */
   restoreSnapshot(t) {
-    this.areaMesh.setPoints(t.points.map((n) => n.clone())), this.updateCreationPointMeshes(), this._editor && this._editor.updatePointMeshes();
+    this.areaMesh.setPoints(t.points.map((r) => r.clone())), this.updateCreationPointMeshes(), this._editor && this._editor.updatePointMeshes();
   }
   create(t) {
     return ot(this, null, function* () {
-      var r;
+      var n;
       this.children.forEach((x) => {
         x.parent === this && this.remove(x);
       }), this.children.length = 0;
-      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();
+      const r = new nt(t);
+      this.areaMesh = r, this.add(this.areaMesh), this.creatingObject = jt(this.areaMesh, this.pointSelector, t), yield (n = this.creatingObject) == null ? void 0 : n.finished, this.creatingObject = null, this.recordHistory(), this.updateCreationPointMeshes(), this.config.defaultAction && this.editor.enable();
     });
   }
 }
-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;
+function jt(s, e, t) {
+  var $, B, G, J, K, Q, X, Z, g;
+  const { promise: r, resolve: n, reject: x } = Dt(), a = s.parent;
   if (!a) {
     x(new Error("No container"));
     return;
   }
-  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;
+  const w = ($ = t == null ? void 0 : t.limit) != null ? $ : "none", c = t == null ? void 0 : t.simpleMode, u = (Q = (K = (G = s.five) != null ? G : (B = s.get) == null ? void 0 : B.call(s, "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;
+  s.userData = (Z = s.userData) != null ? Z : {}, s.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);
+  const P = new rt(s.style);
   a == null || a.add(P);
-  const y = new nt(R(H({}, e.style), { dashed: !0, lengthEnable: !1 }));
+  const y = new rt(R(_({}, s.style), { dashed: !0, lengthEnable: !1 }));
   a == null || a.add(y);
-  let v = [];
-  const lt = (i = o) => {
-    v.forEach((d, p) => {
+  let j = [];
+  const at = (i = o) => {
+    j.forEach((d, p) => {
       const h = i[p];
       h && d.position.copy(h);
     });
   };
   function D() {
     var d, p;
-    v.forEach((h) => {
+    j.forEach((h) => {
       var f;
       return (f = h.parent) == null ? void 0 : f.remove(h);
     });
-    const i = (p = (d = e.line) == null ? void 0 : d.style) != null ? p : e.style;
-    v = o.map((h, f) => {
-      var S, k;
-      const b = new Ht(R(H({}, i), {
+    const i = (p = (d = s.line) == null ? void 0 : d.style) != null ? p : s.style;
+    j = o.map((h, f) => {
+      var S, I;
+      const b = new Ht(R(_({}, i), {
         color: (S = i.pointColor) != null ? S : i.lineColor,
         tip: void 0,
         point: h
       }));
-      return b.name = `PolygonPointMesh_${f}`, b.userData = (k = b.userData) != null ? k : {}, b.userData.dragSelectPixelDistance = V, a == null || a.add(b), b;
-    }), lt();
+      return b.name = `PolygonPointMesh_${f}`, b.userData = (I = b.userData) != null ? I : {}, b.userData.dragSelectPixelDistance = V, a == null || a.add(b), b;
+    }), at();
   }
   function Y() {
-    v.forEach((i) => {
+    j.forEach((i) => {
       var d;
       return (d = i.parent) == null ? void 0 : d.remove(i);
-    }), v = [], e.userData && (delete e.userData.creationPointMeshes, delete e.userData.syncCreationPointMeshes, delete e.userData.disposeCreationPointMeshes);
+    }), j = [], s.userData && (delete s.userData.creationPointMeshes, delete s.userData.syncCreationPointMeshes, delete s.userData.disposeCreationPointMeshes);
   }
-  s.enable(), c && s.setAdherePoints([]);
+  e.enable(), c && e.setAdherePoints([]);
   const o = [];
   let l, m, W = !1, U;
-  const E = [], z = () => o.length > 0, B = () => E.length > 0, at = () => {
+  const E = [], z = () => o.length > 0, q = () => E.length > 0, ht = () => {
     var i;
-    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 = () => {
+    z() && (E.push(o.pop()), O(U), D(), (i = t == null ? void 0 : t.onUndo) == null || i.call(t), e.pointSelectorHelper && e.pointSelectorHelper.magnifier && e.pointSelectorHelper.magnifier.render());
+  }, dt = () => {
     var i;
-    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) => {
+    q() && (o.push(E.pop()), O(U), D(), (i = t == null ? void 0 : t.onRedo) == null || i.call(t), e.pointSelectorHelper && e.pointSelectorHelper.magnifier && e.pointSelectorHelper.magnifier.render());
+  }, F = (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) {
+      if (o.push(d), s.setPoints(o, { closed: !1 }), t != null && t.experimental_self_intersect_check && lt(o)) {
         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);
+        s.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(), (h = t == null ? void 0 : t.onPointPlaced) == null || h.call(t, o), W && (L(), n());
     }
   }, O = (i) => {
     const d = () => {
-      P.setPoints([]), y.setPoints([]), e.setPoints(o), s.pointSelectorHelper && s.pointSelectorHelper.magnifier && s.pointSelectorHelper.magnifier.render();
+      P.setPoints([]), y.setPoints([]), s.setPoints(o), e.pointSelectorHelper && e.pointSelectorHelper.magnifier && e.pointSelectorHelper.magnifier.render();
     };
     if (!i) {
       d(), D();
@@ -214,40 +215,40 @@ function jt(e, s, t) {
     if (U = i, !(o != null && o.length))
       return d();
     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);
+    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 H.Plane().setFromNormalAndCoplanarPoint(new H.Vector3(0, 1, 0), o[0]), e.plane = m, l = m.projectPoint(i.point, new H.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 H.Plane().setFromCoplanarPoints(o[0], o[1], new H.Vector3(0, 1, 0).add(o[0])), e.plane = m, l = m.projectPoint(i.point, new H.Vector3()), P.setPoints([p, l]), y.setPoints([l, i.point])))), o.length >= 3) {
+      c ? l = i.point.clone().setY(M) : l = s.projectPoint(i.point);
       const h = o[0];
       let f = !1;
       if (typeof (t == null ? void 0 : t.autoClosePixelDistance) == "number") {
         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);
+          const b = u.getElement(), S = b.clientWidth, I = b.clientHeight, A = (ct) => {
+            const st = ct.clone().project(u.camera);
             return {
               x: (st.x * 0.5 + 0.5) * S,
-              y: (1 - (st.y * 0.5 + 0.5)) * k
+              y: (1 - (st.y * 0.5 + 0.5)) * I
             };
-          }, 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);
+          }, k = A(h), tt = A(l), et = A(i.point), ut = Math.sqrt(v(k.x - tt.x, 2) + v(k.y - tt.y, 2)), pt = Math.sqrt(v(k.x - et.x, 2) + v(k.y - et.y, 2));
+          (ut < t.autoClosePixelDistance || pt < t.autoClosePixelDistance) && (f = !0);
         }
       } else
         (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]);
+      f ? (l = h, i.point.copy(h), e.pointSelectorHelper.updateWithIntersect(i, { emitEvent: !1 }), W = !0) : W = !1, P.setPoints([p, l]), y.setPoints([l, i.point]);
     }
-    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 = () => {
-    s.off("select", q), s.off("intersectionUpdate", O), s.off("disable", L), s.plane = null, s.disable(), a == null || a.remove(P, y), Y();
+    o.length >= 2 ? (s.setPoints([...o, l], { closed: !1 }), s.line.setPoints(s.points.slice(0, -1)), t != null && t.experimental_self_intersect_check && lt([...o, l]) ? (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([]), D();
   }, L = () => {
-    F(), a == null || a.remove(e, y, P), Y(), x(new Error("Cancelled"));
+    e.off("select", F), e.off("intersectionUpdate", O), e.off("disable", N), e.plane = null, e.disable(), a == null || a.remove(P, y), Y();
+  }, N = () => {
+    L(), a == null || a.remove(s, y, P), Y(), x(new Error("Cancelled"));
   };
-  return s.on("select", q), s.on("intersectionUpdate", O), s.on("disable", L), {
-    finished: n,
+  return e.on("select", F), e.on("intersectionUpdate", O), e.on("disable", N), {
+    finished: r,
     canUndo: z,
-    canRedo: B,
-    undo: at,
-    redo: ht
+    canRedo: q,
+    undo: ht,
+    redo: dt
   };
 }
 export {
-  Wt as Polygon,
+  At as Polygon,
   jt as createPolygon
 };

package/libs/Sculpt/utils/isIntersecting.d.ts

@@ -0,0 +1,17 @@
+interface Point3D {
+    x: number;
+    y: number;
+    z: number;
+}
+interface Line3D {
+    start: Point3D;
+    end: Point3D;
+}
+/**
+ * @description 判断线段是否相交
+ * @todo ai写的一些变量名起的比较怪，懒得改了
+ */
+export declare function isIntersecting(line1: Line3D, line2: Line3D | Line3D[]): boolean;
+export declare function isLinesIntersecting(lines: Line3D[]): boolean;
+export declare function isPolygenIntersecting(points: Point3D[]): boolean;
+export {};