@realsee/dnalogel 3.48.4 → 3.48.6

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

@@ -1,39 +1,38 @@
-var v = Object.defineProperty, E = Object.defineProperties;
-var w = Object.getOwnPropertyDescriptors;
-var f = Object.getOwnPropertySymbols;
-var S = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
-var p = (o, s, e) => s in o ? v(o, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[s] = e, l = (o, s) => {
+var S = Object.defineProperty, b = Object.defineProperties;
+var y = Object.getOwnPropertyDescriptors;
+var p = Object.getOwnPropertySymbols;
+var E = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
+var f = (n, s, e) => s in n ? S(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e, l = (n, s) => {
   for (var e in s || (s = {}))
-    S.call(s, e) && p(o, e, s[e]);
-  if (f)
-    for (var e of f(s))
-      y.call(s, e) && p(o, e, s[e]);
-  return o;
-}, m = (o, s) => E(o, w(s));
-var i = (o, s, e) => (p(o, typeof s != "symbol" ? s + "" : s, e), e);
-import { PointSelectorHelper as I } from "./utils/PointSelectorHelper.js";
-import { isTouchDevice as b } from "../../isTouchDevice.js";
-import C from "hammerjs";
-import * as u from "three";
-import { Subscribe as H } from "../../Subscribe.js";
-import { getIntersectByRaycaster as F, getVirtualIntersectByRaycaster as M } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as N } from "../../five/getRaycasterByNdcPosition.js";
-const x = new u.Vector3(), d = () => !1;
-class R extends H {
+    E.call(s, e) && f(n, e, s[e]);
+  if (p)
+    for (var e of p(s))
+      I.call(s, e) && f(n, e, s[e]);
+  return n;
+}, m = (n, s) => b(n, y(s));
+var i = (n, s, e) => (f(n, typeof s != "symbol" ? s + "" : s, e), e);
+import { PointSelectorHelper as w } from "./utils/PointSelectorHelper.js";
+import { isTouchDevice as H } from "../../isTouchDevice.js";
+import M from "hammerjs";
+import * as d from "three";
+import { Subscribe as N } from "../../Subscribe.js";
+import { getIntersectByRaycaster as F, getVirtualIntersectByRaycaster as U } from "../../five/getPosition.js";
+import { getRaycasterByNdcPosition as L } from "../../five/getRaycasterByNdcPosition.js";
+import { CURSOR_NOT_ALLOW_URL as v } from "./utils/contents.js";
+const T = new d.Vector3(), u = () => !1;
+class G extends N {
   constructor(e, t) {
-    var h, n, c;
+    var a, o, c;
     super();
-    /**
-     * @description: 不在 five canvas 上时为 true
-     */
-    i(this, "outOfFive", !1);
-    i(this, "enabled", !1);
+    i(this, "_cursorError", !1);
     i(this, "actionIfNoModelUnderMouse", "virtualPoint");
     i(this, "plane");
     i(this, "pointSelectorHelper");
     /** @deprecated directly use `pointSelector.on/off` instead */
     i(this, "hook", this);
     i(this, "five");
+    i(this, "_outOfFive", !1);
+    i(this, "_enabled", !1);
     i(this, "hammer");
     i(this, "mode");
     /** 长按屏幕的动作触发后为true，手指抬起后为false */
@@ -55,11 +54,18 @@ class R extends H {
       const t = this.emit("wantsSelect", this.position);
       return t || (this.pointSelectorHelper.hide(), this.emit("select", this.position), console.debug(this.position)), !t;
     });
+    i(this, "onMouseWheel", (e) => {
+      this.updateByMousePosition(e);
+      const t = () => this.updateByMousePosition();
+      this.five.off("render.prepare", t), this.five.on("render.prepare", t), setTimeout(() => {
+        this.five.off("render.prepare", t);
+      }, 200);
+    });
     /**
      * @description: 鼠标进入five canvas时
      */
     i(this, "onEnter", () => {
-      this.pointSelectorHelper.show(), this.outOfFive = !1, this.emit("intersectionUpdate", this.position);
+      this.cursorError || this.pointSelectorHelper.show(), this.outOfFive = !1, this.emit("intersectionUpdate", this.position);
     });
     /**
      * @description: 鼠标离开five canvas时
@@ -102,24 +108,24 @@ class R extends H {
       this.pressDown && (this.pressDown = !1, this.select());
     });
     i(this, "updateByMousePosition", (e) => {
-      this.five.getElement() && (this.mousePosition = e, this.updateByNdcPosition(this.mouseNdcPosition));
+      this.five.getElement() && (e && (this.mousePosition = e), this.updateByNdcPosition(this.mouseNdcPosition));
     });
     /**
      * @description: 根据鼠标位置计算焦点位置并更新
      */
     i(this, "updateByNdcPosition", (e) => {
-      var a, h;
-      const t = N(this.five, e), r = F(this.five, t);
+      var h, a;
+      const t = L(this.five, e), r = F(this.five, t);
       if (r)
         return this.updatePointSelectorHelperIntersect(r), this.lastIntersection = r, !0;
       if (this.plane) {
-        const n = t.ray.intersectPlane(this.plane, x);
-        if (n) {
+        const o = t.ray.intersectPlane(this.plane, T);
+        if (o) {
           const c = {
-            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()),
+            distance: this.five.camera.position.distanceTo(o),
+            point: o.clone(),
+            object: new d.Object3D(),
+            face: new d.Face3(0, 0, 0, this.plane.normal.clone()),
             raycaster: t,
             isVirtual: !0
           };
@@ -129,8 +135,8 @@ class R extends H {
       if (this.actionIfNoModelUnderMouse === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoModelUnderMouse === "virtualPoint") {
-        const n = M(t, (a = this.lastIntersection) == null ? void 0 : a.distance);
-        return n.face = new u.Face3(0, 0, 0, (h = this.lastIntersection) == null ? void 0 : h.face.normal), n.isVirtual = !0, this.lastIntersection = n, this.updatePointSelectorHelperIntersect(n), !0;
+        const o = U(t, (h = this.lastIntersection) == null ? void 0 : h.distance);
+        return o.face = new d.Face3(0, 0, 0, (a = this.lastIntersection) == null ? void 0 : a.face.normal), o.isVirtual = !0, this.lastIntersection = o, this.updatePointSelectorHelperIntersect(o), !0;
       } else if (this.actionIfNoModelUnderMouse === "disable")
         return this.updatePointSelectorHelperIntersect(null), !1;
     });
@@ -139,16 +145,16 @@ class R extends H {
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
       if (!e) {
-        this.onLeave(), this.five.getElement().style.cursor = `url("data:image/svg+xml,%3Csvg width='12px' height='12px' viewBox='0 0 12 12' xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M6,12 C9.3137085,12 12,9.3137085 12,6 C12,2.6862915 9.3137085,0 6,0 C2.6862915,0 0,2.6862915 0,6 C0,9.3137085 2.6862915,12 6,12 Z' fill='%23FF5959'%3E%3C/path%3E%3Cg transform='translate(2, 2)' stroke='%23FFFFFF'%3E%3Ccircle cx='4' cy='4' r='4'%3E%3C/circle%3E%3Cline x1='1.07141075' y1='1.23997894' x2='6.64700843' y2='6.81557662'%3E%3C/line%3E%3C/g%3E%3C/g%3E%3C/svg%3E"), auto`;
+        this.onLeave(), this.five.getElement().style.cursor = v;
         return;
       }
-      this.onEnter(), this.five.getElement().style.cursor = "";
+      this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
       const t = l({}, e);
       let r = !1;
       if (typeof this.adherePoints == "function" && typeof this.adherePointsRadius == "number") {
-        for (const a of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
-          if (a.distanceTo(e.point) < this.adherePointsRadius) {
-            t.point = a.clone(), r = !0;
+        for (const h of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
+          if (h.distanceTo(e.point) < this.adherePointsRadius) {
+            t.point = h.clone(), r = !0;
             break;
           }
       }
@@ -158,10 +164,10 @@ class R extends H {
       const t = this.five.getElement();
       if (!t)
         return null;
-      const { top: r, left: a, width: h, height: n } = t.getBoundingClientRect(), { clientX: c, clientY: P } = e;
+      const { top: r, left: h, width: a, height: o } = t.getBoundingClientRect(), { clientX: c, clientY: P } = e;
       return {
-        x: (c - a) / h,
-        y: 1 - (P - r) / n
+        x: (c - h) / a,
+        y: 1 - (P - r) / o
       };
     });
     i(this, "onFiveWantsPanGesture", () => {
@@ -174,20 +180,41 @@ class R extends H {
     i(this, "emitIntersectionUpdate", (e) => {
       this.emit("intersectionUpdate", e);
     });
-    this.five = e, this.config = l(l({}, this.config), t), this.actionIfNoModelUnderMouse = (h = t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? h : "virtualPoint";
-    const r = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
-    r === "auto" ? this.mode = b ? "fixed" : "cursor" : this.mode = r;
-    const a = {
+    this.five = e, this.config = l(l({}, this.config), t), this.actionIfNoModelUnderMouse = (a = t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? a : "virtualPoint";
+    const r = (o = t == null ? void 0 : t.mode) != null ? o : "auto";
+    r === "auto" ? this.mode = H ? "fixed" : "cursor" : this.mode = r;
+    const h = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new I(this.five, m(l({}, t == null ? void 0 : t.helper), {
-      magnifierParams: l(l({}, a), (c = t == null ? void 0 : t.helper) == null ? void 0 : c.magnifierParams)
+    this.pointSelectorHelper = new w(this.five, m(l({}, t == null ? void 0 : t.helper), {
+      magnifierParams: l(l({}, h), (c = t == null ? void 0 : t.helper) == null ? void 0 : c.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {
     return this.outOfFive ? null : this.pointSelectorHelper.position;
   }
+  /**
+   * @description: 不在 five canvas 上时为 true
+   */
+  get outOfFive() {
+    return this._outOfFive;
+  }
+  get enabled() {
+    return this._enabled;
+  }
+  get cursorError() {
+    return this._cursorError;
+  }
+  set cursorError(e) {
+    this._cursorError = e, this.five.getElement().style.cursor = e ? v : "", e ? this.pointSelectorHelper.hide() : this.pointSelectorHelper.show();
+  }
+  set outOfFive(e) {
+    this._outOfFive = e;
+  }
+  set enabled(e) {
+    this._enabled = e;
+  }
   get mouseNdcPosition() {
     return this.mousePosition ? this.mousePositionToNdcPosition(this.mousePosition) : null;
   }
@@ -198,14 +225,14 @@ class R extends H {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.hammer || (this.hammer = new C(e)), this.mode === "cursor" ? (this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", d), this.five.on("wantsChangeMode", d), this.five.on("wantsTapGesture", d), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.updateByMousePosition), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
+    this.hammer || (this.hammer = new M(e)), this.mode === "cursor" ? (this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", u), this.five.on("wantsChangeMode", u), this.five.on("wantsTapGesture", u), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
   }
   disable() {
     if (!this.enabled)
       return;
     this.enabled = !1, this.pointSelectorHelper.disable(), this.five.getElement().style.cursor = "";
     const e = this.five.getElement();
-    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", d), this.five.off("wantsChangeMode", d), this.five.off("wantsTapGesture", d), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.updateByMousePosition), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), 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");
+    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", u), this.five.off("wantsChangeMode", u), this.five.off("wantsTapGesture", u), this.five.helperVisible = this.lastFiveHelperVisible, 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.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), 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");
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
@@ -215,5 +242,5 @@ class R extends H {
   }
 }
 export {
-  R as PointSelector
+  G as PointSelector
 };

package/libs/shared-utils/three/PointSelector/utils/contents.d.ts

@@ -0,0 +1 @@
+export declare const CURSOR_NOT_ALLOW_URL = "url(\"data:image/svg+xml,%3Csvg width='12px' height='12px' viewBox='0 0 12 12' xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M6,12 C9.3137085,12 12,9.3137085 12,6 C12,2.6862915 9.3137085,0 6,0 C2.6862915,0 0,2.6862915 0,6 C0,9.3137085 2.6862915,12 6,12 Z' fill='%23FF5959'%3E%3C/path%3E%3Cg transform='translate(2, 2)' stroke='%23FFFFFF'%3E%3Ccircle cx='4' cy='4' r='4'%3E%3C/circle%3E%3Cline x1='1.07141075' y1='1.23997894' x2='6.64700843' y2='6.81557662'%3E%3C/line%3E%3C/g%3E%3C/g%3E%3C/svg%3E\") 6 6, auto";

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

@@ -0,0 +1,4 @@
+const e = `url("data:image/svg+xml,%3Csvg width='12px' height='12px' viewBox='0 0 12 12' xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M6,12 C9.3137085,12 12,9.3137085 12,6 C12,2.6862915 9.3137085,0 6,0 C2.6862915,0 0,2.6862915 0,6 C0,9.3137085 2.6862915,12 6,12 Z' fill='%23FF5959'%3E%3C/path%3E%3Cg transform='translate(2, 2)' stroke='%23FFFFFF'%3E%3Ccircle cx='4' cy='4' r='4'%3E%3C/circle%3E%3Cline x1='1.07141075' y1='1.23997894' x2='6.64700843' y2='6.81557662'%3E%3C/line%3E%3C/g%3E%3C/g%3E%3C/svg%3E") 6 6, auto`;
+export {
+  e as CURSOR_NOT_ALLOW_URL
+};

package/libs/shared-utils/three/generatePolygonGeometry.d.ts

@@ -2,5 +2,8 @@ import type { Vector3 } from 'three';
 import * as THREE from 'three';
 /**
  * @description: 根据多边形的顶点数组生成多边形的 BufferGeometry
+ * @param checkLinesIntersect 检查多边形边线是否相交,需要保证传入的顶点是有序的
  */
-export default function generatePolygonGeometry(_points: Vector3[]): THREE.BufferGeometry;
+export default function generatePolygonGeometry(_points: Vector3[], config?: {
+    checkLinesIntersect?: boolean;
+}): THREE.BufferGeometry;

package/libs/shared-utils/three/generatePolygonGeometry.js

@@ -1,13 +1,24 @@
-import * as n from "three";
-import { earcut3D as a } from "./earcut3D.js";
-function m(r) {
-  const t = [...new Set(r)];
+import * as i from "three";
+import { earcut3D as c } from "./earcut3D.js";
+import { isIntersecting as m } from "../../PanoMeasurePlugin/utils/isIntersecting.js";
+function h(a, s) {
+  const t = [...new Set(a)];
   if (t.length < 3)
     return;
-  t.at(-1).equals(t[0]) || t.push(t[0]);
-  const i = t.flatMap((o) => [o.x, o.y, o.z]), s = new n.Float32BufferAttribute(i, 3), u = a(t), e = new n.BufferGeometry();
-  return e.setAttribute("position", s), e.setIndex(u), e.name = "PolygonGeometry", e;
+  if (t.at(-1).equals(t[0]) || t.push(t[0]), s != null && s.checkLinesIntersect && t.length >= 5) {
+    const e = t.map((r, n) => {
+      if (n !== 0)
+        return { start: t[n - 1], end: t[n] };
+    }).filter(Boolean);
+    for (let r = 0; r < e.length; r++) {
+      const n = m(e[r], e.slice(r));
+      if (n && console.log("多边形边线相交", r, t), n)
+        return;
+    }
+  }
+  const l = t.flatMap((e) => [e.x, e.y, e.z]), u = new i.Float32BufferAttribute(l, 3), f = c(t), o = new i.BufferGeometry();
+  return o.setAttribute("position", u), o.setIndex(f), o.name = "PolygonGeometry", o;
 }
 export {
-  m as generatePolygonGeometry
+  h as generatePolygonGeometry
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.48.4",
+  "version": "3.48.6",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.2.0-alpha.6",
+    "@realsee/five": "6.1.3",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",