@realsee/dnalogel 3.61.6 → 3.61.7-alpha.1

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

@@ -1,56 +1,59 @@
-var I = Object.defineProperty, k = Object.defineProperties;
-var q = Object.getOwnPropertyDescriptors;
+var q = Object.defineProperty, G = Object.defineProperties;
+var J = Object.getOwnPropertyDescriptors;
 var W = Object.getOwnPropertySymbols;
-var G = Object.prototype.hasOwnProperty, J = Object.prototype.propertyIsEnumerable;
-var A = (o, n, e) => n in o ? I(o, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[n] = e, p = (o, n) => {
-  for (var e in n || (n = {}))
-    G.call(n, e) && A(o, e, n[e]);
+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) => {
+  for (var n in e || (e = {}))
+    K.call(e, n) && O(s, n, e[n]);
   if (W)
-    for (var e of W(n))
-      J.call(n, e) && A(o, e, n[e]);
-  return o;
-}, w = (o, n) => k(o, q(n));
-var O = (o, n, e) => (A(o, typeof n != "symbol" ? n + "" : n, e), e);
-var _ = (o, n, e) => new Promise((m, f) => {
-  var y = (c) => {
+    for (var n of W(e))
+      Q.call(e, n) && O(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) => {
     try {
-      i(e.next(c));
-    } catch (h) {
-      f(h);
+      a(n.next(c));
+    } catch (m) {
+      f(m);
     }
   }, l = (c) => {
     try {
-      i(e.throw(c));
-    } catch (h) {
-      f(h);
+      a(n.throw(c));
+    } catch (m) {
+      f(m);
     }
-  }, i = (c) => c.done ? m(c.value) : Promise.resolve(c.value).then(y, l);
-  i((e = e.apply(o, n)).next());
+  }, a = (c) => c.done ? i(c.value) : Promise.resolve(c.value).then(P, l);
+  a((n = n.apply(s, e)).next());
 });
-import { BaseObject as K } from "../Base/index.js";
-import * as s from "three";
-import { PolylineWithDotsMesh as b } from "../../Meshes/Polyline.js";
-import { RectangleMeshEditor as Q } from "../../Editors/RectangleMeshEditor.js";
-import { RectangleWithEdgeMesh as j } from "../../Meshes/RectangleWithEdge.js";
-import { sortPositionsByCameraPosition as D } from "../../utils/sortPositionsByCameraPosition.js";
-import { Sculpt as F } from "../../index.js";
-import { vector3ToArray as X } from "../../../shared-utils/three/vector3ToArray.js";
-import { anyPositionToVector3 as Y } from "../../../shared-utils/positionToVector3.js";
-import { withResolvers as B } from "../../../shared-utils/promise/withResolvers.js";
-class he extends K {
-  constructor(e, m) {
-    super(e, m);
-    O(this, "type", "Rectangle");
-    O(this, "rectangleMesh");
-    O(this, "_editor");
-    e && (this.rectangleMesh = new j(p(p({}, e.style), e)), this.add(this.rectangleMesh));
+import { BaseObject as X } from "../Base/index.js";
+import * as o 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";
+import { RectangleWithEdgeMesh as B } from "../../Meshes/RectangleWithEdge.js";
+import { sortPositionsByCameraPosition as H } from "../../utils/sortPositionsByCameraPosition.js";
+import { Sculpt as I } from "../../index.js";
+import { vector3ToArray as $ } from "../../../shared-utils/three/vector3ToArray.js";
+import { anyPositionToVector3 as j } from "../../../shared-utils/positionToVector3.js";
+import { withResolvers as U } from "../../../shared-utils/promise/withResolvers.js";
+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);
+    N(this, "type", "Rectangle");
+    N(this, "rectangleMesh");
+    N(this, "_editor");
+    n && (this.rectangleMesh = new B(p(p({}, n.style), n)), this.add(this.rectangleMesh));
   }
   get editor() {
-    return this._editor || (this._editor = new Q(this.rectangleMesh)), this._editor;
+    return this._editor || (this._editor = new Y(this.rectangleMesh)), this._editor;
   }
   get data() {
-    return w(p({}, this.baseData), {
-      points: X(this.applyObjectMatrixWorld(this.rectangleMesh.points, this.rectangleMesh)),
+    return u(p({}, this.baseData), {
+      points: $(this.applyObjectMatrixWorld(this.rectangleMesh.points, this.rectangleMesh)),
       style: {
         color: this.rectangleMesh.color.getHex(),
         opacity: this.rectangleMesh.opacity,
@@ -59,126 +62,135 @@ class he extends K {
       }
     });
   }
-  setData(e) {
-    e.points && this.rectangleMesh.setPoints(this.applyObjectReversalMatrixWorld(e.points.map(Y), this.rectangleMesh)), this.rectangleMesh.setStyle(e.style), this._editor && this._editor.initialHelperMatrix();
+  setData(n) {
+    n.points && this.rectangleMesh.setPoints(this.applyObjectReversalMatrixWorld(n.points.map(j), this.rectangleMesh)), this.rectangleMesh.setStyle(n.style), this._editor && this._editor.initialHelperMatrix();
   }
   highlight() {
-    var e;
-    (e = this.rectangleMesh) == null || e.highlight();
+    var n;
+    (n = this.rectangleMesh) == null || n.highlight();
   }
   unhighlight() {
-    var e;
-    (e = this.rectangleMesh) == null || e.unhighlight();
+    var n;
+    (n = this.rectangleMesh) == null || n.unhighlight();
   }
-  create(e) {
-    return _(this, null, function* () {
+  create(n) {
+    return D(this, null, function* () {
       this.removeChildren();
-      const m = new j(e);
-      this.rectangleMesh = m, this.add(this.rectangleMesh), yield Z(this.rectangleMesh, this.pointSelector, e), this.config.defaultAction && this.editor.enable();
+      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();
     });
   }
 }
-function Z(o, n, e) {
+function te(s, e, n) {
   var f;
-  return ((f = e == null ? void 0 : e.drawMethod) != null ? f : "diagonal") === "diagonal" ? $(o, n, e) : S(o, n, e);
+  return ((f = n == null ? void 0 : n.drawMethod) != null ? f : "diagonal") === "diagonal" ? se(s, e, n) : oe(s, e, n);
 }
-function $(o, n, e) {
+function ne(s, e) {
+  const n = [];
+  return s.scene.traverse((i) => {
+    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;
+      });
+      n.push(...P);
+    }
+  }), n;
+}
+function se(s, e, n) {
   var C;
-  const { promise: m, reject: f, resolve: y } = B(), l = o.parent;
+  const { promise: i, reject: f, resolve: P } = U(), l = s.parent;
   if (!l)
     return f(new Error("No container"));
-  const i = (C = e == null ? void 0 : e.limit) != null ? C : "none", c = new b(w(p({}, o.style), { dashed: !0 })), h = new b(w(p({}, o.style), { dashed: !0, lengthEnable: !1 })), P = new b(w(p({}, o.style), { dashed: !1, lengthEnable: !1 }));
-  l.add(c, P, h), n.enable();
+  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 }));
+  l.add(c, g, m), e.enable();
   const t = [];
-  let a = new s.Vector3(), L = new s.Vector3();
-  const d = new s.Plane(), M = () => {
-    t.push(a.clone()), t.length === 1 ? (i === "xoz" && d.setFromNormalAndCoplanarPoint(new s.Vector3(0, 1, 0), t[0]), i === "none" && d.setFromNormalAndCoplanarPoint(L, t[0])) : t.length === 2 ? i === "y" || i === "xoz" ? (V(), y()) : P.setPoints([t[0], t[1]]) : t.length === 3 && (V(), y());
-  }, E = (r) => {
-    var N, z;
+  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) => {
+    var A, R;
     if (!(r != null && r.raycaster))
       return;
-    const R = (N = t.at(-1)) == null ? void 0 : N.clone();
+    const T = (A = t.at(-1)) == null ? void 0 : A.clone();
     if (t.length === 0) {
-      a = r.point.clone(), L = (z = r.face) == null ? void 0 : z.normal;
+      d = r.point.clone(), M = (R = r.face) == null ? void 0 : R.normal;
       return;
     }
-    if (t.length === 1 && i === "y") {
-      const u = new s.Line3(new s.Vector3(0, 1, 0).add(t[0]), new s.Vector3(0, -1, 0).add(t[0])).closestPointToPoint(r.point, !1, new s.Vector3());
-      o.setPoints([t[0], u, r.point]);
+    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]);
       return;
     }
-    if (t.length === 1 && i === "xoz") {
-      const g = new s.Line3(new s.Vector3(1, 0, 0).add(t[0]), new s.Vector3(-1, 0, 0).add(t[0])), u = r.raycaster.ray.intersectPlane(d, new s.Vector3()), v = g.closestPointToPoint(u, !1, new s.Vector3());
-      o.setPoints([t[0], v, u]);
+    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());
+      s.setPoints([t[0], V, w]);
       return;
     }
-    if (t.length === 1 && i === "none") {
-      d ? (a = r.raycaster.ray.intersectPlane(d, new s.Vector3()), h.setPoints([a, r.point])) : a = r.point.clone(), c.setPoints([R, a]);
+    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]);
       return;
     }
-    if (t.length === 2 && i === "none") {
+    if (t.length === 2 && a === "none") {
       l.remove(c);
-      const g = r.raycaster.ray.intersectPlane(d, new s.Vector3()), u = t[0].distanceTo(t[1]) / 2, v = new s.Vector3().lerpVectors(t[0], t[1], 0.5), T = new s.Vector3().subVectors(g, v).normalize();
-      a = new s.Vector3().addVectors(v, T.multiplyScalar(u));
-      const H = [t[0], a, t[1]], U = D(H, F.modules.five.camera.position);
-      o.setPoints(U);
+      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);
       return;
     }
-  }, V = () => {
-    n.off("select", M), n.off("intersectionUpdate", E), n.off("disable", x), n.disable(), l == null || l.remove(c, P, h);
-  }, x = () => {
-    V(), l == null || l.remove(o), f(new Error("Cancelled"));
+  }, v = () => {
+    e.off("select", b), e.off("intersectionUpdate", x), e.off("disable", E), e.disable(), l == null || l.remove(c, g, m);
+  }, E = () => {
+    v(), l == null || l.remove(s), f(new Error("Cancelled"));
   };
-  return n.on("select", M), n.on("intersectionUpdate", E), n.on("disable", x), m;
+  return e.on("select", b), e.on("intersectionUpdate", x), e.on("disable", E), i;
 }
-function S(o, n, e) {
+function oe(s, e, n) {
   var C;
-  const { promise: m, reject: f, resolve: y } = B(), l = o.parent;
+  const { promise: i, reject: f, resolve: P } = U(), l = s.parent;
   if (!l)
     return f(new Error("No container"));
-  const i = (C = e == null ? void 0 : e.limit) != null ? C : "none", c = new b(w(p({}, o.style), { dashed: !0 })), h = new b(w(p({}, o.style), { dashed: !0, lengthEnable: !1 })), P = new b(w(p({}, o.style), { dashed: !1, lengthEnable: !1 }));
-  l.add(c, P, h), n.enable();
+  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 }));
+  l.add(c, g, m), e.enable(), e.setAdherePoints(ne(e.five, { excludes: [s] }));
   const t = [];
-  let a = new s.Vector3(), L = new s.Vector3();
-  const d = new s.Plane(), M = () => {
-    t.push(a.clone()), t.length === 1 ? (i === "xoz" && d.setFromNormalAndCoplanarPoint(new s.Vector3(0, 1, 0), t[0]), i === "none" && d.setFromNormalAndCoplanarPoint(L, t[0])) : t.length === 2 ? (i === "y" && d.setFromCoplanarPoints(t[0], t[1], new s.Vector3(0, 1, 0).add(t[0])), P.setPoints([t[0], t[1]])) : t.length === 3 && (V(), y());
-  }, E = (r) => {
-    var N, z;
-    if (!(r != null && r.raycaster))
+  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" && 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) => {
+    var A, R, y, w;
+    if (!r || !(r != null && r.raycaster))
       return;
-    const R = (N = t.at(-1)) == null ? void 0 : N.clone();
+    const T = (A = t.at(-1)) == null ? void 0 : A.clone();
     if (t.length === 0) {
-      a = r.point.clone(), L = (z = r.face) == null ? void 0 : z.normal;
-      return;
-    }
-    if (t.length === 1 && i === "y") {
-      a = r.point, h.setPoints([]), c.setPoints([R, a]);
+      d = r.point.clone(), M = (R = r.face) == null ? void 0 : R.normal;
       return;
     }
-    if (t.length === 1 && i === "xoz") {
-      a = r.raycaster.ray.intersectPlane(d, new s.Vector3()), h.setPoints([a, r.point]), c.setPoints([R, a]);
-      return;
-    }
-    if (t.length === 1 && i === "none") {
-      a = r.raycaster.ray.intersectPlane(d, new s.Vector3()), h.setPoints([a, r.point]), c.setPoints([R, a]);
+    if (t.length === 1) {
+      d = r.point, m.setPoints([(y = r.originalPoint) != null ? y : r.point, r.point]), c.setPoints([T, d]);
       return;
     }
     if (t.length === 2) {
-      l.remove(c);
-      const g = new s.Vector3().crossVectors(t[0].clone().sub(t[1]), d.normal).normalize();
-      a = new s.Line3(t[1].clone().add(g), t[1].clone().sub(g)).closestPointToPoint(r.point, !1, new s.Vector3());
-      const v = [t[0], t[1], a], T = D(v, F.modules.five.camera.position);
-      o.setPoints(T);
+      if (!e.plane) {
+        const k = ee([t[0], t[1], r.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);
       return;
     }
-  }, V = () => {
-    n.off("select", M), n.off("intersectionUpdate", E), n.off("disable", x), n.disable(), l == null || l.remove(c, P, h);
-  }, x = () => {
-    V(), l == null || l.remove(o), f(new Error("Cancelled"));
+  }, v = () => {
+    e.setAdherePoints([]), e.adhereLine = [], e.adherePlane = [], e.plane = void 0, e.off("select", b), e.off("intersectionUpdate", x), e.off("disable", E), e.disable(), l == null || l.remove(c, g, m);
+  }, E = () => {
+    v(), l == null || l.remove(s), f(new Error("Cancelled"));
   };
-  return n.on("select", M), n.on("intersectionUpdate", E), n.on("disable", x), m;
+  return e.on("select", b), e.on("intersectionUpdate", x), e.on("disable", E), i;
 }
 export {
-  he as Rectangle,
-  Z as createRectangle
+  ge as Rectangle,
+  te as createRectangle
 };

package/libs/base/BasePlugin.js

@@ -11,8 +11,8 @@ import "@realsee/five/line";
 import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../vendor/animejs/lib/anime.es.js";
-import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
-import { absoluteUrl as a } from "../shared-utils/url/absoluteUrl.js";
+import { FiveUtil as a } from "../shared-utils/Utils/FiveUtil.js";
+import { absoluteUrl as m } from "../shared-utils/url/absoluteUrl.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
 let S = class {
@@ -20,7 +20,7 @@ let S = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.61.6");
+    i(this, "VERSION", "3.61.7-alpha.1");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");
@@ -30,7 +30,7 @@ let S = class {
      */
     i(this, "hooks", new l());
     i(this, "staticPrefix", "//vr-image-4.realsee-cdn.cn");
-    this.five = t, this.fiveUtil = new m(t), this.workUtil = this.fiveUtil.workUtil, r != null && r.staticPrefix && (this.staticPrefix = r.staticPrefix);
+    this.five = t, this.fiveUtil = new a(t), this.workUtil = this.fiveUtil.workUtil, r != null && r.staticPrefix && (this.staticPrefix = r.staticPrefix);
   }
   set workCode(t) {
     this.workUtil.workCode = t, this.onWorkCodeChange();
@@ -51,7 +51,7 @@ let S = class {
    * @description: 获取静态资源的url
    */
   absoluteUrl(t) {
-    return a(this.staticPrefix, t);
+    return m(this.staticPrefix, t);
   }
   onWorkCodeChange() {
   }

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -128,6 +128,7 @@ import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
+import "../../Sculpt/utils/three/rayOnLine.js";
 import "@realsee/five";
 function W(d) {
   const { latitude: n, longitude: t } = d, e = Math.abs(n - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
@@ -137,7 +138,7 @@ function G(d) {
   const { latitude: n, longitude: t } = d, e = Math.abs(n - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class Re extends D {
+class He extends D {
   constructor(t, e) {
     var a, m;
     super(t);
@@ -474,5 +475,5 @@ class Re extends D {
   }
 }
 export {
-  Re as Controller
+  He as Controller
 };

package/libs/floorplan/MapviewFloorplanPlugin/index.js

@@ -94,6 +94,7 @@ import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
+import "../../Sculpt/utils/three/rayOnLine.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../../shared-utils/getPxmm.js";
 import "../utils/correctFiveState.js";
@@ -101,8 +102,8 @@ import "../utils/constant.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
-const $o = (o, r) => new t(o, r);
+const or = (o, r) => new t(o, r);
 export {
-  $o as MapviewFloorplanPlugin,
-  $o as default
+  or as MapviewFloorplanPlugin,
+  or as default
 };

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -128,6 +128,7 @@ import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
+import "../../Sculpt/utils/three/rayOnLine.js";
 import "@realsee/five";
 function W(d) {
   const { latitude: s, longitude: t } = d, e = Math.abs(s - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
@@ -137,7 +138,7 @@ function z(d) {
   const { latitude: s, longitude: t } = d, e = Math.abs(s - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class Re extends T {
+class He extends T {
   constructor(t, e) {
     var a, p, c;
     super(t);
@@ -470,5 +471,5 @@ class Re extends T {
   }
 }
 export {
-  Re as Controller
+  He as Controller
 };

package/libs/floorplan/ModelFloorplanPlugin/index.js

@@ -95,14 +95,15 @@ import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
+import "../../Sculpt/utils/three/rayOnLine.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../utils/correctFiveState.js";
 import "../utils/constant.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
-const $o = (o, r) => new t(o, r);
+const or = (o, r) => new t(o, r);
 export {
-  $o as ModelFloorplanPlugin,
-  $o as default
+  or as ModelFloorplanPlugin,
+  or as default
 };

package/libs/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -103,9 +103,10 @@ import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
+import "../../Sculpt/utils/three/rayOnLine.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../Assets/floorplanExtraObject.js";
-class Yt extends O {
+class Zt extends O {
   constructor(t, i) {
     super(t);
     // =============== public properties =================
@@ -248,5 +249,5 @@ class Yt extends O {
   }
 }
 export {
-  Yt as Controller
+  Zt as Controller
 };

package/libs/floorplan/PanoFloorplanRadarPlugin/index.js

@@ -74,11 +74,12 @@ import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
+import "../../Sculpt/utils/three/rayOnLine.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../utils/formatData.js";
 import "../Assets/floorplanExtraObject.js";
-const zo = (o, r) => new t(o, r);
+const Ao = (o, r) => new t(o, r);
 export {
-  zo as PanoFloorplanRadarPlugin,
-  zo as default
+  Ao as PanoFloorplanRadarPlugin,
+  Ao as default
 };

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -126,8 +126,9 @@ import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
+import "../../Sculpt/utils/three/rayOnLine.js";
 import "@realsee/five";
-class Li extends M {
+class Ti extends M {
   constructor(t, i) {
     var h, p;
     super(t);
@@ -400,5 +401,5 @@ class Li extends M {
   }
 }
 export {
-  Li as Controller
+  Ti as Controller
 };

package/libs/floorplan/TopviewFloorplanPlugin/index.js

@@ -93,14 +93,15 @@ import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
+import "../../Sculpt/utils/three/rayOnLine.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../../shared-utils/five/changeMode.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/to.js";
 import "../../shared-utils/getPxmm.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
-const Zo = (o, r) => new t(o, r);
+const _o = (o, r) => new t(o, r);
 export {
-  Zo as TopviewFloorplanPlugin,
-  Zo as default
+  _o as TopviewFloorplanPlugin,
+  _o as default
 };

package/libs/index.js

@@ -128,6 +128,7 @@ import "./shared-utils/isTouchDevice.js";
 import "./shared-utils/five/getPosition.js";
 import "./shared-utils/five/getRaycasterByNdcPosition.js";
 import "./shared-utils/three/PointSelector/utils/contents.js";
+import "./Sculpt/utils/three/rayOnLine.js";
 import "./shared-utils/three/boundingBox.js";
 import "./CSS3DRenderPlugin/Controller.js";
 import "./CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
@@ -439,7 +440,6 @@ import "./shared-utils/Object3DHelper/Base/BaseController.js";
 import "./shared-utils/Object3DHelper/utils/cameraHooks.js";
 import "./shared-utils/Object3DHelper/utils/getMouseRaycaster.js";
 import "./shared-utils/Object3DHelper/utils/calculateThreeMouse.js";
-import "./Sculpt/utils/three/rayOnLine.js";
 import "./Object3DHelperPlugin/FiveControllerWrapper.js";
 import "./shared-utils/Object3DHelper/index.js";
 import "./shared-utils/Object3DHelper/Controller/RotateController.js";

package/libs/shared-utils/logger.js

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

@@ -6,6 +6,12 @@ import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
 export type { PointIntersection };
 export type ActionIfNoIntersection = LiteralString<'virtualPoint' | 'lastPoint' | 'disable'>;
+export type AdherePoint = (Vector3 | THREE.Face3) & {
+    /**
+     * @description 被模型遮挡也能看到的点
+     */
+    IsAlwaysVisible?: boolean;
+};
 type PointerSelectorMode = 'fixed' | 'cursor';
 interface Config {
     /**
@@ -33,9 +39,8 @@ export type PointSelectorConfig = Partial<Config>;
 type EventMap = {
     /**
      * @description: 与模型交点更新时触发，移出监听范围时为null
-     * @param isAdhered 是否为吸附的点
      */
-    intersectionUpdate: (intersection: PointIntersection | null, isAdhered?: boolean) => void;
+    intersectionUpdate: (intersection: PointIntersection | null) => void;
     /**
      * @description: 试图打点，返回false则不打点
      */
@@ -68,10 +73,26 @@ export declare class PointSelector extends Subscribe<EventMap> {
     _cursorError: boolean;
     actionIfNoIntersection: ActionIfNoIntersection;
     plane?: THREE.Plane | null;
+    /**
+     * @description 结果区别：vertical: 射线和模型的交点在plane上的投影点；onlyPlane: 不论射线和模型是否有交点，都为射线和plane的焦点；onlyVirtual: 仅当射线和模型没有交点时，为射线和plane的焦点
+     */
+    planeMode: 'vertical' | 'onlyPlane' | 'onlyVirtual';
     readonly pointSelectorHelper: PointSelectorHelper;
+    five: Five;
     /** @deprecated directly use `pointSelector.on/off` instead */
     readonly hook: this;
-    private five;
+    /**
+     * @description 吸附半径
+     */
+    adhereRadius: number;
+    /**
+     * @description 吸附面
+     */
+    adherePlane: THREE.Plane[];
+    /**
+     * @description 吸附线
+     */
+    adhereLine: THREE.Line3[];
     private set outOfFive(value);
     private _outOfFive;
     private set enabled(value);
@@ -81,8 +102,6 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private pressDown;
     /** 一组吸附的点，光标靠近这些点时，会将helper以及放大镜的位置设置为这些点 */
     private adherePoints;
-    /** 吸附点的半径 */
-    private adherePointsRadius;
     /** 有值时表明处于按压检查阶段 */
     private setPressDown?;
     private lastFiveHelperVisible?;
@@ -95,10 +114,14 @@ export declare class PointSelector extends Subscribe<EventMap> {
     enable(): void;
     disable(): void;
     dispose(): void;
-    setAdherePoints(points: Vector3[] | ((params: {
+    setAdherePoints(points: AdherePoint[] | ((params: {
         intersection: PointIntersection;
         pointSelectorInstance: PointSelector;
-    }) => Vector3[]) | null, radius?: number): void;
+    }) => AdherePoint[]) | null, 
+    /**
+     * @deprecated use `.adhereRadius = 0.1` instead
+     */
+    radius?: number): void;
     /**
      * @description: 主动触发一次选点
      * @return: select 是否成功
@@ -113,7 +136,6 @@ export declare class PointSelector extends Subscribe<EventMap> {
      * @description: 鼠标离开five canvas时
      */
     private onLeave;
-    private onClick;
     private onMouseDown;
     private onMouseUp;
     private onTouchStart;