@realsee/dnalogel 3.20.7 → 3.21.1

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

@@ -1,38 +1,39 @@
-var D = Object.defineProperty;
-var O = (g, h, n) => h in g ? D(g, h, { enumerable: !0, configurable: !0, writable: !0, value: n }) : g[h] = n;
-var d = (g, h, n) => (O(g, typeof h != "symbol" ? h + "" : h, n), n);
-import { BaseController as v } from "../Base/BaseController.js";
-import * as s from "three";
-import { getMouseRaycaster as E } from "../utils/getMouseRaycaster.js";
-import { setObjectQuaternion as w } from "../utils/setObjectQuaternion.js";
-import { rad2Deg as C } from "../../math/rad2Deg.js";
+var v = Object.defineProperty;
+var w = (u, h, n) => h in u ? v(u, h, { enumerable: !0, configurable: !0, writable: !0, value: n }) : u[h] = n;
+var d = (u, h, n) => (w(u, typeof h != "symbol" ? h + "" : h, n), n);
+import { BaseController as C } from "../Base/BaseController.js";
+import * as a from "three";
+import { getMouseRaycaster as D } from "../utils/getMouseRaycaster.js";
+import { setObjectQuaternion as O } from "../utils/setObjectQuaternion.js";
+import { rad2Deg as k } from "../../math/rad2Deg.js";
 import { deg2Rad as f } from "../../math/deg2Rad.js";
-class P extends v {
+const y = new a.Quaternion();
+class P extends C {
   constructor(...n) {
-    var c, l, p;
+    var l, c, m;
     super(...n);
     d(this, "name", "RotateController");
     d(this, "startInfo");
     d(this, "removeListener");
     const e = this.helperObject3D;
-    this.hoverListener([(c = e.xCircle) == null ? void 0 : c.circle, (l = e.yCircle) == null ? void 0 : l.circle, (p = e.zCircle) == null ? void 0 : p.circle].filter(Boolean));
-    const t = this.dragStart.bind(this), i = this.dragging.bind(this), o = this.dragEnd.bind(this), r = this.show.bind(this), a = this.hide.bind(this);
-    this.domEvents.addEventListener(this.helperObject3D, "mousedown", t), document.addEventListener("mousemove", i), document.addEventListener("mouseup", o), this.hooks.on("moveStart", a), this.hooks.on("moveEnd", r), this.hooks.on("moveByMouseEnable", a), this.hooks.on("moveByMouseDisable", r), this.removeListener = () => {
-      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", t), document.removeEventListener("mousemove", i), document.removeEventListener("mouseup", o), this.hooks.off("moveStart", a), this.hooks.off("moveEnd", r), this.hooks.off("moveByMouseEnable", a), this.hooks.off("moveByMouseDisable", r);
+    this.hoverListener([(l = e.xCircle) == null ? void 0 : l.circle, (c = e.yCircle) == null ? void 0 : c.circle, (m = e.zCircle) == null ? void 0 : m.circle].filter(Boolean));
+    const t = this.dragStart.bind(this), i = this.dragging.bind(this), s = this.dragEnd.bind(this), r = this.show.bind(this), o = this.hide.bind(this);
+    this.domEvents.addEventListener(this.helperObject3D, "mousedown", t), document.addEventListener("mousemove", i), document.addEventListener("mouseup", s), this.hooks.on("moveStart", o), this.hooks.on("moveEnd", r), this.hooks.on("scaleStart", o), this.hooks.on("scaleEnd", r), this.hooks.on("moveByMouseEnable", o), this.hooks.on("moveByMouseDisable", r), this.removeListener = () => {
+      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", t), document.removeEventListener("mousemove", i), document.removeEventListener("mouseup", s), this.hooks.off("moveStart", o), this.hooks.off("moveEnd", r), this.hooks.off("scaleStart", o), this.hooks.off("scaleEnd", r), this.hooks.off("moveByMouseEnable", o), this.hooks.off("moveByMouseDisable", r);
     };
   }
   get rotateCenter() {
     return this.helperObject3D.position.clone();
   }
-  initialHelperQuaternion() {
-    this.helperObject3D.applyHelperQuaternion(this.originObject3D.quaternion);
-  }
+  // public initialHelperQuaternion() {
+  //   this.helperObject3D.applyHelperQuaternion(this.originObject3D.quaternion)
+  // }
   setRotateAngle(n) {
-    const { x: e = 0, y: t = 0, z: i = 0 } = n, o = new s.Euler(f(e), f(t), f(i)), r = new s.Quaternion().setFromEuler(o);
+    const { x: e = 0, y: t = 0, z: i = 0 } = n, s = new a.Euler(f(e), f(t), f(i)), r = new a.Quaternion().setFromEuler(s);
     if (this.hooks.emit("wantToRotate", r))
       return;
-    const { originObject3D: c, rotateCenter: l } = this;
-    w(c, r, l), this.internalHooks.emit("setObjectRotate", r, l), this.hooks.emit("rotate", r), this.render();
+    const { originObject3D: l, rotateCenter: c } = this;
+    O(l, r, c), this.internalHooks.emit("setObjectRotate", r, c), this.hooks.emit("rotate", r), this.render();
   }
   dispose() {
     this.removeListener(), super.dispose();
@@ -54,53 +55,53 @@ class P extends v {
     const t = (e == null ? void 0 : e.object).direction;
     if (!t)
       return this.dragEnd();
-    const i = e.point, o = this.getAngleHelper(t);
+    const i = e.point, s = this.getAngleHelper(t);
     this.setTipsAngle(0);
     const r = i.clone();
     r.y += 0.2, this.setTipsPosition(r);
-    const a = (() => {
+    const o = this.helperObject3D.quaternion.clone(), l = (() => {
       if (t === "x")
-        return new s.Vector3(1, 0, 0).applyQuaternion(this.originObject3D.quaternion);
+        return new a.Vector3(1, 0, 0).applyQuaternion(o);
       if (t === "y")
-        return new s.Vector3(0, 1, 0).applyQuaternion(this.originObject3D.quaternion);
+        return new a.Vector3(0, 1, 0).applyQuaternion(o);
       if (t === "z")
-        return new s.Vector3(0, 0, 1).applyQuaternion(this.originObject3D.quaternion);
-    })(), c = new s.Plane().setFromNormalAndCoplanarPoint(a, i), p = c.projectPoint(i.clone(), new s.Vector3()).clone().sub(this.rotateCenter), u = p.angleTo(o.baseAxes.clone().applyQuaternion(this.originObject3D.quaternion));
-    this.setAngleHelperStart(t, u), this.setAngleHelperLength(t, 0), this.startInfo = { direction: t, startVector: p, plane: c, angleHelper: o, angle: 0, objectQuaternion: this.originObject3D.quaternion.clone() }, this.helperObject3D.showDraggingHelper([t]), this.hooks.emit("rotateStart"), this.isDragging = !0;
+        return new a.Vector3(0, 0, 1).applyQuaternion(o);
+    })(), c = new a.Plane().setFromNormalAndCoplanarPoint(l, i), p = c.projectPoint(i.clone(), new a.Vector3()).clone().sub(this.rotateCenter), g = p.angleTo(s.baseAxes.clone().applyQuaternion(o));
+    this.setAngleHelperStart(t, g), this.setAngleHelperLength(t, 0), this.startInfo = { direction: t, startVector: p, plane: c, angleHelper: s, angle: 0, helperQuaternion: o.clone() }, y.copy(o), this.helperObject3D.showDraggingHelper([t]), this.hooks.emit("rotateStart"), this.isDragging = !0;
   }
   dragging(n) {
     if (!this.isDragging)
       return;
-    const e = E(this.camera, n, this.container);
+    const e = D(this.camera, n, this.container);
     return e ? (this.rotate(e), !1) : this.dragEnd();
   }
   rotate(n) {
     if (!this.startInfo)
       return this.dragEnd();
-    const { startVector: e, plane: t, angleHelper: i, direction: o, objectQuaternion: r } = this.startInfo, { originObject3D: a } = this, c = n.ray.intersectPlane(t, new s.Vector3());
-    if (!c)
+    const { startVector: e, plane: t, angleHelper: i, direction: s, helperQuaternion: r } = this.startInfo, { originObject3D: o } = this, l = n.ray.intersectPlane(t, new a.Vector3());
+    if (!l)
       return;
-    const l = this.rotateCenter.clone(), u = t.projectPoint(c.clone(), new s.Vector3()).clone().sub(l);
-    if (e.angleTo(u) === 0)
+    const c = this.rotateCenter.clone(), p = t.projectPoint(l.clone(), new a.Vector3()).clone().sub(c);
+    if (e.angleTo(p) === 0)
       return;
-    const m = new s.Quaternion().setFromUnitVectors(e.clone().normalize(), u.clone().normalize()), b = a.quaternion.clone().premultiply(m);
+    const g = new a.Quaternion().setFromUnitVectors(e.clone().normalize(), p.clone().normalize()), b = o.quaternion.clone().premultiply(g);
     if (this.hooks.emit("wantToRotate", b))
       return;
-    const y = new s.Euler().setFromQuaternion(
-      new s.Quaternion().setFromUnitVectors(
+    const E = new a.Euler().setFromQuaternion(
+      new a.Quaternion().setFromUnitVectors(
         e.clone().normalize().applyQuaternion(r.clone().inverse()),
-        u.clone().normalize().applyQuaternion(r.clone().inverse())
+        p.clone().normalize().applyQuaternion(r.clone().inverse())
       ),
-      `${o.toUpperCase()}${"XZY".replace(o.toUpperCase(), "")}`
-    )[o] * i.angleDirection;
-    if (this.startInfo.angle += y, this.setAngleHelperLength(o, this.startInfo.angle), this.setTipsAngle(C(this.startInfo.angle)), l) {
-      const j = new s.Vector3().subVectors(a.position, l).applyQuaternion(m).add(l);
-      a.position.copy(j);
+      `${s.toUpperCase()}${"XZY".replace(s.toUpperCase(), "")}`
+    )[s] * i.angleDirection;
+    if (this.startInfo.angle += E, this.setAngleHelperLength(s, this.startInfo.angle), this.setTipsAngle(k(this.startInfo.angle)), c) {
+      const j = new a.Vector3().subVectors(o.position, c).applyQuaternion(g).add(c);
+      o.position.copy(j);
     }
-    a.applyQuaternion(m), this.internalHooks.emit("applyObjectRotate", { quaternion: m, origin: l }), this.hooks.emit("rotate", a.quaternion), this.startInfo.startVector = u;
+    o.applyQuaternion(g), y.premultiply(g), this.internalHooks.emit("applyObjectRotate", { quaternion: g, origin: c }), this.hooks.emit("rotate", o.quaternion), this.startInfo.startVector = p;
   }
   dragEnd() {
-    this.isDragging && (this.internalHooks.emit("setObjectRotate", this.originObject3D.quaternion, this.rotateCenter), this.startInfo = void 0, this.isDragging = !1, this.helperObject3D.show(), this.hooks.emit("rotateEnd"));
+    this.isDragging && (this.internalHooks.emit("setObjectRotate", y, this.rotateCenter), this.startInfo = void 0, this.isDragging = !1, this.helperObject3D.show(), this.hooks.emit("rotateEnd"));
   }
   getAngleHelper(n) {
     var e, t, i;
@@ -119,17 +120,17 @@ class P extends v {
       console.warn("angleHelper is undefined");
       return;
     }
-    if (t instanceof s.Mesh && t.geometry instanceof s.CircleGeometry) {
-      const { radius: i, segments: o, thetaLength: r } = t.geometry.parameters;
-      t.geometry = new s.CircleGeometry(i, o, e, r);
+    if (t instanceof a.Mesh && t.geometry instanceof a.CircleGeometry) {
+      const { radius: i, segments: s, thetaLength: r } = t.geometry.parameters;
+      t.geometry = new a.CircleGeometry(i, s, e, r);
     } else
       console.warn("only support THREE.CircleGeometry");
   }
   setAngleHelperLength(n, e) {
-    const i = e >= 0 ? Math.max(e, 1e-3) : Math.min(e, -1e-3), o = this.getAngleHelper(n);
-    if (o instanceof s.Mesh && o.geometry instanceof s.CircleGeometry) {
-      const { radius: r, thetaStart: a } = o.geometry.parameters, c = Math.ceil(Math.abs(i) * (40 / (2 * Math.PI)));
-      o.geometry = new s.CircleGeometry(r, c, a, i);
+    const i = e >= 0 ? Math.max(e, 1e-3) : Math.min(e, -1e-3), s = this.getAngleHelper(n);
+    if (s instanceof a.Mesh && s.geometry instanceof a.CircleGeometry) {
+      const { radius: r, thetaStart: o } = s.geometry.parameters, l = Math.ceil(Math.abs(i) * (40 / (2 * Math.PI)));
+      s.geometry = new a.CircleGeometry(r, l, o, i);
     } else
       console.warn("only support THREE.CircleGeometry");
   }
@@ -142,11 +143,11 @@ class P extends v {
     const e = this.helperObject3D.angleTips;
     if (!e)
       return;
-    const t = n.project(this.camera), { x: i, y: o, z: r } = t;
+    const t = n.project(this.camera), { x: i, y: s, z: r } = t;
     if (r > 1)
       return;
-    const a = (i + 1) / 2 * 100 + "%", c = (-o + 1) / 2 * 100 + "%";
-    e.setLeftTop(a, c);
+    const o = (i + 1) / 2 * 100 + "%", l = (-s + 1) / 2 * 100 + "%";
+    e.setLeftTop(o, l);
   }
 }
 export {

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

@@ -1,12 +1,19 @@
 import { BaseController } from '../Base/BaseController';
 import type { ScaleHelperAbstract } from '../Helper';
 import * as THREE from 'three';
-export declare class ScaleController<OriginObject3D extends THREE.Object3D = THREE.Object3D> extends BaseController<ScaleHelperAbstract<OriginObject3D>> {
+export declare class ScaleController<T extends ScaleHelperAbstract = ScaleHelperAbstract> extends BaseController<T> {
     protected name: string;
-    constructor(...params: ConstructorParameters<typeof BaseController<ScaleHelperAbstract<OriginObject3D>>>);
-    setScale(scale: number | {
-        x?: number;
-        y?: number;
-        z?: number;
-    }): void;
+    private startInfo?;
+    constructor(...params: ConstructorParameters<typeof BaseController<T>>);
+    initialHelperQuaternion(): void;
+    initialHelperPosition(): void;
+    dragStart: (params: {
+        intersect: THREE.Intersection;
+    }) => void;
+    dragging: (point: {
+        x: number;
+        y: number;
+    }) => false | void;
+    scale: (raycaster: THREE.Raycaster) => void;
+    dragEnd: () => void;
 }

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

@@ -1,21 +1,55 @@
 var f = Object.defineProperty;
-var h = (o, t, e) => t in o ? f(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
-var m = (o, t, e) => (h(o, typeof t != "symbol" ? t + "" : t, e), e);
-import { BaseController as p } from "../Base/BaseController.js";
-import * as y from "three";
-class u extends p {
-  constructor(...e) {
-    super(...e);
-    m(this, "name", "ScaleController");
+var u = (o, i, t) => i in o ? f(o, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[i] = t;
+var s = (o, i, t) => (u(o, typeof i != "symbol" ? i + "" : i, t), t);
+import { BaseController as P } from "../Base/BaseController.js";
+import * as m from "three";
+import { getMouseRaycaster as b } from "../utils/getMouseRaycaster.js";
+import { rayOnLine as p } from "../../../Sculpt/utils/three/rayOnLine.js";
+class H extends P {
+  constructor(...t) {
+    super(...t);
+    s(this, "name", "ScaleController");
+    s(this, "startInfo");
+    s(this, "dragStart", (t) => {
+      if (this.isDragging)
+        return;
+      this.isDragging = !0;
+      const { intersect: n } = t, l = this.camera.position, r = n.object, a = r.scalePosition.basePosition.clone(), d = r.scalePosition.handlePosition.clone().clone().sub(a).clone(), e = new m.Line3(a, a.clone().add(d.normalize().multiplyScalar(5)));
+      e.applyMatrix4(this.helperObject3D.matrixWorld);
+      const c = new m.Ray(l, n.point.clone().sub(l)), h = p(l, c, e);
+      this.startInfo = { line: e, scaleStartPoint: h, draggingObject: r }, this.hooks.emit("scaleStart");
+    });
+    s(this, "dragging", (t) => {
+      if (!this.isDragging || !this.startInfo)
+        return;
+      const n = b(this.camera, t, this.container);
+      return n ? (this.scale(n), !1) : this.dragEnd();
+    });
+    s(this, "scale", (t) => {
+      var c, h;
+      if (!this.startInfo)
+        return;
+      const { line: n, scaleStartPoint: l, draggingObject: r } = this.startInfo, { scalePosition: a } = r, { basePosition: g } = a, d = this.camera.position, e = p(d, t.ray, n);
+      e.applyMatrix4(new m.Matrix4().getInverse(this.helperObject3D.matrixWorld.clone())), (h = (c = this.config) == null ? void 0 : c.scaleCallback) == null || h.call(c, {
+        ratio: e.distanceTo(g) / l.distanceTo(g),
+        intersectPoint: e,
+        scalePosition: a
+      }), r.position.copy(e.clone());
+    });
+    s(this, "dragEnd", () => {
+      this.isDragging && (this.startInfo = void 0, this.isDragging = !1, this.internalHooks.emit("initialHelperPosition"), this.hooks.emit("scaleEnd"));
+    });
+    this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd);
   }
-  setScale(e) {
-    var s, l, a;
-    let n = 1, c = 1, i = 1;
-    typeof e == "number" ? (n = e, c = e, i = e) : typeof e == "object" && (n = (s = e.x) != null ? s : 1, c = (l = e.y) != null ? l : 1, i = (a = e.z) != null ? a : 1);
-    const r = new y.Vector3(n, c, i);
-    this.hooks.emit("wantToScale", r) || (this.originObject3D.scale.copy(r), this.internalHooks.emit("setObjectScale", r), this.hooks.emit("scale", r), this.render());
+  initialHelperQuaternion() {
+    this.helperObject3D.initQuaternion();
+  }
+  initialHelperPosition() {
+    this.helperObject3D.initialPosition();
+    const t = this;
+    t.offHoverListener && t.offHoverListener(), t.offHoverListener = this.hoverListener(this.helperObject3D.scaleMeshes);
   }
 }
 export {
-  u as ScaleController
+  H as ScaleController
 };

package/libs/shared-utils/Object3DHelper/Helper/MoveHelper.d.ts

@@ -1,7 +1,8 @@
 import type { Object3D } from 'three';
 import type { Direction } from '../typings';
-import { MoveHelperAbstract } from '.';
+import { MoveHelperAbstract, type BaseHelperConfig } from '.';
 import { ArrowGroup } from './Objects/ArrowGroup';
+import type * as THREE from 'three';
 export declare class MoveHelper extends MoveHelperAbstract {
     xArrow?: ArrowGroup;
     yArrow?: ArrowGroup;
@@ -10,8 +11,9 @@ export declare class MoveHelper extends MoveHelperAbstract {
         xArrowEnable?: boolean;
         yArrowEnable?: boolean;
         zArrowEnable?: boolean;
-    });
+    } & BaseHelperConfig);
     show(): void;
+    setScaleByCamera(camera: THREE.PerspectiveCamera): void;
     showDraggingHelper(directions: Direction[]): void;
     dispose(): void;
 }

package/libs/shared-utils/Object3DHelper/Helper/MoveHelper.js

@@ -1,22 +1,26 @@
-var A = Object.defineProperty;
-var h = (o, i, r) => i in o ? A(o, i, { enumerable: !0, configurable: !0, writable: !0, value: r }) : o[i] = r;
-var s = (o, i, r) => (h(o, typeof i != "symbol" ? i + "" : i, r), r);
-import { MoveHelperAbstract as l } from "../Base/BaseHelper.js";
+var l = Object.defineProperty;
+var A = (o, i, r) => i in o ? l(o, i, { enumerable: !0, configurable: !0, writable: !0, value: r }) : o[i] = r;
+var e = (o, i, r) => (A(o, typeof i != "symbol" ? i + "" : i, r), r);
+import { MoveHelperAbstract as h } from "../Base/BaseHelper.js";
 import { ArrowGroup as t } from "./Objects/ArrowGroup.js";
 import { AXES_THREE_COLOR as w } from "../Constants/color.js";
+import { calculateScaleByCamera as a } from "../utils/calculateScaleByCamera.js";
 import "three";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-class y extends l {
-  constructor(r, e) {
-    super(r);
-    s(this, "xArrow");
-    s(this, "yArrow");
-    s(this, "zArrow");
-    e.xArrowEnable !== !1 && (this.xArrow = new t({ direction: "x", color: w.X })), e.yArrowEnable !== !1 && (this.yArrow = new t({ direction: "y", color: w.Y })), e.zArrowEnable !== !1 && (this.zArrow = new t({ direction: "z", color: w.Z })), this.add(...[this.xArrow, this.yArrow, this.zArrow].filter(Boolean));
+class u extends h {
+  constructor(r, s) {
+    super(r, s);
+    e(this, "xArrow");
+    e(this, "yArrow");
+    e(this, "zArrow");
+    s.xArrowEnable !== !1 && (this.xArrow = new t({ direction: "x", color: w.X })), s.yArrowEnable !== !1 && (this.yArrow = new t({ direction: "y", color: w.Y })), s.zArrowEnable !== !1 && (this.zArrow = new t({ direction: "z", color: w.Z })), this.add(...[this.xArrow, this.yArrow, this.zArrow].filter(Boolean));
   }
   show() {
     super.show(), this.xArrow && (this.xArrow.visible = !0), this.yArrow && (this.yArrow.visible = !0), this.zArrow && (this.zArrow.visible = !0);
   }
+  setScaleByCamera(r) {
+    this.scale.setScalar(a(r, this.position));
+  }
   showDraggingHelper(r) {
     this.xArrow && (this.xArrow.visible = r.includes("x")), this.yArrow && (this.yArrow.visible = r.includes("y")), this.zArrow && (this.zArrow.visible = r.includes("z"));
   }
@@ -25,5 +29,5 @@ class y extends l {
   }
 }
 export {
-  y as MoveHelper
+  u as MoveHelper
 };

package/libs/shared-utils/Object3DHelper/Helper/Objects/ArrowGroup.js

@@ -12,16 +12,19 @@ class G extends f {
     i(this, "lineHeight", 0.4);
     i(this, "arrowHeight", 0.1);
     this.name = "ArrowGroup";
-    const w = new o.Color((c = e.color) != null ? c : 16214315), n = new o.MeshBasicMaterial({
-      color: w,
+    const d = new o.Color((c = e.color) != null ? c : 16214315), n = new o.MeshBasicMaterial({
+      color: d,
       depthTest: !1,
+      depthWrite: !1,
       opacity: 1,
       transparent: !0,
       side: o.DoubleSide
-    }), d = new o.ConeGeometry(0.04, 0.1, 32), s = new l(d, n.clone(), e.direction);
+    });
+    this.renderOrder = 50;
+    const w = new o.ConeGeometry(0.04, 0.1, 32), s = new l(w, n.clone(), e.direction);
     s.name = `arrow-${e.direction}`, this.arrow = s;
-    const a = 4e-3, m = new o.CylinderGeometry(a, a, 0.4, 32), h = new l(m, n.clone(), e.direction);
-    h.name = `line-${e.direction}`, this.line = h, this.formatArrow(), this.formatLine(), this.add(this.arrow, this.line);
+    const h = 4e-3, m = new o.CylinderGeometry(h, h, 0.4, 32), a = new l(m, n.clone(), e.direction);
+    a.name = `line-${e.direction}`, this.line = a, this.formatArrow(), this.formatLine(), this.add(this.arrow, this.line);
   }
   formatArrow() {
     this.arrow.geometry.translate(0, this.lineHeight + this.arrowHeight / 2, 0), this.direction === "x" ? (this.arrow.geometry.rotateX(Math.PI / 2), this.arrow.geometry.rotateY(Math.PI / 2)) : this.direction === "z" && this.arrow.geometry.rotateX(Math.PI / 2);

package/libs/shared-utils/Object3DHelper/Helper/RotateHelper.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import type { Object3D } from 'three';
-import { RotateHelperAbstract } from '../Base/BaseHelper';
+import { RotateHelperAbstract, type BaseHelperConfig } from '../Base/BaseHelper';
 import type { Color, Direction } from '../typings';
 import { tipsDom } from './HTML/tipsDom';
 export declare class RotateHelper extends RotateHelperAbstract {
@@ -16,9 +16,10 @@ export declare class RotateHelper extends RotateHelperAbstract {
         xzCircleEnable?: boolean;
         xyCircleEnable?: boolean;
         angleTipsEnable?: boolean;
-    });
+    } & BaseHelperConfig);
     hide(): void;
     show(): void;
+    setScaleByCamera(camera: THREE.PerspectiveCamera): void;
     showDraggingHelper(directions: Direction[]): void;
     dispose(): void;
 }

package/libs/shared-utils/Object3DHelper/Helper/RotateHelper.js

@@ -5,9 +5,10 @@ import * as r from "three";
 import { RotateHelperAbstract as u } from "../Base/BaseHelper.js";
 import { AXES_THREE_COLOR as l } from "../Constants/color.js";
 import { tipsDom as y } from "./HTML/tipsDom.js";
-class T extends u {
+import { calculateScaleByCamera as C } from "../utils/calculateScaleByCamera.js";
+class D extends u {
   constructor(t, e) {
-    super(t);
+    super(t, e);
     i(this, "xCircle");
     i(this, "yCircle");
     i(this, "zCircle");
@@ -23,6 +24,9 @@ class T extends u {
     var t;
     this.children.forEach((e) => e.showCircle()), (t = this.angleTips) == null || t.hide();
   }
+  setScaleByCamera(t) {
+    this.scale.setScalar(C(t, this.position));
+  }
   showDraggingHelper(t) {
     var e;
     this.hide(), this.children.filter((h) => t.includes(h.direction)).forEach((h) => h.showRing()), (e = this.angleTips) == null || e.show();
@@ -42,7 +46,7 @@ class n extends r.Group {
     i(this, "ring");
     /** 旋转过程中表示角度的扇形 */
     i(this, "angleSector");
-    this.direction = t.direction, this.circle = new C(t), this.ring = new x(t), this.angleSector = new b(t), this.add(this.circle, this.ring, this.angleSector), this.direction === "y" ? this.rotateX(Math.PI / 2) : this.direction === "x" && this.rotateY(-Math.PI / 2);
+    this.direction = t.direction, this.circle = new x(t), this.ring = new b(t), this.angleSector = new M(t), this.add(this.circle, this.ring, this.angleSector), this.direction === "y" ? this.rotateX(Math.PI / 2) : this.direction === "x" && this.rotateY(-Math.PI / 2);
   }
   showCircle() {
     this.add(this.circle), this.remove(this.ring, this.angleSector);
@@ -54,7 +58,7 @@ class n extends r.Group {
     this.remove(this.ring, this.angleSector, this.circle);
   }
 }
-class C extends r.Mesh {
+class x extends r.Mesh {
   constructor(t) {
     var e;
     super();
@@ -66,29 +70,33 @@ class C extends r.Mesh {
       color: (e = t.color) != null ? e : 16777215,
       transparent: !0,
       side: r.DoubleSide,
-      depthTest: !1
-    }), this.direction = t.direction, this.geometry.name = `RotateHelperCircleGeometry-${this.direction}`;
+      depthTest: !1,
+      depthWrite: !1
+    }), this.renderOrder = 50, this.direction = t.direction, this.geometry.name = `RotateHelperCircleGeometry-${this.direction}`;
   }
 }
-class x extends r.Group {
+class b extends r.Group {
   constructor(t) {
     super();
     i(this, "direction");
     this.direction = t.direction;
-    const e = 0.015, h = new Array(8).fill(null).map((g, c) => {
+    const e = 0.015, h = new Array(8).fill(null).map((S, c) => {
       const d = new r.RingGeometry(0.25, 0.3, 20, 8, Math.PI / 4 * c + e, Math.PI / 4 - e * 2), p = new r.MeshBasicMaterial({
         opacity: 1,
         color: 16777215,
         depthTest: !1,
+        depthWrite: !1,
         transparent: !0,
         side: r.DoubleSide
-      }), o = new r.Mesh(d, p);
+      });
+      this.renderOrder = 50;
+      const o = new r.Mesh(d, p);
       return o.name = `AxesDashedRing-${this.direction}-${c}`, o;
     });
     this.add(...h);
   }
 }
-class b extends r.Mesh {
+class M extends r.Mesh {
   constructor(t) {
     var h;
     super();
@@ -111,11 +119,12 @@ class b extends r.Mesh {
       opacity: 0.4,
       color: (h = t.color) != null ? h : 16777215,
       depthTest: !1,
+      depthWrite: !1,
       transparent: !0,
       side: r.DoubleSide
-    }), this.direction = t.direction, this.angleDirection = this.direction === "z" ? 1 : -1;
+    }), this.renderOrder = 50, this.direction = t.direction, this.angleDirection = this.direction === "z" ? 1 : -1;
   }
 }
 export {
-  T as RotateHelper
+  D as RotateHelper
 };

package/libs/shared-utils/Object3DHelper/Helper/ScaleHelper.d.ts

@@ -1,5 +1,14 @@
-import type * as THREE from 'three';
-import { ScaleHelperAbstract } from '../Base/BaseHelper';
+import * as THREE from 'three';
+import { ScaleHelperAbstract, type BaseHelperConfig } from '../Base/BaseHelper';
+import type { ScalePosition } from '../typings';
 export declare class ScaleHelper<T extends THREE.Object3D = THREE.Object3D> extends ScaleHelperAbstract<T> {
-    constructor(originObject3D: T);
+    scaleMeshes: Array<THREE.Mesh & {
+        scalePosition: ScalePosition;
+    }>;
+    private positions;
+    constructor(originObject3D: T, config?: {
+        positions?: Array<ScalePosition> | (() => Array<ScalePosition>);
+    } & BaseHelperConfig);
+    initialPosition(offset?: THREE.Vector3): void;
+    setScaleByCamera(camera: THREE.PerspectiveCamera): void;
 }

package/libs/shared-utils/Object3DHelper/Helper/ScaleHelper.js

@@ -1,9 +1,42 @@
-import { ScaleHelperAbstract as r } from "../Base/BaseHelper.js";
-class s extends r {
-  constructor(e) {
-    super(e);
+var c = Object.defineProperty;
+var l = (i, t, s) => t in i ? c(i, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[t] = s;
+var r = (i, t, s) => (l(i, typeof t != "symbol" ? t + "" : t, s), s);
+import * as o from "three";
+import { ScaleHelperAbstract as h } from "../Base/BaseHelper.js";
+import { calculateScaleByCamera as p } from "../utils/calculateScaleByCamera.js";
+class M extends h {
+  constructor(s, e) {
+    super(s, e);
+    r(this, "scaleMeshes", []);
+    r(this, "positions", []);
+    e && (this.positions = e.positions);
   }
+  initialPosition(s) {
+    this.position.copy(this.originObject3D.position), this.scaleMeshes.length && this.remove(...this.scaleMeshes);
+    const e = typeof this.positions == "function" ? this.positions() : this.positions;
+    e && (this.scaleMeshes = e.map((n) => {
+      const a = m();
+      return a.position.copy(n.handlePosition), a.scalePosition = n, a;
+    }), this.add(...this.scaleMeshes));
+  }
+  setScaleByCamera(s) {
+    this.scaleMeshes.forEach((e) => {
+      e.scale.setScalar(
+        p(s, e.scalePosition.handlePosition.clone().applyMatrix4(this.matrixWorld))
+      );
+    });
+  }
+}
+function m() {
+  const t = new o.BoxGeometry(0.05, 0.05, 0.05), s = new o.MeshBasicMaterial({
+    color: 16776960,
+    depthTest: !1,
+    depthWrite: !1,
+    transparent: !0,
+    side: o.DoubleSide
+  }), e = new o.Mesh(t, s);
+  return e.renderOrder = 10, e;
 }
 export {
-  s as ScaleHelper
+  M as ScaleHelper
 };

package/libs/shared-utils/Object3DHelper/typings/Hooks.d.ts

@@ -16,6 +16,7 @@ export type HelperEventMap = {
     moveByMouseDisable: () => void;
 };
 export type InternalHelperEventMap = {
+    initialHelperPosition: () => void;
     setObjectPosition: (position: THREE.Vector3) => void;
     setObjectRotate: (quaternion: THREE.Quaternion, origin?: THREE.Vector3) => void;
     setObjectScale: (scale: THREE.Vector3) => void;

package/libs/shared-utils/Object3DHelper/typings/index.d.ts

@@ -19,9 +19,20 @@ export interface HelperOffset {
 }
 export type Color = THREE.Color | string | number;
 export type ClassFunctionParameters<C extends new (...params: any[]) => any, F extends keyof InstanceType<C>> = Parameters<InstanceType<C>[F]>;
+export type PositionFrom = 'objectPosition' | 'boundingBox' | THREE.Vector3 | (() => THREE.Vector3);
 export interface ObjectHelperControllers {
     moveController?: MoveController;
     rotateController?: RotateController;
     scaleController?: ScaleController;
     boundingBoxController?: BoundingBoxController;
 }
+export type ScaleCallback = (params: {
+    ratio: number;
+    intersectPoint: THREE.Vector3;
+    scalePosition: ScalePosition;
+}) => any;
+export type ScalePosition = {
+    id?: string;
+    handlePosition: THREE.Vector3;
+    basePosition: THREE.Vector3;
+};