@realsee/dnalogel 3.46.1 → 3.47.0

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

@@ -2,50 +2,50 @@ var F = Object.defineProperty, L = Object.defineProperties;
 var N = Object.getOwnPropertyDescriptors;
 var x = Object.getOwnPropertySymbols;
 var O = Object.prototype.hasOwnProperty, U = Object.prototype.propertyIsEnumerable;
-var u = (o, e, t) => e in o ? F(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, g = (o, e) => {
+var w = (o, e, t) => e in o ? F(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, u = (o, e) => {
   for (var t in e || (e = {}))
-    O.call(e, t) && u(o, t, e[t]);
+    O.call(e, t) && w(o, t, e[t]);
   if (x)
     for (var t of x(e))
-      U.call(e, t) && u(o, t, e[t]);
+      U.call(e, t) && w(o, t, e[t]);
   return o;
-}, j = (o, e) => L(o, N(e));
-var y = (o, e, t) => (u(o, typeof e != "symbol" ? e + "" : e, t), t);
-var T = (o, e, t) => new Promise((f, d) => {
+}, V = (o, e) => L(o, N(e));
+var y = (o, e, t) => (w(o, typeof e != "symbol" ? e + "" : e, t), t);
+var j = (o, e, t) => new Promise((c, d) => {
   var n = (l) => {
     try {
-      h(t.next(l));
+      r(t.next(l));
     } catch (s) {
       d(s);
     }
   }, p = (l) => {
     try {
-      h(t.throw(l));
+      r(t.throw(l));
     } catch (s) {
       d(s);
     }
-  }, h = (l) => l.done ? f(l.value) : Promise.resolve(l.value).then(n, p);
-  h((t = t.apply(o, e)).next());
+  }, r = (l) => l.done ? c(l.value) : Promise.resolve(l.value).then(n, p);
+  r((t = t.apply(o, e)).next());
 });
 import { hotkeys as k } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
 import { BaseObject as z } from "../Base/index.js";
 import * as P from "three";
-import { PolylineMesh as A } from "../../Meshes/Polyline.js";
-import { AreaMesh as V } from "../../Meshes/Area.js";
+import { PolylineMesh as T } from "../../Meshes/Polyline.js";
+import { AreaMesh as A } from "../../Meshes/Area.js";
 import { PolygonEditor as B } from "./Editor.js";
 import { vector3ToArray as H } from "../../../shared-utils/three/vector3ToArray.js";
 const D = new P.Vector3();
 class X extends z {
-  constructor(t, f) {
-    super(t, f);
+  constructor(t, c) {
+    super(t, c);
     y(this, "type", "Polygon");
     y(this, "areaMesh");
-    this.editor = new B(this), t && (this.areaMesh = new V(g(g({}, t.style), t)), this.add(this.areaMesh)), k("esc", () => {
+    this.editor = new B(this), t && (this.areaMesh = new A(u(u({}, t.style), t)), this.add(this.areaMesh)), k("esc", () => {
       this.stopCreating();
     });
   }
   get data() {
-    return j(g({}, this.baseData), {
+    return V(u({}, this.baseData), {
       points: H(this.applyObjectMatrixWorld(this.areaMesh.points)),
       style: {
         color: this.areaMesh.color.getHex(),
@@ -63,48 +63,54 @@ class X extends z {
     (t = this.areaMesh) == null || t.unhighlight();
   }
   create(t) {
-    return T(this, null, function* () {
+    return j(this, null, function* () {
       this.children.forEach((d) => {
         d.parent === this && this.remove(d);
       }), this.children.length = 0;
-      const f = new V(t);
-      this.areaMesh = f, this.add(this.areaMesh), yield I(this.areaMesh, this.pointSelector, t), this.editor.enable();
+      const c = new A(t);
+      this.areaMesh = c, this.add(this.areaMesh), yield I(this.areaMesh, this.pointSelector, t), this.editor.enable();
     });
   }
 }
 function I(o, e, t) {
-  return new Promise((f, d) => {
+  return new Promise((c, d) => {
     var M;
     const n = o.parent;
     if (!n) {
       d(new Error("No container"));
       return;
     }
-    const p = (M = t == null ? void 0 : t.limit) != null ? M : "none", h = new A({ dashed: !0, lineColor: o.lineColor, lineWidth: o.lineWidth });
-    n == null || n.add(h);
-    const l = new A({ dashed: !0, lineColor: o.lineColor, lineWidth: o.lineWidth });
+    const p = (M = t == null ? void 0 : t.limit) != null ? M : "none", r = new T({
+      dashed: !1,
+      lineColor: o.lineColor,
+      lineWidth: o.lineWidth,
+      occlusionMode: o.occlusionMode,
+      occlusionVisibility: o.occlusionVisibility
+    });
+    n == null || n.add(r);
+    const l = new T({ dashed: !0, lineColor: o.lineColor, lineWidth: o.lineWidth });
     n == null || n.add(l), e.enable();
     const s = [];
-    let i, a, w = !1;
-    const C = (r) => {
-      const c = s.length === 0 ? r.point : i.clone();
-      s.push(c), o.setPoints(s, { closed: !1 }), w && (b(), f());
-    }, v = (r) => {
-      if (!(s != null && s.length) || !r)
+    let i, a, g = !1;
+    const C = (h) => {
+      const f = s.length === 0 ? h.point : i.clone();
+      s.push(f), o.setPoints(s, { closed: !1 }), g && (v(), c());
+    }, b = (h) => {
+      if (!(s != null && s.length) || !h)
         return;
-      const c = s.at(-1).clone();
-      if (s.length < 3 && (p === "none" ? (i = r.point, h.setPoints([c, i])) : p === "xoz" ? (a = a != null ? a : new P.Plane().setFromNormalAndCoplanarPoint(new P.Vector3(0, 1, 0), s[0]), i = a.projectPoint(r.point, D), h.setPoints([c, i]), l.setPoints([i, r.point])) : p === "y" && (s.length === 1 ? (i = r.point, h.setPoints([c, i])) : (a = a != null ? a : new P.Plane().setFromCoplanarPoints(s[0], s[1], new P.Vector3(0, 1, 0).add(s[0])), i = a.projectPoint(r.point, D), h.setPoints([c, i]), l.setPoints([i, r.point])))), s.length >= 3) {
-        i = o.projectPoint(r.point);
+      const f = s.at(-1).clone();
+      if (s.length < 3 && (p === "none" ? (i = h.point, r.setPoints([f, i])) : p === "xoz" ? (a = a != null ? a : new P.Plane().setFromNormalAndCoplanarPoint(new P.Vector3(0, 1, 0), s[0]), e.plane = a, i = a.projectPoint(h.point, D), r.setPoints([f, i]), l.setPoints([i, h.point])) : p === "y" && (s.length === 1 ? (i = h.point, r.setPoints([f, i])) : (a = a != null ? a : new P.Plane().setFromCoplanarPoints(s[0], s[1], new P.Vector3(0, 1, 0).add(s[0])), e.plane = a, i = a.projectPoint(h.point, D), r.setPoints([f, i]), l.setPoints([i, h.point])))), s.length >= 3) {
+        i = o.projectPoint(h.point);
         const m = s[0], W = 0.2;
-        m.distanceTo(i) < W || m.distanceTo(r.point) < W ? (i = m, r.point.copy(m), e.pointSelectorHelper.updateWithIntersect(r, { emitEvent: !1 }), w = !0) : w = !1, h.setPoints([c, i]), l.setPoints([i, r.point]);
+        m.distanceTo(i) < W || m.distanceTo(h.point) < W ? (i = m, h.point.copy(m), e.pointSelectorHelper.updateWithIntersect(h, { emitEvent: !1 }), g = !0) : g = !1, r.setPoints([f, i]), l.setPoints([i, h.point]);
       }
       s.length >= 2 && o.setPoints([...s, i], { closed: !1 });
-    }, b = () => {
-      e.off("select", C), e.off("intersectionUpdate", v), e.off("disable", E), e.disable(), n == null || n.remove(h, l);
+    }, v = () => {
+      e.off("select", C), e.off("intersectionUpdate", b), e.off("disable", E), e.plane = null, e.disable(), n == null || n.remove(r, l);
     }, E = () => {
-      b(), n == null || n.remove(o, l, h), d(new Error("Cancelled"));
+      v(), n == null || n.remove(o, l, r), d(new Error("Cancelled"));
     };
-    e.on("select", C), e.on("intersectionUpdate", v), e.on("disable", E);
+    e.on("select", C), e.on("intersectionUpdate", b), e.on("disable", E);
   });
 }
 export {

package/libs/Sculpt/Objects/Polyline/Editor.js

@@ -4,13 +4,13 @@ var r = (o, i, t) => (p(o, typeof i != "symbol" ? i + "" : i, t), t);
 import { Sculpt as g } from "../../index.js";
 import { getIntersectByRaycaster as c } from "../../../shared-utils/five/getPosition.js";
 import { LineEditorAbstract as a } from "../Line/Editor.js";
-class d extends a {
+class y extends a {
   constructor(t) {
     super(t);
     r(this, "onDrag", (t) => {
       if (!this.draggingPoints || this.draggingPoints.length === 0)
         return;
-      const e = c(g.modules.five, t.raycaster, { virtualPoint: !0 });
+      const e = c(g.modules.five, t.raycaster);
       this.draggingPoints.forEach((s) => s.position.copy(e.point)), this.originObject.polyLineMesh.setPoints(this.pointMeshes.map((s) => s.position));
     });
   }
@@ -19,5 +19,5 @@ class d extends a {
   }
 }
 export {
-  d as PolylineEditor
+  y as PolylineEditor
 };

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

@@ -1,45 +1,45 @@
 var j = Object.defineProperty, E = Object.defineProperties;
 var V = Object.getOwnPropertyDescriptors;
-var v = Object.getOwnPropertySymbols;
+var C = Object.getOwnPropertySymbols;
 var A = Object.prototype.hasOwnProperty, D = Object.prototype.propertyIsEnumerable;
 var f = (i, t, e) => t in i ? j(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, w = (i, t) => {
   for (var e in t || (t = {}))
     A.call(t, e) && f(i, e, t[e]);
-  if (v)
-    for (var e of v(t))
+  if (C)
+    for (var e of C(t))
       D.call(t, e) && f(i, e, t[e]);
   return i;
 }, M = (i, t) => E(i, V(t));
 var u = (i, t, e) => (f(i, typeof t != "symbol" ? t + "" : t, e), e);
-var L = (i, t, e) => new Promise((o, d) => {
-  var a = (r) => {
+var L = (i, t, e) => new Promise((n, d) => {
+  var a = (h) => {
     try {
-      c(e.next(r));
-    } catch (y) {
-      d(y);
+      P(e.next(h));
+    } catch (m) {
+      d(m);
     }
-  }, p = (r) => {
+  }, p = (h) => {
     try {
-      c(e.throw(r));
-    } catch (y) {
-      d(y);
+      P(e.throw(h));
+    } catch (m) {
+      d(m);
     }
-  }, c = (r) => r.done ? o(r.value) : Promise.resolve(r.value).then(a, p);
-  c((e = e.apply(i, t)).next());
+  }, P = (h) => h.done ? n(h.value) : Promise.resolve(h.value).then(a, p);
+  P((e = e.apply(i, t)).next());
 });
 import { hotkeys as F } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { PolylineWithDotsMesh as W, PolylineMesh as b } from "../../Meshes/Polyline.js";
+import { PolylineWithDotsMesh as b, PolylineMesh as W } from "../../Meshes/Polyline.js";
 import { BaseObject as O } from "../Base/index.js";
-import * as m from "three";
+import * as c from "three";
 import { PolylineEditor as T } from "./Editor.js";
 import { vector3ToArray as U } from "../../../shared-utils/three/vector3ToArray.js";
-const x = new m.Vector3();
+const x = new c.Vector3();
 class G extends O {
-  constructor(e, o) {
-    super(e, o);
+  constructor(e, n) {
+    super(e, n);
     u(this, "type", "Polyline");
     u(this, "polyLineMesh");
-    e && (this.polyLineMesh = new W(w(w({}, e.style), e)), this.add(this.polyLineMesh)), this.editor = new T(this), F("esc", () => {
+    e && (this.polyLineMesh = new b(w(w({}, e.style), e)), this.add(this.polyLineMesh)), this.editor = new T(this), F("esc", () => {
       this.stopCreating();
     });
   }
@@ -47,7 +47,7 @@ class G extends O {
     return M(w({}, this.baseData), {
       points: U(this.applyObjectMatrixWorld(this.polyLineMesh.points)),
       style: {
-        lineColor: new m.Color(this.polyLineMesh.lineColor).getHex(),
+        lineColor: new c.Color(this.polyLineMesh.lineColor).getHex(),
         lineWidth: this.polyLineMesh.lineWidth,
         dashed: this.polyLineMesh.dashed
       }
@@ -64,35 +64,35 @@ class G extends O {
   create(e) {
     return L(this, null, function* () {
       this.removeChildren();
-      const o = new W(e);
-      this.polyLineMesh = o, this.add(this.polyLineMesh), yield k(o, this.pointSelector, e), this.editor.enable();
+      const n = new b(e);
+      this.polyLineMesh = n, this.add(this.polyLineMesh), yield k(n, this.pointSelector, e), this.editor.enable();
     });
   }
 }
 function k(i, t, e) {
-  var c;
-  const o = i.parent;
-  if (!o)
+  var P;
+  const n = i.parent;
+  if (!n)
     return;
-  const d = (c = e == null ? void 0 : e.limit) != null ? c : "none", a = new b({ dashed: !0, lineColor: i.lineColor, lineWidth: i.lineWidth });
-  o.add(a);
-  const p = new b({ dashed: !0, lineColor: i.lineColor, lineWidth: i.lineWidth });
-  return o.add(p), t.enable(), new Promise((r, y) => {
-    const n = [];
-    let s, l;
-    const C = (h) => {
-      const P = n.length === 0 ? h.point : s.clone();
-      n.push(P), i.setPoints(n);
-    }, g = (h) => {
-      if (!(n != null && n.length) || !h)
+  const d = (P = e == null ? void 0 : e.limit) != null ? P : "none", a = new W(i.style);
+  n.add(a);
+  const p = new W({ dashed: !0, lineColor: i.lineColor, lineWidth: i.lineWidth });
+  return n.add(p), t.enable(), new Promise((h, m) => {
+    const o = [];
+    let l, s;
+    const g = (r) => {
+      const y = o.length === 0 ? r.point : l.clone();
+      o.push(y), i.setPoints(o);
+    }, v = (r) => {
+      if (!(o != null && o.length) || !r)
         return;
-      const P = n.at(-1).clone();
-      d === "none" ? (s = h.point, a.setPoints([P, s])) : d === "xoz" ? (l = l != null ? l : new m.Plane().setFromNormalAndCoplanarPoint(new m.Vector3(0, 1, 0), n[0]), s = l.projectPoint(h.point, x), a.setPoints([P, s]), p.setPoints([s, h.point])) : d === "y" && (n.length === 1 ? (s = h.point, a.setPoints([P, s])) : (l = l != null ? l : new m.Plane().setFromCoplanarPoints(n[0], n[1], new m.Vector3(0, 1, 0).add(n[0])), s = l.projectPoint(h.point, x), a.setPoints([P, s]), p.setPoints([s, h.point])));
+      const y = o.at(-1).clone();
+      d === "none" ? (l = r.point, a.setPoints([y, l])) : d === "xoz" ? (s = s != null ? s : new c.Plane().setFromNormalAndCoplanarPoint(new c.Vector3(0, 1, 0), o[0]), t.plane = s, l = s.projectPoint(r.point, x), a.setPoints([y, l]), p.setPoints([l, r.point])) : d === "y" && (o.length === 1 ? (l = r.point, a.setPoints([y, l])) : (s = s != null ? s : new c.Plane().setFromCoplanarPoints(o[0], o[1], new c.Vector3(0, 1, 0).add(o[0])), t.plane = s, l = s.projectPoint(r.point, x), a.setPoints([y, l]), p.setPoints([l, r.point])));
     };
-    t.on("select", C), t.on("intersectionUpdate", g), t.on("disable", () => {
-      if (t.off("select", C), t.off("intersectionUpdate", g), o.remove(a), o.remove(p), n.length < 2)
-        return o.remove(i), y(new Error("Cancelled"));
-      r();
+    t.on("select", g), t.on("intersectionUpdate", v), t.on("disable", () => {
+      if (t.off("select", g), t.off("intersectionUpdate", v), t.plane = null, n.remove(a), n.remove(p), o.length < 2)
+        return n.remove(i), m(new Error("Cancelled"));
+      h();
     });
   });
 }

package/libs/Sculpt/utils/three/ColoredMesh.d.ts

@@ -6,6 +6,12 @@ export default class ColoredMesh<TGeometry extends THREE.Geometry | THREE.Buffer
     name: string;
     meshFont: THREE.Mesh<TGeometry, THREE.MeshBasicMaterial>;
     meshBackground: THREE.Mesh<TGeometry, THREE.MeshBasicMaterial>;
+    get style(): {
+        color: THREE.Color;
+        opacity: number;
+        occlusionVisibility: boolean;
+        occlusionMode: string;
+    };
     get color(): THREE.Color;
     get opacity(): number;
     get occlusionVisibility(): boolean;

package/libs/Sculpt/utils/three/ColoredMesh.js

@@ -1,17 +1,17 @@
 var g = Object.defineProperty;
 var a = Object.getOwnPropertySymbols;
-var f = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
-var d = (i, t, e) => t in i ? g(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, u = (i, t) => {
-  for (var e in t || (t = {}))
-    f.call(t, e) && d(i, e, t[e]);
+var f = Object.prototype.hasOwnProperty, M = Object.prototype.propertyIsEnumerable;
+var u = (i, e, t) => e in i ? g(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, d = (i, e) => {
+  for (var t in e || (e = {}))
+    f.call(e, t) && u(i, t, e[t]);
   if (a)
-    for (var e of a(t))
-      F.call(t, e) && d(i, e, t[e]);
+    for (var t of a(e))
+      M.call(e, t) && u(i, t, e[t]);
   return i;
 };
-var r = (i, t, e) => (d(i, typeof t != "symbol" ? t + "" : t, e), e);
+var n = (i, e, t) => (u(i, typeof e != "symbol" ? e + "" : e, t), t);
 import * as s from "three";
-import { DEFAULT_COLOR as M } from "../../typings/style.js";
+import { DEFAULT_COLOR as F } from "../../typings/style.js";
 import { IObject3D as B } from "../../../shared-utils/three/IObject3D.js";
 import "hammerjs";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -19,33 +19,41 @@ import "@realsee/five/line";
 import "../Modules/Global.js";
 import "../../../shared-utils/three/THREESphere.js";
 import "animejs";
-import { notNil as m } from "../../../shared-utils/isNil.js";
+import { notNil as y } from "../../../shared-utils/isNil.js";
 import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 class _ extends B {
-  constructor(e) {
-    var h, y;
+  constructor(t) {
+    var h, m;
     super();
-    r(this, "name", "ColoredMesh");
-    r(this, "meshFont");
-    r(this, "meshBackground");
-    r(this, "paramsStyle", {});
-    r(this, "_geometry", new s.BufferGeometry());
-    this.paramsStyle = e != null ? e : {};
-    const c = new s.MeshBasicMaterial({
-      color: (h = e == null ? void 0 : e.color) != null ? h : M,
+    n(this, "name", "ColoredMesh");
+    n(this, "meshFont");
+    n(this, "meshBackground");
+    n(this, "paramsStyle", {});
+    n(this, "_geometry", new s.BufferGeometry());
+    this.paramsStyle = t != null ? t : {};
+    const r = new s.MeshBasicMaterial({
+      color: (h = t == null ? void 0 : t.color) != null ? h : F,
       transparent: !0,
       side: s.DoubleSide,
       depthTest: !0,
-      opacity: (y = e == null ? void 0 : e.opacity) != null ? y : 0.5
+      opacity: (m = t == null ? void 0 : t.opacity) != null ? m : 0.5
     }), l = new s.MeshBasicMaterial({
       color: 16777215,
       transparent: !0,
       side: s.DoubleSide,
       depthTest: !1,
       depthWrite: !1,
-      opacity: 0.3 / 0.5 * c.opacity
-    }), o = new s.Mesh(this.geometry, c), n = new s.Mesh(this.geometry, l);
-    o.name = "MeshFront", n.name = "MeshBackground", o.renderOrder = 1, n.renderOrder = 0, this.meshFont = o, this.meshBackground = n, this.add(o), this.setOcclusionVisibility({ occlusionVisibility: e == null ? void 0 : e.occlusionVisibility, occlusionMode: e == null ? void 0 : e.occlusionMode });
+      opacity: 0.3 / 0.5 * r.opacity
+    }), o = new s.Mesh(this.geometry, r), c = new s.Mesh(this.geometry, l);
+    o.name = "MeshFront", c.name = "MeshBackground", o.renderOrder = 1, c.renderOrder = 0, this.meshFont = o, this.meshBackground = c, this.add(o), this.setOcclusionVisibility({ occlusionVisibility: t == null ? void 0 : t.occlusionVisibility, occlusionMode: t == null ? void 0 : t.occlusionMode });
+  }
+  get style() {
+    return {
+      color: this.color,
+      opacity: this.opacity,
+      occlusionVisibility: this.occlusionVisibility,
+      occlusionMode: this.occlusionMode
+    };
   }
   get color() {
     return this.meshFont.material.color;
@@ -59,19 +67,19 @@ class _ extends B {
   get occlusionMode() {
     return this.meshFont.material.depthTest === !1 ? "depthTest" : "translucence";
   }
-  set geometry(e) {
-    this._geometry = e, this.meshFont.geometry = e, this.meshBackground.geometry = e;
+  set geometry(t) {
+    this._geometry = t, this.meshFont.geometry = t, this.meshBackground.geometry = t;
   }
   get geometry() {
     return this._geometry;
   }
-  setStyle(e) {
-    this.paramsStyle = u(u({}, this.paramsStyle), e), m(e.color) && (this.meshFont.material.color.set(e.color), this.needsRender = !0), m(e.opacity) && (this.meshFont.material.opacity = e.opacity, this.meshBackground.material.opacity = 0.3 / 0.5 * e.opacity, this.needsRender = !0), this.setOcclusionVisibility(e);
+  setStyle(t) {
+    this.paramsStyle = d(d({}, this.paramsStyle), t), y(t.color) && (this.meshFont.material.color.set(t.color), this.needsRender = !0), y(t.opacity) && (this.meshFont.material.opacity = t.opacity, this.meshBackground.material.opacity = 0.3 / 0.5 * t.opacity, this.needsRender = !0), this.setOcclusionVisibility(t);
   }
-  setOcclusionVisibility(e) {
-    var o, n, h;
-    const c = (n = (o = e.occlusionMode) != null ? o : this.paramsStyle.occlusionMode) != null ? n : "translucence", l = (h = e.occlusionVisibility) != null ? h : this.paramsStyle.occlusionVisibility;
-    m(l) && (l ? c === "depthTest" ? (this.meshFont.material.depthTest = !1, this.remove(this.meshBackground)) : c === "translucence" && (this.meshFont.material.depthTest = !0, this.addIfNotExists(this.meshBackground)) : (this.meshFont.material.depthTest = !0, this.remove(this.meshBackground)));
+  setOcclusionVisibility(t) {
+    var o, c, h;
+    const r = (c = (o = t.occlusionMode) != null ? o : this.paramsStyle.occlusionMode) != null ? c : "translucence", l = (h = t.occlusionVisibility) != null ? h : this.paramsStyle.occlusionVisibility;
+    y(l) && (l ? r === "depthTest" ? (this.meshFont.material.depthTest = !1, this.remove(this.meshBackground)) : r === "translucence" && (this.meshFont.material.depthTest = !0, this.addIfNotExists(this.meshBackground)) : (this.meshFont.material.depthTest = !0, this.remove(this.meshBackground)));
   }
 }
 export {

package/libs/base/BasePlugin.js

@@ -17,7 +17,7 @@ let x = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.46.1");
+    i(this, "VERSION", "3.47.0");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/five/getPosition.d.ts

@@ -19,4 +19,6 @@ export declare function getIntersectByNdcPosition(five: Five, position: {
 export declare function getIntersectByRaycaster(five: Five, raycaster: THREE.Raycaster, config?: {
     virtualPoint?: boolean;
 }): IIntersection | undefined;
+export declare function getVirtualIntersectByRaycaster(raycaster: THREE.Raycaster, distance?: number): IIntersection;
+export declare function getRealIntersectByRaycaster(five: Five, raycaster: THREE.Raycaster): IIntersection;
 export {};

package/libs/shared-utils/five/getPosition.js

@@ -1,46 +1,41 @@
-var u = Object.defineProperty, d = Object.defineProperties;
-var m = Object.getOwnPropertyDescriptors;
+var u = Object.defineProperty, m = Object.defineProperties;
+var d = Object.getOwnPropertyDescriptors;
 var c = Object.getOwnPropertySymbols;
-var y = Object.prototype.hasOwnProperty, p = Object.prototype.propertyIsEnumerable;
-var s = (t, e, n) => e in t ? u(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, a = (t, e) => {
-  for (var n in e || (e = {}))
-    y.call(e, n) && s(t, n, e[n]);
+var p = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
+var s = (e, t, n) => t in e ? u(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, l = (e, t) => {
+  for (var n in t || (t = {}))
+    p.call(t, n) && s(e, n, t[n]);
   if (c)
-    for (var n of c(e))
-      p.call(e, n) && s(t, n, e[n]);
-  return t;
-}, l = (t, e) => d(t, m(e));
+    for (var n of c(t))
+      y.call(t, n) && s(e, n, t[n]);
+  return e;
+}, a = (e, t) => m(e, d(t));
 import * as i from "three";
-import { getRaycasterByNdcPosition as R } from "./getRaycasterByNdcPosition.js";
-import { getFiveModel as f } from "./getFiveModel.js";
-function P(t, e, n) {
-  const r = R(t, e);
-  return B(t, r, n);
+import { getFiveModel as R } from "./getFiveModel.js";
+function w(e, t, n) {
+  const r = V(e, t);
+  return n != null && n.virtualPoint ? r != null ? r : f(t) : r;
 }
-function B(t, e, n) {
-  const r = V(t, e);
-  return n != null && n.virtualPoint ? r != null ? r : I(e) : r;
-}
-function I(t) {
+function f(e, t = 3) {
   const n = new i.Vector3().addVectors(
-    t.ray.origin,
-    t.ray.direction.clone().normalize().multiplyScalar(3)
-  ), r = t.ray.direction.clone().negate();
+    e.ray.origin,
+    e.ray.direction.clone().normalize().multiplyScalar(t)
+  ), r = e.ray.direction.clone().negate();
   return {
-    distance: 3,
+    distance: t,
     point: n,
     object: new i.Object3D(),
     face: new i.Face3(0, 0, 0, r),
-    raycaster: t,
+    raycaster: e,
     isVirtual: !0
   };
 }
-function V(t, e) {
-  const o = f(t).intersectRaycaster(e)[0];
+function V(e, t) {
+  const o = R(e).intersectRaycaster(t)[0];
   if (o)
-    return l(a({}, o), { raycaster: e, isVirtual: !1 });
+    return a(l({}, o), { raycaster: t, isVirtual: !1 });
 }
 export {
-  P as getIntersectByNdcPosition,
-  B as getIntersectByRaycaster
+  w as getIntersectByRaycaster,
+  f as getVirtualIntersectByRaycaster
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.46.1",
+    "%c %c@realsee/dnalogel %cv3.47.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/libs/shared-utils/three/PointSelector/index.d.ts

@@ -1,8 +1,10 @@
-import type { Five, Mode as FiveMode } from '@realsee/five';
+import type { Five } from '@realsee/five';
 import { PointSelectorHelper, type PointIntersection, type PointSelectorHelperConfig } from './utils/PointSelectorHelper';
-import type { Vector3 } from 'three';
+import { type Vector3 } from 'three';
+import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
 export type { PointIntersection };
+type ActionIfNoModelUnderMouse = 'virtualPoint' | 'lastPoint' | 'disable';
 interface Config {
     /**
      * @description: 选点的两种模式, 'fixed' 为固定选点为屏幕中心点，拖动five画布来更新点，'cursor' 为跟随鼠标移动来更新点, 'auto' 则根据设备类型自动选择
@@ -10,15 +12,15 @@ interface Config {
      */
     mode: 'fixed' | 'cursor' | 'auto';
     /**
-     * @description 当鼠标位置没有模型时，是否生成一个虚拟点
+     * @description 当鼠标位置没有模型时的行为
      * ```markdown
-     * true: 生成虚拟点
-     * false: 不生成虚拟点
-     * FiveMode[]: 指定的five mode下才生成虚拟点，推荐 ['Panorama']
+     * virtualPoint: 生成一个虚拟点
+     * lastPoint: 选点器停留在上一个点处
+     * disable: 禁止选点
      * ```
-     * @default: true
+     * @default 'virtualPoint'
      */
-    virtualPoint: boolean | FiveMode[];
+    actionIfNoModelUnderMouse: ActionIfNoModelUnderMouse;
     helper: PointSelectorHelperConfig;
 }
 export type PointSelectorConfig = Partial<Config>;
@@ -55,6 +57,8 @@ export declare class PointSelector extends Subscribe<EventMap> {
      */
     outOfFive: boolean;
     enabled: boolean;
+    actionIfNoModelUnderMouse: ActionIfNoModelUnderMouse;
+    plane?: THREE.Plane | null;
     pointSelectorHelper: PointSelectorHelper;
     /** @deprecated directly use `pointSelector.on/off` instead */
     hook: this;
@@ -68,10 +72,10 @@ export declare class PointSelector extends Subscribe<EventMap> {
     /** 吸附点的半径 */
     private adherePointsRadius;
     private lastFiveHelperVisible?;
+    private lastIntersection?;
     private mousePosition;
     private config;
     private get mouseNdcPosition();
-    private get virtualPoint();
     constructor(five: Five, config?: PointSelectorConfig);
     enable(): void;
     disable(): void;
@@ -109,7 +113,7 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private onPanEnd;
     private updateByMousePosition;
     /**
-     * @description: 根据鼠标位置更新helper位置
+     * @description: 根据鼠标位置计算焦点位置并更新
      */
     private updateByNdcPosition;
     /**