@realsee/dnalogel 3.61.7-alpha.0 → 3.61.7-alpha.1

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.7-alpha.0",
+    "%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 {
     /**
@@ -75,6 +81,18 @@ export declare class PointSelector extends Subscribe<EventMap> {
     five: Five;
     /** @deprecated directly use `pointSelector.on/off` instead */
     readonly hook: this;
+    /**
+     * @description 吸附半径
+     */
+    adhereRadius: number;
+    /**
+     * @description 吸附面
+     */
+    adherePlane: THREE.Plane[];
+    /**
+     * @description 吸附线
+     */
+    adhereLine: THREE.Line3[];
     private set outOfFive(value);
     private _outOfFive;
     private set enabled(value);
@@ -84,8 +102,6 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private pressDown;
     /** 一组吸附的点，光标靠近这些点时，会将helper以及放大镜的位置设置为这些点 */
     private adherePoints;
-    /** 吸附点的半径 */
-    private adherePointsRadius;
     /** 有值时表明处于按压检查阶段 */
     private setPressDown?;
     private lastFiveHelperVisible?;
@@ -98,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 是否成功

package/libs/shared-utils/three/PointSelector/index.js

@@ -1,27 +1,29 @@
-var I = Object.defineProperty, S = Object.defineProperties;
-var b = Object.getOwnPropertyDescriptors;
-var v = Object.getOwnPropertySymbols;
-var y = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
-var f = (r, o, e) => o in r ? I(r, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[o] = e, a = (r, o) => {
-  for (var e in o || (o = {}))
-    y.call(o, e) && f(r, e, o[e]);
-  if (v)
-    for (var e of v(o))
-      E.call(o, e) && f(r, e, o[e]);
-  return r;
-}, m = (r, o) => S(r, b(o));
-var i = (r, o, e) => (f(r, typeof o != "symbol" ? o + "" : o, e), e);
-import { PointSelectorHelper as H } from "./utils/PointSelectorHelper.js";
-import { isTouchDevice as M } from "../../isTouchDevice.js";
-import * as u from "three";
-import { Subscribe as T } from "../../Subscribe.js";
-import { getIntersectByRaycaster as D, getVirtualIntersectByRaycaster as L } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as N } from "../../five/getRaycasterByNdcPosition.js";
-import { CURSOR_NOT_ALLOW_URL as P } from "./utils/contents.js";
-const w = new u.Vector3(), p = () => !1;
-class V extends T {
+var T = Object.defineProperty, L = Object.defineProperties;
+var H = Object.getOwnPropertyDescriptors;
+var y = Object.getOwnPropertySymbols;
+var D = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
+var v = (c, r, e) => r in c ? T(c, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[r] = e, d = (c, r) => {
+  for (var e in r || (r = {}))
+    D.call(r, e) && v(c, e, r[e]);
+  if (y)
+    for (var e of y(r))
+      F.call(r, e) && v(c, e, r[e]);
+  return c;
+}, P = (c, r) => L(c, H(r));
+var i = (c, r, e) => (v(c, typeof r != "symbol" ? r + "" : r, e), e);
+import { PointSelectorHelper as N } from "./utils/PointSelectorHelper.js";
+import { isTouchDevice as V } from "../../isTouchDevice.js";
+import * as a from "three";
+import { Subscribe as _ } from "../../Subscribe.js";
+import { getIntersectByRaycaster as x, getVirtualIntersectByRaycaster as R } from "../../five/getPosition.js";
+import { getRaycasterByNdcPosition as U } from "../../five/getRaycasterByNdcPosition.js";
+import { CURSOR_NOT_ALLOW_URL as I } from "./utils/contents.js";
+import { rayOnLine as B } from "../../../Sculpt/utils/three/rayOnLine.js";
+import { THREERaycaster as C } from "../core/Raycaster.js";
+const S = new a.Vector3(), p = () => !1;
+class k extends _ {
   constructor(e, t) {
-    var l, c, n, d;
+    var u, h, o, l;
     super();
     i(this, "_cursorError", !1);
     i(this, "actionIfNoIntersection", "virtualPoint");
@@ -34,6 +36,18 @@ class V extends T {
     i(this, "five");
     /** @deprecated directly use `pointSelector.on/off` instead */
     i(this, "hook", this);
+    /**
+     * @description 吸附半径
+     */
+    i(this, "adhereRadius", 0.1);
+    /**
+     * @description 吸附面
+     */
+    i(this, "adherePlane", []);
+    /**
+     * @description 吸附线
+     */
+    i(this, "adhereLine", []);
     i(this, "_outOfFive", !1);
     i(this, "_enabled", !1);
     i(this, "mode");
@@ -41,8 +55,6 @@ class V extends T {
     i(this, "pressDown", !1);
     /** 一组吸附的点，光标靠近这些点时，会将helper以及放大镜的位置设置为这些点 */
     i(this, "adherePoints");
-    /** 吸附点的半径 */
-    i(this, "adherePointsRadius", 0.1);
     /** 有值时表明处于按压检查阶段 */
     i(this, "setPressDown");
     i(this, "lastFiveHelperVisible");
@@ -88,8 +100,8 @@ class V extends T {
     i(this, "onMouseUp", (e) => {
       if (!this._mouseDownInfo)
         return;
-      const { clientX: t, clientY: s, timestamp: h } = this._mouseDownInfo;
-      Math.abs(e.clientX - t) < 2 && Math.abs(e.clientY - s) < 2 && performance.now() - h < 500 ? this.select() : this._mouseDownInfo = null;
+      const { clientX: t, clientY: s, timestamp: n } = this._mouseDownInfo;
+      Math.abs(e.clientX - t) < 2 && Math.abs(e.clientY - s) < 2 && performance.now() - n < 500 ? this.select() : this._mouseDownInfo = null;
     });
     i(this, "onTouchStart", (e) => {
       this.setPressDown = setTimeout(() => {
@@ -132,47 +144,47 @@ class V extends T {
      * @description: 根据鼠标位置计算焦点位置并更新
      */
     i(this, "updateByNdcPosition", (e) => {
-      var h, l, c;
-      const t = N(this.five, e);
-      let s = D(this.five, t);
+      var n, u, h;
+      const t = U(this.five, e);
+      let s = x(this.five, t);
       if (s) {
-        if (this.plane && this.planeMode === "vertical" && (s = m(a({}, s), {
-          point: this.plane.projectPoint(s.point, new u.Vector3()),
-          face: new u.Face3(0, 0, 0, this.plane.normal.clone()),
+        if (this.plane && this.planeMode === "vertical" && (s = P(d({}, s), {
+          point: this.plane.projectPoint(s.point, new a.Vector3()),
+          face: new a.Face3(0, 0, 0, this.plane.normal.clone()),
           originalPoint: s.point.clone()
         })), this.plane && this.planeMode === "onlyPlane") {
-          const n = t.ray.intersectPlane(this.plane, w);
-          if (!n)
+          const o = t.ray.intersectPlane(this.plane, S);
+          if (!o)
             return !1;
           s = {
-            distance: this.five.camera.position.distanceTo(n),
-            point: n.clone(),
+            distance: this.five.camera.position.distanceTo(o),
+            point: o.clone(),
             originalPoint: s.point.clone(),
-            face: new u.Face3(0, 0, 0, this.plane.normal.clone()),
+            face: new a.Face3(0, 0, 0, this.plane.normal.clone()),
             raycaster: t
           };
         }
         return this.updatePointSelectorHelperIntersect(s), this.lastIntersection = s, !0;
       }
       if (this.plane) {
-        const n = t.ray.intersectPlane(this.plane, w);
-        if (n) {
-          const d = {
-            distance: this.five.camera.position.distanceTo(n),
-            point: n.clone(),
-            object: new u.Object3D(),
-            face: new u.Face3(0, 0, 0, this.plane.normal.clone()),
+        const o = t.ray.intersectPlane(this.plane, S);
+        if (o) {
+          const l = {
+            distance: this.five.camera.position.distanceTo(o),
+            point: o.clone(),
+            object: new a.Object3D(),
+            face: new a.Face3(0, 0, 0, this.plane.normal.clone()),
             raycaster: t,
             isVirtual: !0
           };
-          return this.updatePointSelectorHelperIntersect(d), !0;
+          return this.updatePointSelectorHelperIntersect(l), !0;
         }
       }
       if (this.actionIfNoIntersection === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoIntersection === "virtualPoint") {
-        const n = L(t, (h = this.lastIntersection) == null ? void 0 : h.distance);
-        return n.face = new u.Face3(0, 0, 0, (c = (l = this.lastIntersection) == null ? void 0 : l.face) == null ? void 0 : c.normal), n.isVirtual = !0, this.lastIntersection = n, this.updatePointSelectorHelperIntersect(n), !0;
+        const o = R(t, (n = this.lastIntersection) == null ? void 0 : n.distance);
+        return o.face = new a.Face3(0, 0, 0, (h = (u = this.lastIntersection) == null ? void 0 : u.face) == null ? void 0 : h.normal), o.isVirtual = !0, this.lastIntersection = o, this.updatePointSelectorHelperIntersect(o), !0;
       } else if (this.actionIfNoIntersection === "disable")
         return this.updatePointSelectorHelperIntersect(null), !1;
     });
@@ -181,17 +193,69 @@ class V extends T {
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
       if (!e) {
-        this.onLeave(), this.five.getElement().style.cursor = P;
+        this.onLeave(), this.five.getElement().style.cursor = I;
         return;
       }
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
-      const t = a({}, e);
-      if (typeof this.adherePoints == "function" && typeof this.adherePointsRadius == "number") {
-        for (const s of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
-          if (s.distanceTo(e.point) < this.adherePointsRadius) {
-            t.point = s.clone(), t.isAdsorbed = !0;
+      const t = d({}, e);
+      if (typeof this.adherePoints == "function" && typeof this.adhereRadius == "number") {
+        for (const s of this.adherePlane)
+          s.distanceToPoint(e.point) < this.adhereRadius && (t.point = s.projectPoint(e.point, new a.Vector3()), this.plane || (t.face = new a.Face3(0, 0, 0, s.normal.clone())), t.isAdsorbed = !0);
+        for (const s of this.adhereLine) {
+          const n = s.closestPointToPoint(e.point, !1, new a.Vector3());
+          if (n.distanceTo(e.point) < this.adhereRadius)
+            t.point = n.clone(), t.isAdsorbed = !0;
+          else {
+            const u = B({
+              raycaster: new C(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
+              line: s,
+              clampToLine: !1
+            }), h = u.clone().project(this.five.camera);
+            if (h.z <= 1) {
+              const o = this.five.renderer.getSize(new a.Vector2()), l = {
+                x: (h.x + 1) / 2 * o.width,
+                y: (1 - h.y) / 2 * o.height
+              }, f = {
+                x: this.mousePosition.clientX,
+                y: this.mousePosition.clientY
+              };
+              Math.abs(l.x - f.x) < 10 && Math.abs(l.y - f.y) < 10 && (t.point = u.clone(), t.isAdsorbed = !0);
+            }
+          }
+        }
+        for (const s of this.adherePoints({ intersection: e, pointSelectorInstance: this })) {
+          const n = s instanceof a.Face3 ? new a.Vector3(s.a, s.b, s.c) : s;
+          if (n.IsAlwaysVisible = s.IsAlwaysVisible, n.distanceTo(e.point) < this.adhereRadius) {
+            t.point = n.clone(), !this.plane && s instanceof a.Face3 && (t.face = s), t.isAdsorbed = !0;
             break;
+          } else {
+            const h = n.clone().project(this.five.camera);
+            if (h.z > 1)
+              return;
+            const o = this.five.renderer.getSize(new a.Vector2()), l = {
+              x: (h.x + 1) / 2 * o.width,
+              y: (1 - h.y) / 2 * o.height
+            }, f = {
+              x: this.mousePosition.clientX,
+              y: this.mousePosition.clientY
+            };
+            if (Math.abs(l.x - f.x) < 10 && Math.abs(l.y - f.y) < 10) {
+              let m = !1;
+              if (n.IsAlwaysVisible)
+                m = !0;
+              else {
+                const w = new a.Raycaster();
+                w.setFromCamera(n.clone(), this.five.camera);
+                const b = this.five.model.intersectRaycaster(w, void 0, !0)[0], E = 0.1, M = this.five.camera.position.distanceTo(n);
+                b && b.distance < M + E && (m = !0);
+              }
+              if (m) {
+                t.point = n.clone(), !this.plane && s instanceof a.Face3 && (t.face = s), t.isAdsorbed = !0;
+                break;
+              }
+            }
           }
+        }
       }
       this.pointSelectorHelper.updateWithIntersect(t, { emitEvent: !1 }), this.emit("intersectionUpdate", t);
     });
@@ -199,10 +263,10 @@ class V extends T {
       const t = this.five.getElement();
       if (!t)
         return null;
-      const { top: s, left: h, width: l, height: c } = t.getBoundingClientRect(), { clientX: n, clientY: d } = e;
+      const { top: s, left: n, width: u, height: h } = t.getBoundingClientRect(), { clientX: o, clientY: l } = e;
       return {
-        x: (n - h) / l,
-        y: 1 - (d - s) / c
+        x: (o - n) / u,
+        y: 1 - (l - s) / h
       };
     });
     i(this, "onFiveWantsPanGesture", () => {
@@ -215,15 +279,15 @@ class V extends T {
     i(this, "emitIntersectionUpdate", (e) => {
       this.emit("intersectionUpdate", e);
     });
-    this.five = e, this.config = a(a({}, this.config), t), this.actionIfNoIntersection = (c = (l = t == null ? void 0 : t.actionIfNoIntersection) != null ? l : t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? c : "virtualPoint";
-    const s = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
-    s === "auto" ? this.mode = M ? "fixed" : "cursor" : this.mode = s;
-    const h = {
+    this.five = e, this.config = d(d({}, this.config), t), this.actionIfNoIntersection = (h = (u = t == null ? void 0 : t.actionIfNoIntersection) != null ? u : t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? h : "virtualPoint";
+    const s = (o = t == null ? void 0 : t.mode) != null ? o : "auto";
+    s === "auto" ? this.mode = V ? "fixed" : "cursor" : this.mode = s;
+    const n = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new H(this.five, m(a({}, t == null ? void 0 : t.helper), {
-      magnifierParams: a(a({}, h), (d = t == null ? void 0 : t.helper) == null ? void 0 : d.magnifierParams)
+    this.pointSelectorHelper = new N(this.five, P(d({}, t == null ? void 0 : t.helper), {
+      magnifierParams: d(d({}, n), (l = t == null ? void 0 : t.helper) == null ? void 0 : l.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {
@@ -242,7 +306,7 @@ class V extends T {
     return this._cursorError;
   }
   set cursorError(e) {
-    this._cursorError = e, this.five.getElement().style.cursor = e ? P : "", e ? this.pointSelectorHelper.hide() : this.pointSelectorHelper.show();
+    this._cursorError = e, this.five.getElement().style.cursor = e ? I : "", e ? this.pointSelectorHelper.hide() : this.pointSelectorHelper.show();
   }
   set outOfFive(e) {
     this._outOfFive = e;
@@ -265,7 +329,7 @@ class V extends T {
   disable() {
     if (!this.enabled)
       return;
-    this.enabled = !1, this.pointSelectorHelper.disable(), this.five.getElement().style.cursor = "";
+    this.enabled = !1, this.adherePoints = null, this.adhereLine = [], this.adherePlane = [], this.plane = void 0, this.pointSelectorHelper.disable(), this.five.getElement().style.cursor = "";
     const e = this.five.getElement();
     this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", p), this.five.off("wantsChangeMode", p), this.five.off("wantsTapGesture", p), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("touchstart", this.onTouchStart), e == null || e.removeEventListener("touchmove", this.onTouchMove), e == null || e.removeEventListener("touchend", this.onTouchEnd), e == null || e.removeEventListener("mousedown", this.onMouseDown), e == null || e.removeEventListener("mouseup", this.onMouseUp), e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
   }
@@ -273,9 +337,9 @@ class V extends T {
     this.disable(), this.pointSelectorHelper.dispose();
   }
   setAdherePoints(e, t) {
-    e ? typeof e == "function" ? this.adherePoints = e : this.adherePoints = () => e : this.adherePoints = null, typeof t == "number" && (this.adherePointsRadius = t);
+    e ? typeof e == "function" ? this.adherePoints = e : this.adherePoints = () => e : this.adherePoints = null;
   }
 }
 export {
-  V as PointSelector
+  k as PointSelector
 };

package/package.json

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