@realsee/dnalogel 2.22.0-dev.0 → 2.22.0-dev.2

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

@@ -12,12 +12,12 @@ var p = (s, e, t) => e in s ? u(s, e, { enumerable: !0, configurable: !0, writab
 }, c = (s, e) => v(s, P(e));
 var i = (s, e, t) => (p(s, typeof e != "symbol" ? e + "" : e, t), t);
 import { Subscribe as H } from "@realsee/five";
-import { PointSelectorHelper as y } from "./PointSelectorHelper.js";
-import { isTouchDevice as b } from "../isTouchDevice.js";
-import U from "hammerjs";
+import { PointSelectorHelper as b } from "./PointSelectorHelper.js";
+import { isTouchDevice as y } from "../isTouchDevice.js";
+import F from "hammerjs";
 import { getIntersectionFromEvent as d } from "../getIntersectionFromEvent.js";
-import { Vector3 as E, Object3D as M, Face3 as F, Vector2 as I, Raycaster as O } from "three";
-import { getIntersectFromRelativePosition as k } from "./getIntersect.js";
+import { Vector3 as U, Object3D as E, Face3 as M, Vector2 as I, Raycaster as O } from "three";
+import { getIntersectFromRelativePosition as V } from "./getIntersect.js";
 const l = () => !1;
 class W {
   constructor(e, t) {
@@ -37,6 +37,7 @@ class W {
     i(this, "adherePoints", null);
     /** 吸附点的半径 */
     i(this, "adherePointsRadius", 0.1);
+    i(this, "lastFiveHelperVisible");
     /**
      * @description: 主动触发一次选点
      * @return: select 是否成功
@@ -102,7 +103,7 @@ class W {
      * @description: 根据鼠标位置更新helper位置
      */
     i(this, "updateByNdcPosition", (e) => {
-      const t = k(this.five, e), o = (() => t ? c(a({}, t), { isVirtual: !1 }) : c(a({}, x(this.five, e)), { isVirtual: !0 }))();
+      const t = V(this.five, e), o = (() => t ? c(a({}, t), { isVirtual: !1 }) : c(a({}, C(this.five, e)), { isVirtual: !0 }))();
       this.updatePointSelectorHelperIntersect(o);
     });
     /**
@@ -134,12 +135,12 @@ class W {
     var n, h;
     this.five = e;
     const o = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
-    o === "auto" ? this.mode = b ? "fixed" : "cursor" : this.mode = o;
+    o === "auto" ? this.mode = y ? "fixed" : "cursor" : this.mode = o;
     const r = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new y(e, c(a({}, t == null ? void 0 : t.pointSelectorHelperParams), {
+    this.pointSelectorHelper = new b(e, c(a({}, t == null ? void 0 : t.pointSelectorHelperParams), {
       magnifierParams: a(a({}, r), (h = t == null ? void 0 : t.pointSelectorHelperParams) == null ? void 0 : h.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
@@ -153,14 +154,14 @@ class W {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.hammer || (this.hammer = new U(e)), this.mode === "cursor" ? (this.five.on("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", l), this.five.on("wantsChangeMode", l), this.five.on("wantsTapGesture", l), e.addEventListener("mousemove", 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("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate);
+    this.hammer || (this.hammer = new F(e)), this.mode === "cursor" ? (this.five.on("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", l), this.five.on("wantsChangeMode", l), this.five.on("wantsTapGesture", l), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, e.addEventListener("mousemove", 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("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate);
   }
   disable() {
     if (!this.enabled)
       return;
     this.enabled = !1, this.pointSelectorHelper.disable();
     const e = this.five.getElement();
-    this.five.off("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", l), this.five.off("wantsChangeMode", l), this.five.off("wantsTapGesture", l), e == null || e.removeEventListener("mousemove", 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("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate);
+    this.five.off("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", l), this.five.off("wantsChangeMode", l), this.five.off("wantsTapGesture", l), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", 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("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate);
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
@@ -169,17 +170,17 @@ class W {
     e ? this.adherePoints = Array.isArray(e) ? e : [e] : this.adherePoints = null, typeof t == "number" && (this.adherePointsRadius = t);
   }
 }
-function C(s, e) {
+function k(s, e) {
   const { x: t, y: o } = e, r = t * 2 - 1, n = o * 2 - 1, h = new I().fromArray([r, n]), f = new O();
   return f.setFromCamera(h, s.camera), f;
 }
-function x(s, e) {
-  const t = C(s, e), o = 3, r = new E().addVectors(t.ray.origin, t.ray.direction.clone().normalize().multiplyScalar(o)), n = t.ray.direction.clone().negate();
+function C(s, e) {
+  const t = k(s, e), o = 3, r = new U().addVectors(t.ray.origin, t.ray.direction.clone().normalize().multiplyScalar(o)), n = t.ray.direction.clone().negate();
   return {
     distance: o,
     point: r,
-    object: new M(),
-    face: new F(0, 0, 0, n)
+    object: new E(),
+    face: new M(0, 0, 0, n)
   };
 }
 export {

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.22.0-dev.0",
+  "version": "2.22.0-dev.2",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",