@realsee/dnalogel 3.70.2 → 3.70.4-alpha.1

package/libs/components/AreaLabel/LabelItem.js

@@ -1,244 +1,266 @@
-import { SvelteComponent as Y, init as Z, safe_not_equal as J, append_styles as K, element as v, attr as B, set_style as r, insert as z, noop as R, detach as I, onMount as Q, onDestroy as V, text as X, space as x, append as $, listen as ee, is_function as ie, set_data as te, binding_callbacks as O } from "../../vendor/svelte/internal/index.js";
+import { SvelteComponent as Y, init as Z, safe_not_equal as J, append_styles as K, element as B, attr as M, set_style as o, insert as k, noop as R, detach as v, onMount as Q, onDestroy as V, text as X, space as x, append as $, listen as ee, is_function as ie, set_data as ne, binding_callbacks as p } from "../../vendor/svelte/internal/index.js";
 import { ROOM_LABEL_PC_BG as T, ROOM_LABEL_MOBILE_BG as U } from "./Assets/roomLabelBg.js";
-import { rad2Deg as ne } from "../../shared-utils/math/rad2Deg.js";
-import { FONT_SIZE_MAP as oe } from "./Assets/fontSize.js";
-import { px2rem as s } from "../../shared-utils/px2rem.js";
-function re(i) {
-  K(i, "svelte-1j96xkf", ".room-label-item.svelte-1j96xkf{position:absolute;font-size:0.625rem;transform:none;cursor:pointer;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;color:#fff}.room-label-item__text.svelte-1j96xkf{position:absolute;left:0;transform:translate(-50%, 0);display:flex;justify-content:center;align-items:center;pointer-events:all;white-space:nowrap;position:relative;box-shadow:0 0.1875rem 0.8125rem 0 #00000033;font-weight:500;background-position:center;background-repeat:no-repeat;background-size:100% 100%;background-image:var(--bg-image);-o-border-image:var(--bg-image) 3 / 0.0625rem / 0rem stretch;border-image:var(--bg-image) 3 fill / 0.0625rem / 0rem stretch;box-sizing:border-box}.room-label-item__bar.svelte-1j96xkf{position:absolute;transform-origin:top;height:3rem;width:0.0625rem;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0))}");
+import { rad2Deg as te } from "../../shared-utils/math/rad2Deg.js";
+import { FONT_SIZE_MAP as re } from "./Assets/fontSize.js";
+import { px2rem as m } from "../../shared-utils/px2rem.js";
+function oe(i) {
+  K(i, "svelte-c02qws", ".room-label-item.svelte-c02qws{position:absolute;font-size:0.625rem;transform:none;cursor:pointer;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;color:#fff}.room-label-item__text.svelte-c02qws{position:absolute;left:0;transform:translate(-50%, 0);display:flex;justify-content:center;align-items:center;pointer-events:all;white-space:nowrap;position:relative;box-shadow:0 0.1875rem 0.8125rem 0 #00000033;font-weight:500;border-radius:var(--border-radius);-o-border-image:var(--bg-image) var(--border-radius-num) / var(--border-radius) / 0rem stretch;border-image:var(--bg-image) var(--border-radius-num) fill / var(--border-radius) / 0rem stretch;box-sizing:border-box}.room-label-item__bar.svelte-c02qws{position:absolute;transform-origin:top;height:3rem;width:0.0625rem;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0))}");
 }
 function C(i) {
-  let e, t, l, o, c, d;
+  let e, n, s, r, _, u;
   return {
     c() {
-      var m, f;
-      e = v("span"), t = X(
+      var f, l, b, a;
+      e = B("span"), n = X(
         /*content*/
         i[0]
-      ), l = x(), o = v("div"), B(e, "class", "room-label-item__text svelte-1j96xkf"), r(
+      ), s = x(), r = B("div"), M(e, "class", "room-label-item__text svelte-c02qws"), o(
         e,
         "font-size",
         /*nameSize*/
         i[13]
-      ), r(
+      ), o(
         e,
         "padding",
         /*paddingStyle*/
         i[12]
-      ), r(
+      ), o(
         e,
         "line-height",
         /*textLineHeightRem*/
         i[11]
-      ), r(
+      ), o(
         e,
         "--bg-image",
         /*fontConfig*/
-        ((m = i[6]) == null ? void 0 : m.name) >= 16 ? `url(${T})` : `url(${U})`
-      ), r(e, "min-width", s(
+        ((f = i[6]) == null ? void 0 : f.name) >= 16 ? `url(${T})` : `url(${U})`
+      ), o(e, "min-width", m(
         /*fontConfig*/
-        (f = i[6]) == null ? void 0 : f.minWidth
-      )), B(o, "class", "room-label-item__bar svelte-1j96xkf"), r(o, "top", s(
+        (l = i[6]) == null ? void 0 : l.minWidth
+      )), o(
+        e,
+        "--border-radius",
+        /*fontConfig*/
+        ((b = i[6]) == null ? void 0 : b.name) >= 16 ? m(4) : m(2)
+      ), o(
+        e,
+        "--border-radius-num",
+        /*fontConfig*/
+        ((a = i[6]) == null ? void 0 : a.name) >= 16 ? 8 : 4
+      ), M(r, "class", "room-label-item__bar svelte-c02qws"), o(r, "top", m(
         /*barTopPosition*/
         i[10]
       ));
     },
-    m(m, f) {
-      z(m, e, f), $(e, t), i[22](e), z(m, l, f), z(m, o, f), i[23](o), c || (d = ee(e, "click", function() {
+    m(f, l) {
+      k(f, e, l), $(e, n), i[22](e), k(f, s, l), k(f, r, l), i[23](r), _ || (u = ee(e, "click", function() {
         ie(
           /*onClick*/
           i[4]
         ) && i[4].apply(this, arguments);
-      }), c = !0);
+      }), _ = !0);
     },
-    p(m, f) {
-      var g, u;
-      i = m, f & /*content*/
-      1 && te(
-        t,
+    p(f, l) {
+      var b, a, g, h;
+      i = f, l & /*content*/
+      1 && ne(
+        n,
         /*content*/
         i[0]
-      ), f & /*nameSize*/
-      8192 && r(
+      ), l & /*nameSize*/
+      8192 && o(
         e,
         "font-size",
         /*nameSize*/
         i[13]
-      ), f & /*paddingStyle*/
-      4096 && r(
+      ), l & /*paddingStyle*/
+      4096 && o(
         e,
         "padding",
         /*paddingStyle*/
         i[12]
-      ), f & /*textLineHeightRem*/
-      2048 && r(
+      ), l & /*textLineHeightRem*/
+      2048 && o(
         e,
         "line-height",
         /*textLineHeightRem*/
         i[11]
-      ), f & /*fontConfig*/
-      64 && r(
+      ), l & /*fontConfig*/
+      64 && o(
         e,
         "--bg-image",
         /*fontConfig*/
-        ((g = i[6]) == null ? void 0 : g.name) >= 16 ? `url(${T})` : `url(${U})`
-      ), f & /*fontConfig*/
-      64 && r(e, "min-width", s(
+        ((b = i[6]) == null ? void 0 : b.name) >= 16 ? `url(${T})` : `url(${U})`
+      ), l & /*fontConfig*/
+      64 && o(e, "min-width", m(
+        /*fontConfig*/
+        (a = i[6]) == null ? void 0 : a.minWidth
+      )), l & /*fontConfig*/
+      64 && o(
+        e,
+        "--border-radius",
+        /*fontConfig*/
+        ((g = i[6]) == null ? void 0 : g.name) >= 16 ? m(4) : m(2)
+      ), l & /*fontConfig*/
+      64 && o(
+        e,
+        "--border-radius-num",
         /*fontConfig*/
-        (u = i[6]) == null ? void 0 : u.minWidth
-      )), f & /*barTopPosition*/
-      1024 && r(o, "top", s(
+        ((h = i[6]) == null ? void 0 : h.name) >= 16 ? 8 : 4
+      ), l & /*barTopPosition*/
+      1024 && o(r, "top", m(
         /*barTopPosition*/
         i[10]
       ));
     },
-    d(m) {
-      m && I(e), i[22](null), m && I(l), m && I(o), i[23](null), c = !1, d();
+    d(f) {
+      f && v(e), i[22](null), f && v(s), f && v(r), i[23](null), _ = !1, u();
     }
   };
 }
-function fe(i) {
-  let e, t = !/*rendererIfNeed*/
+function le(i) {
+  let e, n = !/*rendererIfNeed*/
   i[5] && C(i);
   return {
     c() {
-      e = v("div"), t && t.c(), B(e, "class", "room-label-item svelte-1j96xkf"), r(
+      e = B("div"), n && n.c(), M(e, "class", "room-label-item svelte-c02qws"), o(
         e,
         "z-index",
         /*zIndex*/
         i[2]
-      ), r(
+      ), o(
         e,
         "transform",
         /*transform*/
         i[3]
-      ), r(
+      ), o(
         e,
         "opacity",
         /*opacity*/
         i[1]
-      ), r(
+      ), o(
         e,
         "visibility",
         /*visibility*/
         i[14]
       );
     },
-    m(l, o) {
-      z(l, e, o), t && t.m(e, null), i[24](e);
+    m(s, r) {
+      k(s, e, r), n && n.m(e, null), i[24](e);
     },
-    p(l, [o]) {
+    p(s, [r]) {
       /*rendererIfNeed*/
-      l[5] ? t && (t.d(1), t = null) : t ? t.p(l, o) : (t = C(l), t.c(), t.m(e, null)), o & /*zIndex*/
-      4 && r(
+      s[5] ? n && (n.d(1), n = null) : n ? n.p(s, r) : (n = C(s), n.c(), n.m(e, null)), r & /*zIndex*/
+      4 && o(
         e,
         "z-index",
         /*zIndex*/
-        l[2]
-      ), o & /*transform*/
-      8 && r(
+        s[2]
+      ), r & /*transform*/
+      8 && o(
         e,
         "transform",
         /*transform*/
-        l[3]
-      ), o & /*opacity*/
-      2 && r(
+        s[3]
+      ), r & /*opacity*/
+      2 && o(
         e,
         "opacity",
         /*opacity*/
-        l[1]
-      ), o & /*visibility*/
-      16384 && r(
+        s[1]
+      ), r & /*visibility*/
+      16384 && o(
         e,
         "visibility",
         /*visibility*/
-        l[14]
+        s[14]
       );
     },
     i: R,
     o: R,
-    d(l) {
-      l && I(e), t && t.d(), i[24](null);
+    d(s) {
+      s && v(e), n && n.d(), i[24](null);
     }
   };
 }
-function le(i, e, t) {
-  let l, o, c, d, m, f, g, u, S, { content: M } = e, { five: a = void 0 } = e, { visible: j = !0 } = e, { opacity: N = 1 } = e, { zIndex: E = 0 } = e, { transform: H = void 0 } = e, { onClick: P = () => {
-  } } = e, { rendererIfNeed: k = void 0 } = e, { rendererData: p = void 0 } = e, { fontSize: w } = e, _, b, h, y;
-  const L = (n) => {
-    if (a.state.mode !== "Panorama") {
-      const A = -(10 + 54 * (1 - ne(n.latitude) / 90)), D = A + u, q = D >= 0 ? 0 : -D / -S;
-      t(8, b.style.transform = `scaleY(${q})`, b), t(8, b.style.top = s(D), b), t(9, h.style.top = s(A), h);
+function se(i, e, n) {
+  let s, r, _, u, f, l, b, a, g, { content: h } = e, { five: d = void 0 } = e, { visible: S = !0 } = e, { opacity: N = 1 } = e, { zIndex: E = 0 } = e, { transform: H = void 0 } = e, { onClick: P = () => {
+  } } = e, { rendererIfNeed: w = void 0 } = e, { rendererData: q = void 0 } = e, { fontSize: L } = e, y, c, z, I;
+  const D = (t) => {
+    if (d.state.mode !== "Panorama") {
+      const A = -(10 + 54 * (1 - te(t.latitude) / 90)), O = A + a, j = O >= 0 ? 0 : -O / -g;
+      n(8, c.style.transform = `scaleY(${j})`, c), n(8, c.style.top = m(O), c), n(9, z.style.top = m(A), z);
     }
   };
   Q(() => {
-    _ && typeof k == "function" && (y = k(_, p)), a && (L(a.camera.pose), a.on("cameraUpdate", L));
+    y && typeof w == "function" && (I = w(y, q)), d && (D(d.camera.pose), d.on("cameraUpdate", D));
   }), V(() => {
-    y == null || y(), a == null || a.off("cameraUpdate", L);
+    I == null || I(), d == null || d.off("cameraUpdate", D);
   });
-  function F(n) {
-    O[n ? "unshift" : "push"](() => {
-      h = n, t(9, h);
+  function F(t) {
+    p[t ? "unshift" : "push"](() => {
+      z = t, n(9, z);
     });
   }
-  function G(n) {
-    O[n ? "unshift" : "push"](() => {
-      b = n, t(8, b);
+  function G(t) {
+    p[t ? "unshift" : "push"](() => {
+      c = t, n(8, c);
     });
   }
-  function W(n) {
-    O[n ? "unshift" : "push"](() => {
-      _ = n, t(7, _);
+  function W(t) {
+    p[t ? "unshift" : "push"](() => {
+      y = t, n(7, y);
     });
   }
-  return i.$$set = (n) => {
-    "content" in n && t(0, M = n.content), "five" in n && t(15, a = n.five), "visible" in n && t(16, j = n.visible), "opacity" in n && t(1, N = n.opacity), "zIndex" in n && t(2, E = n.zIndex), "transform" in n && t(3, H = n.transform), "onClick" in n && t(4, P = n.onClick), "rendererIfNeed" in n && t(5, k = n.rendererIfNeed), "rendererData" in n && t(17, p = n.rendererData), "fontSize" in n && t(18, w = n.fontSize);
+  return i.$$set = (t) => {
+    "content" in t && n(0, h = t.content), "five" in t && n(15, d = t.five), "visible" in t && n(16, S = t.visible), "opacity" in t && n(1, N = t.opacity), "zIndex" in t && n(2, E = t.zIndex), "transform" in t && n(3, H = t.transform), "onClick" in t && n(4, P = t.onClick), "rendererIfNeed" in t && n(5, w = t.rendererIfNeed), "rendererData" in t && n(17, q = t.rendererData), "fontSize" in t && n(18, L = t.fontSize);
   }, i.$$.update = () => {
-    var n;
+    var t;
     i.$$.dirty & /*visible*/
-    65536 && t(14, l = j ? "visible" : "hidden"), i.$$.dirty & /*fontSize*/
-    262144 && t(6, o = oe[w]), i.$$.dirty & /*fontConfig*/
-    64 && t(13, c = s(o == null ? void 0 : o.name)), i.$$.dirty & /*fontConfig*/
-    64 && t(20, d = (n = o == null ? void 0 : o.padding) == null ? void 0 : n.room), i.$$.dirty & /*padding*/
-    1048576 && t(12, m = `${s(d[1])} ${s(d[0])}`), i.$$.dirty & /*fontConfig*/
-    64 && t(21, f = o == null ? void 0 : o.lineHeight), i.$$.dirty & /*textLineHeight*/
-    2097152 && t(11, g = s(f)), i.$$.dirty & /*textLineHeight, padding*/
-    3145728 && t(19, u = f + d[1] * 2), i.$$.dirty & /*textHeight*/
-    524288 && t(10, S = -(64 - u));
+    65536 && n(14, s = S ? "visible" : "hidden"), i.$$.dirty & /*fontSize*/
+    262144 && n(6, r = re[L]), i.$$.dirty & /*fontConfig*/
+    64 && n(13, _ = m(r == null ? void 0 : r.name)), i.$$.dirty & /*fontConfig*/
+    64 && n(20, u = (t = r == null ? void 0 : r.padding) == null ? void 0 : t.room), i.$$.dirty & /*padding*/
+    1048576 && n(12, f = `${m(u[1])} ${m(u[0])}`), i.$$.dirty & /*fontConfig*/
+    64 && n(21, l = r == null ? void 0 : r.lineHeight), i.$$.dirty & /*textLineHeight*/
+    2097152 && n(11, b = m(l)), i.$$.dirty & /*textLineHeight, padding*/
+    3145728 && n(19, a = l + u[1] * 2), i.$$.dirty & /*textHeight*/
+    524288 && n(10, g = -(64 - a));
   }, [
-    M,
+    h,
     N,
     E,
     H,
     P,
-    k,
-    o,
-    _,
+    w,
+    r,
+    y,
+    c,
+    z,
+    g,
     b,
-    h,
+    f,
+    _,
+    s,
+    d,
     S,
-    g,
-    m,
-    c,
-    l,
+    q,
+    L,
     a,
-    j,
-    p,
-    w,
     u,
-    d,
-    f,
+    l,
     F,
     G,
     W
   ];
 }
-class ge extends Y {
+class _e extends Y {
   constructor(e) {
     super(), Z(
       this,
       e,
+      se,
       le,
-      fe,
       J,
       {
         content: 0,
@@ -252,10 +274,10 @@ class ge extends Y {
         rendererData: 17,
         fontSize: 18
       },
-      re
+      oe
     );
   }
 }
 export {
-  ge as LabelItem
+  _e as LabelItem
 };

package/libs/index.js

@@ -486,10 +486,10 @@ import "./shared-utils/Object3DHelper/Helper/HTML/tipsDom.js";
 import "./shared-utils/Object3DHelper/Helper/HTML/utils/createElement.js";
 import "./shared-utils/Object3DHelper/Helper/CSS3DScaleHelper.js";
 import "./shared-utils/Object3DHelper/Helper/HTML/rectangleScaleDom.js";
+import "./shared-utils/Object3DHelper/utils/cameraHooks.js";
 import "./shared-utils/Object3DHelper/Helper/BoundingBoxHelper.js";
 import "./shared-utils/Object3DHelper/Controller/MoveController.js";
 import "./shared-utils/Object3DHelper/Base/BaseController.js";
-import "./shared-utils/Object3DHelper/utils/cameraHooks.js";
 import "./shared-utils/Object3DHelper/utils/solidGuide.js";
 import "./shared-utils/Object3DHelper/utils/getMouseRaycaster.js";
 import "./shared-utils/Object3DHelper/utils/calculateThreeMouse.js";

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

@@ -37,6 +37,24 @@ export declare abstract class BaseController<T extends BaseHelper = BaseHelper,
     protected cameraHooks: Subscribe<{
         cameraUpdate: () => any;
     }>;
+    /** 其他控制器的引用，用于跨控制器状态检查 */
+    protected otherControllers?: {
+        moveController?: BaseController;
+        rotateController?: BaseController;
+        scaleController?: BaseController;
+    };
+    /**
+     * 更新其他控制器的引用
+     */
+    updateOtherControllers(otherControllers: {
+        moveController?: BaseController;
+        rotateController?: BaseController;
+        scaleController?: BaseController;
+    }): void;
+    /**
+     * 获取当前控制器的拖拽状态
+     */
+    getIsDragging(): boolean;
     constructor(params: {
         camera: THREE.Camera;
         model: THREE.Object3D;
@@ -48,6 +66,12 @@ export declare abstract class BaseController<T extends BaseHelper = BaseHelper,
         onRender?: () => void;
         sharedHooks?: Subscribe<HelperEventMap>;
         sharedInternalHooks?: Subscribe<InternalHelperEventMap>;
+        /** 其他控制器的引用，用于跨控制器状态检查 */
+        otherControllers?: {
+            moveController?: BaseController;
+            rotateController?: BaseController;
+            scaleController?: BaseController;
+        };
     }, config?: Config);
     initialHelperPosition(): void;
     initialHelperQuaternion(): void;

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 一致，使用两个三角形拼成矩形
      */