@realsee/dnalogel 3.70.3 → 3.70.4-alpha.1

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

@@ -1,10 +1,10 @@
-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);
+var g = Object.defineProperty;
+var H = (h, e, t) => e in h ? g(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 d from "three";
 import { Subscribe as j } from "../../Subscribe.js";
-import { notNil as y } from "../../isNil.js";
-import { boundingBox as g } from "../../three/boundingBox.js";
+import { notNil as m } from "../../isNil.js";
+import { boundingBox as y } from "../../three/boundingBox.js";
 import { toArray as S } from "../../util.js";
 import { cameraHooks as k } from "../utils/cameraHooks.js";
 class B {
@@ -27,6 +27,8 @@ class B {
     o(this, "config");
     o(this, "onRender");
     o(this, "cameraHooks");
+    /** 其他控制器的引用，用于跨控制器状态检查 */
+    o(this, "otherControllers");
     o(this, "onWantsTapGesture", (e) => {
       if (this.getIntersectObject(e))
         return !1;
@@ -34,15 +36,27 @@ class B {
     o(this, "updateHelperScale", () => {
       "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 = g(this.originObject3D), this.boundingBox));
+    o(this, "getBox", () => this.boundingBox ? this.boundingBox : (this.boundingBox = y(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();
+    }, this.config = t != null ? t : {}, this.otherControllers = e.otherControllers, 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);
     });
   }
+  /**
+   * 更新其他控制器的引用
+   */
+  updateOtherControllers(e) {
+    this.otherControllers = e;
+  }
+  /**
+   * 获取当前控制器的拖拽状态
+   */
+  getIsDragging() {
+    return this.isDragging;
+  }
   initialHelperPosition() {
     this.helperObject3D.initialPosition(this.calculateOffset(this.config.offset));
   }
@@ -136,7 +150,7 @@ class B {
     }
   }
   hoverListener(e, t = 16777215, n = 1) {
-    const a = S(e).filter(y), s = [];
+    const a = S(e).filter(m), s = [];
     for (const r of a)
       if (r.material || r instanceof d.Group) {
         const c = r instanceof d.Group ? r.children.filter((i) => i instanceof d.Mesh) : [r];

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

@@ -1,16 +1,16 @@
 var W = Object.defineProperty;
 var X = (h, a, t) => a in h ? W(h, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[a] = t;
-var j = (h, a, t) => (X(h, typeof a != "symbol" ? a + "" : a, t), t);
+var w = (h, a, t) => (X(h, typeof a != "symbol" ? a + "" : a, t), t);
 import { BaseController as Y } from "../Base/BaseController.js";
-import * as m from "three";
+import * as D from "three";
 import { Vector3 as o } from "three";
 import { getMouseRaycaster as T } from "../utils/getMouseRaycaster.js";
 import { vectorIsEqual as G } from "../../three/vectorIsEqual.js";
 class _ extends Y {
   constructor(...t) {
     super(...t);
-    j(this, "startInfo");
-    j(this, "name", "RectangleScaleController");
+    w(this, "startInfo");
+    w(this, "name", "RectangleScaleController");
   }
   enable() {
     this.helperObject3D.enable(), super.enable();
@@ -31,7 +31,7 @@ class _ extends Y {
     this.helperObject3D.applyHelperScaleMatrix4(t.matrix, t.origin);
   }
   getDragPlane() {
-    const t = new m.Plane(), s = this.helperObject3D.cornerPositions;
+    const t = new D.Plane(), s = this.helperObject3D.cornerPositions;
     if (s.length !== 0)
       return s.length < 3 ? t.setFromNormalAndCoplanarPoint(this.originObject3D.getWorldDirection(new o()), s[0]) : t.setFromCoplanarPoints(s[0], s[1], s[2]), t;
   }
@@ -52,7 +52,7 @@ class _ extends Y {
     this.scale(s);
   }
   scale(t) {
-    var C, M;
+    var C, E;
     if (!this.startInfo)
       return;
     const s = this.originObject3D, { startPoint: f, plane: p } = this.startInfo, n = this.helperObject3D.cornerPositions;
@@ -61,30 +61,30 @@ class _ extends Y {
     const g = t.ray.intersectPlane(p, new o());
     if (!g || G(g, this.camera.position))
       return;
-    const I = new o().addVectors(n[0], n[2]).divideScalar(2), { position: k, direction: z } = f, D = new o().subVectors(n[1], n[0]), y = new o().subVectors(n[3], n[0]), V = (r) => {
+    const m = new o().addVectors(n[0], n[2]).divideScalar(2), { position: k, direction: z } = f, I = new o().subVectors(n[1], n[0]), y = new o().subVectors(n[3], n[0]), S = (r) => {
       const i = new o(0, 0, 0);
       if (!this.startInfo)
         return i;
-      const e = (r === "ew" ? D : y).clone(), c = k.clone().projectOnVector(e), b = g.clone().projectOnVector(e), E = I.clone().projectOnVector(e);
+      const e = (r === "ew" ? I : y).clone(), c = k.clone().projectOnVector(e), b = g.clone().projectOnVector(e), M = m.clone().projectOnVector(e);
       if (b.equals(c))
         return i;
       if (r === "ns" && typeof this.startInfo.dragPointInCenterBottom != "boolean") {
-        const l = new o().subVectors(b, E), P = l.x < 0 && e.x >= 0, w = l.y < 0 && e.y >= 0, O = l.z < 0 && e.z >= 0;
-        this.startInfo.dragPointInCenterBottom = P || w || O;
+        const l = new o().subVectors(b, M), O = l.x < 0 && e.x >= 0, P = l.y < 0 && e.y >= 0, j = l.z < 0 && e.z >= 0;
+        this.startInfo.dragPointInCenterBottom = O || P || j;
       }
       if (r === "ew" && typeof this.startInfo.dragPointInCenterLeft != "boolean") {
-        const l = new o().subVectors(b, E), P = l.x < 0 && e.x >= 0, w = l.y < 0 && e.y >= 0, O = l.z < 0 && e.z >= 0;
-        this.startInfo.dragPointInCenterLeft = P || w || O;
+        const l = new o().subVectors(b, M), O = l.x < 0 && e.x >= 0, P = l.y < 0 && e.y >= 0, j = l.z < 0 && e.z >= 0;
+        this.startInfo.dragPointInCenterLeft = O || P || j;
       }
       const v = new o().subVectors(b, c), N = v.length();
       return N > 0.3 ? (console.warn("offset.length() > 0.3, skipped", N), i) : v;
-    }, A = V("ew"), B = V("ns"), x = () => {
+    }, A = S("ew"), B = S("ns"), V = () => {
       const r = A;
       this.helperObject3D.cornerPositions.forEach((i, e) => {
         var c;
         (c = this.startInfo) != null && c.dragPointInCenterLeft ? (e === 0 || e === 3) && i.add(r) : (e === 1 || e === 2) && i.add(r);
       });
-    }, S = () => {
+    }, x = () => {
       const r = B;
       this.helperObject3D.cornerPositions.forEach((i, e) => {
         var c;
@@ -93,22 +93,22 @@ class _ extends Y {
     };
     switch (z) {
       case "ew":
-        x();
+        V();
         break;
       case "ns":
-        S();
+        x();
         break;
       case "nesw":
       case "nwse":
-        x(), S();
+        V(), x();
     }
-    const H = new o().subVectors(n[1], n[0]).length() / D.length(), L = new o().subVectors(n[3], n[0]).length() / y.length(), R = new o(H, L, 1), u = new m.Matrix4().scale(R);
+    const H = new o().subVectors(n[1], n[0]).length() / I.length(), L = new o().subVectors(n[3], n[0]).length() / y.length(), R = new o(H, L, 1), u = new D.Matrix4().scale(R);
     s.isCSS3DObjectPlus && s.applyScaleMatrix4 ? s.applyScaleMatrix4(u) : s.scale.applyMatrix4(u), f.position.copy(g);
-    const q = new o().addVectors(n[0], n[2]).divideScalar(2), F = new o().subVectors(q, I), d = new m.Matrix4().setPosition(F);
-    s.applyMatrix4(d), (C = this.helperObject3D.css3DInstance) == null || C.css3DObject.applyMatrix4(d), (M = this.helperObject3D.plane) == null || M.applyMatrix4(d), this.internalHooks.emit("applyObjectScale", { matrix: u }), this.internalHooks.emit("applyObjectPosition", { matrix: d }), this.render();
+    const q = new o().addVectors(n[0], n[2]).divideScalar(2), F = new o().subVectors(q, m), d = new D.Matrix4().setPosition(F);
+    s.applyMatrix4(d), (C = this.helperObject3D.css3DInstance) == null || C.css3DObject.applyMatrix4(d), (E = this.helperObject3D.plane) == null || E.applyMatrix4(d), this.internalHooks.emit("applyObjectScale", { matrix: u }), this.internalHooks.emit("applyObjectPosition", { matrix: d }), this.render();
   }
   dragEnd() {
-    this.isDragging && (this.startInfo = void 0, this.isDragging = !1, this.hooks.emit("scaleEnd"), this.render());
+    this.isDragging && (this.startInfo = void 0, this.isDragging = !1, "onScaleEnd" in this.helperObject3D && typeof this.helperObject3D.onScaleEnd == "function" && this.helperObject3D.onScaleEnd(), this.hooks.emit("scaleEnd"), this.render());
   }
 }
 export {

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

@@ -37,6 +37,10 @@ export declare class ScaleController<T extends ScaleHelperAbstract = ScaleHelper
      * 更新直线缩放，保持视觉上的恒定大小
      */
     private updateDragGuideLineScale;
+    /**
+     * 检查 MoveController 是否正在拖拽中
+     */
+    private isMoveControllerDragging;
     /**
      * 向场景添加一个表示 face 的面片，红色，位置与 face.center 一致，使用两个三角形拼成矩形
      */

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

@@ -1,5 +1,5 @@
-var M = Object.defineProperty;
-var F = (f, p, e) => p in f ? M(f, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[p] = e;
+var E = Object.defineProperty;
+var F = (f, p, e) => p in f ? E(f, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[p] = e;
 var g = (f, p, e) => (F(f, typeof p != "symbol" ? p + "" : p, e), e);
 import { BaseController as w } from "../Base/BaseController.js";
 import { RENDER_ORDER as D } from "../Constants/RenderOrder.js";
@@ -17,53 +17,49 @@ class B extends w {
     g(this, "dragGuideLine");
     /** 当前拖拽时显示的面片 */
     g(this, "currentFacePatch");
-    g(this, "solidGuide", new S(
-      this.camera,
-      this.container,
-      (P = (j = this.config) == null ? void 0 : j.solidGuide) != null ? P : {}
-    ));
+    g(this, "solidGuide", new S(this.camera, this.container, (P = (j = this.config) == null ? void 0 : j.solidGuide) != null ? P : {}));
     g(this, "startInfo");
     g(this, "dragStart", (e) => {
       if (this.isDragging)
         return;
       this.isDragging = !0;
-      const { intersect: t } = e, r = this.camera.position, s = new Set(this.helperObject3D.scaleMeshes.map((u) => u.uuid));
+      const { intersect: t } = e, s = this.camera.position, r = new Set(this.helperObject3D.scaleMeshes.map((u) => u.uuid));
       let i = t.object;
-      for (; i.parent && !s.has(i.uuid); )
+      for (; i.parent && !r.has(i.uuid); )
         i = i.parent;
-      const o = i, n = o.scalePosition.basePosition.clone(), c = o.scalePosition.handlePosition.clone(), d = c.clone().sub(n).clone(), h = new a.Line3(n, n.clone().add(d.normalize().multiplyScalar(5)));
+      const o = i, n = o.scalePosition.basePosition.clone(), c = o.scalePosition.handlePosition.clone(), l = c.clone().sub(n).clone(), h = new a.Line3(n, n.clone().add(l.normalize().multiplyScalar(5)));
       h.applyMatrix4(this.helperObject3D.matrixWorld);
-      const l = new a.Raycaster(r, t.point.clone().sub(r)), m = y({ raycaster: l, line: h });
+      const d = new a.Raycaster(s, t.point.clone().sub(s)), m = y({ raycaster: d, line: h });
       this.startInfo = { line: h, scaleStartPoint: m, draggingObject: o }, this.helperObject3D.scaleMeshes.forEach((u) => {
         u.uuid !== o.uuid && (u.visible = !1);
       }), "hideLineConnections" in this.helperObject3D && typeof this.helperObject3D.hideLineConnections == "function" && this.helperObject3D.hideLineConnections();
       try {
         this.originObject3D.updateMatrixWorld(!0), this.helperObject3D.updateMatrixWorld(!0);
-        const u = O(this.originObject3D), v = u ? u.getCenter(new a.Vector3()) : this.originObject3D.getWorldPosition(new a.Vector3()), L = c.clone().applyMatrix4(this.helperObject3D.matrixWorld).clone().sub(v).normalize(), E = v, b = this.solidGuide.createSolidLine(E, L, { color: 16777215, renderOrder: D.DRAG_GUIDE_LINE });
+        const u = O(this.originObject3D), v = u ? u.getCenter(new a.Vector3()) : this.originObject3D.getWorldPosition(new a.Vector3()), L = c.clone().applyMatrix4(this.helperObject3D.matrixWorld).clone().sub(v).normalize(), M = v, b = this.solidGuide.createSolidLine(M, L, { color: 16777215, renderOrder: D.DRAG_GUIDE_LINE });
         this.scene.add(b), this.dragGuideLine = b, this.addFaceMesh();
       } catch (u) {
       }
       o.visible = !0, this.hooks.emit("scaleStart");
     });
     g(this, "dragging", (e) => {
-      const t = "touches" in e ? e.touches[0].clientX : e.x, r = "touches" in e ? e.touches[0].clientY : e.y, s = G(this.camera, { x: t, y: r }, this.container);
-      if (!this.isDragging) {
-        s && this.addHoverFaceMesh(s);
+      const t = "touches" in e ? e.touches[0].clientX : e.x, s = "touches" in e ? e.touches[0].clientY : e.y, r = G(this.camera, { x: t, y: s }, this.container), i = this.isMoveControllerDragging();
+      if (!this.isDragging && !i && r) {
+        this.addHoverFaceMesh(r);
         return;
       }
       if (this.startInfo)
-        return s ? (this.scale(s), this.updateDragGuideLineDirection(), this.removeFaceMesh(), this.addFaceMesh(), !1) : this.dragEnd();
+        return r ? (this.scale(r), this.updateDragGuideLineDirection(), this.removeFaceMesh(), this.addFaceMesh(), !1) : this.dragEnd();
     });
     g(this, "scale", (e) => {
       var n, c;
       if (!this.startInfo)
         return;
-      const { line: t, scaleStartPoint: r, draggingObject: s } = this.startInfo, { scalePosition: i } = s, o = y({ raycaster: e, line: t, clampToLine: !1 });
+      const { line: t, scaleStartPoint: s, draggingObject: r } = this.startInfo, { scalePosition: i } = r, o = y({ raycaster: e, line: t, clampToLine: !1 });
       o.applyMatrix4(new a.Matrix4().getInverse(this.helperObject3D.matrixWorld.clone())), (c = (n = this.config) == null ? void 0 : n.scaleCallback) == null || c.call(n, {
         intersectPoint: o,
         scalePosition: i,
-        offset: o.clone().sub(r)
-      }), s.position.copy(o.clone()), this.hooks.emit("scale", new a.Vector3(1, 1, 1));
+        offset: o.clone().sub(s)
+      }), r.position.copy(o.clone()), this.hooks.emit("scale", new a.Vector3(1, 1, 1));
     });
     g(this, "dragEnd", () => {
       if (this.isDragging) {
@@ -77,13 +73,13 @@ class B extends w {
         this.removeFaceMesh(), this.internalHooks.emit("initialHelperPosition"), this.hooks.emit("scaleEnd");
       }
     });
-    const t = this.show.bind(this), r = this.hide.bind(this), s = () => {
+    const t = this.show.bind(this), s = this.hide.bind(this), r = () => {
       "update" in this.helperObject3D && typeof this.helperObject3D.update == "function" && this.helperObject3D.update(this.camera), this.isDragging && this.updateDragGuideLineScale(), this.render();
     };
-    s(), 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", r), this.hooks.on("rotateEnd", t), this.hooks.on("moveStart", r), this.hooks.on("moveEnd", t), this.hooks.on("moveByMouseEnable", r), this.hooks.on("moveByMouseDisable", t), this.hooks.on("updateOtherHelpers", (i) => {
+    r(), 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", t), this.hooks.on("moveStart", s), this.hooks.on("moveEnd", t), this.hooks.on("moveByMouseEnable", s), this.hooks.on("moveByMouseDisable", t), this.hooks.on("updateOtherHelpers", (i) => {
       "update" in this.helperObject3D && typeof this.helperObject3D.update == "function" && this.helperObject3D.update(i.camera), this.isDragging && this.updateDragGuideLineScale(), this.render();
-    }), this.cameraHooks.on("cameraUpdate", s), this.disposers.push(() => {
-      if (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", r), this.hooks.off("rotateEnd", t), this.hooks.off("moveStart", r), this.hooks.off("moveEnd", t), this.hooks.off("moveByMouseEnable", r), this.hooks.off("moveByMouseDisable", t), this.hooks.off("updateOtherHelpers"), this.cameraHooks.off("cameraUpdate", s), this.currentFacePatch) {
+    }), this.cameraHooks.on("cameraUpdate", r), this.disposers.push(() => {
+      if (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", t), this.hooks.off("moveStart", s), this.hooks.off("moveEnd", t), this.hooks.off("moveByMouseEnable", s), this.hooks.off("moveByMouseDisable", t), this.hooks.off("updateOtherHelpers"), this.cameraHooks.off("cameraUpdate", r), this.currentFacePatch) {
         this.scene.remove(this.currentFacePatch), this.currentFacePatch.geometry.dispose();
         const i = this.currentFacePatch.material;
         Array.isArray(i) ? i.forEach((o) => o.dispose()) : i.dispose(), this.currentFacePatch = void 0;
@@ -96,8 +92,8 @@ class B extends w {
     e.offHoverListener && e.offHoverListener(), e.offHoverListener = this.hoverListener(this.helperObject3D.scaleMeshes);
   }
   getMoveMeshes() {
-    var r, s, i, o;
-    const e = [], t = (o = (i = (s = (r = this.helperObject3D.parent) == null ? void 0 : r.children) == null ? void 0 : s.find((n) => n.name === "MoveHelper")) == null ? void 0 : i.children) != null ? o : [];
+    var s, r, i, o;
+    const e = [], t = (o = (i = (r = (s = this.helperObject3D.parent) == null ? void 0 : s.children) == null ? void 0 : r.find((n) => n.name === "MoveHelper")) == null ? void 0 : i.children) != null ? o : [];
     for (const n of t)
       n.name === "ArrowGroup" ? e.push(...n.children) : n.name === "center-plane-handle" && e.push(n);
     return e;
@@ -106,54 +102,54 @@ class B extends w {
     var n, c;
     if (this.removeFaceMesh(), !((n = this.originObject3D.parent) != null && n.getWorldFacesGeometry))
       return;
-    const t = (c = this.originObject3D.parent) == null ? void 0 : c.getWorldFacesGeometry(), r = this.helperObject3D.scaleMeshes, s = this.getMoveMeshes();
-    if (e.intersectObjects(s, !1), e.intersectObjects(s, !1).length > 0)
+    const t = (c = this.originObject3D.parent) == null ? void 0 : c.getWorldFacesGeometry(), s = this.helperObject3D.scaleMeshes, r = this.getMoveMeshes();
+    if (e.intersectObjects(r, !1), e.intersectObjects(r, !1).length > 0)
       return;
     let i = null, o = null;
-    for (const d of r) {
-      if (!d.visible)
+    for (const l of s) {
+      if (!l.visible)
         continue;
-      const h = e.intersectObject(d, !1);
+      const h = e.intersectObject(l, !1);
       if (h && h.length > 0) {
-        i = d, o = h[0].point.clone();
+        i = l, o = h[0].point.clone();
         break;
       }
     }
     if (i && o && Array.isArray(t) && t.length > 0) {
-      let d = null, h = 1 / 0;
-      for (const l of t) {
-        if (!l.vertices || l.vertices.length < 3)
+      let l = null, h = 1 / 0;
+      for (const d of t) {
+        if (!d.vertices || d.vertices.length < 3)
           continue;
         const m = new a.Vector3();
-        for (const v of l.vertices)
+        for (const v of d.vertices)
           m.add(v);
-        m.divideScalar(l.vertices.length);
+        m.divideScalar(d.vertices.length);
         const u = o.distanceTo(m);
-        u < h && (h = u, d = l);
+        u < h && (h = u, l = d);
       }
-      d && this.addFacePatch(d);
+      l && this.addFacePatch(l);
     }
   }
   addFaceMesh() {
-    var r, s, i;
-    const e = (r = this.startInfo) == null ? void 0 : r.draggingObject;
-    if (!e || !((s = this.originObject3D.parent) != null && s.getWorldFacesGeometry))
+    var s, r, i;
+    const e = (s = this.startInfo) == null ? void 0 : s.draggingObject;
+    if (!e || !((r = this.originObject3D.parent) != null && r.getWorldFacesGeometry))
       return;
     const t = (i = this.originObject3D.parent) == null ? void 0 : i.getWorldFacesGeometry();
     if (t && t.length > 0) {
       const o = e.getWorldPosition(new a.Vector3());
       let n = 1 / 0, c = t[0];
-      for (const d of t) {
-        const h = d.center;
-        let l;
+      for (const l of t) {
+        const h = l.center;
+        let d;
         if (h instanceof a.Vector3)
-          l = h;
+          d = h;
         else if (Array.isArray(h) && h.length === 3)
-          l = new a.Vector3(h[0], h[1], h[2]);
+          d = new a.Vector3(h[0], h[1], h[2]);
         else
           continue;
-        const m = l.distanceTo(o);
-        m < n && (n = m, c = d);
+        const m = d.distanceTo(o);
+        m < n && (n = m, c = l);
       }
       this.addFacePatch(c);
     }
@@ -166,10 +162,10 @@ class B extends w {
     }
   }
   setScale(e) {
-    var n, c, d;
-    let t = 1, r = 1, s = 1;
-    typeof e == "number" ? (t = e, r = e, s = e) : typeof e == "object" && (t = (n = e.x) != null ? n : 1, r = (c = e.y) != null ? c : 1, s = (d = e.z) != null ? d : 1);
-    const i = new a.Vector3(t, r, s);
+    var n, c, l;
+    let t = 1, s = 1, r = 1;
+    typeof e == "number" ? (t = e, s = e, r = e) : typeof e == "object" && (t = (n = e.x) != null ? n : 1, s = (c = e.y) != null ? c : 1, r = (l = e.z) != null ? l : 1);
+    const i = new a.Vector3(t, s, r);
     this.hooks.emit("wantToScale", i) || (this.originObject3D.scale.copy(i), this.internalHooks.emit("setObjectScale", i), this.hooks.emit("scale", i), this.render());
   }
   /**
@@ -180,7 +176,7 @@ class B extends w {
       return;
     const { draggingObject: e } = this.startInfo;
     this.originObject3D.updateMatrixWorld(!0), this.helperObject3D.updateMatrixWorld(!0);
-    const t = O(this.originObject3D), r = t ? t.getCenter(new a.Vector3()) : this.originObject3D.getWorldPosition(new a.Vector3()), i = e.position.clone().applyMatrix4(this.helperObject3D.matrixWorld).clone().sub(r).normalize(), o = r;
+    const t = O(this.originObject3D), s = t ? t.getCenter(new a.Vector3()) : this.originObject3D.getWorldPosition(new a.Vector3()), i = e.position.clone().applyMatrix4(this.helperObject3D.matrixWorld).clone().sub(s).normalize(), o = s;
     this.solidGuide.updateSolidLine(this.dragGuideLine, o, i);
   }
   /**
@@ -189,8 +185,15 @@ class B extends w {
   updateDragGuideLineScale() {
     if (!this.dragGuideLine || !this.startInfo)
       return;
-    const { scalePosition: e } = this.startInfo.draggingObject, t = e.handlePosition.clone().applyMatrix4(this.helperObject3D.matrixWorld), r = e.basePosition.clone().applyMatrix4(this.helperObject3D.matrixWorld), s = t, i = t.clone().sub(r).normalize();
-    this.solidGuide.updateSolidLine(this.dragGuideLine, s, i);
+    const { scalePosition: e } = this.startInfo.draggingObject, t = e.handlePosition.clone().applyMatrix4(this.helperObject3D.matrixWorld), s = e.basePosition.clone().applyMatrix4(this.helperObject3D.matrixWorld), r = t, i = t.clone().sub(s).normalize();
+    this.solidGuide.updateSolidLine(this.dragGuideLine, r, i);
+  }
+  /**
+   * 检查 MoveController 是否正在拖拽中
+   */
+  isMoveControllerDragging() {
+    var e, t, s;
+    return (s = (t = (e = this.otherControllers) == null ? void 0 : e.moveController) == null ? void 0 : t.getIsDragging()) != null ? s : !1;
   }
   /**
    * 向场景添加一个表示 face 的面片，红色，位置与 face.center 一致，使用两个三角形拼成矩形
@@ -237,7 +240,7 @@ class B extends w {
       }), t.setAttribute("position", new a.BufferAttribute(i, 3)), t.setIndex(new a.BufferAttribute(o, 1));
     }
     t.computeVertexNormals();
-    const r = new a.MeshBasicMaterial({
+    const s = new a.MeshBasicMaterial({
       color: 16777215,
       side: a.DoubleSide,
       depthTest: !1,
@@ -246,8 +249,8 @@ class B extends w {
       // 禁用深度写入
       transparent: !0,
       opacity: 0.45
-    }), s = new a.Mesh(t, r);
-    return s.renderOrder = D.DRAG_FACE_PATCH, this.scene.add(s), this.currentFacePatch = s, this.render(), s;
+    }), r = new a.Mesh(t, s);
+    return r.renderOrder = D.DRAG_FACE_PATCH, this.scene.add(r), this.currentFacePatch = r, this.render(), r;
   }
 }
 export {

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

@@ -29,6 +29,11 @@ export declare class CSS3DScaleHelper<T extends CSS3DObjectPlus = CSS3DObjectPlu
     show(): void;
     hide(): void;
     dispose(): void;
+    /**
+     * 缩放结束时的回调方法
+     * 触发相机更新事件
+     */
+    onScaleEnd(): void;
     private initRectangleScaleHelper;
     private getCornerPositions;
     private calculatePointPosition;

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

@@ -1,13 +1,14 @@
 var D = Object.defineProperty;
-var b = (a, n, e) => n in a ? D(a, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[n] = e;
-var i = (a, n, e) => (b(a, typeof n != "symbol" ? n + "" : n, e), e);
-import { CSS3DRender as u } from "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import * as p from "three";
-import { RectangleScaleHelperAbstract as f } from "../Base/BaseHelper.js";
+var b = (c, n, e) => n in c ? D(c, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[n] = e;
+var i = (c, n, e) => (b(c, typeof n != "symbol" ? n + "" : n, e), e);
+import { CSS3DRender as f } from "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import * as l from "three";
+import { RectangleScaleHelperAbstract as u } from "../Base/BaseHelper.js";
 import "../utils/getOrthographicCameraDirection.js";
-import { rectangleScaleDom as y } from "./HTML/rectangleScaleDom.js";
+import { rectangleScaleDom as m } from "./HTML/rectangleScaleDom.js";
+import { cameraHooks as y } from "../utils/cameraHooks.js";
 import "../../three/core/Sphere.js";
-class v extends f {
+class w extends u {
   // eslint-disable-next-line max-params
   constructor(e, t, s, o) {
     super(e);
@@ -16,7 +17,7 @@ class v extends f {
     i(this, "cornerPositions", []);
     i(this, "css3DInstance");
     i(this, "plane");
-    i(this, "css3DRenderer", new u());
+    i(this, "css3DRenderer", new f());
     i(this, "camera");
     i(this, "scene");
     i(this, "container");
@@ -56,16 +57,16 @@ class v extends f {
     var o;
     const s = (o = this.css3DInstance) == null ? void 0 : o.css3DObject;
     if (s) {
-      const c = new p.Vector3().subVectors(s.position, t).applyQuaternion(e).add(t);
-      s.position.copy(c), s.applyQuaternion(e);
+      const a = new l.Vector3().subVectors(s.position, t).applyQuaternion(e).add(t);
+      s.position.copy(a), s.applyQuaternion(e);
     }
     if (this.plane) {
-      const c = new p.Vector3().subVectors(this.plane.position, t).applyQuaternion(e).add(t);
-      this.plane.position.copy(c), this.plane.applyQuaternion(e);
+      const a = new l.Vector3().subVectors(this.plane.position, t).applyQuaternion(e).add(t);
+      this.plane.position.copy(a), this.plane.applyQuaternion(e);
     }
-    this.cornerPositions.forEach((c) => {
-      const l = new p.Vector3().subVectors(c, t).applyQuaternion(e).add(t);
-      c.copy(l);
+    this.cornerPositions.forEach((a) => {
+      const p = new l.Vector3().subVectors(a, t).applyQuaternion(e).add(t);
+      a.copy(p);
     });
   }
   enable() {
@@ -87,8 +88,15 @@ class v extends f {
   dispose() {
     this.disable(), this.css3DRenderer.dispose();
   }
+  /**
+   * 缩放结束时的回调方法
+   * 触发相机更新事件
+   */
+  onScaleEnd() {
+    y(this.camera).emit("cameraUpdate");
+  }
   initRectangleScaleHelper() {
-    var l, r;
+    var p, r;
     const e = this.getCornerPositions();
     if (!e)
       return;
@@ -97,12 +105,12 @@ class v extends f {
     if (!t)
       return;
     this.css3DInstance = t, t.appendToElement(this.container);
-    const s = t.css3DObject.container, { container: o, spheres: c } = y();
-    this.points = c.map((h, d) => ({
+    const s = t.css3DObject.container, { container: o, spheres: a } = m();
+    this.points = a.map((h, d) => ({
       direction: h.direction,
       point: h.element,
       position: this.calculatePointPosition(e)[d]
-    })), s.insertBefore(o, (l = s.children[0]) != null ? l : null), this.helperObject.position.copy(this.originObject3D.position), (r = this.plane) == null || r.position.copy(this.originObject3D.position);
+    })), s.insertBefore(o, (p = s.children[0]) != null ? p : null), this.helperObject.position.copy(this.originObject3D.position), (r = this.plane) == null || r.position.copy(this.originObject3D.position);
   }
   getCornerPositions() {
     const { originObject3D: e } = this;
@@ -124,5 +132,5 @@ class v extends f {
   }
 }
 export {
-  v as CSS3DScaleHelper
+  w as CSS3DScaleHelper
 };

package/libs/shared-utils/Object3DHelper/Helper/HTML/rectangleScaleDom.js

@@ -1,12 +1,12 @@
 var f = Object.defineProperty;
 var u = Object.getOwnPropertySymbols;
 var x = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
-var b = (t, e, r) => e in t ? f(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, w = (t, e) => {
+var w = (t, e, r) => e in t ? f(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, b = (t, e) => {
   for (var r in e || (e = {}))
-    x.call(e, r) && b(t, r, e[r]);
+    x.call(e, r) && w(t, r, e[r]);
   if (u)
     for (var r of u(e))
-      z.call(e, r) && b(t, r, e[r]);
+      z.call(e, r) && w(t, r, e[r]);
   return t;
 };
 import { createElement as s } from "./utils/createElement.js";
@@ -38,24 +38,23 @@ function v() {
     border: "1px solid rgba(255,255,255,0.4)"
   });
   t.appendChild(e), e.appendChild(r);
-  const n = "-4px", i = { direction: "nesw", element: o({ cursor: "nesw-resize", left: n, bottom: n }) }, p = { direction: "ns", element: o({ cursor: "ns-resize", bottom: n }) }, c = { direction: "nwse", element: o({ cursor: "nwse-resize", right: n, bottom: n }) }, h = { direction: "ew", element: o({ cursor: "ew-resize", right: n }) }, d = { direction: "nesw", element: o({ cursor: "nesw-resize", right: n, top: n }) }, a = { direction: "ns", element: o({ cursor: "ns-resize", top: n }) }, l = { direction: "nwse", element: o({ cursor: "nwse-resize", left: n, top: n }) }, g = { direction: "ew", element: o({ cursor: "ew-resize", left: n }) };
-  return new Array(p, h, a, g, i, c, d, l).forEach((m) => e.appendChild(m.element)), { container: t, spheres: [
+  const n = "-4px", i = { direction: "nesw", element: o({ cursor: "nesw-resize", left: n, bottom: n }) }, p = { direction: "ns", element: o({ cursor: "ns-resize", bottom: n }) }, c = { direction: "nwse", element: o({ cursor: "nwse-resize", right: n, bottom: n }) }, h = { direction: "ew", element: o({ cursor: "ew-resize", right: n }) }, a = { direction: "nesw", element: o({ cursor: "nesw-resize", right: n, top: n }) }, d = { direction: "ns", element: o({ cursor: "ns-resize", top: n }) }, l = { direction: "nwse", element: o({ cursor: "nwse-resize", left: n, top: n }) }, g = { direction: "ew", element: o({ cursor: "ew-resize", left: n }) };
+  return new Array(p, h, d, g, i, c, a, l).forEach((m) => e.appendChild(m.element)), { container: t, spheres: [
     i,
     p,
     c,
     h,
-    d,
     a,
+    d,
     l,
     g
   ] };
 }
 function o(t) {
-  const e = s(w({
+  const e = s(b({
     background: "#FFFFFF",
     width: "9px",
     height: "9px",
-    borderRadius: "50%",
     position: "absolute",
     pointerEvents: "none"
   }, t)), r = s({

package/libs/shared-utils/logger.js

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

package/libs/shared-utils/three/getIntersect.d.ts

@@ -8,7 +8,7 @@ export declare function getIntersectFromRelativePosition(five: Five, position: {
     isVirtual: boolean;
     floor: number;
     model?: import("@realsee/five").Model;
-    viewLayer?: import("@realsee/five").Tile3DModel;
+    viewLayer?: import("@realsee/five").ModelViewLayer;
     distance: number;
     distanceToRay?: number;
     point: THREE.Vector3;

package/libs/vendor/@tweenjs/tween/dist/tween.esm.js.js

@@ -4,13 +4,13 @@ var y = Object.freeze({
       return t;
     },
     In: function(t) {
-      return t;
+      return this.None(t);
     },
     Out: function(t) {
-      return t;
+      return this.None(t);
     },
     InOut: function(t) {
-      return t;
+      return this.None(t);
     }
   }),
   Quadratic: Object.freeze({
@@ -389,7 +389,7 @@ var y = Object.freeze({
       typeof r == "string" ? this._valuesStartRepeat[e] = this._valuesStartRepeat[e] + parseFloat(r) : this._valuesStartRepeat[e] = this._valuesEnd[e], this._valuesEnd[e] = i;
     }, t;
   }()
-), T = "23.1.3", E = w.nextId, o = O, R = o.getAll.bind(o), k = o.removeAll.bind(o), A = o.add.bind(o), j = o.remove.bind(o), F = o.update.bind(o), U = {
+), T = "23.1.1", E = w.nextId, o = O, R = o.getAll.bind(o), k = o.removeAll.bind(o), A = o.add.bind(o), j = o.remove.bind(o), F = o.update.bind(o), U = {
   Easing: y,
   Group: P,
   Interpolation: d,