@realsee/dnalogel 3.61.7-alpha.2 → 3.61.7-alpha.4

package/libs/Sculpt/Objects/Rectangle/index.js

@@ -2,33 +2,33 @@ var q = Object.defineProperty, G = Object.defineProperties;
 var J = Object.getOwnPropertyDescriptors;
 var W = Object.getOwnPropertySymbols;
 var K = Object.prototype.hasOwnProperty, Q = Object.prototype.propertyIsEnumerable;
-var O = (s, e, n) => e in s ? q(s, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : s[e] = n, p = (s, e) => {
+var T = (s, e, n) => e in s ? q(s, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : s[e] = n, p = (s, e) => {
   for (var n in e || (e = {}))
-    K.call(e, n) && O(s, n, e[n]);
+    K.call(e, n) && T(s, n, e[n]);
   if (W)
     for (var n of W(e))
-      Q.call(e, n) && O(s, n, e[n]);
+      Q.call(e, n) && T(s, n, e[n]);
   return s;
-}, u = (s, e) => G(s, J(e));
-var N = (s, e, n) => (O(s, typeof e != "symbol" ? e + "" : e, n), n);
-var D = (s, e, n) => new Promise((i, f) => {
-  var P = (c) => {
+}, P = (s, e) => G(s, J(e));
+var N = (s, e, n) => (T(s, typeof e != "symbol" ? e + "" : e, n), n);
+var D = (s, e, n) => new Promise((a, f) => {
+  var u = (c) => {
     try {
-      a(n.next(c));
+      i(n.next(c));
     } catch (m) {
       f(m);
     }
   }, l = (c) => {
     try {
-      a(n.throw(c));
+      i(n.throw(c));
     } catch (m) {
       f(m);
     }
-  }, a = (c) => c.done ? i(c.value) : Promise.resolve(c.value).then(P, l);
-  a((n = n.apply(s, e)).next());
+  }, i = (c) => c.done ? a(c.value) : Promise.resolve(c.value).then(u, l);
+  i((n = n.apply(s, e)).next());
 });
 import { BaseObject as X } from "../Base/index.js";
-import * as o from "three";
+import * as r from "three";
 import { PolylineWithDotsMesh as L } from "../../Meshes/Polyline.js";
 import { RectangleMeshEditor as Y } from "../../Editors/RectangleMeshEditor.js";
 import { RectangleMesh as Z } from "../../Meshes/Rectangle.js";
@@ -41,8 +41,8 @@ import { withResolvers as U } from "../../../shared-utils/promise/withResolvers.
 import { PolygonMesh as S } from "../../Meshes/Polygon.js";
 import { getNormal as ee } from "../../../shared-utils/three/getNormal.js";
 class ge extends X {
-  constructor(n, i) {
-    super(n, i);
+  constructor(n, a) {
+    super(n, a);
     N(this, "type", "Rectangle");
     N(this, "rectangleMesh");
     N(this, "_editor");
@@ -52,7 +52,7 @@ class ge extends X {
     return this._editor || (this._editor = new Y(this.rectangleMesh)), this._editor;
   }
   get data() {
-    return u(p({}, this.baseData), {
+    return P(p({}, this.baseData), {
       points: $(this.applyObjectMatrixWorld(this.rectangleMesh.points, this.rectangleMesh)),
       style: {
         color: this.rectangleMesh.color.getHex(),
@@ -76,8 +76,8 @@ class ge extends X {
   create(n) {
     return D(this, null, function* () {
       this.removeChildren();
-      const i = new B(n);
-      this.rectangleMesh = i, this.add(this.rectangleMesh), yield te(this.rectangleMesh, this.pointSelector, n), this.config.defaultAction && this.editor.enable();
+      const a = new B(n);
+      this.rectangleMesh = a, this.add(this.rectangleMesh), yield te(this.rectangleMesh, this.pointSelector, n), this.config.defaultAction && this.editor.enable();
     });
   }
 }
@@ -87,57 +87,57 @@ function te(s, e, n) {
 }
 function ne(s, e) {
   const n = [];
-  return s.scene.traverse((i) => {
+  return s.scene.traverse((a) => {
     var f;
-    if (i.visible && !((f = e == null ? void 0 : e.excludes) != null && f.includes(i)) && (i instanceof Z || i instanceof S)) {
-      const P = i.points.map((l) => {
-        const a = new o.Face3(l.x, l.y, l.z, i.normal);
-        return i.style.occlusionVisibility && (a.IsAlwaysVisible = !0), a;
+    if (a.visible && !((f = e == null ? void 0 : e.excludes) != null && f.includes(a)) && (a instanceof Z || a instanceof S)) {
+      const u = a.points.map((l) => {
+        const i = new r.Face3(l.x, l.y, l.z, a.normal);
+        return a.style.occlusionVisibility && (i.IsAlwaysVisible = !0), i;
       });
-      n.push(...P);
+      n.push(...u);
     }
   }), n;
 }
 function se(s, e, n) {
   var C;
-  const { promise: i, reject: f, resolve: P } = U(), l = s.parent;
+  const { promise: a, reject: f, resolve: u } = U(), l = s.parent;
   if (!l)
     return f(new Error("No container"));
-  const a = (C = n == null ? void 0 : n.limit) != null ? C : "none", c = new L(u(p({}, s.style), { dashed: !0 })), m = new L(u(p({}, s.style), { dashed: !0, lengthEnable: !1 })), g = new L(u(p({}, s.style), { dashed: !1, lengthEnable: !1 }));
+  const i = (C = n == null ? void 0 : n.limit) != null ? C : "none", c = new L(P(p({}, s.style), { dashed: !0 })), m = new L(P(p({}, s.style), { dashed: !0, lengthEnable: !1 })), g = new L(P(p({}, s.style), { dashed: !1, lengthEnable: !1 }));
   l.add(c, g, m), e.enable();
   const t = [];
-  let d = new o.Vector3(), M = new o.Vector3();
-  const h = new o.Plane(), b = () => {
-    t.push(d.clone()), t.length === 1 ? (a === "xoz" && h.setFromNormalAndCoplanarPoint(new o.Vector3(0, 1, 0), t[0]), a === "none" && h.setFromNormalAndCoplanarPoint(M, t[0])) : t.length === 2 ? a === "y" || a === "xoz" ? (v(), P()) : g.setPoints([t[0], t[1]]) : t.length === 3 && (v(), P());
-  }, x = (r) => {
+  let d = new r.Vector3(), M = new r.Vector3();
+  const h = new r.Plane(), b = () => {
+    t.push(d.clone()), t.length === 1 ? (i === "xoz" && h.setFromNormalAndCoplanarPoint(new r.Vector3(0, 1, 0), t[0]), i === "none" && h.setFromNormalAndCoplanarPoint(M, t[0])) : t.length === 2 ? i === "y" || i === "xoz" ? (v(), u()) : g.setPoints([t[0], t[1]]) : t.length === 3 && (v(), u());
+  }, x = (o) => {
     var A, R;
-    if (!(r != null && r.raycaster))
+    if (!(o != null && o.raycaster))
       return;
-    const T = (A = t.at(-1)) == null ? void 0 : A.clone();
+    const z = (A = t.at(-1)) == null ? void 0 : A.clone();
     if (t.length === 0) {
-      d = r.point.clone(), M = (R = r.face) == null ? void 0 : R.normal;
+      d = o.point.clone(), M = (R = o.face) == null ? void 0 : R.normal;
       return;
     }
-    if (t.length === 1 && a === "y") {
-      const w = new o.Line3(new o.Vector3(0, 1, 0).add(t[0]), new o.Vector3(0, -1, 0).add(t[0])).closestPointToPoint(r.point, !1, new o.Vector3());
-      s.setPoints([t[0], w, r.point]);
+    if (t.length === 1 && i === "y") {
+      const w = new r.Line3(new r.Vector3(0, 1, 0).add(t[0]), new r.Vector3(0, -1, 0).add(t[0])).closestPointToPoint(o.point, !1, new r.Vector3());
+      s.setPoints([t[0], w, o.point]);
       return;
     }
-    if (t.length === 1 && a === "xoz") {
-      const y = new o.Line3(new o.Vector3(1, 0, 0).add(t[0]), new o.Vector3(-1, 0, 0).add(t[0])), w = r.raycaster.ray.intersectPlane(h, new o.Vector3()), V = y.closestPointToPoint(w, !1, new o.Vector3());
+    if (t.length === 1 && i === "xoz") {
+      const y = new r.Line3(new r.Vector3(1, 0, 0).add(t[0]), new r.Vector3(-1, 0, 0).add(t[0])), w = o.raycaster.ray.intersectPlane(h, new r.Vector3()), V = y.closestPointToPoint(w, !1, new r.Vector3());
       s.setPoints([t[0], V, w]);
       return;
     }
-    if (t.length === 1 && a === "none") {
-      h ? (d = r.raycaster.ray.intersectPlane(h, new o.Vector3()), m.setPoints([d, r.point])) : d = r.point.clone(), c.setPoints([T, d]);
+    if (t.length === 1 && i === "none") {
+      h ? (d = o.raycaster.ray.intersectPlane(h, new r.Vector3()), m.setPoints([d, o.point])) : d = o.point.clone(), c.setPoints([z, d]);
       return;
     }
-    if (t.length === 2 && a === "none") {
+    if (t.length === 2 && i === "none") {
       l.remove(c);
-      const y = r.raycaster.ray.intersectPlane(h, new o.Vector3()), w = t[0].distanceTo(t[1]) / 2, V = new o.Vector3().lerpVectors(t[0], t[1], 0.5), _ = new o.Vector3().subVectors(y, V).normalize();
-      d = new o.Vector3().addVectors(V, _.multiplyScalar(w));
-      const z = [t[0], d, t[1]], F = H(z, I.modules.five.camera.position);
-      s.setPoints(F);
+      const y = o.raycaster.ray.intersectPlane(h, new r.Vector3()), w = t[0].distanceTo(t[1]) / 2, V = new r.Vector3().lerpVectors(t[0], t[1], 0.5), _ = new r.Vector3().subVectors(y, V).normalize();
+      d = new r.Vector3().addVectors(V, _.multiplyScalar(w));
+      const F = [t[0], d, t[1]], O = H(F, I.modules.five.camera.position);
+      s.setPoints(O);
       return;
     }
   }, v = () => {
@@ -145,42 +145,49 @@ function se(s, e, n) {
   }, E = () => {
     v(), l == null || l.remove(s), f(new Error("Cancelled"));
   };
-  return e.on("select", b), e.on("intersectionUpdate", x), e.on("disable", E), i;
+  return e.on("select", b), e.on("intersectionUpdate", x), e.on("disable", E), a;
 }
 function oe(s, e, n) {
   var C;
-  const { promise: i, reject: f, resolve: P } = U(), l = s.parent;
+  const { promise: a, reject: f, resolve: u } = U(), l = s.parent;
   if (!l)
     return f(new Error("No container"));
-  const a = (C = n == null ? void 0 : n.limit) != null ? C : "none", c = new L(u(p({}, s.style), { dashed: !0 })), m = new L(u(p({}, s.style), { dashed: !0, lengthEnable: !1 })), g = new L(u(p({}, s.style), { dashed: !1, lengthEnable: !1 }));
+  const i = (C = n == null ? void 0 : n.limit) != null ? C : "none", c = new L(P(p({}, s.style), { dashed: !0 })), m = new L(P(p({}, s.style), { dashed: !0, lengthEnable: !1 })), g = new L(P(p({}, s.style), { dashed: !1, lengthEnable: !1 }));
   l.add(c, g, m), e.enable(), e.setAdherePoints(ne(e.five, { excludes: [s] }));
   const t = [];
-  let d = new o.Vector3(), M = new o.Vector3();
-  const h = new o.Plane(), b = () => {
-    t.push(d.clone()), t.length === 1 ? (e.planeMode = "onlyPlane", a === "y" && (e.adhereLine = [new o.Line3(t[0], new o.Vector3(0, 1, 0).add(t[0]))]), a === "xoz" && (h.setFromNormalAndCoplanarPoint(new o.Vector3(0, 1, 0), t[0]), e.plane = h), a === "none" && (h.setFromNormalAndCoplanarPoint(M, t[0]), e.plane = h)) : t.length === 2 ? (e.planeMode = "vertical", a === "y" && (e.adhereLine = []), a === "y" && new o.Vector3(0, 1, 0).angleTo(t[0].clone().sub(t[1])) > Math.PI / 4 && (h.setFromCoplanarPoints(t[0], t[1], new o.Vector3(0, 1, 0).add(t[0])), e.plane = h), g.setPoints([t[0], t[1]])) : t.length === 3 && (v(), P());
-  }, x = (r) => {
+  let d = new r.Vector3(), M = new r.Vector3();
+  const h = new r.Plane(), b = () => {
+    if (t.push(d.clone()), t.length === 1)
+      e.planeMode = "onlyPlane", i === "y" && (e.adhereLine = [new r.Line3(t[0], new r.Vector3(0, 1, 0).add(t[0]))]), i === "xoz" && (h.setFromNormalAndCoplanarPoint(new r.Vector3(0, 1, 0), t[0]), e.plane = h), i === "none" && (h.setFromNormalAndCoplanarPoint(M, t[0]), e.plane = h);
+    else if (t.length === 2) {
+      e.planeMode = "vertical", i === "y" && (e.adhereLine = []);
+      let o = !1;
+      t[0].x === t[1].x && t[0].z === t[1].z && (o = !0), i === "y" && !o && (h.setFromCoplanarPoints(t[0], t[1], new r.Vector3(0, 1, 0).add(t[0])), e.plane = h), g.setPoints([t[0], t[1]]);
+    } else
+      t.length === 3 && (v(), u());
+  }, x = (o) => {
     var A, R, y, w;
-    if (!r || !(r != null && r.raycaster))
+    if (!o || !(o != null && o.raycaster))
       return;
-    const T = (A = t.at(-1)) == null ? void 0 : A.clone();
+    const z = (A = t.at(-1)) == null ? void 0 : A.clone();
     if (t.length === 0) {
-      d = r.point.clone(), M = (R = r.face) == null ? void 0 : R.normal;
+      d = o.point.clone(), M = (R = o.face) == null ? void 0 : R.normal;
       return;
     }
     if (t.length === 1) {
-      d = r.point, m.setPoints([(y = r.originalPoint) != null ? y : r.point, r.point]), c.setPoints([T, d]);
+      d = o.point, m.setPoints([(y = o.originalPoint) != null ? y : o.point, o.point]), c.setPoints([z, d]);
       return;
     }
     if (t.length === 2) {
       if (!e.plane) {
-        const k = ee([t[0], t[1], r.point]);
+        const k = ee([t[0], t[1], o.point]);
         h.setFromNormalAndCoplanarPoint(k, t[0]);
       }
-      m.setPoints([(w = r.originalPoint) != null ? w : r.point, r.point]);
-      const V = new o.Vector3().crossVectors(t[0].clone().sub(t[1]), h.normal).normalize();
-      d = new o.Line3(t[1].clone().add(V), t[1].clone().sub(V)).closestPointToPoint(r.point, !1, new o.Vector3());
-      const z = [t[0], t[1], d], F = H(z, I.modules.five.camera.position);
-      s.setPoints(F);
+      m.setPoints([(w = o.originalPoint) != null ? w : o.point, o.point]);
+      const V = new r.Vector3().crossVectors(t[0].clone().sub(t[1]), h.normal).normalize();
+      d = new r.Line3(t[1].clone().add(V), t[1].clone().sub(V)).closestPointToPoint(o.point, !1, new r.Vector3());
+      const F = [t[0], t[1], d], O = H(F, I.modules.five.camera.position);
+      s.setPoints(O);
       return;
     }
   }, v = () => {
@@ -188,7 +195,7 @@ function oe(s, e, n) {
   }, E = () => {
     v(), l == null || l.remove(s), f(new Error("Cancelled"));
   };
-  return e.on("select", b), e.on("intersectionUpdate", x), e.on("disable", E), i;
+  return e.on("select", b), e.on("intersectionUpdate", x), e.on("disable", E), a;
 }
 export {
   ge as Rectangle,

package/libs/base/BasePlugin.js

@@ -20,7 +20,7 @@ let S = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.61.7-alpha.2");
+    i(this, "VERSION", "3.61.7-alpha.4");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/logger.js

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