@realsee/dnalogel 3.77.1 → 3.77.2-alpha.0

package/libs/CruisePlugin/typing.d.ts

@@ -18,6 +18,13 @@ export type CruiseData = {
      * @description 旋转速度 rad/ms
      */
     rotateSpeed?: number;
+    /**
+     * @description move effect独有，音频播放相关参数
+     */
+    audio?: {
+        url: string;
+        duration: number;
+    };
 } & FivePoseAndState;
 export interface CruiseKeyframe {
     id: string;

package/libs/CruisePlugin/utils/coordinatesAngle.d.ts

@@ -1,6 +1,6 @@
 /**
- * @description: 获取coordinates间的夹角
- * @return {number} 夹角角度
+ * @description: 获取coordinates间的夹角（两个方向向量之间的最小夹角）
+ * @return {number} 夹角角度（0 到 π）
  */
 declare function coordinatesAngle(coordinates1: {
     longitude: number;
@@ -9,4 +9,20 @@ declare function coordinatesAngle(coordinates1: {
     longitude: number;
     latitude: number;
 }): number;
-export { coordinatesAngle };
+/**
+ * @description: 获取coordinates间的实际旋转角度（基于 longitude/latitude 差值）
+ * @param coordinates1 起始坐标
+ * @param coordinates2 目标坐标
+ * @param signed 是否返回有符号角度（默认 false）
+ *   - true: 返回有符号角度（以主要旋转方向的符号为准）
+ *   - false: 返回无符号角度（绝对值）
+ * @return {number} 旋转角度（弧度），可以超过 π
+ */
+declare function coordinatesRotation(coordinates1: {
+    longitude: number;
+    latitude: number;
+}, coordinates2: {
+    longitude: number;
+    latitude: number;
+}, signed?: boolean): number;
+export { coordinatesAngle, coordinatesRotation };

package/libs/CruisePlugin/utils/coordinatesAngle.js

@@ -1,9 +1,14 @@
-import { coordinatesToVector as o } from "./coordinatesToVector.js";
+import { coordinatesToVector as l } from "./coordinatesToVector.js";
 import "three";
-function s(t, n) {
-  const e = o(t), r = o(n);
-  return e.angleTo(r);
+function s(e, a) {
+  const r = l(e), t = l(a);
+  return r.angleTo(t);
+}
+function u(e, a, r = !1) {
+  const t = a.longitude - e.longitude, n = a.latitude - e.latitude, o = Math.sqrt(t * t + n * n);
+  return r ? Math.abs(t) >= Math.abs(n) ? t >= 0 ? o : -o : n >= 0 ? o : -o : o;
 }
 export {
-  s as coordinatesAngle
+  s as coordinatesAngle,
+  u as coordinatesRotation
 };

package/libs/Sculpt/Objects/Base/Editor.d.ts

@@ -2,21 +2,9 @@ import type * as THREE from 'three';
 import { IObject3D } from '../../../shared-utils/three/IObject3D';
 import type { AddObject3DHelperConfig } from '../../../Object3DHelperPlugin';
 import { Subscribe } from '../../../shared-utils/Subscribe';
-import type { Direction, Direction4 } from '../../../shared-utils/Object3DHelper/typings/Direction';
-export type ObjectUpdateType = 'move' | 'rotate' | 'scale';
-export interface ObjectUpdateParams {
-    /** 操作类型：移动、旋转、缩放 */
-    type: ObjectUpdateType;
-    /** 开始时间戳 */
-    start_timestamp: number;
-    /** 结束时间戳 */
-    end_timestamp?: number;
-    /** 轴向 */
-    axis?: Direction | Direction4;
-}
 export declare class BaseEditor<OriginObject extends THREE.Object3D = THREE.Object3D> extends IObject3D {
     hooks: Subscribe<{
-        objectUpdate: (params?: ObjectUpdateParams) => void;
+        objectUpdate: () => void;
     }>;
     protected originObject: OriginObject;
     constructor(originObject: OriginObject);
@@ -32,16 +20,9 @@ export declare class BaseEditor<OriginObject extends THREE.Object3D = THREE.Obje
 export declare class BaseEditorWithObjectHelper<OriginObject extends THREE.Object3D = THREE.Object3D> extends BaseEditor<OriginObject> {
     private get helper();
     private objectHelperConfig;
-    private currentOperation;
     constructor(originObject: OriginObject, objectHelperConfig?: AddObject3DHelperConfig | (() => AddObject3DHelperConfig));
     enable(): void;
     disable(): void;
     initialHelperMatrix(): void;
-    private onMoveStart;
-    private onRotateStart;
-    private onScaleStart;
-    private onMoveEnd;
-    private onRotateEnd;
-    private onScaleEnd;
     private onObjectUpdate;
 }

package/libs/Sculpt/Objects/Base/Editor.js

@@ -1,24 +1,24 @@
-var d = Object.defineProperty;
+var b = Object.defineProperty;
 var l = Object.getOwnPropertySymbols;
-var j = Object.prototype.hasOwnProperty, m = Object.prototype.propertyIsEnumerable;
-var s = (r, e, t) => e in r ? d(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, b = (r, e) => {
-  for (var t in e || (e = {}))
-    j.call(e, t) && s(r, t, e[t]);
+var h = Object.prototype.hasOwnProperty, j = Object.prototype.propertyIsEnumerable;
+var c = (o, t, e) => t in o ? b(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e, n = (o, t) => {
+  for (var e in t || (t = {}))
+    h.call(t, e) && c(o, e, t[e]);
   if (l)
-    for (var t of l(e))
-      m.call(e, t) && s(r, t, e[t]);
-  return r;
+    for (var e of l(t))
+      j.call(t, e) && c(o, e, t[e]);
+  return o;
 };
-var o = (r, e, t) => (s(r, typeof e != "symbol" ? e + "" : e, t), t);
-import { Sculpt as n } from "../../index.js";
-import { IObject3D as u } from "../../../shared-utils/three/IObject3D.js";
-import { Subscribe as O } from "../../../shared-utils/Subscribe.js";
-class f extends u {
-  constructor(t) {
+var r = (o, t, e) => (c(o, typeof t != "symbol" ? t + "" : t, e), e);
+import { Sculpt as s } from "../../index.js";
+import { IObject3D as a } from "../../../shared-utils/three/IObject3D.js";
+import { Subscribe as d } from "../../../shared-utils/Subscribe.js";
+class O extends a {
+  constructor(e) {
     super();
-    o(this, "hooks", new O());
-    o(this, "originObject");
-    this.originObject = t;
+    r(this, "hooks", new d());
+    r(this, "originObject");
+    this.originObject = e;
   }
   /**
    * @description: 开启编辑器
@@ -33,92 +33,36 @@ class f extends u {
     this.originObject.remove(this);
   }
 }
-class k extends f {
-  constructor(t, i) {
-    super(t);
-    o(this, "objectHelperConfig");
-    // 记录当前操作的类型、开始时间和轴向
-    o(this, "currentOperation", null);
-    // 记录移动操作开始
-    o(this, "onMoveStart", (t) => {
-      this.currentOperation = {
-        type: "move",
-        startTime: Date.now(),
-        axis: t
-      };
-    });
-    // 记录旋转操作开始
-    o(this, "onRotateStart", (t) => {
-      this.currentOperation = {
-        type: "rotate",
-        startTime: Date.now(),
-        axis: t
-      };
-    });
-    // 记录缩放操作开始
-    o(this, "onScaleStart", (t) => {
-      this.currentOperation = {
-        type: "scale",
-        startTime: Date.now(),
-        axis: t
-      };
-    });
-    // 移动中的处理（可选)，可以在这里做一些实时处理，暂时不触发 objectUpdate
-    // private onMove = () => {
-    // }
-    // // 旋转中的处理
-    // private onRotate = () => {
-    // }
-    // // 缩放中的处理
-    // private onScale = () => {
-    // }
-    // 移动结束，触发 objectUpdate
-    o(this, "onMoveEnd", () => {
-      this.onObjectUpdate();
-    });
-    // 旋转结束，触发 objectUpdate
-    o(this, "onRotateEnd", () => {
-      this.onObjectUpdate();
-    });
-    // 缩放结束，触发 objectUpdate
-    o(this, "onScaleEnd", () => {
-      this.onObjectUpdate();
-    });
-    // 统一的触发 objectUpdate 方法
-    o(this, "onObjectUpdate", () => {
-      if (!this.currentOperation)
-        return;
-      const t = {
-        type: this.currentOperation.type,
-        start_timestamp: this.currentOperation.startTime,
-        end_timestamp: Date.now(),
-        axis: this.currentOperation.axis
-      };
-      this.hooks.emit("objectUpdate", t), this.currentOperation = null;
+class u extends O {
+  constructor(e, i) {
+    super(e);
+    r(this, "objectHelperConfig");
+    r(this, "onObjectUpdate", () => {
+      this.hooks.emit("objectUpdate");
     });
     this.objectHelperConfig = i;
   }
   get helper() {
-    var t;
-    return (t = n.modules.object3DHelper.getObject3DHelper(this.originObject)) == null ? void 0 : t.helper;
+    var e;
+    return (e = s.modules.object3DHelper.getObject3DHelper(this.originObject)) == null ? void 0 : e.helper;
   }
   enable() {
     super.enable();
-    const t = typeof this.objectHelperConfig == "function" ? this.objectHelperConfig() : this.objectHelperConfig;
-    n.modules.object3DHelper.addObject3DHelper(this.originObject, b({ positionFrom: "boundingBox" }, t));
-    const i = n.modules.object3DHelper.getObject3DHelper(this.originObject).helper;
-    i.hooks.on("moveStart", this.onMoveStart), i.hooks.on("rotateStart", this.onRotateStart), i.hooks.on("scaleStart", this.onScaleStart), i.hooks.on("moveEnd", this.onMoveEnd), i.hooks.on("rotateEnd", this.onRotateEnd), i.hooks.on("scaleEnd", this.onScaleEnd);
+    const e = typeof this.objectHelperConfig == "function" ? this.objectHelperConfig() : this.objectHelperConfig;
+    s.modules.object3DHelper.addObject3DHelper(this.originObject, n({ positionFrom: "boundingBox" }, e));
+    const i = s.modules.object3DHelper.getObject3DHelper(this.originObject).helper;
+    i.hooks.on("move", this.onObjectUpdate), i.hooks.on("rotate", this.onObjectUpdate), i.hooks.on("scale", this.onObjectUpdate);
   }
   disable() {
-    var t, i, a, h, c, p;
-    super.disable(), (t = this.helper) == null || t.hooks.off("moveStart", this.onMoveStart), (i = this.helper) == null || i.hooks.off("rotateStart", this.onRotateStart), (a = this.helper) == null || a.hooks.off("scaleStart", this.onScaleStart), (h = this.helper) == null || h.hooks.off("moveEnd", this.onMoveEnd), (c = this.helper) == null || c.hooks.off("rotateEnd", this.onRotateEnd), (p = this.helper) == null || p.hooks.off("scaleEnd", this.onScaleEnd), n.modules.object3DHelper.removeObject3DHelper(this.originObject);
+    var e, i, p;
+    super.disable(), (e = this.helper) == null || e.hooks.off("move", this.onObjectUpdate), (i = this.helper) == null || i.hooks.off("rotate", this.onObjectUpdate), (p = this.helper) == null || p.hooks.off("scale", this.onObjectUpdate), s.modules.object3DHelper.removeObject3DHelper(this.originObject);
   }
   initialHelperMatrix() {
-    var t;
-    (t = this.helper) == null || t.initialHelperMatrix();
+    var e;
+    (e = this.helper) == null || e.initialHelperMatrix();
   }
 }
 export {
-  f as BaseEditor,
-  k as BaseEditorWithObjectHelper
+  O as BaseEditor,
+  u as BaseEditorWithObjectHelper
 };

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

@@ -9,9 +9,6 @@ export interface BoxImportData extends BaseImportData, BoxData {
     type: LiteralString<'Box'>;
     style?: Partial<BoxStyle>;
 }
-export type BoxCreateConfig = Partial<BoxStyle & CreateLimitConfig & DrawMethodConfig> & {
-    onPointPlaced?: () => void;
-};
 export declare class Box extends BaseObject<BoxImportData> {
     readonly type = "Box";
     boxMesh: BoxMesh;
@@ -33,7 +30,7 @@ export declare class Box extends BaseObject<BoxImportData> {
     setData(data: Partial<BoxImportData>): void;
     highlight(): void;
     unhighlight(): void;
-    create(params?: BoxCreateConfig): Promise<void>;
+    create(params?: Partial<BoxStyle & CreateLimitConfig & DrawMethodConfig>): Promise<void>;
     /**
      * 获取盒子在世界坐标中的6个面的几何信息
      * 返回顺序：bottom、top、side0~side3（自底面第0点起顺时针）
@@ -45,4 +42,4 @@ export declare class Box extends BaseObject<BoxImportData> {
         normal: THREE.Vector3;
     }>;
 }
-export declare function createBox(boxMesh: BoxMesh, pointSelector: PointSelector, config?: BoxCreateConfig): Promise<void>;
+export declare function createBox(boxMesh: BoxMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig & DrawMethodConfig>): Promise<void>;

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

@@ -1,34 +1,34 @@
 var R = Object.defineProperty, _ = Object.defineProperties;
 var C = Object.getOwnPropertyDescriptors;
-var O = Object.getOwnPropertySymbols;
+var W = Object.getOwnPropertySymbols;
 var L = Object.prototype.hasOwnProperty, T = Object.prototype.propertyIsEnumerable;
-var x = (e, o, t) => o in e ? R(e, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[o] = t, d = (e, o) => {
+var d = (e, o, t) => o in e ? R(e, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[o] = t, m = (e, o) => {
   for (var t in o || (o = {}))
-    L.call(o, t) && x(e, t, o[t]);
-  if (O)
-    for (var t of O(o))
-      T.call(o, t) && x(e, t, o[t]);
+    L.call(o, t) && d(e, t, o[t]);
+  if (W)
+    for (var t of W(o))
+      T.call(o, t) && d(e, t, o[t]);
   return e;
-}, M = (e, o) => _(e, C(o));
-var p = (e, o, t) => (x(e, typeof o != "symbol" ? o + "" : o, t), t);
-var c = (e, o, t) => new Promise((n, a) => {
-  var s = (h) => {
+}, O = (e, o) => _(e, C(o));
+var b = (e, o, t) => (d(e, typeof o != "symbol" ? o + "" : o, t), t);
+var p = (e, o, t) => new Promise((r, a) => {
+  var i = (h) => {
     try {
-      i(t.next(h));
+      s(t.next(h));
     } catch (l) {
       a(l);
     }
-  }, r = (h) => {
+  }, n = (h) => {
     try {
-      i(t.throw(h));
+      s(t.throw(h));
     } catch (l) {
       a(l);
     }
-  }, i = (h) => h.done ? n(h.value) : Promise.resolve(h.value).then(s, r);
-  i((t = t.apply(e, o)).next());
+  }, s = (h) => h.done ? r(h.value) : Promise.resolve(h.value).then(i, n);
+  s((t = t.apply(e, o)).next());
 });
 import { BaseObject as N } from "../Base/index.js";
-import * as P from "three";
+import * as x from "three";
 import { BoxMeshEditor as A } from "../../Editors/BoxMeshEditor.js";
 import { BoxMesh as E } from "../../Meshes/Box.js";
 import { createRectangle as D } from "../Rectangle/index.js";
@@ -40,18 +40,18 @@ import { RectangleWithEdgeMesh as G } from "../../Meshes/RectangleWithEdge.js";
 import { centerPoint as B } from "../../../shared-utils/three/centerPoint.js";
 import { anyPositionToVector3 as v } from "../../../shared-utils/positionToVector3.js";
 class ot extends N {
-  constructor(t, n) {
-    super(t, n);
-    p(this, "type", "Box");
-    p(this, "boxMesh");
-    p(this, "_editor");
-    t && (this.boxMesh = new E(d(d({}, t.style), t)), this.add(this.boxMesh));
+  constructor(t, r) {
+    super(t, r);
+    b(this, "type", "Box");
+    b(this, "boxMesh");
+    b(this, "_editor");
+    t && (this.boxMesh = new E(m(m({}, t.style), t)), this.add(this.boxMesh));
   }
   get editor() {
     return this._editor || (this._editor = new A(this.boxMesh)), this._editor;
   }
   get data() {
-    return M(d({}, this.baseData), {
+    return O(m({}, this.baseData), {
       points: j(this.applyObjectMatrixWorld(this.boxMesh.bottomPositions, this.boxMesh)),
       heightPoint: j(this.applyObjectMatrixWorld(this.boxMesh.topPosition, this.boxMesh)),
       style: {
@@ -77,7 +77,7 @@ class ot extends N {
     (t = this.boxMesh) == null || t.unhighlight();
   }
   create(t) {
-    return c(this, null, function* () {
+    return p(this, null, function* () {
       this.removeChildren(), this.boxMesh = new E(t), this.add(this.boxMesh), yield $(this.boxMesh, this.pointSelector, t), this.config.defaultAction && this.editor.enable();
     });
   }
@@ -88,58 +88,52 @@ class ot extends N {
   getWorldFacesGeometry() {
     if (!this.boxMesh)
       return [];
-    const t = this.applyObjectMatrixWorld(this.boxMesh.bottomPositions, this.boxMesh), n = this.applyObjectMatrixWorld(this.boxMesh.topPositions, this.boxMesh);
-    if (!t || !n || t.length !== 4 || n.length !== 4)
+    const t = this.applyObjectMatrixWorld(this.boxMesh.bottomPositions, this.boxMesh), r = this.applyObjectMatrixWorld(this.boxMesh.topPositions, this.boxMesh);
+    if (!t || !r || t.length !== 4 || r.length !== 4)
       return [];
-    const a = [], s = (r, i) => {
-      const h = new P.Triangle(i[0], i[1], i[2]).getNormal(new P.Vector3()), l = B(...i);
-      a.push({ name: r, vertices: i, center: l, normal: h });
+    const a = [], i = (n, s) => {
+      const h = new x.Triangle(s[0], s[1], s[2]).getNormal(new x.Vector3()), l = B(...s);
+      a.push({ name: n, vertices: s, center: l, normal: h });
     };
-    s("bottom", [t[0], t[1], t[2], t[3]]), s("top", [n[0], n[1], n[2], n[3]]);
-    for (let r = 0; r < 4; r++) {
-      const i = (r + 1) % 4;
-      s(`side${r}`, [t[r], t[i], n[i], n[r]]);
+    i("bottom", [t[0], t[1], t[2], t[3]]), i("top", [r[0], r[1], r[2], r[3]]);
+    for (let n = 0; n < 4; n++) {
+      const s = (n + 1) % 4;
+      i(`side${n}`, [t[n], t[s], r[s], r[n]]);
     }
     return a;
   }
 }
 function $(e, o, t) {
-  return c(this, null, function* () {
-    return new Promise((n, a) => c(this, null, function* () {
-      const s = e.parent;
-      if (!s) {
+  return p(this, null, function* () {
+    return new Promise((r, a) => p(this, null, function* () {
+      const i = e.parent;
+      if (!i) {
         a(new Error("No container"));
         return;
       }
-      const r = new G(e.style);
-      s.add(r), yield D(r, o, M(d({}, t), {
-        onPointPlaced: () => {
-          var m;
-          (m = t == null ? void 0 : t.onPointPlaced) == null || m.call(t);
-        }
-      })), s.remove(r), e.setPoints({ points: r.points });
-      const i = new F(), h = U(e.bottomPositions), l = B(...e.bottomPositions), y = l.clone().add(h.clone().multiplyScalar(100)), u = l.clone().sub(h.clone().multiplyScalar(100));
-      i.setPoints([y, u]), s.add(i), o.enable();
-      const f = (m) => {
-        var b;
-        (b = t == null ? void 0 : t.onPointPlaced) == null || b.call(t), g(), n();
-      }, w = (m) => {
-        if (!(m != null && m.raycaster))
+      const n = new G(e.style);
+      i.add(n), yield D(n, o, t), i.remove(n), e.setPoints({ points: n.points });
+      const s = new F(), h = U(e.bottomPositions), l = B(...e.bottomPositions), f = l.clone().add(h.clone().multiplyScalar(100)), M = l.clone().sub(h.clone().multiplyScalar(100));
+      s.setPoints([f, M]), i.add(s), o.enable();
+      const g = (c) => {
+        P(), r();
+      }, y = (c) => {
+        if (!(c != null && c.raycaster))
           return;
-        const b = V({
-          raycaster: m.raycaster,
-          line: new P.Line3(y, u)
+        const w = V({
+          raycaster: c.raycaster,
+          line: new x.Line3(f, M)
         });
-        if (b) {
-          const H = b.clone().sub(l);
+        if (w) {
+          const H = w.clone().sub(l);
           e.setPoints({ heightPoint: e.bottomPositions[0].clone().add(H) });
         }
-      }, g = () => {
-        o.off("select", f), o.off("intersectionUpdate", w), o.off("disable", W), o.disable(), s == null || s.remove(i);
-      }, W = () => {
-        g(), s == null || s.remove(e), a(new Error("Cancelled"));
+      }, P = () => {
+        o.off("select", g), o.off("intersectionUpdate", y), o.off("disable", u), o.disable(), i == null || i.remove(s);
+      }, u = () => {
+        P(), i == null || i.remove(e), a(new Error("Cancelled"));
       };
-      o.on("select", f), o.on("intersectionUpdate", w), o.on("disable", W);
+      o.on("select", g), o.on("intersectionUpdate", y), o.on("disable", u);
     }));
   });
 }

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

@@ -1,31 +1,31 @@
 var _ = Object.defineProperty, j = Object.defineProperties;
 var E = Object.getOwnPropertyDescriptors;
-var g = Object.getOwnPropertySymbols;
+var u = Object.getOwnPropertySymbols;
 var L = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
-var P = (s, i, t) => i in s ? _(s, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[i] = t, d = (s, i) => {
-  for (var t in i || (i = {}))
-    L.call(i, t) && P(s, t, i[t]);
-  if (g)
-    for (var t of g(i))
-      A.call(i, t) && P(s, t, i[t]);
+var d = (s, t, i) => t in s ? _(s, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : s[t] = i, p = (s, t) => {
+  for (var i in t || (t = {}))
+    L.call(t, i) && d(s, i, t[i]);
+  if (u)
+    for (var i of u(t))
+      A.call(t, i) && d(s, i, t[i]);
   return s;
-}, w = (s, i) => j(s, E(i));
-var c = (s, i, t) => (P(s, typeof i != "symbol" ? i + "" : i, t), t);
-var M = (s, i, t) => new Promise((o, r) => {
+}, w = (s, t) => j(s, E(t));
+var c = (s, t, i) => (d(s, typeof t != "symbol" ? t + "" : t, i), i);
+var f = (s, t, i) => new Promise((o, r) => {
   var n = (e) => {
     try {
-      h(t.next(e));
+      h(i.next(e));
     } catch (l) {
       r(l);
     }
-  }, p = (e) => {
+  }, a = (e) => {
     try {
-      h(t.throw(e));
+      h(i.throw(e));
     } catch (l) {
       r(l);
     }
-  }, h = (e) => e.done ? o(e.value) : Promise.resolve(e.value).then(n, p);
-  h((t = t.apply(s, i)).next());
+  }, h = (e) => e.done ? o(e.value) : Promise.resolve(e.value).then(n, a);
+  h((i = i.apply(s, t)).next());
 });
 import { BaseObject as C } from "../Base/index.js";
 import * as R from "three";
@@ -39,18 +39,18 @@ import { vector3ToArray as x } from "../../../shared-utils/three/vector3ToArray.
 import { AreaMesh as V } from "../../Meshes/Area.js";
 import { anyPositionToVector3 as H } from "../../../shared-utils/positionToVector3.js";
 class $ extends C {
-  constructor(t, o) {
-    super(t, o);
+  constructor(i, o) {
+    super(i, o);
     c(this, "type", "Prism");
     c(this, "prismMesh");
     c(this, "_editor");
-    t && (this.prismMesh = new v(d(d({}, t.style), t)), this.add(this.prismMesh));
+    i && (this.prismMesh = new v(p(p({}, i.style), i)), this.add(this.prismMesh));
   }
   get editor() {
     return this._editor || (this._editor = new U(this.prismMesh)), this._editor;
   }
   get data() {
-    return w(d({}, this.baseData), {
+    return w(p({}, this.baseData), {
       points: x(this.applyObjectMatrixWorld(this.prismMesh.bottomPositions, this.prismMesh)),
       heightPoint: x(this.applyObjectMatrixWorld(this.prismMesh.topPosition, this.prismMesh)),
       style: {
@@ -60,51 +60,50 @@ class $ extends C {
       }
     });
   }
-  setData(t) {
+  setData(i) {
     this.prismMesh.setPoints({
-      points: t.points ? this.applyObjectReversalMatrixWorld(t.points.map(H), this.prismMesh) : void 0,
-      heightPoint: t.heightPoint ? this.applyObjectReversalMatrixWorld(H(t.heightPoint), this.prismMesh) : void 0
-    }), this.prismMesh.setStyle(t.style), this._editor && this._editor.initialHelperMatrix();
+      points: i.points ? this.applyObjectReversalMatrixWorld(i.points.map(H), this.prismMesh) : void 0,
+      heightPoint: i.heightPoint ? this.applyObjectReversalMatrixWorld(H(i.heightPoint), this.prismMesh) : void 0
+    }), this.prismMesh.setStyle(i.style), this._editor && this._editor.initialHelperMatrix();
   }
   highlight() {
-    var t;
-    (t = this.prismMesh) == null || t.highlight();
+    var i;
+    (i = this.prismMesh) == null || i.highlight();
   }
   unhighlight() {
-    var t;
-    (t = this.prismMesh) == null || t.unhighlight();
+    var i;
+    (i = this.prismMesh) == null || i.unhighlight();
   }
-  create(t) {
-    return M(this, null, function* () {
-      this.prismMesh = new v(t), this.add(this.prismMesh), yield k(this.prismMesh, this.pointSelector, t), this.config.defaultAction && this.editor.enable();
+  create(i) {
+    return f(this, null, function* () {
+      this.prismMesh = new v(i), this.add(this.prismMesh), yield k(this.prismMesh, this.pointSelector, i), this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function k(s, i, t) {
-  return M(this, null, function* () {
+function k(s, t, i) {
+  return f(this, null, function* () {
     const o = s.parent, r = new V(s.style);
-    o.add(r), yield T(r, i, t).finished, o.remove(r), s.setPoints({ points: r.points });
+    o.add(r), yield T(r, t, i).finished, o.remove(r), s.setPoints({ points: r.points });
     const n = new D();
     n.name = "LineHelper", o.add(n);
-    const p = r.points.at(-1), h = N(r.points), e = p.clone().add(h.clone().multiplyScalar(100)), l = p.clone().sub(h.clone().multiplyScalar(100));
-    return n.setPoints([e, l]), i.enable(), new Promise((O, W) => {
-      const y = (a) => {
-        var m;
-        (m = t == null ? void 0 : t.onPointPlaced) == null || m.call(t, s.bottomPositions), b(), O();
-      }, f = (a) => {
-        if (!(a != null && a.raycaster))
+    const a = r.points.at(-1), h = N(r.points), e = a.clone().add(h.clone().multiplyScalar(100)), l = a.clone().sub(h.clone().multiplyScalar(100));
+    return n.setPoints([e, l]), t.enable(), new Promise((O, W) => {
+      const M = (m) => {
+        y(), O();
+      }, P = (m) => {
+        if (!(m != null && m.raycaster))
           return;
-        const m = B({
-          raycaster: a.raycaster,
+        const b = B({
+          raycaster: m.raycaster,
           line: new R.Line3(e, l)
         });
-        m && s.setPoints({ heightPoint: m });
-      }, b = () => {
-        i.off("select", y), i.off("intersectionUpdate", f), i.off("disable", u), o.remove(n), i.disable();
-      }, u = () => {
-        b(), o.remove(s), W(new Error("Cancelled"));
+        b && s.setPoints({ heightPoint: b });
+      }, y = () => {
+        t.off("select", M), t.off("intersectionUpdate", P), t.off("disable", g), o.remove(n), t.disable();
+      }, g = () => {
+        y(), o.remove(s), W(new Error("Cancelled"));
       };
-      i.on("select", y), i.on("intersectionUpdate", f), i.on("disable", u);
+      t.on("select", M), t.on("intersectionUpdate", P), t.on("disable", g);
     });
   });
 }

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

@@ -9,9 +9,6 @@ export interface RectangleImportData extends BaseImportData, RectangleData {
     type: LiteralString<'Rectangle'>;
     style?: Partial<RectangleWithEdgeMeshStyle>;
 }
-export type RectangleCreateConfig = Partial<RectangleWithEdgeMeshStyle & CreateLimitConfig & DrawMethodConfig> & {
-    onPointPlaced?: () => void;
-};
 export declare class Rectangle extends BaseObject<RectangleImportData> {
     readonly type = "Rectangle";
     rectangleMesh: RectangleWithEdgeMesh;
@@ -32,17 +29,17 @@ export declare class Rectangle extends BaseObject<RectangleImportData> {
     setData(data: Partial<RectangleImportData>): void;
     highlight(): void;
     unhighlight(): void;
-    create(config?: RectangleCreateConfig): Promise<void>;
+    create(config?: Partial<RectangleWithEdgeMeshStyle & CreateLimitConfig & DrawMethodConfig>): Promise<void>;
 }
 /**
  * @description 创建矩形
  */
-export declare function createRectangle(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: RectangleCreateConfig): 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?: RectangleCreateConfig): 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?: RectangleCreateConfig): void | Promise<void>;
+export declare function createRectangleByVertex(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig>): void | Promise<void>;