@realsee/dnalogel 3.69.13 → 3.69.15

package/libs/shared-utils/Object3DHelper/Base/BaseController.d.ts

@@ -1,5 +1,6 @@
 import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
+import type { SolidGuideOptions } from '../utils/solidGuide';
 import type { HelperEventMap, HelperOffset, InternalHelperEventMap, ScaleCallback } from '../typings';
 import type { BaseHelper } from './BaseHelper';
 import DomEvents from '../../threex/domevents';
@@ -12,6 +13,8 @@ type Config = {
     xAxis?: THREE.Vector3 | (() => THREE.Vector3);
     zAxis?: THREE.Vector3 | (() => THREE.Vector3);
     scaleCallback?: ScaleCallback;
+    /** 实线样式与行为配置（透传给 SolidGuideLine） */
+    solidGuide?: SolidGuideOptions;
 };
 export declare abstract class BaseController<T extends BaseHelper = BaseHelper, K extends THREE.Object3D = THREE.Object3D> {
     originObject3D: K;

package/libs/shared-utils/Object3DHelper/Base/BaseController.js

@@ -1,12 +1,12 @@
-var m = Object.defineProperty;
-var H = (h, e, t) => e in h ? m(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t;
-var o = (h, e, t) => (H(h, typeof e != "symbol" ? e + "" : e, t), t);
-import * as b from "three";
+var H = Object.defineProperty;
+var m = (h, e, t) => e in h ? H(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t;
+var o = (h, e, t) => (m(h, typeof e != "symbol" ? e + "" : e, t), t);
+import * as d from "three";
 import { Subscribe as j } from "../../Subscribe.js";
-import { notNil as g } from "../../isNil.js";
-import { boundingBox as y } from "../../three/boundingBox.js";
-import { toArray as k } from "../../util.js";
-import { cameraHooks as S } from "../utils/cameraHooks.js";
+import { notNil as y } from "../../isNil.js";
+import { boundingBox as g } from "../../three/boundingBox.js";
+import { toArray as S } from "../../util.js";
+import { cameraHooks as k } from "../utils/cameraHooks.js";
 class B {
   constructor(e, t) {
     o(this, "originObject3D");
@@ -32,15 +32,15 @@ class B {
         return !1;
     });
     o(this, "updateHelperScale", () => {
-      this.helperObject3D.setScaleByCamera(this.camera);
+      "update" in this.helperObject3D && typeof this.helperObject3D.update == "function" && this.helperObject3D.update(this.camera), this.helperObject3D.setScaleByCamera(this.camera);
     });
-    o(this, "getBox", () => this.boundingBox ? this.boundingBox : (this.boundingBox = y(this.originObject3D), this.boundingBox));
-    var d, f, i;
-    this.hooks = (d = e.sharedHooks) != null ? d : new j(), this.internalHooks = (f = e.sharedInternalHooks) != null ? f : new j(), this.camera = e.camera, this.model = e.model, this.originObject3D = e.originObject3D, this.helperObject3D = e.helperObject3D, this.container = e.container, this.scene = e.scene, this.domEvents = e.domEvents, this.onRender = (i = e.onRender) != null ? i : () => {
-    }, this.config = t != null ? t : {}, this.initialHelperPosition(), this.initialHelperQuaternion(), this.updateHelperScale(), this.cameraHooks = S(this.camera), this.enable();
-    const s = this.onSetOriginObjectScale.bind(this), a = this.onSetOriginObjectRotate.bind(this), n = this.onSetOriginObjectPosition.bind(this), r = this.onApplyOriginObjectScale.bind(this), c = this.onApplyOriginObjectRotate.bind(this), p = this.onApplyOriginObjectPosition.bind(this), l = this.initialHelperPosition.bind(this);
-    this.cameraHooks.on("cameraUpdate", this.updateHelperScale), this.internalHooks.on("initialHelperPosition", l), this.internalHooks.on("setObjectScale", s), this.internalHooks.on("setObjectRotate", a), this.internalHooks.on("setObjectPosition", n), this.internalHooks.on("applyObjectPosition", p), this.internalHooks.on("applyObjectRotate", c), this.internalHooks.on("applyObjectScale", r), this.hooks.on("moveEnd", this.updateHelperScale), this.internalHooks.on("setObjectPosition", this.updateHelperScale), this.internalHooks.on("initialHelperPosition", this.updateHelperScale), this.disposers.push(() => {
-      this.cameraHooks.off("cameraUpdate", this.updateHelperScale), this.internalHooks.off("initialHelperPosition", l), this.internalHooks.off("setObjectScale", s), this.internalHooks.off("setObjectRotate", a), this.internalHooks.off("setObjectPosition", n), this.internalHooks.off("applyObjectPosition", p), this.internalHooks.off("applyObjectRotate", c), this.internalHooks.off("applyObjectScale", r), this.hooks.off("moveEnd", this.updateHelperScale), this.internalHooks.off("setObjectPosition", this.updateHelperScale), this.internalHooks.off("initialHelperPosition", this.updateHelperScale);
+    o(this, "getBox", () => this.boundingBox ? this.boundingBox : (this.boundingBox = g(this.originObject3D), this.boundingBox));
+    var b, f, i;
+    this.hooks = (b = e.sharedHooks) != null ? b : new j(), this.internalHooks = (f = e.sharedInternalHooks) != null ? f : new j(), this.camera = e.camera, this.model = e.model, this.originObject3D = e.originObject3D, this.helperObject3D = e.helperObject3D, this.container = e.container, this.scene = e.scene, this.domEvents = e.domEvents, this.onRender = (i = e.onRender) != null ? i : () => {
+    }, this.config = t != null ? t : {}, this.initialHelperPosition(), this.initialHelperQuaternion(), this.updateHelperScale(), this.cameraHooks = k(this.camera), this.enable();
+    const n = this.onSetOriginObjectScale.bind(this), a = this.onSetOriginObjectRotate.bind(this), s = this.onSetOriginObjectPosition.bind(this), r = this.onApplyOriginObjectScale.bind(this), c = this.onApplyOriginObjectRotate.bind(this), p = this.onApplyOriginObjectPosition.bind(this), l = this.initialHelperPosition.bind(this);
+    this.cameraHooks.on("cameraUpdate", this.updateHelperScale), this.internalHooks.on("initialHelperPosition", l), this.internalHooks.on("setObjectScale", n), this.internalHooks.on("setObjectRotate", a), this.internalHooks.on("setObjectPosition", s), this.internalHooks.on("applyObjectPosition", p), this.internalHooks.on("applyObjectRotate", c), this.internalHooks.on("applyObjectScale", r), this.hooks.on("moveEnd", this.updateHelperScale), this.internalHooks.on("setObjectPosition", this.updateHelperScale), this.internalHooks.on("initialHelperPosition", this.updateHelperScale), this.disposers.push(() => {
+      this.cameraHooks.off("cameraUpdate", this.updateHelperScale), this.internalHooks.off("initialHelperPosition", l), this.internalHooks.off("setObjectScale", n), this.internalHooks.off("setObjectRotate", a), this.internalHooks.off("setObjectPosition", s), this.internalHooks.off("applyObjectPosition", p), this.internalHooks.off("applyObjectRotate", c), this.internalHooks.off("applyObjectScale", r), this.hooks.off("moveEnd", this.updateHelperScale), this.internalHooks.off("setObjectPosition", this.updateHelperScale), this.internalHooks.off("initialHelperPosition", this.updateHelperScale);
     });
   }
   initialHelperPosition() {
@@ -88,7 +88,7 @@ class B {
   applyHelperScaleMatrix4(e, t) {
     this.helperObject3D.applyHelperScaleMatrix4(e, t);
   }
-  onWantsGesture(e, t, s) {
+  onWantsGesture(e, t, n) {
     if (this.isDragging)
       return !1;
   }
@@ -131,78 +131,78 @@ class B {
   }
   updateOffsetByScale(e) {
     if (this.boundingBox && this.config.offset) {
-      const t = this.originObject3D.position, s = new b.Vector3().subVectors(this.boundingBox.max, t).multiply(e).add(t), a = new b.Vector3().subVectors(this.boundingBox.min, t).multiply(e).add(t), n = this.calculateOffset(this.config.offset, { min: a, max: s });
-      this.helperObject3D.initialPosition(n);
+      const t = this.originObject3D.position, n = new d.Vector3().subVectors(this.boundingBox.max, t).multiply(e).add(t), a = new d.Vector3().subVectors(this.boundingBox.min, t).multiply(e).add(t), s = this.calculateOffset(this.config.offset, { min: a, max: n });
+      this.helperObject3D.initialPosition(s);
     }
   }
-  hoverListener(e, t = 16777215, s = 1) {
-    const a = k(e).filter(g), n = [];
+  hoverListener(e, t = 16777215, n = 1) {
+    const a = S(e).filter(y), s = [];
     for (const r of a)
-      if (r.material || r instanceof b.Group) {
-        const c = r instanceof b.Group ? r.children.filter((i) => i instanceof b.Mesh) : [r];
+      if (r.material || r instanceof d.Group) {
+        const c = r instanceof d.Group ? r.children.filter((i) => i instanceof d.Mesh) : [r];
         c.forEach((i) => {
           var O, u;
           i.__originalColor__ = (O = i.__originalColor__) != null ? O : i.material.color.clone(), i.__originalOpacity__ = (u = i.__originalOpacity__) != null ? u : i.material.opacity;
         });
         const p = () => {
           c.forEach((i) => {
-            i.material.color.set(t), i.material.opacity = s;
+            i.name === "ScaleHelperTransparentGroup" ? i.children[0] && (i.children[0].material.color.set(t), i.children[0].material.opacity = n) : (i.material.color.set(t), i.material.opacity = n);
           }), this.render();
         }, l = () => {
           c.forEach((i) => {
-            i.material.color.copy(i.__originalColor__), i.material.opacity = i.__originalOpacity__;
+            i.name === "ScaleHelperTransparentGroup" ? i.children[0] && (i.children[0].material.color.set(16776960), i.children[0].material.opacity = 1) : (i.material.color.copy(i.__originalColor__), i.material.opacity = i.__originalOpacity__);
           }), this.render();
-        }, d = () => {
+        }, b = (i) => {
           this.isDragging || p();
-        }, f = () => {
+        }, f = (i) => {
           this.isDragging || l();
         };
         for (const i of c)
-          this.domEvents.addEventListener(i, "mouseover", d), this.domEvents.addEventListener(i, "mouseout", f), this.hooks.on("moveStart", p), this.hooks.on("moveEnd", l), this.hooks.on("rotateEnd", l), this.hooks.on("scaleEnd", l), n.push(() => {
-            this.domEvents.removeEventListener(i, "mouseover", d), this.domEvents.removeEventListener(i, "mouseout", f), this.hooks.off("moveStart", p), this.hooks.off("moveEnd", l), this.hooks.off("rotateEnd", l), this.hooks.off("scaleEnd", l);
+          this.domEvents.addEventListener(i, "mouseover", b), this.domEvents.addEventListener(i, "mouseout", f), this.hooks.on("moveStart", p), this.hooks.on("moveEnd", l), this.hooks.on("rotateEnd", l), this.hooks.on("scaleEnd", l), s.push(() => {
+            this.domEvents.removeEventListener(i, "mouseover", b), this.domEvents.removeEventListener(i, "mouseout", f), this.hooks.off("moveStart", p), this.hooks.off("moveEnd", l), this.hooks.off("rotateEnd", l), this.hooks.off("scaleEnd", l);
           });
       }
-    return () => n.forEach((r) => r == null ? void 0 : r());
+    return () => s.forEach((r) => r == null ? void 0 : r());
   }
   getIntersectObject(e) {
-    const t = this.camera.position, s = this.helperObject3D;
-    if (!s)
+    const t = this.camera.position, n = this.helperObject3D;
+    if (!n)
       return;
     const a = this.helperObject3D.raycasterIntersectObject(e)[0];
     if (!a)
       return;
-    const n = a;
-    if (n.object = s, this.model.intersectRaycaster) {
+    const s = a;
+    if (s.object = n, this.model.intersectRaycaster) {
       const r = this.model.intersectRaycaster(e)[0];
-      if (r && r.point.distanceTo(t) < n.point.distanceTo(t))
+      if (r && r.point.distanceTo(t) < s.point.distanceTo(t))
         return;
     }
-    return n.object;
+    return s.object;
   }
   calculateOffset(e, t) {
-    const s = new b.Vector3(0, 0, 0);
+    const n = new d.Vector3(0, 0, 0);
     if (!e)
-      return s;
+      return n;
     const a = () => t || this.getBox();
     if (typeof e.x == "number")
-      s.setX(e.x);
+      n.setX(e.x);
     else if (typeof e.x == "object") {
-      const n = a();
-      s.setX((n.max.x - n.min.x) * e.x.percents);
+      const s = a();
+      n.setX((s.max.x - s.min.x) * e.x.percents);
     }
     if (typeof e.y == "number")
-      s.setY(e.y);
+      n.setY(e.y);
     else if (typeof e.y == "object") {
-      const n = a();
-      s.setY((n.max.y - n.min.y) * e.y.percents);
+      const s = a();
+      n.setY((s.max.y - s.min.y) * e.y.percents);
     }
     if (typeof e.z == "number")
-      s.setZ(e.z);
+      n.setZ(e.z);
     else if (typeof e.z == "object") {
-      const n = a();
-      s.setZ((n.max.z - n.min.z) * e.z.percents);
+      const s = a();
+      n.setZ((s.max.z - s.min.z) * e.z.percents);
     }
-    return s;
+    return n;
   }
 }
 export {

package/libs/shared-utils/Object3DHelper/Base/BaseHelper.d.ts

@@ -54,6 +54,9 @@ export declare abstract class MoveHelperAbstract<OriginObject3D extends Object3D
         line?: Object3D;
         direction: Direction;
     };
+    abstract centerHandle?: Object3D & {
+        direction: Direction;
+    };
     abstract showDraggingHelper(directions?: Direction[]): void;
     abstract update(camera: THREE.Camera): void;
 }
@@ -73,11 +76,13 @@ export declare abstract class RotateHelperAbstract<OriginObject3D extends Object
     abstract zCircle?: Circle;
     abstract angleTips?: ReturnType<typeof tipsDom>;
     abstract showDraggingHelper(directions: Direction[]): void;
+    abstract update(camera: THREE.Camera): void;
 }
 export declare abstract class ScaleHelperAbstract<OriginObject3D extends Object3D = Object3D> extends BaseHelper<OriginObject3D> {
     abstract scaleMeshes: Array<Object3D & {
         scalePosition: ScalePosition;
     }>;
+    abstract update(camera: THREE.Camera): void;
 }
 export declare abstract class RectangleScaleHelperAbstract<OriginObject3D extends Object3D, PointType extends Object3D | HTMLElement> extends BaseHelper<OriginObject3D> {
     abstract points: PointType extends Object3D ? {

package/libs/shared-utils/Object3DHelper/Constants/RenderOrder.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Object3DHelper 渲染顺序常量
+ * 数值越大，渲染优先级越高
+ */
+export declare const RENDER_ORDER: {
+    readonly ROTATE_HELPER: 9992;
+    readonly MOVE_HELPER: 9993;
+    readonly SCALE_HELPER_LINE: 9994;
+    readonly SCALE_HELPER_SPHERE: 9995;
+    readonly MOVE_HELPER_ARROW: 10001;
+    readonly MOVE_HELPER_CENTER: 10002;
+    readonly DRAG_GUIDE_LINE: 10003;
+    readonly DRAG_FACE_PATCH: 10004;
+};
+export type RenderOrderType = (typeof RENDER_ORDER)[keyof typeof RENDER_ORDER];

package/libs/shared-utils/Object3DHelper/Constants/RenderOrder.js

@@ -0,0 +1,23 @@
+const E = {
+  // 基础几何体（如Box）的渲染顺序通常在 0-100 之间
+  // 所以Helper的渲染顺序需要远大于这个范围
+  // 旋转辅助器 - 最低优先级
+  ROTATE_HELPER: 9992,
+  // 移动辅助器
+  MOVE_HELPER: 9993,
+  // 缩放辅助器的连接线
+  SCALE_HELPER_LINE: 9994,
+  // 缩放辅助器的球体
+  SCALE_HELPER_SPHERE: 9995,
+  // 移动辅助器的箭头 - 确保高于所有透明对象
+  MOVE_HELPER_ARROW: 10001,
+  // 移动辅助器的中心手柄 - 应该盖住箭头，优先响应事件
+  MOVE_HELPER_CENTER: 10002,
+  // 拖拽引导线
+  DRAG_GUIDE_LINE: 10003,
+  // 拖拽面片 - 最高优先级
+  DRAG_FACE_PATCH: 10004
+};
+export {
+  E as RENDER_ORDER
+};

package/libs/shared-utils/Object3DHelper/Constants/color.js

@@ -1,8 +1,8 @@
 import * as e from "three";
 const o = {
-  X: 15618642,
-  Y: 4765519,
-  Z: 4227839
+  X: 16730698,
+  Y: 54927,
+  Z: 3368703
 };
 class t {
   static get X() {

package/libs/shared-utils/Object3DHelper/Controller/MoveController.d.ts

@@ -20,6 +20,9 @@ export declare class MoveController<T extends MoveHelperAbstract = MoveHelperAbs
     get moveByMouseEnable(): boolean;
     protected name: string;
     private startInfo?;
+    /** 拖拽时用于显示方向参考的直线（与 ScaleController 一致：Line + LineBasicMaterial） */
+    private dragGuideLine?;
+    private solidGuide;
     private _moveByMouse;
     private mouseInfo?;
     private mousedownEventListenerDisposer;
@@ -47,6 +50,10 @@ export declare class MoveController<T extends MoveHelperAbstract = MoveHelperAbs
      */
     private dragStart;
     private dragging;
+    /**
+     * 更新直线缩放，保持视觉上的恒定大小（与 ScaleController 保持一致）
+     */
+    private updateDragGuideLineScale;
     private move;
     private dragEnd;
 }

package/libs/shared-utils/Object3DHelper/Controller/MoveController.js

@@ -1,24 +1,34 @@
-var v = Object.defineProperty;
-var f = (c, h, e) => h in c ? v(c, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[h] = e;
-var a = (c, h, e) => (f(c, typeof h != "symbol" ? h + "" : h, e), e);
-import { BaseController as g } from "../Base/BaseController.js";
-import * as m from "three";
-import { getMouseRaycaster as p } from "../utils/getMouseRaycaster.js";
-import { rayOnLine as y } from "../../../Sculpt/utils/three/rayOnLine.js";
-class w extends g {
+var b = Object.defineProperty;
+var D = (g, d, e) => d in g ? b(g, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : g[d] = e;
+var r = (g, d, e) => (D(g, typeof d != "symbol" ? d + "" : d, e), e);
+import { BaseController as M } from "../Base/BaseController.js";
+import { RENDER_ORDER as L } from "../Constants/RenderOrder.js";
+import * as a from "three";
+import { SolidGuideLine as w } from "../utils/solidGuide.js";
+import { getMouseRaycaster as j } from "../utils/getMouseRaycaster.js";
+import { rayOnLine as B } from "../../../Sculpt/utils/three/rayOnLine.js";
+var y, E;
+class S extends M {
   constructor(...e) {
     super(...e);
-    a(this, "name", "MoveController");
-    a(this, "startInfo");
-    a(this, "_moveByMouse", {
+    r(this, "name", "MoveController");
+    r(this, "startInfo");
+    /** 拖拽时用于显示方向参考的直线（与 ScaleController 一致：Line + LineBasicMaterial） */
+    r(this, "dragGuideLine");
+    r(this, "solidGuide", new w(
+      this.camera,
+      this.container,
+      (E = (y = this.config) == null ? void 0 : y.solidGuide) != null ? E : {}
+    ));
+    r(this, "_moveByMouse", {
       enabled: !1
     });
-    a(this, "mouseInfo");
-    a(this, "mousedownEventListenerDisposer");
+    r(this, "mouseInfo");
+    r(this, "mousedownEventListenerDisposer");
     /**
      * @description: 拖动开始，找出拖的Direction
      */
-    a(this, "dragStart", (e) => {
+    r(this, "dragStart", (e) => {
       if (this.moveByMouseEnable || this.isDragging)
         return;
       const t = e == null ? void 0 : e.intersect;
@@ -27,37 +37,66 @@ class w extends g {
       const o = (t == null ? void 0 : t.object).direction;
       if (!o)
         return this.dragEnd();
-      const s = new m.Vector3(1, 0, 0).applyQuaternion(this.helperObject3D.quaternion), n = new m.Vector3(0, 1, 0).applyQuaternion(this.helperObject3D.quaternion), u = new m.Vector3(0, 0, 1).applyQuaternion(this.helperObject3D.quaternion), i = (() => {
+      const s = new a.Vector3(1, 0, 0).applyQuaternion(this.helperObject3D.quaternion), c = new a.Vector3(0, 1, 0).applyQuaternion(this.helperObject3D.quaternion), n = new a.Vector3(0, 0, 1).applyQuaternion(this.helperObject3D.quaternion), u = (() => {
         switch (o) {
           case "x":
             return s;
           case "y":
-            return n;
+            return c;
           case "z":
-            return u;
+            return n;
+          case "plane":
+            return;
         }
-      })(), r = t.point.clone(), d = new m.Line3(
-        r.clone().sub(i.normalize()),
-        r.clone().add(i.normalize())
-      );
-      this.startInfo = { startVectorProject: r, line: d }, this.helperObject3D.showDraggingHelper([o]), this.hooks.emit("moveStart"), this.isDragging = !0;
+      })(), i = t.point.clone();
+      if (o === "plane") {
+        const l = this.camera.position.clone(), h = i.clone(), m = h.clone().sub(l).normalize(), f = new a.Plane().setFromNormalAndCoplanarPoint(m, h), p = h.clone();
+        this.startInfo = {
+          draggingDirection: o,
+          startVectorProject: p,
+          line: new a.Line3(p.clone(), p.clone()),
+          // 保存固定的平面，拖拽过程中不变
+          plane: f
+        };
+      } else {
+        const l = new a.Line3(
+          i.clone().sub(u.normalize()),
+          i.clone().add(u.normalize())
+        );
+        this.startInfo = { draggingDirection: o, startVectorProject: i, line: l };
+        try {
+          const h = u.clone().normalize(), m = this.helperObject3D.getWorldPosition(new a.Vector3()), f = this.solidGuide.createSolidLine(m, h, { color: 16777215, renderOrder: L.DRAG_GUIDE_LINE });
+          this.scene.add(f), this.dragGuideLine = f;
+        } catch (h) {
+        }
+      }
+      this.helperObject3D.showDraggingHelper([o]), this.hooks.emit("moveStart"), this.isDragging = !0;
     });
-    a(this, "dragging", (e) => {
+    r(this, "dragging", (e) => {
       if (!this.isDragging || !this.startInfo)
         return;
-      const t = "touches" in e ? e.touches[0].clientX : e.x, o = "touches" in e ? e.touches[0].clientY : e.y, s = p(this.camera, { x: t, y: o }, this.container);
+      const t = "touches" in e ? e.touches[0].clientX : e.x, o = "touches" in e ? e.touches[0].clientY : e.y, s = j(this.camera, { x: t, y: o }, this.container);
       return s ? (this.move(s), !1) : this.dragEnd();
     });
-    a(this, "dragEnd", () => {
-      this.isDragging && (this.startInfo = void 0, this.isDragging = !1, this.helperObject3D.show(), this.hooks.emit("moveEnd"));
+    r(this, "dragEnd", () => {
+      if (this.isDragging) {
+        if (this.startInfo = void 0, this.isDragging = !1, this.dragGuideLine) {
+          this.scene.remove(this.dragGuideLine), this.dragGuideLine.geometry.dispose();
+          const e = this.dragGuideLine.material;
+          Array.isArray(e) ? e.forEach((t) => t.dispose()) : e.dispose(), this.dragGuideLine = void 0;
+        }
+        this.helperObject3D.show(), this.hooks.emit("moveEnd");
+      }
     });
     const t = this.helperObject3D;
-    this.hoverListener([t.xArrow, t.yArrow, t.zArrow]);
-    const o = this.show.bind(this), s = this.hide.bind(this), n = () => {
-      this.helperObject3D.update(this.camera), this.render();
+    this.hoverListener([t.centerHandle, t.xArrow, t.yArrow, t.zArrow]);
+    const o = this.show.bind(this), s = this.hide.bind(this), c = () => {
+      this.helperObject3D.update(this.camera), this.isDragging && this.updateDragGuideLineScale(), this.render();
     };
-    n(), this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd), this.domEvents.addEventListener(this.helperObject3D, "touchstart", this.dragStart), document.addEventListener("touchmove", this.dragging), document.addEventListener("touchend", this.dragEnd), this.hooks.on("rotateStart", s), this.hooks.on("rotateEnd", o), this.hooks.on("scaleStart", s), this.hooks.on("scaleEnd", o), this.hooks.on("moveByMouseEnable", s), this.hooks.on("moveByMouseDisable", o), this.cameraHooks.on("cameraUpdate", n), this.disposers.push(() => {
-      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", this.dragStart), document.removeEventListener("mousemove", this.dragging), document.removeEventListener("mouseup", this.dragEnd), this.domEvents.removeEventListener(this.helperObject3D, "touchstart", this.dragStart), document.removeEventListener("touchmove", this.dragging), document.removeEventListener("touchend", this.dragEnd), this.hooks.off("rotateStart", s), this.hooks.off("rotateEnd", o), this.hooks.off("scaleStart", s), this.hooks.off("scaleEnd", o), this.hooks.off("moveByMouseEnable", s), this.hooks.off("moveByMouseDisable", o), this.cameraHooks.off("cameraUpdate", n);
+    c(), this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd), this.domEvents.addEventListener(this.helperObject3D, "touchstart", this.dragStart), document.addEventListener("touchmove", this.dragging), document.addEventListener("touchend", this.dragEnd), this.hooks.on("rotateStart", s), this.hooks.on("rotateEnd", o), this.hooks.on("scaleStart", s), this.hooks.on("scaleEnd", o), this.hooks.on("moveByMouseEnable", s), this.hooks.on("moveByMouseDisable", o), this.hooks.on("updateOtherHelpers", (n) => {
+      this.helperObject3D.update(n.camera), this.render();
+    }), this.cameraHooks.on("cameraUpdate", c), this.disposers.push(() => {
+      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", this.dragStart), document.removeEventListener("mousemove", this.dragging), document.removeEventListener("mouseup", this.dragEnd), this.domEvents.removeEventListener(this.helperObject3D, "touchstart", this.dragStart), document.removeEventListener("touchmove", this.dragging), document.removeEventListener("touchend", this.dragEnd), this.hooks.off("rotateStart", s), this.hooks.off("rotateEnd", o), this.hooks.off("scaleStart", s), this.hooks.off("scaleEnd", o), this.hooks.off("moveByMouseEnable", s), this.hooks.off("moveByMouseDisable", o), this.hooks.off("updateOtherHelpers"), this.cameraHooks.off("cameraUpdate", c);
     }), this.moveByMouseEnable && this.moveByMouse();
   }
   get moveByMouseEnable() {
@@ -91,14 +130,14 @@ class w extends g {
     this._moveByMouse = { enabled: !1 }, this.preventTapDefaultEvent = !1, this.hooks.emit("moveByMouseDisable"), (e = this.mousedownEventListenerDisposer) == null || e.call(this);
   }
   onIntersectionOnModelUpdate(e) {
-    var n, u, i;
+    var c, n, u;
     if (!this.moveByMouseEnable)
       return;
     const { point: t, face: o } = e;
     if (!this.hooks.emit("wantToMove", t)) {
       if (this.originObject3D.position.copy(t), (this._moveByMouse.useFaceNormal === !0 || typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.enable !== !1) && o != null && o.normal) {
-        const r = (() => typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.alignmentVector ? this._moveByMouse.useFaceNormal.alignmentVector : { x: 0, y: 1, z: 0 })(), d = new m.Vector3((n = r.x) != null ? n : 0, (u = r.y) != null ? u : 0, (i = r.z) != null ? i : 0), l = (() => typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.fixedFaceNormal ? this._moveByMouse.useFaceNormal.fixedFaceNormal(o.normal) : o.normal)();
-        this.originObject3D.quaternion.setFromUnitVectors(d, l), this.internalHooks.emit("setObjectRotate", this.originObject3D.quaternion.clone());
+        const i = (() => typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.alignmentVector ? this._moveByMouse.useFaceNormal.alignmentVector : { x: 0, y: 1, z: 0 })(), l = new a.Vector3((c = i.x) != null ? c : 0, (n = i.y) != null ? n : 0, (u = i.z) != null ? u : 0), h = (() => typeof this._moveByMouse.useFaceNormal == "object" && this._moveByMouse.useFaceNormal.fixedFaceNormal ? this._moveByMouse.useFaceNormal.fixedFaceNormal(o.normal) : o.normal)();
+        this.originObject3D.quaternion.setFromUnitVectors(l, h), this.internalHooks.emit("setObjectRotate", this.originObject3D.quaternion.clone());
       }
       this.internalHooks.emit("setObjectPosition", t), this.hooks.emit("move", t);
     }
@@ -113,15 +152,42 @@ class w extends g {
     const { x: t, y: o } = e;
     this.mouseInfo.x === t && this.mouseInfo.y === o && Date.now() - this.mouseInfo.mouseDownTimestamp < 500 && (this.disableMoveByMouse(), this.mouseInfo = void 0);
   }
+  /**
+   * 更新直线缩放，保持视觉上的恒定大小（与 ScaleController 保持一致）
+   */
+  updateDragGuideLineScale() {
+    if (!this.dragGuideLine || !this.startInfo)
+      return;
+    const { line: e } = this.startInfo, t = e.end.clone().sub(e.start).normalize();
+    if (t.lengthSq() < 1e-6)
+      return;
+    const o = this.helperObject3D.getWorldPosition(new a.Vector3());
+    this.solidGuide.updateSolidLine(this.dragGuideLine, o, t);
+  }
   move(e) {
     if (!this.startInfo)
       return this.dragEnd();
-    const { line: t, startVectorProject: o } = this.startInfo, s = this.originObject3D, n = y({ raycaster: e, line: t, clampToLine: !1 }), u = n.clone().sub(o), i = new m.Matrix4();
+    const { line: t, startVectorProject: o } = this.startInfo, s = this.originObject3D, c = this.startInfo.draggingDirection === "plane";
+    let n;
+    if (c) {
+      const m = this.startInfo.plane;
+      if (!m)
+        return;
+      const f = new a.Vector3(), p = m.normal.dot(e.ray.direction);
+      if (Math.abs(p) < 1e-6)
+        return;
+      const v = -(m.normal.dot(e.ray.origin) + m.constant) / p;
+      if (v < 0)
+        return;
+      f.copy(e.ray.origin.clone().add(e.ray.direction.clone().multiplyScalar(v))), n = f;
+    } else
+      n = B({ raycaster: e, line: t, clampToLine: !1 });
+    const u = n.clone().sub(o), i = new a.Matrix4();
     i.setPosition(u);
-    const r = s.position.clone().applyMatrix4(i);
-    this.hooks.emit("wantToMove", r) || (s.applyMatrix4(i), o.copy(n), this.internalHooks.emit("applyObjectPosition", { matrix: i }), this.hooks.emit("move", r));
+    const l = s.position.clone().applyMatrix4(i);
+    this.hooks.emit("wantToMove", l) || (s.applyMatrix4(i), o.copy(n), this.internalHooks.emit("applyObjectPosition", { matrix: i }), this.hooks.emit("move", l));
   }
 }
 export {
-  w as MoveController
+  S as MoveController
 };

package/libs/shared-utils/Object3DHelper/Controller/RotateController.d.ts

@@ -12,6 +12,13 @@ export declare class RotateController<T extends RotateHelperAbstract = RotateHel
         y?: number;
         z?: number;
     }): void;
+    /**
+     * @description 通过改变欧拉角中的某一个值来改变旋转，但保持其他两个轴的旋转不变
+     * @param axis 要修改的轴 ('x' | 'y' | 'z')
+     * @param angle 新的角度值（度）
+     * @returns 新的四元数值
+     */
+    getEulerAngle(axis: 'x' | 'y' | 'z', angle: number): THREE.Quaternion;
     protected onApplyOriginObjectRotate(params: {
         quaternion: THREE.Quaternion;
         origin: THREE.Vector3;
@@ -24,9 +31,13 @@ export declare class RotateController<T extends RotateHelperAbstract = RotateHel
      * @description: 拖动开始，找出拖的Direction
      */
     private dragStart;
+    private getMatrix;
+    private getMatrixAngle;
+    private parseAngleByDirection;
     private dragging;
     private rotate;
     private dragEnd;
+    private updateOtherHelpers;
     private getAngleHelper;
     private setAngleHelperStart;
     private setAngleHelperLength;