@realsee/dnalogel 3.52.0 → 3.52.1

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

@@ -1,53 +1,54 @@
 var _ = Object.defineProperty, H = Object.defineProperties;
 var I = Object.getOwnPropertyDescriptors;
-var F = Object.getOwnPropertySymbols;
-var k = Object.prototype.hasOwnProperty, q = Object.prototype.propertyIsEnumerable;
-var A = (o, n, t) => n in o ? _(o, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[n] = t, P = (o, n) => {
+var T = Object.getOwnPropertySymbols;
+var j = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
+var O = (o, n, t) => n in o ? _(o, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[n] = t, P = (o, n) => {
   for (var t in n || (n = {}))
-    k.call(n, t) && A(o, t, n[t]);
-  if (F)
-    for (var t of F(n))
-      q.call(n, t) && A(o, t, n[t]);
+    j.call(n, t) && O(o, t, n[t]);
+  if (T)
+    for (var t of T(n))
+      k.call(n, t) && O(o, t, n[t]);
   return o;
-}, u = (o, n) => H(o, I(n));
-var R = (o, n, t) => (A(o, typeof n != "symbol" ? n + "" : n, t), t);
-var O = (o, n, t) => new Promise((f, m) => {
+}, p = (o, n) => H(o, I(n));
+var R = (o, n, t) => (O(o, typeof n != "symbol" ? n + "" : n, t), t);
+var A = (o, n, t) => new Promise((f, m) => {
   var a = (c) => {
     try {
-      d(t.next(c));
+      h(t.next(c));
     } catch (w) {
       m(w);
     }
   }, i = (c) => {
     try {
-      d(t.throw(c));
+      h(t.throw(c));
     } catch (w) {
       m(w);
     }
-  }, d = (c) => c.done ? f(c.value) : Promise.resolve(c.value).then(a, i);
-  d((t = t.apply(o, n)).next());
+  }, h = (c) => c.done ? f(c.value) : Promise.resolve(c.value).then(a, i);
+  h((t = t.apply(o, n)).next());
 });
-import { BaseObject as G } from "../Base/index.js";
+import { BaseObject as q } from "../Base/index.js";
 import * as s from "three";
 import { PolylineWithDotsMesh as b } from "../../Meshes/Polyline.js";
-import { RectangleMeshEditor as J } from "../../Editors/RectangleMeshEditor.js";
-import { RectangleWithEdgeMesh as T } from "../../Meshes/RectangleWithEdge.js";
-import { sortPositionsByCameraPosition as B } from "../../utils/sortPositionsByCameraPosition.js";
-import { Sculpt as D } from "../../index.js";
-class ne extends G {
+import { RectangleMeshEditor as G } from "../../Editors/RectangleMeshEditor.js";
+import { RectangleWithEdgeMesh as F } from "../../Meshes/RectangleWithEdge.js";
+import { sortPositionsByCameraPosition as W } from "../../utils/sortPositionsByCameraPosition.js";
+import { Sculpt as B } from "../../index.js";
+import { vector3ToArray as J } from "../../../shared-utils/three/vector3ToArray.js";
+class se extends q {
   constructor(t, f) {
     super(t, f);
     R(this, "type", "Rectangle");
     R(this, "rectangleMesh");
     R(this, "_editor");
-    t && (this.rectangleMesh = new T(P(P({}, t.style), t)), this.add(this.rectangleMesh));
+    t && (this.rectangleMesh = new F(P(P({}, t.style), t)), this.add(this.rectangleMesh));
   }
   get editor() {
-    return this._editor || (this._editor = new J(this.rectangleMesh)), this._editor;
+    return this._editor || (this._editor = new G(this.rectangleMesh)), this._editor;
   }
   get data() {
-    return u(P({}, this.baseData), {
-      points: this.rectangleMesh.builtPoints.map((t) => t.toArray()),
+    return p(P({}, this.baseData), {
+      points: J(this.applyObjectMatrixWorld(this.rectangleMesh.points, this.rectangleMesh)),
       style: {
         color: this.rectangleMesh.color.getHex(),
         opacity: this.rectangleMesh.opacity,
@@ -65,9 +66,9 @@ class ne extends G {
     (t = this.rectangleMesh) == null || t.unhighlight();
   }
   create(t) {
-    return O(this, null, function* () {
+    return A(this, null, function* () {
       this.removeChildren();
-      const f = new T(t);
+      const f = new F(t);
       this.rectangleMesh = f, this.add(this.rectangleMesh), yield K(this.rectangleMesh, this.pointSelector, t), this.config.canEdit && this.editor.enable();
     });
   }
@@ -78,23 +79,23 @@ function K(o, n, t) {
 }
 function Q(o, n, t) {
   return new Promise((f, m) => {
-    var x;
+    var C;
     const a = o.parent;
     if (!a)
       return m(new Error("No container"));
-    const i = (x = t == null ? void 0 : t.limit) != null ? x : "none", d = new b(u(P({}, o.style), { dashed: !0, lengthEnable: !0 })), c = new b(u(P({}, o.style), { dashed: !0, lengthEnable: !1 })), w = new b(u(P({}, o.style), { dashed: !1, lengthEnable: !1 }));
-    a.add(d, w, c), n.enable();
+    const i = (C = t == null ? void 0 : t.limit) != null ? C : "none", h = new b(p(P({}, o.style), { dashed: !0, lengthEnable: !0 })), c = new b(p(P({}, o.style), { dashed: !0, lengthEnable: !1 })), w = new b(p(P({}, o.style), { dashed: !1, lengthEnable: !1 }));
+    a.add(h, w, c), n.enable();
     const e = [];
-    let l = new s.Vector3(), E = new s.Vector3();
-    const h = new s.Plane(), v = () => {
-      e.push(l.clone()), e.length === 1 ? (i === "xoz" && h.setFromNormalAndCoplanarPoint(new s.Vector3(0, 1, 0), e[0]), i === "none" && h.setFromNormalAndCoplanarPoint(E, e[0])) : e.length === 2 ? i === "y" || i === "xoz" ? (y(), f()) : w.setPoints([e[0], e[1]]) : e.length === 3 && (y(), f());
+    let l = new s.Vector3(), v = new s.Vector3();
+    const d = new s.Plane(), E = () => {
+      e.push(l.clone()), e.length === 1 ? (i === "xoz" && d.setFromNormalAndCoplanarPoint(new s.Vector3(0, 1, 0), e[0]), i === "none" && d.setFromNormalAndCoplanarPoint(v, e[0])) : e.length === 2 ? i === "y" || i === "xoz" ? (y(), f()) : w.setPoints([e[0], e[1]]) : e.length === 3 && (y(), f());
     }, L = (r) => {
       var N;
       if (!(r != null && r.raycaster))
         return;
       const M = (N = e.at(-1)) == null ? void 0 : N.clone();
       if (e.length === 0) {
-        l = r.point.clone(), E = r.face.normal;
+        l = r.point.clone(), v = r.face.normal;
         return;
       }
       if (e.length === 1 && i === "y") {
@@ -103,80 +104,80 @@ function Q(o, n, t) {
         return;
       }
       if (e.length === 1 && i === "xoz") {
-        const p = new s.Line3(new s.Vector3(1, 0, 0).add(e[0]), new s.Vector3(-1, 0, 0).add(e[0])), g = r.raycaster.ray.intersectPlane(h, new s.Vector3()), V = p.closestPointToPoint(g, !1, new s.Vector3());
+        const u = new s.Line3(new s.Vector3(1, 0, 0).add(e[0]), new s.Vector3(-1, 0, 0).add(e[0])), g = r.raycaster.ray.intersectPlane(d, new s.Vector3()), V = u.closestPointToPoint(g, !1, new s.Vector3());
         o.setPoints([e[0], V, g]);
         return;
       }
       if (e.length === 1 && i === "none") {
-        h ? (l = r.raycaster.ray.intersectPlane(h, new s.Vector3()), c.setPoints([l, r.point])) : l = r.point.clone(), d.setPoints([M, l]);
+        d ? (l = r.raycaster.ray.intersectPlane(d, new s.Vector3()), c.setPoints([l, r.point])) : l = r.point.clone(), h.setPoints([M, l]);
         return;
       }
       if (e.length === 2 && i === "none") {
-        a.remove(d);
-        const p = r.raycaster.ray.intersectPlane(h, new s.Vector3()), g = e[0].distanceTo(e[1]) / 2, V = new s.Vector3().lerpVectors(e[0], e[1], 0.5), z = new s.Vector3().subVectors(p, V).normalize();
+        a.remove(h);
+        const u = r.raycaster.ray.intersectPlane(d, new s.Vector3()), g = e[0].distanceTo(e[1]) / 2, V = new s.Vector3().lerpVectors(e[0], e[1], 0.5), z = new s.Vector3().subVectors(u, V).normalize();
         l = new s.Vector3().addVectors(V, z.multiplyScalar(g));
-        const U = [e[0], l, e[1]], W = B(U, D.modules.five.camera.position);
-        o.setPoints(W);
+        const D = [e[0], l, e[1]], U = W(D, B.modules.five.camera.position);
+        o.setPoints(U);
         return;
       }
     }, y = () => {
-      n.off("select", v), n.off("intersectionUpdate", L), n.off("disable", C), n.disable(), a == null || a.remove(d, w, c);
-    }, C = () => {
+      n.off("select", E), n.off("intersectionUpdate", L), n.off("disable", x), n.disable(), a == null || a.remove(h, w, c);
+    }, x = () => {
       y(), a == null || a.remove(o), m(new Error("Cancelled"));
     };
-    n.on("select", v), n.on("intersectionUpdate", L), n.on("disable", C);
+    n.on("select", E), n.on("intersectionUpdate", L), n.on("disable", x);
   });
 }
 function X(o, n, t) {
   return new Promise((f, m) => {
-    var x;
+    var C;
     const a = o.parent;
     if (!a)
       return m(new Error("No container"));
-    const i = (x = t == null ? void 0 : t.limit) != null ? x : "none", d = new b(u(P({}, o.style), { dashed: !0, lengthEnable: !0 })), c = new b(u(P({}, o.style), { dashed: !0, lengthEnable: !1 })), w = new b(u(P({}, o.style), { dashed: !1, lengthEnable: !1 }));
-    a.add(d, w, c), n.enable();
+    const i = (C = t == null ? void 0 : t.limit) != null ? C : "none", h = new b(p(P({}, o.style), { dashed: !0, lengthEnable: !0 })), c = new b(p(P({}, o.style), { dashed: !0, lengthEnable: !1 })), w = new b(p(P({}, o.style), { dashed: !1, lengthEnable: !1 }));
+    a.add(h, w, c), n.enable();
     const e = [];
-    let l = new s.Vector3(), E = new s.Vector3();
-    const h = new s.Plane(), v = () => {
-      e.push(l.clone()), e.length === 1 ? (i === "xoz" && h.setFromNormalAndCoplanarPoint(new s.Vector3(0, 1, 0), e[0]), i === "none" && h.setFromNormalAndCoplanarPoint(E, e[0])) : e.length === 2 ? (i === "y" && h.setFromCoplanarPoints(e[0], e[1], new s.Vector3(0, 1, 0).add(e[0])), w.setPoints([e[0], e[1]])) : e.length === 3 && (y(), f());
+    let l = new s.Vector3(), v = new s.Vector3();
+    const d = new s.Plane(), E = () => {
+      e.push(l.clone()), e.length === 1 ? (i === "xoz" && d.setFromNormalAndCoplanarPoint(new s.Vector3(0, 1, 0), e[0]), i === "none" && d.setFromNormalAndCoplanarPoint(v, e[0])) : e.length === 2 ? (i === "y" && d.setFromCoplanarPoints(e[0], e[1], new s.Vector3(0, 1, 0).add(e[0])), w.setPoints([e[0], e[1]])) : e.length === 3 && (y(), f());
     }, L = (r) => {
       var N;
       if (!(r != null && r.raycaster))
         return;
       const M = (N = e.at(-1)) == null ? void 0 : N.clone();
       if (e.length === 0) {
-        l = r.point.clone(), E = r.face.normal;
+        l = r.point.clone(), v = r.face.normal;
         return;
       }
       if (e.length === 1 && i === "y") {
-        l = r.point, c.setPoints([]), d.setPoints([M, l]);
+        l = r.point, c.setPoints([]), h.setPoints([M, l]);
         return;
       }
       if (e.length === 1 && i === "xoz") {
-        l = r.raycaster.ray.intersectPlane(h, new s.Vector3()), c.setPoints([l, r.point]), d.setPoints([M, l]);
+        l = r.raycaster.ray.intersectPlane(d, new s.Vector3()), c.setPoints([l, r.point]), h.setPoints([M, l]);
         return;
       }
       if (e.length === 1 && i === "none") {
-        l = r.raycaster.ray.intersectPlane(h, new s.Vector3()), c.setPoints([l, r.point]), d.setPoints([M, l]);
+        l = r.raycaster.ray.intersectPlane(d, new s.Vector3()), c.setPoints([l, r.point]), h.setPoints([M, l]);
         return;
       }
       if (e.length === 2) {
-        a.remove(d);
-        const p = new s.Vector3().crossVectors(e[0].clone().sub(e[1]), h.normal).normalize();
-        l = new s.Line3(e[1].clone().add(p), e[1].clone().sub(p)).closestPointToPoint(r.point, !1, new s.Vector3());
-        const V = [e[0], e[1], l], z = B(V, D.modules.five.camera.position);
+        a.remove(h);
+        const u = new s.Vector3().crossVectors(e[0].clone().sub(e[1]), d.normal).normalize();
+        l = new s.Line3(e[1].clone().add(u), e[1].clone().sub(u)).closestPointToPoint(r.point, !1, new s.Vector3());
+        const V = [e[0], e[1], l], z = W(V, B.modules.five.camera.position);
         o.setPoints(z);
         return;
       }
     }, y = () => {
-      n.off("select", v), n.off("intersectionUpdate", L), n.off("disable", C), n.disable(), a == null || a.remove(d, w, c);
-    }, C = () => {
+      n.off("select", E), n.off("intersectionUpdate", L), n.off("disable", x), n.disable(), a == null || a.remove(h, w, c);
+    }, x = () => {
       y(), a == null || a.remove(o), m(new Error("Cancelled"));
     };
-    n.on("select", v), n.on("intersectionUpdate", L), n.on("disable", C);
+    n.on("select", E), n.on("intersectionUpdate", L), n.on("disable", x);
   });
 }
 export {
-  ne as Rectangle,
+  se as Rectangle,
   K as createRectangle
 };

package/libs/Sculpt/index.d.ts

@@ -86,16 +86,6 @@ export declare class Sculpt extends Subscribe<Event> {
             };
             readonly id: string;
             readonly type: string;
-        } | {
-            points: [import("..").ArrayPosition, import("..").ArrayPosition, import("..").ArrayPosition];
-            style: {
-                color: number;
-                opacity: number;
-                lineWidth: number;
-                lineColor: number;
-            };
-            id: string;
-            type: string;
         } | {
             center: [number, number, number];
             normal: [number, number, number];

package/libs/base/BasePlugin.js

@@ -18,7 +18,7 @@ let P = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.52.0");
+    i(this, "VERSION", "3.52.1");
     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.52.0",
+    "%c %c@realsee/dnalogel %cv3.52.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/package.json

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