@realsee/dnalogel 3.73.4 → 3.73.5

package/libs/base/BasePlugin.js

@@ -23,7 +23,7 @@ let I = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.73.4");
+    r(this, "VERSION", "3.73.5");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");

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

@@ -1,16 +1,16 @@
-var S = Object.defineProperty;
-var G = (f, m, e) => m in f ? S(f, m, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[m] = e;
-var g = (f, m, e) => (G(f, typeof m != "symbol" ? m + "" : m, e), e);
-import { BaseController as A } from "../Base/BaseController.js";
-import { RENDER_ORDER as L } from "../Constants/RenderOrder.js";
+var C = Object.defineProperty;
+var S = (v, m, e) => m in v ? C(v, m, { enumerable: !0, configurable: !0, writable: !0, value: e }) : v[m] = e;
+var g = (v, m, e) => (S(v, typeof m != "symbol" ? m + "" : m, e), e);
+import { BaseController as G } from "../Base/BaseController.js";
+import { RENDER_ORDER as E } from "../Constants/RenderOrder.js";
 import * as c from "three";
-import { getMouseRaycaster as k } from "../utils/getMouseRaycaster.js";
-import { SolidGuideLine as H } from "../utils/solidGuide.js";
-import { rayOnLine as w } from "../../../Sculpt/utils/three/rayOnLine.js";
+import { getMouseRaycaster as A } from "../utils/getMouseRaycaster.js";
+import { SolidGuideLine as k } from "../utils/solidGuide.js";
+import { rayOnLine as P } from "../../../Sculpt/utils/three/rayOnLine.js";
 import { worldBoundingBox as I } from "../../three/boundingBox.js";
-import { getNormal as z } from "../../three/getNormal.js";
-var F, x;
-class Y extends A {
+import { getNormal as H } from "../../three/getNormal.js";
+var L, w;
+class Y extends G {
   constructor(...e) {
     super(...e);
     g(this, "name", "ScaleController");
@@ -18,7 +18,7 @@ class Y extends A {
     g(this, "dragGuideLine");
     /** 当前拖拽时显示的面片 */
     g(this, "currentFacePatch");
-    g(this, "solidGuide", new H(this.camera, this.container, (x = (F = this.config) == null ? void 0 : F.solidGuide) != null ? x : {}));
+    g(this, "solidGuide", new k(this.camera, this.container, (w = (L = this.config) == null ? void 0 : L.solidGuide) != null ? w : {}));
     g(this, "startInfo");
     g(this, "dragStart", (e) => {
       if (this.isDragging)
@@ -30,20 +30,20 @@ class Y extends A {
         i = i.parent;
       const n = i, o = n.scalePosition.basePosition.clone(), h = n.scalePosition.handlePosition.clone(), l = h.clone().sub(o).clone(), a = new c.Line3(o, o.clone().add(l.normalize().multiplyScalar(5)));
       a.applyMatrix4(this.helperObject3D.matrixWorld);
-      const d = new c.Raycaster(r, t.point.clone().sub(r)), p = w({ raycaster: d, line: a });
+      const d = new c.Raycaster(r, t.point.clone().sub(r)), p = P({ raycaster: d, line: a });
       this.startInfo = { line: a, scaleStartPoint: p, draggingObject: n }, this.helperObject3D.scaleMeshes.forEach((u) => {
         u.uuid !== n.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 = this.getObjectWorldCenter(), y = h.clone().applyMatrix4(this.helperObject3D.matrixWorld).clone().sub(u).normalize(), v = u, D = this.solidGuide.createSolidLine(v, y, { color: 16777215, renderOrder: L.DRAG_GUIDE_LINE });
-        this.isRectangleWithEdgeMesh() || this.scene.add(D), this.dragGuideLine = D, this.addFaceMesh();
+        const u = this.getObjectWorldCenter(), M = h.clone().applyMatrix4(this.helperObject3D.matrixWorld).clone().sub(u).normalize(), b = u, y = this.solidGuide.createSolidLine(b, M, { color: 16777215, renderOrder: E.DRAG_GUIDE_LINE });
+        this.isRectangleWithEdgeMesh() || this.scene.add(y), this.dragGuideLine = y, this.addFaceMesh();
       } catch (u) {
       }
       n.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 = k(this.camera, { x: t, y: r }, this.container), i = this.isMoveControllerDragging();
+      const t = "touches" in e ? e.touches[0].clientX : e.x, r = "touches" in e ? e.touches[0].clientY : e.y, s = A(this.camera, { x: t, y: r }, this.container), i = this.isMoveControllerDragging();
       if (!this.isDragging && !i && s) {
         this.addHoverFaceMesh(s);
         return;
@@ -61,26 +61,34 @@ class Y extends A {
         const d = this.originObject3D, u = d.geometry.attributes.position;
         if (!u)
           return [];
-        const b = [], y = u.count;
-        for (let M = 0; M < y; M++) {
-          const E = new c.Vector3().fromBufferAttribute(u, M);
-          d.updateMatrixWorld(!0), E.applyMatrix4(d.matrixWorld), b.push(E);
+        const D = [], M = u.count;
+        for (let f = 0; f < M; f++) {
+          const j = new c.Vector3().fromBufferAttribute(u, f);
+          d.updateMatrixWorld(!0), j.applyMatrix4(d.matrixWorld), D.push(j);
         }
-        const v = b.slice(0, 4);
-        if (!v || v.length < 4)
+        const b = D.slice(0, 4);
+        if (!b || b.length < 4)
           return;
-        const D = z(v).normalize(), W = new c.Plane().setFromNormalAndCoplanarPoint(D, v[0]), O = new c.Vector3();
-        if (e.ray.intersectPlane(W, O), !O)
-          return;
-        const P = new c.Matrix4().getInverse(this.helperObject3D.matrixWorld), j = O.clone().applyMatrix4(P), C = r.clone().applyMatrix4(P);
+        const y = H(b).normalize(), x = new c.Plane().setFromNormalAndCoplanarPoint(y, b[0]), F = Math.abs(e.ray.direction.dot(y)) < 0.1;
+        let O;
+        if (F)
+          O = P({ raycaster: e, line: t, clampToLine: !1 }).applyMatrix4(new c.Matrix4().getInverse(this.helperObject3D.matrixWorld.clone()));
+        else {
+          const f = new c.Vector3();
+          if (e.ray.intersectPlane(x, f), !f)
+            return;
+          const j = new c.Matrix4().getInverse(this.helperObject3D.matrixWorld);
+          O = f.clone().applyMatrix4(j);
+        }
+        const W = r.clone().applyMatrix4(new c.Matrix4().getInverse(this.helperObject3D.matrixWorld));
         (h = (o = this.config) == null ? void 0 : o.scaleCallback) == null || h.call(o, {
-          intersectPoint: j,
+          intersectPoint: O,
           scalePosition: i,
-          offset: j.clone().sub(C)
-        }), s.position.copy(j), this.hooks.emit("scale", new c.Vector3(1, 1, 1));
+          offset: O.clone().sub(W)
+        }), s.position.copy(O), this.hooks.emit("scale", new c.Vector3(1, 1, 1));
         return;
       }
-      const n = w({ raycaster: e, line: t, clampToLine: !1 });
+      const n = P({ raycaster: e, line: t, clampToLine: !1 });
       n.applyMatrix4(new c.Matrix4().getInverse(this.helperObject3D.matrixWorld.clone())), (a = (l = this.config) == null ? void 0 : l.scaleCallback) == null || a.call(l, {
         intersectPoint: n,
         scalePosition: i,
@@ -159,8 +167,8 @@ class Y extends A {
         if (!d.vertices || d.vertices.length < 3)
           continue;
         const p = new c.Vector3();
-        for (const b of d.vertices)
-          p.add(b);
+        for (const D of d.vertices)
+          p.add(D);
         p.divideScalar(d.vertices.length);
         const u = n.distanceTo(p);
         u < a && (a = u, l = d);
@@ -290,7 +298,7 @@ class Y extends A {
       transparent: !0,
       opacity: 0.45
     }), s = new c.Mesh(t, r);
-    return s.renderOrder = L.DRAG_FACE_PATCH, this.scene.add(s), this.currentFacePatch = s, this.render(), s;
+    return s.renderOrder = E.DRAG_FACE_PATCH, this.scene.add(s), this.currentFacePatch = s, this.render(), s;
   }
 }
 export {

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.73.4",
+    "%c %c@realsee/dnalogel %cv3.73.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.73.4",
+  "version": "3.73.5",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",