@realsee/dnalogel 3.70.4 → 3.70.5

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";
@@ -23,43 +23,43 @@ class B extends w {
       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(), !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) {
@@ -73,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;
@@ -92,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;
@@ -102,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);
     }
@@ -162,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());
   }
   /**
@@ -176,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);
   }
   /**
@@ -185,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 一致，使用两个三角形拼成矩形
@@ -233,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,
@@ -242,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/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.70.4",
+    "%c %c@realsee/dnalogel %cv3.70.5",
     [
       "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.70.4",
+  "version": "3.70.5",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",