@realsee/dnalogel 3.69.12 → 3.69.13-alpha-2

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;

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

@@ -1,36 +1,58 @@
-var j = Object.defineProperty;
-var w = (g, h, t) => h in g ? j(g, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : g[h] = t;
-var d = (g, h, t) => (w(g, typeof h != "symbol" ? h + "" : h, t), t);
-import { BaseController as D } from "../Base/BaseController.js";
-import * as a from "three";
-import { getMouseRaycaster as O } from "../utils/getMouseRaycaster.js";
-import { setObjectQuaternion as C } from "../utils/setObjectQuaternion.js";
-import { rad2Deg as L } from "../../math/rad2Deg.js";
-import { deg2Rad as f } from "../../math/deg2Rad.js";
-let y = new a.Quaternion();
-class P extends D {
+var x = Object.defineProperty;
+var D = (m, p, t) => p in m ? x(m, p, { enumerable: !0, configurable: !0, writable: !0, value: t }) : m[p] = t;
+var E = (m, p, t) => (D(m, typeof p != "symbol" ? p + "" : p, t), t);
+import { BaseController as Q } from "../Base/BaseController.js";
+import * as o from "three";
+import { getMouseRaycaster as H } from "../utils/getMouseRaycaster.js";
+import { setObjectQuaternion as A } from "../utils/setObjectQuaternion.js";
+import { rad2Deg as u } from "../../math/rad2Deg.js";
+import { deg2Rad as g } from "../../math/deg2Rad.js";
+let w = new o.Quaternion();
+class I extends Q {
   constructor(...t) {
-    var l, c, m;
+    var l, y, h;
     super(...t);
-    d(this, "name", "RotateController");
-    d(this, "startInfo");
-    d(this, "removeListener");
-    const n = this.helperObject3D;
-    this.hoverListener([(l = n.xCircle) == null ? void 0 : l.circle, (c = n.yCircle) == null ? void 0 : c.circle, (m = n.zCircle) == null ? void 0 : m.circle].filter(Boolean));
-    const e = this.dragStart.bind(this), o = this.dragging.bind(this), r = this.dragEnd.bind(this), s = this.show.bind(this), i = this.hide.bind(this);
-    this.domEvents.addEventListener(this.helperObject3D, "mousedown", e), document.addEventListener("mousemove", o), document.addEventListener("mouseup", r), this.domEvents.addEventListener(this.helperObject3D, "touchstart", e), document.addEventListener("touchmove", o), document.addEventListener("touchend", r), this.hooks.on("moveStart", i), this.hooks.on("moveEnd", s), this.hooks.on("scaleStart", i), this.hooks.on("scaleEnd", s), this.hooks.on("moveByMouseEnable", i), this.hooks.on("moveByMouseDisable", s), this.disposers.push(() => {
-      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", e), document.removeEventListener("mousemove", o), document.removeEventListener("mouseup", r), this.domEvents.removeEventListener(this.helperObject3D, "touchstart", e), document.removeEventListener("touchmove", o), document.removeEventListener("touchend", r), this.hooks.off("moveStart", i), this.hooks.off("moveEnd", s), this.hooks.off("scaleStart", i), this.hooks.off("scaleEnd", s), this.hooks.off("moveByMouseEnable", i), this.hooks.off("moveByMouseDisable", s);
+    E(this, "name", "RotateController");
+    E(this, "startInfo");
+    E(this, "removeListener");
+    const e = this.helperObject3D;
+    this.hoverListener([(l = e.xCircle) == null ? void 0 : l.circle, (y = e.yCircle) == null ? void 0 : y.circle, (h = e.zCircle) == null ? void 0 : h.circle].filter(Boolean));
+    const n = this.dragStart.bind(this), r = this.dragging.bind(this), s = this.dragEnd.bind(this), i = this.show.bind(this), a = this.hide.bind(this), c = () => {
+      this.helperObject3D.update(this.camera), this.render();
+    };
+    c(), this.domEvents.addEventListener(this.helperObject3D, "mousedown", n), document.addEventListener("mousemove", r), document.addEventListener("mouseup", s), this.domEvents.addEventListener(this.helperObject3D, "touchstart", n), document.addEventListener("touchmove", r), document.addEventListener("touchend", s), this.hooks.on("moveStart", a), this.hooks.on("moveEnd", i), this.hooks.on("scaleStart", a), this.hooks.on("scaleEnd", i), this.hooks.on("moveByMouseEnable", a), this.hooks.on("moveByMouseDisable", i), this.hooks.on("updateOtherHelpers", (d) => {
+      this.helperObject3D.update(d.camera), this.render();
+    }), this.cameraHooks.on("cameraUpdate", c), this.disposers.push(() => {
+      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", n), document.removeEventListener("mousemove", r), document.removeEventListener("mouseup", s), this.domEvents.removeEventListener(this.helperObject3D, "touchstart", n), document.removeEventListener("touchmove", r), document.removeEventListener("touchend", s), this.hooks.off("moveStart", a), this.hooks.off("moveEnd", i), this.hooks.off("scaleStart", a), this.hooks.off("scaleEnd", i), this.hooks.off("moveByMouseEnable", a), this.hooks.off("moveByMouseDisable", i), this.hooks.off("updateOtherHelpers"), this.cameraHooks.off("cameraUpdate", c);
     });
   }
   get rotateCenter() {
     return this.helperObject3D.position.clone();
   }
   setRotateAngle(t) {
-    const { x: n = 0, y: e = 0, z: o = 0 } = t, r = new a.Euler(f(n), f(e), f(o)), s = new a.Quaternion().setFromEuler(r);
-    if (this.hooks.emit("wantToRotate", s))
+    const { x: e = 0, y: n = 0, z: r = 0 } = t, s = new o.Euler(g(e), g(n), g(r)), i = new o.Quaternion().setFromEuler(s);
+    if (this.hooks.emit("wantToRotate", i))
       return;
-    const { originObject3D: l, rotateCenter: c } = this;
-    C(l, s, c), this.internalHooks.emit("setObjectRotate", s, c), this.hooks.emit("rotate", s), this.render();
+    const { originObject3D: c, rotateCenter: l } = this;
+    A(c, i, l), this.internalHooks.emit("setObjectRotate", i, l), this.hooks.emit("rotate", i), this.render();
+  }
+  /**
+   * @description 通过改变欧拉角中的某一个值来改变旋转，但保持其他两个轴的旋转不变
+   * @param axis 要修改的轴 ('x' | 'y' | 'z')
+   * @param angle 新的角度值（度）
+   * @returns 新的四元数值
+   */
+  getEulerAngle(t, e) {
+    const { originObject3D: n } = this, r = new o.Euler().setFromQuaternion(n.quaternion), s = {
+      x: u(r.x),
+      y: u(r.y),
+      z: u(r.z)
+    }, i = {
+      x: t === "x" ? e : s.x,
+      y: t === "y" ? e : s.y,
+      z: t === "z" ? e : s.z
+    }, a = new o.Euler(g(i.x), g(i.y), g(i.z));
+    return new o.Quaternion().setFromEuler(a);
   }
   onApplyOriginObjectRotate(t) {
     this.isDragging || super.onApplyOriginObjectRotate(t);
@@ -43,107 +65,155 @@ class P extends D {
   dragStart(t) {
     if (this.isDragging)
       return;
-    const n = t == null ? void 0 : t.intersect;
-    if (!n)
-      return this.dragEnd();
-    const e = (n == null ? void 0 : n.object).direction;
+    this.helperObject3D.update(this.camera);
+    const e = t == null ? void 0 : t.intersect;
     if (!e)
       return this.dragEnd();
-    const o = n.point, r = this.getAngleHelper(e);
+    const n = (e == null ? void 0 : e.object).direction;
+    if (!n)
+      return this.dragEnd();
+    const r = e.point, s = this.getAngleHelper(n);
     this.setTipsAngle(0);
-    const s = o.clone();
-    s.y += 0.2, this.setTipsPosition(s);
-    const i = this.helperObject3D.quaternion.clone(), l = (() => {
+    const i = r.clone();
+    i.y += 0.2, this.setTipsPosition(i);
+    const a = this.helperObject3D.quaternion.clone(), c = (() => {
+      if (n === "x")
+        return new o.Vector3(1, 0, 0).applyQuaternion(a);
+      if (n === "y")
+        return new o.Vector3(0, 1, 0).applyQuaternion(a);
+      if (n === "z")
+        return new o.Vector3(0, 0, 1).applyQuaternion(a);
+    })(), l = new o.Plane().setFromNormalAndCoplanarPoint(c, r), h = l.projectPoint(r.clone(), new o.Vector3()).clone().sub(this.rotateCenter), d = h.angleTo(s.baseAxes.clone().applyQuaternion(a)), b = s.offsetAngle(d);
+    this.setAngleHelperStart(n, b), this.setAngleHelperLength(n, 0), this.startInfo = {
+      direction: n,
+      startVector: h,
+      directionVector: c,
+      plane: l,
+      angleHelper: s,
+      angle: 0,
+      helperQuaternion: a.clone()
+    }, w = new o.Quaternion(), this.helperObject3D.showDraggingHelper([n]), this.hooks.emit("rotateStart"), this.isDragging = !0;
+  }
+  getMatrix() {
+    var e, n;
+    return (n = (e = this.originObject3D) == null ? void 0 : e.ext) == null ? void 0 : n.matrix;
+  }
+  getMatrixAngle(t, e) {
+    let n;
+    if (t && t.isMatrix4) {
+      n = new o.Quaternion(), t.decompose(new o.Vector3(), n, new o.Vector3());
+      const r = new o.Euler().setFromQuaternion(n);
       if (e === "x")
-        return new a.Vector3(1, 0, 0).applyQuaternion(i);
+        return Math.round(u(r.z));
       if (e === "y")
-        return new a.Vector3(0, 1, 0).applyQuaternion(i);
+        return Math.round(u(r.y));
       if (e === "z")
-        return new a.Vector3(0, 0, 1).applyQuaternion(i);
-    })(), c = new a.Plane().setFromNormalAndCoplanarPoint(l, o), p = c.projectPoint(o.clone(), new a.Vector3()).clone().sub(this.rotateCenter), u = p.angleTo(r.baseAxes.clone().applyQuaternion(i));
-    this.setAngleHelperStart(e, u), this.setAngleHelperLength(e, 0), this.startInfo = { direction: e, startVector: p, plane: c, angleHelper: r, angle: 0, helperQuaternion: i.clone() }, y = new a.Quaternion(), this.helperObject3D.showDraggingHelper([e]), this.hooks.emit("rotateStart"), this.isDragging = !0;
+        return Math.round(u(r.x));
+    }
+  }
+  parseAngleByDirection(t) {
+    var r, s;
+    const e = (s = (r = this.originObject3D) == null ? void 0 : r.ext) == null ? void 0 : s.matrix;
+    let n;
+    if (e && e.isMatrix4) {
+      n = new o.Quaternion(), e.decompose(new o.Vector3(), n, new o.Vector3());
+      const i = new o.Euler().setFromQuaternion(n);
+      if (t === "x")
+        return Math.round(u(i.z));
+      if (t === "y")
+        return Math.round(u(i.y));
+      if (t === "z")
+        return Math.round(u(i.x));
+    }
   }
   dragging(t) {
     if (!this.isDragging)
       return;
-    const n = "touches" in t ? t.touches[0].clientX : t.x, e = "touches" in t ? t.touches[0].clientY : t.y, o = O(this.camera, { x: n, y: e }, this.container);
-    return o ? (this.rotate(o), !1) : this.dragEnd();
+    const e = "touches" in t ? t.touches[0].clientX : t.x, n = "touches" in t ? t.touches[0].clientY : t.y, r = H(this.camera, { x: e, y: n }, this.container);
+    return r ? (this.rotate(r), !1) : this.dragEnd();
   }
   rotate(t) {
     if (!this.startInfo)
       return this.dragEnd();
-    const { startVector: n, plane: e, angleHelper: o, direction: r, helperQuaternion: s } = this.startInfo, { originObject3D: i } = this, l = t.ray.intersectPlane(e, new a.Vector3());
-    if (!l)
+    const { startVector: e, plane: n, angleHelper: r, direction: s, helperQuaternion: i } = this.startInfo, { originObject3D: a } = this, c = t.ray.intersectPlane(n, new o.Vector3());
+    if (!c)
       return;
-    const c = this.rotateCenter.clone(), p = e.projectPoint(l.clone(), new a.Vector3()).clone().sub(c);
-    if (n.angleTo(p) === 0)
+    const l = this.rotateCenter.clone();
+    let h = n.projectPoint(c.clone(), new o.Vector3()).clone().sub(l);
+    const d = this.startInfo.directionVector.clone().normalize();
+    h = h.clone().projectOnPlane(d).normalize().multiplyScalar(h.length());
+    const f = new o.Quaternion().setFromUnitVectors(e.clone().normalize(), h.clone().normalize()), v = a.quaternion.clone().premultiply(f);
+    if (e.angleTo(h) === 0 || this.hooks.emit("wantToRotate", v))
       return;
-    const u = new a.Quaternion().setFromUnitVectors(n.clone().normalize(), p.clone().normalize()), v = i.quaternion.clone().premultiply(u);
-    if (this.hooks.emit("wantToRotate", v))
-      return;
-    const E = new a.Euler().setFromQuaternion(
-      new a.Quaternion().setFromUnitVectors(
-        n.clone().normalize().applyQuaternion(s.clone().inverse()),
-        p.clone().normalize().applyQuaternion(s.clone().inverse())
+    const j = new o.Euler().setFromQuaternion(
+      new o.Quaternion().setFromUnitVectors(
+        e.clone().normalize().applyQuaternion(i.clone().inverse()),
+        h.clone().normalize().applyQuaternion(i.clone().inverse())
       ),
-      `${r.toUpperCase()}${"XZY".replace(r.toUpperCase(), "")}`
-    )[r] * o.angleDirection;
-    if (this.startInfo.angle += E, this.setAngleHelperLength(r, this.startInfo.angle), this.setTipsAngle(L(this.startInfo.angle)), c) {
-      const b = new a.Vector3().subVectors(i.position, c).applyQuaternion(u).add(c);
-      i.position.copy(b);
+      `${s.toUpperCase()}${"XZY".replace(s.toUpperCase(), "")}`
+    )[s] * r.angleDirection;
+    if (this.startInfo.angle += j, this.setAngleHelperLength(s, this.startInfo.angle), this.setTipsAngle(u(this.startInfo.angle)), l) {
+      const O = new o.Vector3().subVectors(a.position, l).applyQuaternion(f).add(l);
+      a.position.copy(O);
     }
-    i.applyQuaternion(u), y.premultiply(u), this.internalHooks.emit("applyObjectRotate", { quaternion: u, origin: c }), this.hooks.emit("rotate", i.quaternion), this.startInfo.startVector = p;
+    a.applyQuaternion(f), w.premultiply(f), this.internalHooks.emit("applyObjectRotate", { quaternion: f, origin: l }), this.hooks.emit("rotate", a.quaternion), this.startInfo.startVector = h;
   }
   dragEnd() {
-    this.isDragging && (this.applyHelperQuaternion(y, this.rotateCenter), this.startInfo = void 0, this.isDragging = !1, this.helperObject3D.show(), this.hooks.emit("rotateEnd"));
+    var t;
+    this.isDragging && (this.applyHelperQuaternion(w, this.rotateCenter), (t = this.startInfo) != null && t.lineMeshes && this.startInfo.lineMeshes.forEach((e) => {
+      this.scene.remove(e), e.geometry.dispose(), e.material instanceof o.Material && e.material.dispose();
+    }), this.startInfo = void 0, this.isDragging = !1, this.helperObject3D.show(), this.updateOtherHelpers(), this.hooks.emit("rotateEnd"));
+  }
+  updateOtherHelpers() {
+    this.hooks.emit("updateOtherHelpers", { camera: this.camera });
   }
   getAngleHelper(t) {
-    var n, e, o;
+    var e, n, r;
     switch (t) {
       case "x":
-        return (n = this.helperObject3D.xCircle) == null ? void 0 : n.angleSector;
+        return (e = this.helperObject3D.xCircle) == null ? void 0 : e.angleSector;
       case "y":
-        return (e = this.helperObject3D.yCircle) == null ? void 0 : e.angleSector;
+        return (n = this.helperObject3D.yCircle) == null ? void 0 : n.angleSector;
       case "z":
-        return (o = this.helperObject3D.zCircle) == null ? void 0 : o.angleSector;
+        return (r = this.helperObject3D.zCircle) == null ? void 0 : r.angleSector;
     }
   }
-  setAngleHelperStart(t, n) {
-    const e = this.getAngleHelper(t);
-    if (!e) {
+  setAngleHelperStart(t, e) {
+    const n = this.getAngleHelper(t);
+    if (!n) {
       console.warn("angleHelper is undefined");
       return;
     }
-    if (e instanceof a.Mesh && e.geometry instanceof a.CircleGeometry) {
-      const { radius: o, segments: r, thetaLength: s } = e.geometry.parameters;
-      e.geometry = new a.CircleGeometry(o, r, n, s);
+    if (n instanceof o.Mesh && n.geometry instanceof o.CircleGeometry) {
+      const { radius: r, segments: s, thetaLength: i } = n.geometry.parameters;
+      n.geometry = new o.CircleGeometry(r, s, e, i);
     } else
       console.warn("only support THREE.CircleGeometry");
   }
-  setAngleHelperLength(t, n) {
-    const o = n >= 0 ? Math.max(n, 1e-3) : Math.min(n, -1e-3), r = this.getAngleHelper(t);
-    if (r instanceof a.Mesh && r.geometry instanceof a.CircleGeometry) {
-      const { radius: s, thetaStart: i } = r.geometry.parameters, l = Math.ceil(Math.abs(o) * (40 / (2 * Math.PI)));
-      r.geometry = new a.CircleGeometry(s, l, i, o);
+  setAngleHelperLength(t, e) {
+    const r = e >= 0 ? Math.max(e, 1e-3) : Math.min(e, -1e-3), s = this.getAngleHelper(t);
+    if (s instanceof o.Mesh && s.geometry instanceof o.CircleGeometry) {
+      const { radius: i, thetaStart: a } = s.geometry.parameters, c = Math.ceil(Math.abs(r) * (40 / (2 * Math.PI)));
+      s.geometry = new o.CircleGeometry(i, c, a, r);
     } else
       console.warn("only support THREE.CircleGeometry");
   }
   setTipsAngle(t) {
-    var e;
-    const n = (e = this.helperObject3D.angleTips) == null ? void 0 : e.element;
-    n && (n.innerText = `${t.toFixed(0)}°`);
+    var n;
+    const e = (n = this.helperObject3D.angleTips) == null ? void 0 : n.element;
+    e && (e.innerText = `${t.toFixed(0)}°`);
   }
   setTipsPosition(t) {
-    const n = this.helperObject3D.angleTips;
-    if (!n)
+    const e = this.helperObject3D.angleTips;
+    if (!e)
       return;
-    const e = t.project(this.camera), { x: o, y: r, z: s } = e;
-    if (s > 1)
+    const n = t.project(this.camera), { x: r, y: s, z: i } = n;
+    if (i > 1)
       return;
-    const i = (o + 1) / 2 * 100 + "%", l = (-r + 1) / 2 * 100 + "%";
-    n.setLeftTop(i, l);
+    const a = (r + 1) / 2 * 100 + "%", c = (-s + 1) / 2 * 100 + "%";
+    e.setLeftTop(a, c);
   }
 }
 export {
-  P as RotateController
+  I as RotateController
 };

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

@@ -3,12 +3,19 @@ import type { ScaleHelperAbstract } from '../Helper';
 import * as THREE from 'three';
 export declare class ScaleController<T extends ScaleHelperAbstract = ScaleHelperAbstract> extends BaseController<T> {
     protected name: string;
+    /** 拖拽时用于显示方向参考的直线（使用 Line 实现无限长穿透整个平面的直线） */
+    private dragGuideLine?;
+    /** 当前拖拽时显示的面片 */
+    private currentFacePatch?;
+    private dashGuide;
     private startInfo?;
     constructor(...params: ConstructorParameters<typeof BaseController<T>>);
     initialHelperPosition(): void;
     dragStart: (params: {
         intersect: THREE.Intersection;
     }) => void;
+    private addFaceMesh;
+    private removeFaceMesh;
     dragging: (point: {
         x: number;
         y: number;
@@ -20,4 +27,32 @@ export declare class ScaleController<T extends ScaleHelperAbstract = ScaleHelper
     }): void;
     scale: (raycaster: THREE.Raycaster) => void;
     dragEnd: () => void;
+    /**
+     * 更新直线方向，保持直线始终经过物体中心和当前拉伸球位置
+     */
+    private updateDragGuideLineDirection;
+    /**
+     * 更新直线缩放，保持视觉上的恒定大小
+     */
+    private updateDragGuideLineScale;
+    /**
+     * 更新面片位置，使其跟随拖拽球的位置
+     */
+    private updateFacePatchPosition;
+    /**
+     * 向场景添加一个表示 face 的面片，红色，位置与 face.center 一致，使用两个三角形拼成矩形
+     */
+    addFacePatch(face: {
+        center: THREE.Vector3;
+        vertices?: THREE.Vector3[];
+        normal?: THREE.Vector3;
+    } | {
+        center: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        vertices?: THREE.Vector3[];
+        normal?: THREE.Vector3;
+    }): THREE.Mesh<THREE.BufferGeometry, THREE.MeshBasicMaterial>;
 }