@realsee/dnalogel 3.72.5-alpha.3 → 3.72.5-alpha.5

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

@@ -1,22 +1,22 @@
 var Q = Object.defineProperty, Y = Object.defineProperties;
 var ee = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
+var R = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
 var T = Math.pow, V = (m, i, e) => i in m ? Q(m, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[i] = e, y = (m, i) => {
   for (var e in i || (i = {}))
-    E.call(i, e) && V(m, e, i[e]);
+    R.call(i, e) && V(m, e, i[e]);
   if (w)
     for (var e of w(i))
-      O.call(i, e) && V(m, e, i[e]);
+      E.call(i, e) && V(m, e, i[e]);
   return m;
 }, S = (m, i) => Y(m, ee(i));
-var R = (m, i) => {
+var O = (m, i) => {
   var e = {};
   for (var t in m)
-    E.call(m, t) && i.indexOf(t) < 0 && (e[t] = m[t]);
+    R.call(m, t) && i.indexOf(t) < 0 && (e[t] = m[t]);
   if (m != null && w)
     for (var t of w(m))
-      i.indexOf(t) < 0 && O.call(m, t) && (e[t] = m[t]);
+      i.indexOf(t) < 0 && E.call(m, t) && (e[t] = m[t]);
   return e;
 };
 var a = (m, i, e) => (V(m, typeof i != "symbol" ? i + "" : i, e), e);
@@ -406,7 +406,7 @@ class Wi {
     this.cache.clear();
   }
   updateVisible() {
-    this.enabled ? (this.state.visible = this.getVisible(), this.applyVisible()) : this.applyVisible(), this._updating = !1;
+    this.enabled ? (this.state.visible = this.getVisible(), this.applyVisible()) : this.applyVisible(), this.five.needsRender = !0, this._updating = !1;
   }
   updateZIndex() {
     const i = this.getSquaredDistance();
@@ -512,7 +512,7 @@ class Wi {
         if ((u == null ? void 0 : u.value) === !1)
           return u;
         if (n.followModelVisibility === !0 && ["poincare", "aerophoto", "sand"].includes(this.workUtil.fromType) && (o === "Floorplan" || o === "Mapview")) {
-          const p = this.computeVisibleByFloorIndex(), { value: v } = p, b = R(p, ["value"]);
+          const p = this.computeVisibleByFloorIndex(), { value: v } = p, b = O(p, ["value"]);
           if (v === !1)
             return y({ value: !1, checkedList: s, reason: "followModelVisibility check failed" }, b);
         }

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

@@ -1,11 +1,11 @@
-var D = Object.defineProperty;
-var A = (m, a, t) => a in m ? D(m, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : m[a] = t;
-var p = (m, a, t) => (A(m, typeof a != "symbol" ? a + "" : a, t), t);
-import { BaseTag as w } from "./BaseTag.js";
+var I = Object.defineProperty;
+var M = (p, h, t) => h in p ? I(p, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : p[h] = t;
+var c = (p, h, t) => (M(p, typeof h != "symbol" ? h + "" : h, t), t);
+import { BaseTag as U } from "./BaseTag.js";
 import * as r from "three";
-import { Line as V } from "@realsee/five/line";
-import { anyPositionToVector3 as E } from "../../../shared-utils/positionToVector3.js";
-import { transformPosition as k } from "../../../shared-utils/five/transformPosition.js";
+import { Line as R } from "@realsee/five/line";
+import { anyPositionToVector3 as g } from "../../../shared-utils/positionToVector3.js";
+import { transformPosition as P } from "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -87,17 +87,17 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/promise/withResolvers.js";
-const u = new r.Vector2();
-class di extends w {
+const _ = new r.Vector2();
+class Pi extends U {
   constructor(t, e) {
-    var i, o, s, n, l;
+    var o, i, n, s, a;
     super(t, e);
-    p(this, "__Object__");
-    p(this, "requestIdleCallbackId");
+    c(this, "__Object__");
+    c(this, "requestIdleCallbackId");
     // icon 与线条端点的固定像素间距
-    p(this, "iconPixelGap", 10);
+    c(this, "iconPixelGap", 10);
     // 优化：重用临时对象，避免频繁创建
-    p(this, "_temp", {
+    c(this, "_temp", {
       lineStart: new r.Vector3(),
       // 线条起点（project后会变成NDC）
       iconPos: new r.Vector3(),
@@ -114,30 +114,30 @@ class di extends w {
       // 射线投射器
     });
     // 用于变化检测的缓存值
-    p(this, "_lastUpdateCache", {
+    c(this, "_lastUpdateCache", {
       position: [0, 0, 0],
       screenLeft: 0,
       screenTop: 0,
       scale: 1,
       visible: !1
     });
-    if ((o = (i = e.style) == null ? void 0 : i.point) != null && o.width) {
-      const h = (l = (n = (s = e.style) == null ? void 0 : s.point) == null ? void 0 : n.scale) != null ? l : 1;
-      this.iconPixelGap = e.style.point.width * h * 1.4 / 2 + 2;
+    if ((i = (o = e.style) == null ? void 0 : o.point) != null && i.width) {
+      const d = (a = (s = (n = e.style) == null ? void 0 : n.point) == null ? void 0 : s.scale) != null ? a : 1;
+      this.iconPixelGap = e.style.point.width * d * 1.4 / 2 + 2;
     }
-    this.initialTagLine();
+    e.contentType === "Audio" && (this.iconPixelGap = 34 / 2 + 2), this.initialTagLine();
   }
   initialTagLine() {
-    var o, s, n;
+    var n, s, a;
     const t = this.config;
-    if (!((o = t == null ? void 0 : t.tagNormalLineConfig) != null && o.enabled) || !this.normalLineLength)
+    if (!this.five.renderer || !((n = t == null ? void 0 : t.tagNormalLineConfig) != null && n.enabled) || !this.normalLineLength)
       return;
-    const e = this.five.renderer.getSize(u), i = this.five.renderer.getPixelRatio();
-    this.tagNormalLine = new V(new r.Vector3().fromArray(this.position), new r.Vector3().fromArray(this.originPosition)), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
+    const e = this.five.renderer.getSize(_), o = this.five.renderer.getPixelRatio(), i = P(g(this.originPosition), this.plugin.workUtil.transform);
+    this.tagNormalLine = new R(new r.Vector3().fromArray(this.position), i), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
       color: new r.Vector3(1, 1, 1),
-      linewidth: (n = (s = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : s.lineWidth) != null ? n : 1.2,
+      linewidth: (a = (s = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : s.lineWidth) != null ? a : 1.2,
       dashed: !1
-    }), this.tagNormalLine.line.material.transparent = !0, this.tagNormalLine.line.material.depthWrite = !1, this.tagNormalLine.line.material.depthTest = !1, this.tagNormalLine.line.material.dashed = !1, this.tagNormalLine.line.renderOrder = 2, this.tagNormalLine.setResolution(e.width * i, e.height * i), this.tagNormalLine.visible = !1, this.tagNormalLine.name = `tagNormalLine-${this.id}`, this.plugin.group.add(this.tagNormalLine);
+    }), this.tagNormalLine.line.material.transparent = !0, this.tagNormalLine.line.material.depthWrite = !1, this.tagNormalLine.line.material.depthTest = !0, this.tagNormalLine.line.material.dashed = !1, this.tagNormalLine.line.renderOrder = 2, this.tagNormalLine.setResolution(e.width * o, e.height * o), this.tagNormalLine.visible = !1, this.tagNormalLine.name = `tagNormalLine-${this.id}`, this.plugin.group.add(this.tagNormalLine);
   }
   /**
    * @description 展开自己，收起其他标签
@@ -146,8 +146,8 @@ class di extends w {
     if (this.isPopoverConfigEnabled())
       return;
     const t = this.can("fold"), e = this.can("unfold");
-    t && e && (this.state.unfolded = !this.state.unfolded, this.manuallyOperated = !0, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((i) => {
-      i.id !== this.id && i.fold();
+    t && e && (this.state.unfolded = !this.state.unfolded, this.manuallyOperated = !0, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((o) => {
+      o.id !== this.id && o.fold();
     }));
   }
   onClick(t) {
@@ -173,97 +173,99 @@ class di extends w {
   setUnfold(t) {
     if (this.isPopoverConfigEnabled())
       return;
-    const e = this.can("fold"), i = this.can("unfold");
-    e && i && (this.state.unfolded = t, this.hooks.emit(t ? "unfolded" : "folded"), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
+    const e = this.can("fold"), o = this.can("unfold");
+    e && o && (this.state.unfolded = t, this.hooks.emit(t ? "unfolded" : "folded"), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
   }
   setPosition(t) {
     this.originPosition = t, this.position = (() => {
       const e = this.plugin.workUtil.transform;
-      let i = k(E(t), e).toArray();
+      let o = P(g(t), e).toArray();
       if (this.normal && this.normalLineLength) {
-        const o = this.computeNormal();
-        i = new r.Vector3().fromArray(i).clone().add(o.clone().setLength(this.normalLineLength)).toArray();
+        const i = this.computeNormal();
+        o = new r.Vector3().fromArray(o).clone().add(i.clone().setLength(this.normalLineLength)).toArray();
       }
-      return i;
+      return o;
     })(), this.cache.clear(), this._lastUpdateCache.position = [0, 0, 0], this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
   /**
    * 更新标签连线的位置，使其端点与icon保持固定像素距离
    * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
    */
-  updateTagNormalLinePosition() {
-    var _, y, v, L, b, x, C;
+  updateTagNormalLinePosition(t) {
+    var L, x, C, N, S, T, D;
     if (!this.screenPosition || !this.tagNormalLine)
       return;
-    if (!this.visible) {
+    const { force: e = !1 } = t != null ? t : {};
+    if (!(e ? this.state.visible : this.currentVisible)) {
       this.tagNormalLine.visible = !1;
       return;
     }
-    const t = this._lastUpdateCache;
-    if (!(this.visible !== t.visible)) {
-      const f = Math.abs(this.position[0] - t.position[0]) > 1e-3 || Math.abs(this.position[1] - t.position[1]) > 1e-3 || Math.abs(this.position[2] - t.position[2]) > 1e-3, T = Math.abs(((_ = this.screenPosition.leftPx) != null ? _ : 0) - t.screenLeft) > 0.5 || Math.abs(((y = this.screenPosition.topPx) != null ? y : 0) - t.screenTop) > 0.5 || Math.abs(((v = this.screenPosition.scale) != null ? v : 1) - t.scale) > 2e-3;
-      if (!f && !T)
+    const i = this._lastUpdateCache;
+    if (!(this.visible !== i.visible)) {
+      const u = Math.abs(this.position[0] - i.position[0]) > 1e-3 || Math.abs(this.position[1] - i.position[1]) > 1e-3 || Math.abs(this.position[2] - i.position[2]) > 1e-3, E = Math.abs(((L = this.screenPosition.leftPx) != null ? L : 0) - i.screenLeft) > 0.5 || Math.abs(((x = this.screenPosition.topPx) != null ? x : 0) - i.screenTop) > 0.5 || Math.abs(((C = this.screenPosition.scale) != null ? C : 1) - i.scale) > 2e-3;
+      if (!u && !E)
         return;
     }
-    t.position = new r.Vector3().fromArray(this.position).toArray(), t.screenLeft = (L = this.screenPosition.leftPx) != null ? L : 0, t.screenTop = (b = this.screenPosition.topPx) != null ? b : 0, t.scale = (x = this.screenPosition.scale) != null ? x : 1, t.visible = this.visible;
-    const i = this.five.renderer.getSize(u);
-    this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineStart.project(this.five.camera), this._temp.iconPos.project(this.five.camera), this._temp.screenDirPixel.set(
-      (this._temp.iconPos.x - this._temp.lineStart.x) * i.x / 2,
-      (this._temp.iconPos.y - this._temp.lineStart.y) * i.y / 2
+    if (i.position = new r.Vector3().fromArray(this.position).toArray(), i.screenLeft = (N = this.screenPosition.leftPx) != null ? N : 0, i.screenTop = (S = this.screenPosition.topPx) != null ? S : 0, i.scale = (T = this.screenPosition.scale) != null ? T : 1, i.visible = this.visible, !this.five.renderer)
+      return;
+    const s = this.five.renderer.getSize(_), a = P(g(this.originPosition), this.plugin.workUtil.transform).toArray();
+    this._temp.lineStart.fromArray(a), this._temp.iconPos.fromArray(this.position), this._temp.lineStart.project(this.five.camera), this._temp.iconPos.project(this.five.camera), this._temp.screenDirPixel.set(
+      (this._temp.iconPos.x - this._temp.lineStart.x) * s.x / 2,
+      (this._temp.iconPos.y - this._temp.lineStart.y) * s.y / 2
     );
-    const o = this._temp.screenDirPixel.length();
+    const d = this._temp.screenDirPixel.length();
     this._temp.screenDirPixel.normalize();
-    const s = this.iconPixelGap * ((C = this.screenPosition.scale) != null ? C : 1);
+    const m = this.iconPixelGap * ((D = this.screenPosition.scale) != null ? D : 1);
     this._temp.targetNDC.set(
-      (this._temp.iconPos.x * i.x / 2 - this._temp.screenDirPixel.x * s) / (i.x / 2),
-      (this._temp.iconPos.y * i.y / 2 - this._temp.screenDirPixel.y * s) / (i.y / 2)
+      (this._temp.iconPos.x * s.x / 2 - this._temp.screenDirPixel.x * m) / (s.x / 2),
+      (this._temp.iconPos.y * s.y / 2 - this._temp.screenDirPixel.y * m) / (s.y / 2)
     ), this._temp.raycaster.setFromCamera(this._temp.targetNDC, this.five.camera);
-    const n = this._temp.raycaster.ray;
-    this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(n.origin).sub(this._temp.lineStart);
-    const l = n.direction.dot(n.direction), h = n.direction.dot(this._temp.lineDir), c = this._temp.lineDir.dot(this._temp.lineDir), d = n.direction.dot(this._temp.lineEnd), N = this._temp.lineDir.dot(this._temp.lineEnd), g = l * c - h * h;
-    let P = 0;
-    Math.abs(g) > 1e-4 && (P = (h * N - c * d) / g), this._temp.lineEnd.copy(n.origin).add(n.direction.multiplyScalar(Math.max(0, P)));
-    const S = this._temp.lineStart.distanceTo(this._temp.iconPos);
-    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > S) {
-      const f = Math.max(0, 1 - s / o);
-      this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, f);
+    const l = this._temp.raycaster.ray;
+    this._temp.lineStart.fromArray(a), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(l.origin).sub(this._temp.lineStart);
+    const A = l.direction.dot(l.direction), f = l.direction.dot(this._temp.lineDir), y = this._temp.lineDir.dot(this._temp.lineDir), w = l.direction.dot(this._temp.lineEnd), V = this._temp.lineDir.dot(this._temp.lineEnd), v = A * y - f * f;
+    let b = 0;
+    Math.abs(v) > 1e-4 && (b = (f * V - y * w) / v), this._temp.lineEnd.copy(l.origin).add(l.direction.multiplyScalar(Math.max(0, b)));
+    const k = this._temp.lineStart.distanceTo(this._temp.iconPos);
+    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > k) {
+      const u = Math.max(0, 1 - m / d);
+      this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, u);
     }
     this.tagNormalLine.setPoints(this._temp.lineStart, this._temp.lineEnd), this.tagNormalLine.visible = !0;
   }
   updateScreenPosition(t) {
-    var n;
+    var s;
     if (this.stickType !== "2DPoint" && this.stickType !== "3DPoint")
       return;
-    const { force: e = !1 } = t != null ? t : {}, i = e ? this.state.visible : this.currentVisible, o = (n = this.__Object__) != null ? n : {
+    const { force: e = !1 } = t != null ? t : {}, o = e ? this.state.visible : this.currentVisible, i = (s = this.__Object__) != null ? s : {
       timeoutId: void 0,
       inAnimation: !1
     };
-    if (this.__Object__ = o, !i && this.screenPosition ? (o.inAnimation = !0, o.timeoutId = setTimeout(() => {
+    if (this.__Object__ = i, !o && this.screenPosition ? (i.inAnimation = !0, i.timeoutId = setTimeout(() => {
       requestAnimationFrame(() => {
-        this.currentVisible || (o.inAnimation = !1, this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
+        this.currentVisible || (i.inAnimation = !1, this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
       });
-    }, 1e3)) : o.timeoutId && (clearTimeout(o.timeoutId), o.inAnimation = !1, o.timeoutId = void 0), !i && !o.inAnimation)
+    }, 1e3)) : i.timeoutId && (clearTimeout(i.timeoutId), i.inAnimation = !1, i.timeoutId = void 0), !o && !i.inAnimation)
       return;
-    const s = this.computeTagProject();
-    if (s && this.five.renderer) {
-      const l = this.getDistance(void 0, 1), h = (() => {
+    const n = this.computeTagProject();
+    if (n && this.five.renderer) {
+      const a = this.getDistance(void 0, 1), d = (() => {
         if (!this.currentConfig.simulate3D)
           return 1;
-        const d = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI);
-        return Math.max(Math.min(1 - d * l / 40, 1), 0.7);
-      })(), c = this.five.renderer.getSize(u);
+        const l = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI);
+        return Math.max(Math.min(1 - l * a / 40, 1), 0.7);
+      })(), m = this.five.renderer.getSize(_);
       this.screenPosition = {
-        leftPx: (s.x + 1) / 2 * c.x,
-        topPx: (-s.y + 1) / 2 * c.y,
-        scale: h
-      }, this.updateTagNormalLinePosition();
+        leftPx: (n.x + 1) / 2 * m.x,
+        topPx: (-n.y + 1) / 2 * m.y,
+        scale: d
+      }, this.updateTagNormalLinePosition({ force: t == null ? void 0 : t.force });
     } else
       this.screenPosition = null;
     this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
   set(t, e = !0) {
-    var i, o, s;
-    super.set(t, e), this.normalLineLength = (s = (o = (i = t.style) == null ? void 0 : i.point) == null ? void 0 : o.normalLen) != null ? s : 0, this._lastUpdateCache.position = [0, 0, 0], this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
+    var o, i, n;
+    super.set(t, e), this.normalLineLength = (n = (i = (o = t.style) == null ? void 0 : o.point) == null ? void 0 : i.normalLen) != null ? n : 0, this._lastUpdateCache.position = [0, 0, 0], this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
   }
   setData(...t) {
     super.setData(...t), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -292,5 +294,5 @@ class di extends w {
   }
 }
 export {
-  di as PointTag
+  Pi as PointTag
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -678,7 +678,7 @@ class _s extends R {
     var e;
     this.tags.length && (this.tags.forEach((t) => {
       var i, o, n, s, r, a;
-      (i = t.tag3DContentSvelte) == null || i.dispose(), (n = (o = t.mediaPlane) == null ? void 0 : o.parent) == null || n.remove(t.mediaPlane), (a = (r = (s = t.model) == null ? void 0 : s.object) == null ? void 0 : r.parent) == null || a.remove(t.model.object);
+      (i = t.tag3DContentSvelte) == null || i.dispose(), (n = (o = t.mediaPlane) == null ? void 0 : o.parent) == null || n.remove(t.mediaPlane), (a = (r = (s = t.model) == null ? void 0 : s.object) == null ? void 0 : r.parent) == null || a.remove(t.model.object), this.group.remove(t.tagNormalLine);
     }), this.tags = [], this.tagsLengthWillUpdate = !0, this.hooks.emit("tagsLengthChange"), (e = this.TagContainerSvelte) == null || e.$destroy(), this.TagContainerSvelte = void 0, this.disposeAllCSS3DContainer()), this.enabledModelTagSet.clear(), this.cache.clear();
   }
   /**

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/base/BasePlugin.js

@@ -22,7 +22,7 @@ let A = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.72.5-alpha.3");
+    r(this, "VERSION", "3.72.5-alpha.5");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.72.5-alpha.3",
+    "%c %c@realsee/dnalogel %cv3.72.5-alpha.5",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.72.5-alpha.3",
+  "version": "3.72.5-alpha.5",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",