@realsee/dnalogel 3.67.10 → 3.68.0

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

@@ -1,55 +1,56 @@
-var F = Object.defineProperty, I = Object.defineProperties;
-var L = Object.getOwnPropertyDescriptors;
-var A = Object.getOwnPropertySymbols;
-var N = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
-var E = (s, t, e) => t in s ? F(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, g = (s, t) => {
+var he = Object.defineProperty, pe = Object.defineProperties;
+var me = Object.getOwnPropertyDescriptors;
+var ee = Object.getOwnPropertySymbols;
+var ue = Object.prototype.hasOwnProperty, Pe = Object.prototype.propertyIsEnumerable;
+var j = Math.pow, Y = (s, t, e) => t in s ? he(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, x = (s, t) => {
   for (var e in t || (t = {}))
-    N.call(t, e) && E(s, e, t[e]);
-  if (A)
-    for (var e of A(t))
-      z.call(t, e) && E(s, e, t[e]);
+    ue.call(t, e) && Y(s, e, t[e]);
+  if (ee)
+    for (var e of ee(t))
+      Pe.call(t, e) && Y(s, e, t[e]);
   return s;
-}, O = (s, t) => I(s, L(t));
-var u = (s, t, e) => (E(s, typeof t != "symbol" ? t + "" : t, e), e);
-var H = (s, t, e) => new Promise((c, d) => {
-  var m = (i) => {
+}, A = (s, t) => pe(s, me(t));
+var H = (s, t, e) => (Y(s, typeof t != "symbol" ? t + "" : t, e), e);
+var te = (s, t, e) => new Promise((l, d) => {
+  var w = (h) => {
     try {
-      f(e.next(i));
-    } catch (l) {
-      d(l);
+      b(e.next(h));
+    } catch (a) {
+      d(a);
     }
-  }, r = (i) => {
+  }, r = (h) => {
     try {
-      f(e.throw(i));
-    } catch (l) {
-      d(l);
+      b(e.throw(h));
+    } catch (a) {
+      d(a);
     }
-  }, f = (i) => i.done ? c(i.value) : Promise.resolve(i.value).then(m, r);
-  f((e = e.apply(s, t)).next());
+  }, b = (h) => h.done ? l(h.value) : Promise.resolve(h.value).then(w, r);
+  b((e = e.apply(s, t)).next());
 });
-import { BaseObject as q } from "../Base/index.js";
-import * as p from "three";
-import { PolylineMesh as _ } from "../../Meshes/Polyline.js";
-import { AreaMesh as D } from "../../Meshes/Area.js";
-import { PolygonEditor as G } from "./Editor.js";
-import { vector3ToArray as J } from "../../../shared-utils/three/vector3ToArray.js";
-import { withResolvers as K } from "../../../shared-utils/promise/withResolvers.js";
-import { anyPositionToVector3 as Q } from "../../../shared-utils/positionToVector3.js";
-class ie extends q {
-  constructor(e, c) {
-    super(e, c);
-    u(this, "type", "Polygon");
-    u(this, "areaMesh");
-    u(this, "_editor");
-    u(this, "creatingObject");
-    e && (this.areaMesh = new D(g(g({}, e.style), e)), this.add(this.areaMesh));
+import { BaseObject as ce } from "../Base/index.js";
+import * as C from "three";
+import { PolylineMesh as se } from "../../Meshes/Polyline.js";
+import { AreaMesh as oe } from "../../Meshes/Area.js";
+import { PolygonEditor as ye } from "./Editor.js";
+import { vector3ToArray as fe } from "../../../shared-utils/three/vector3ToArray.js";
+import { withResolvers as we } from "../../../shared-utils/promise/withResolvers.js";
+import { anyPositionToVector3 as be } from "../../../shared-utils/positionToVector3.js";
+import { PointMesh as ve } from "../../Meshes/Point.js";
+class Ue extends ce {
+  constructor(e, l) {
+    super(e, l);
+    H(this, "type", "Polygon");
+    H(this, "areaMesh");
+    H(this, "_editor");
+    H(this, "creatingObject");
+    e && (this.areaMesh = new oe(x(x({}, e.style), e)), this.add(this.areaMesh));
   }
   get editor() {
-    return this._editor || (this._editor = new G(this)), this._editor;
+    return this._editor || (this._editor = new ye(this)), this._editor;
   }
   get data() {
-    return this.updateMatrixWorld(), O(g({}, this.baseData), {
-      points: J(this.applyObjectMatrixWorld(this.areaMesh.points)),
+    return this.updateMatrixWorld(), A(x({}, this.baseData), {
+      points: fe(this.applyObjectMatrixWorld(this.areaMesh.points)),
       style: {
         color: this.areaMesh.color.getHex(),
         lineColor: this.areaMesh.lineColor.getHex(),
@@ -58,7 +59,7 @@ class ie extends q {
     });
   }
   setData(e) {
-    e.points && this.areaMesh.setPoints(this.applyObjectReversalMatrixWorld(e.points.map(Q))), this.areaMesh.setStyle(e.style);
+    e.points && this.areaMesh.setPoints(this.applyObjectReversalMatrixWorld(e.points.map(be))), this.areaMesh.setStyle(e.style);
   }
   highlight() {
     var e;
@@ -69,79 +70,130 @@ class ie extends q {
     (e = this.areaMesh) == null || e.unhighlight();
   }
   canUndo() {
-    var e;
-    (e = this.creatingObject) == null || e.canUndo();
+    var e, l, d;
+    return (d = (l = (e = this.creatingObject) == null ? void 0 : e.canUndo) == null ? void 0 : l.call(e)) != null ? d : !1;
   }
   canRedo() {
-    var e;
-    (e = this.creatingObject) == null || e.canRedo();
+    var e, l, d;
+    return (d = (l = (e = this.creatingObject) == null ? void 0 : e.canRedo) == null ? void 0 : l.call(e)) != null ? d : !1;
   }
   undo() {
-    var e;
-    (e = this.creatingObject) == null || e.undo();
+    var e, l;
+    return (l = (e = this.creatingObject) == null ? void 0 : e.undo) == null ? void 0 : l.call(e);
   }
   redo() {
-    var e;
-    (e = this.creatingObject) == null || e.redo();
+    var e, l;
+    return (l = (e = this.creatingObject) == null ? void 0 : e.redo) == null ? void 0 : l.call(e);
   }
   create(e) {
-    return H(this, null, function* () {
-      this.children.forEach((d) => {
-        d.parent === this && this.remove(d);
+    return te(this, null, function* () {
+      var d;
+      this.children.forEach((w) => {
+        w.parent === this && this.remove(w);
       }), this.children.length = 0;
-      const c = new D(e);
-      this.areaMesh = c, this.add(this.areaMesh), this.creatingObject = X(this.areaMesh, this.pointSelector, e), yield this.creatingObject.finished, this.config.defaultAction && this.editor.enable();
+      const l = new oe(e);
+      this.areaMesh = l, this.add(this.areaMesh), this.creatingObject = xe(this.areaMesh, this.pointSelector, e), yield (d = this.creatingObject) == null ? void 0 : d.finished, this.config.defaultAction && this.editor.enable();
     });
   }
 }
-function X(s, t, e) {
-  var U;
-  const { promise: c, resolve: d, reject: m } = K(), r = s.parent;
+function xe(s, t, e) {
+  var L, N, $, z, G, J, K, Q;
+  const { promise: l, resolve: d, reject: w } = we(), r = s.parent;
   if (!r) {
-    m(new Error("No container"));
+    w(new Error("No container"));
     return;
   }
-  const f = (U = e == null ? void 0 : e.limit) != null ? U : "none", i = new _(s.style);
-  r == null || r.add(i);
-  const l = new _(O(g({}, s.style), { dashed: !0, lengthEnable: !1 }));
-  r == null || r.add(l), t.enable();
-  const o = [];
-  let n, h, v = !1, C;
-  const y = [], x = () => o.length > 0, M = () => y.length > 0, k = () => {
-    x() && (y.push(o.pop()), w(C), t.pointSelectorHelper.magnifier.render());
-  }, B = () => {
-    M() && (o.push(y.pop()), w(C), t.pointSelectorHelper.magnifier.render());
-  }, R = (a) => {
-    y.length = 0;
-    const b = o.length === 0 ? a.point : n.clone();
-    o.push(b), s.setPoints(o, { closed: !1 }), v && (W(), d());
-  }, w = (a) => {
-    const b = () => {
-      i.setPoints([]), l.setPoints([]), s.setPoints(o), t.pointSelectorHelper.magnifier.render();
+  const b = (L = e == null ? void 0 : e.limit) != null ? L : "none", h = e == null ? void 0 : e.simpleMode, a = (J = (G = ($ = s.five) != null ? $ : (N = s.get) == null ? void 0 : N.call(s, "five")) != null ? G : (z = window.globalModules) == null ? void 0 : z.five) != null ? J : window.$five;
+  (K = e == null ? void 0 : e.autoClosePixelDistance) != null;
+  let O = 0;
+  h && a && a.model && a.model.bounding && typeof ((Q = a.model.bounding.max) == null ? void 0 : Q.y) == "number" && (O = a.model.bounding.max.y + 1);
+  const p = new se(s.style);
+  r == null || r.add(p);
+  const m = new se(A(x({}, s.style), { dashed: !0, lengthEnable: !1 }));
+  r == null || r.add(m);
+  let M = [];
+  function E() {
+    var P, c;
+    M.forEach((y) => {
+      var f;
+      return (f = y.parent) == null ? void 0 : f.remove(y);
+    });
+    const o = (c = (P = s.line) == null ? void 0 : P.style) != null ? c : s.style;
+    M = i.map((y, f) => {
+      var D;
+      const v = new ve(A(x({}, o), {
+        color: (D = o.pointColor) != null ? D : o.lineColor,
+        tip: void 0,
+        point: y
+      }));
+      return v.name = `PolygonPointMesh_${f}`, r == null || r.add(v), v;
+    });
+  }
+  function g() {
+    M.forEach((o) => {
+      var P;
+      return (P = o.parent) == null ? void 0 : P.remove(o);
+    }), M = [];
+  }
+  t.enable(), h && t.setAdherePoints([]);
+  const i = [];
+  let n, u, T = !1, V;
+  const R = [], k = () => i.length > 0, q = () => R.length > 0, ie = () => {
+    var o;
+    k() && (R.push(i.pop()), W(V), E(), (o = e == null ? void 0 : e.onUndo) == null || o.call(e), t.pointSelectorHelper && t.pointSelectorHelper.magnifier && t.pointSelectorHelper.magnifier.render());
+  }, ne = () => {
+    var o;
+    q() && (i.push(R.pop()), W(V), E(), (o = e == null ? void 0 : e.onRedo) == null || o.call(e), t.pointSelectorHelper && t.pointSelectorHelper.magnifier && t.pointSelectorHelper.magnifier.render());
+  }, B = (o) => {
+    var c;
+    R.length = 0;
+    let P = i.length === 0 ? o.point : n.clone();
+    h && (P = P.clone().setY(O)), i.push(P), s.setPoints(i, { closed: !1 }), E(), (c = e == null ? void 0 : e.onPointPlaced) == null || c.call(e, i), T && (F(), d());
+  }, W = (o) => {
+    const P = () => {
+      p.setPoints([]), m.setPoints([]), s.setPoints(i), t.pointSelectorHelper && t.pointSelectorHelper.magnifier && t.pointSelectorHelper.magnifier.render();
     };
-    if (!a || (C = a, !(o != null && o.length)))
-      return b();
-    const P = o.at(-1).clone();
-    if (o.length < 3 && (f === "none" ? (n = a.point, i.setPoints([P, n]), l.setPoints([])) : f === "xoz" ? (h = h != null ? h : new p.Plane().setFromNormalAndCoplanarPoint(new p.Vector3(0, 1, 0), o[0]), t.plane = h, n = h.projectPoint(a.point, new p.Vector3()), i.setPoints([P, n]), l.setPoints([n, a.point])) : f === "y" && (o.length === 1 ? (n = a.point, i.setPoints([P, n]), l.setPoints([])) : (h = h != null ? h : new p.Plane().setFromCoplanarPoints(o[0], o[1], new p.Vector3(0, 1, 0).add(o[0])), t.plane = h, n = h.projectPoint(a.point, new p.Vector3()), i.setPoints([P, n]), l.setPoints([n, a.point])))), o.length >= 3) {
-      n = s.projectPoint(a.point);
-      const j = o[0], V = 0.2;
-      j.distanceTo(n) < V || j.distanceTo(a.point) < V ? (n = j, a.point.copy(j), t.pointSelectorHelper.updateWithIntersect(a, { emitEvent: !1 }), v = !0) : v = !1, i.setPoints([P, n]), l.setPoints([n, a.point]);
+    if (!o) {
+      P(), E();
+      return;
+    }
+    if (V = o, !(i != null && i.length))
+      return P();
+    const c = i.at(-1).clone();
+    if (i.length < 3 && (h ? (n = o.point.clone().setY(O), p.setPoints([c, n]), m.setPoints([])) : b === "none" ? (n = o.point, p.setPoints([c, n]), m.setPoints([])) : b === "xoz" ? (u = u != null ? u : new C.Plane().setFromNormalAndCoplanarPoint(new C.Vector3(0, 1, 0), i[0]), t.plane = u, n = u.projectPoint(o.point, new C.Vector3()), p.setPoints([c, n]), m.setPoints([n, o.point])) : b === "y" && (i.length === 1 ? (n = o.point, p.setPoints([c, n]), m.setPoints([])) : (u = u != null ? u : new C.Plane().setFromCoplanarPoints(i[0], i[1], new C.Vector3(0, 1, 0).add(i[0])), t.plane = u, n = u.projectPoint(o.point, new C.Vector3()), p.setPoints([c, n]), m.setPoints([n, o.point])))), i.length >= 3) {
+      h ? n = o.point.clone().setY(O) : n = s.projectPoint(o.point);
+      const y = i[0];
+      let f = !1;
+      if (typeof (e == null ? void 0 : e.autoClosePixelDistance) == "number") {
+        if (a && a.camera && a.getElement) {
+          const v = a.getElement(), D = v.clientWidth, le = v.clientHeight, _ = (de) => {
+            const S = de.clone().project(a.camera);
+            return {
+              x: (S.x * 0.5 + 0.5) * D,
+              y: (1 - (S.y * 0.5 + 0.5)) * le
+            };
+          }, U = _(y), X = _(n), Z = _(o.point), re = Math.sqrt(j(U.x - X.x, 2) + j(U.y - X.y, 2)), ae = Math.sqrt(j(U.x - Z.x, 2) + j(U.y - Z.y, 2));
+          (re < e.autoClosePixelDistance || ae < e.autoClosePixelDistance) && (f = !0);
+        }
+      } else
+        (y.distanceTo(n) < 0.2 || y.distanceTo(o.point) < 0.2) && (f = !0);
+      f ? (n = y, o.point.copy(y), t.pointSelectorHelper.updateWithIntersect(o, { emitEvent: !1 }), T = !0) : T = !1, p.setPoints([c, n]), m.setPoints([n, o.point]);
     }
-    o.length >= 2 ? (s.setPoints([...o, n], { closed: !1 }), s.line.setPoints(s.points.slice(0, -1)), s.isBlank ? (t.cursorError = !0, i.setStyle({ lineColor: 16734553 }), l.setStyle({ lineColor: 16734553 })) : (t.cursorError = !1, i.setStyle({ lineColor: s.lineColor }), l.setStyle({ lineColor: s.lineColor }))) : s.setPoints([]);
-  }, W = () => {
-    t.off("select", R), t.off("intersectionUpdate", w), t.off("disable", T), t.plane = null, t.disable(), r == null || r.remove(i, l);
-  }, T = () => {
-    W(), r == null || r.remove(s, l, i), m(new Error("Cancelled"));
+    i.length >= 2 ? (s.setPoints([...i, n], { closed: !1 }), s.line.setPoints(s.points.slice(0, -1)), s.isBlank ? (t.cursorError = !0, p.setStyle({ lineColor: 16734553 }), m.setStyle({ lineColor: 16734553 })) : (t.cursorError = !1, p.setStyle({ lineColor: s.lineColor }), m.setStyle({ lineColor: s.lineColor }))) : s.setPoints([]), E();
+  }, F = () => {
+    t.off("select", B), t.off("intersectionUpdate", W), t.off("disable", I), t.plane = null, t.disable(), r == null || r.remove(p, m), g();
+  }, I = () => {
+    F(), r == null || r.remove(s, m, p), g(), w(new Error("Cancelled"));
   };
-  return t.on("select", R), t.on("intersectionUpdate", w), t.on("disable", T), {
-    finished: c,
-    canUndo: x,
-    canRedo: M,
-    undo: k,
-    redo: B
+  return t.on("select", B), t.on("intersectionUpdate", W), t.on("disable", I), {
+    finished: l,
+    canUndo: k,
+    canRedo: q,
+    undo: ie,
+    redo: ne
   };
 }
 export {
-  ie as Polygon,
-  X as createPolygon
+  Ue as Polygon,
+  xe as createPolygon
 };

package/libs/Sculpt/index.js

@@ -70,7 +70,7 @@ const g = class extends x {
      */
     u(this, "undo", () => {
       var e;
-      console.log("undo"), (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
+      (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
     });
     /**
      * @description: 重做

package/libs/Sculpt/typings/style.d.ts

@@ -90,3 +90,14 @@ export type DisplayInfoConfig = {
     cssStyle?: string;
 };
 export type LineStyle = LineColorStyle & LineOpacityStyle & LineWidthStyle;
+export type PolygonDrawConfig = {
+    /**
+     * @description 简单模式：不吸附、不与模型发生关系，所有点高度取模型最高点
+     * @default false
+     */
+    simpleMode?: boolean;
+    /**
+     * @description 闭合吸附的屏幕像素距离，单位px，默认10
+     */
+    autoClosePixelDistance?: number;
+};

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let F = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.67.10");
+    i(this, "VERSION", "3.68.0");
     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.67.10",
+    "%c %c@realsee/dnalogel %cv3.68.0",
     [
       "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.67.10",
+  "version": "3.68.0",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.4.2",
+    "@realsee/five": "6.4.3",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",