@realsee/dnalogel 3.0.0-14 → 3.0.0-15

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.0.0-14",
+    "%c %c@realsee/dnalogel %cv3.0.0-15",
     [
       "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.js

@@ -1,27 +1,27 @@
-var u = Object.defineProperty, v = Object.defineProperties;
-var P = Object.getOwnPropertyDescriptors;
+var P = Object.defineProperty, S = Object.defineProperties;
+var w = Object.getOwnPropertyDescriptors;
 var m = Object.getOwnPropertySymbols;
-var S = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
-var p = (s, e, t) => e in s ? u(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, a = (s, e) => {
+var H = Object.prototype.hasOwnProperty, b = Object.prototype.propertyIsEnumerable;
+var d = (s, e, t) => e in s ? P(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, h = (s, e) => {
   for (var t in e || (e = {}))
-    S.call(e, t) && p(s, t, e[t]);
+    H.call(e, t) && d(s, t, e[t]);
   if (m)
     for (var t of m(e))
-      w.call(e, t) && p(s, t, e[t]);
+      b.call(e, t) && d(s, t, e[t]);
   return s;
-}, 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 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 U, Object3D as E, Face3 as M, Vector2 as I, Raycaster as O } from "three";
-import { getIntersectFromRelativePosition as V } from "./getIntersect.js";
+}, c = (s, e) => S(s, w(e));
+var i = (s, e, t) => (d(s, typeof e != "symbol" ? e + "" : e, t), t);
+import { Subscribe as y } from "@realsee/five";
+import { PointSelectorHelper as F } from "./PointSelectorHelper.js";
+import { isTouchDevice as E } from "../isTouchDevice.js";
+import U from "hammerjs";
+import { getIntersectionFromEvent as f } from "../getIntersectionFromEvent.js";
+import { Vector3 as M, Object3D as I, Face3 as O, Vector2 as V, Raycaster as C } from "three";
+import { getIntersectFromRelativePosition as k } from "./getIntersect.js";
 const l = () => !1;
-class W {
+class N {
   constructor(e, t) {
-    i(this, "hook", new H());
+    i(this, "hook", new y());
     /**
      * @description: 不在 five canvas 上时为 true
      */
@@ -60,7 +60,7 @@ class W {
       this.pointSelectorHelper.hide(), this.outOfFive = !0, this.hook.emit("intersectionUpdate", null);
     });
     i(this, "onTap", (e) => {
-      const [t] = d(this.five, e);
+      const [t] = f(this.five, e);
       t != null && t.face && this.select(t);
     });
     /**
@@ -70,14 +70,14 @@ class W {
     i(this, "onPan", (e) => {
       if (!this.pressDown)
         return;
-      const [t] = d(this.five, e);
+      const [t] = f(this.five, e);
       t != null && t.face && this.intersectionOnModelUpdate(t);
     });
     /**
      * @description: 长按屏幕后，更新长按点的位置
      */
     i(this, "onPress", (e) => {
-      const [t] = d(this.five, e);
+      const [t] = f(this.five, e);
       t != null && t.face && (this.pressDown = !0, this.intersectionOnModelUpdate(t));
     });
     /**
@@ -93,17 +93,17 @@ class W {
       const t = this.five.getElement();
       if (!t)
         return;
-      const { clientX: o, clientY: r } = e, n = {
-        x: o / t.clientWidth,
-        y: 1 - r / t.clientHeight
+      const { top: o, left: r, width: n, height: a } = t.getBoundingClientRect(), { clientX: p, clientY: u } = e, v = {
+        x: (p - r) / n,
+        y: 1 - (u - o) / a
       };
-      this.updateByNdcPosition(n);
+      this.updateByNdcPosition(v);
     });
     /**
      * @description: 根据鼠标位置更新helper位置
      */
     i(this, "updateByNdcPosition", (e) => {
-      const t = V(this.five, e), o = (() => t ? c(a({}, t), { isVirtual: !1 }) : c(a({}, C(this.five, e)), { isVirtual: !0 }))();
+      const t = k(this.five, e), o = (() => t ? c(h({}, t), { isVirtual: !1 }) : c(h({}, G(this.five, e)), { isVirtual: !0 }))();
       this.updatePointSelectorHelperIntersect(o);
     });
     /**
@@ -111,7 +111,7 @@ class W {
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
       var r;
-      const t = a({}, e);
+      const t = h({}, e);
       let o = !1;
       if (((r = this.adherePoints) == null ? void 0 : r.length) > 0 && typeof this.adherePointsRadius == "number") {
         for (const n of this.adherePoints)
@@ -132,16 +132,16 @@ class W {
     i(this, "emitIntersectionUpdate", (e) => {
       this.hook.emit("intersectionUpdate", e);
     });
-    var n, h;
+    var n, a;
     this.five = e;
     const o = (n = t == null ? void 0 : t.mode) != null ? n : "auto";
-    o === "auto" ? this.mode = y ? "fixed" : "cursor" : this.mode = o;
+    o === "auto" ? this.mode = E ? "fixed" : "cursor" : this.mode = o;
     const r = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    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 = new F(e, c(h({}, t == null ? void 0 : t.pointSelectorHelperParams), {
+      magnifierParams: h(h({}, r), (a = t == null ? void 0 : t.pointSelectorHelperParams) == null ? void 0 : a.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
   get position() {
@@ -154,7 +154,7 @@ class W {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    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), 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.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1;
+    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.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1;
   }
   disable() {
     if (!this.enabled)
@@ -170,19 +170,19 @@ class W {
     e ? this.adherePoints = Array.isArray(e) ? e : [e] : this.adherePoints = null, typeof t == "number" && (this.adherePointsRadius = t);
   }
 }
-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 { x: t, y: o } = e, r = t * 2 - 1, n = o * 2 - 1, a = new V().fromArray([r, n]), p = new C();
+  return p.setFromCamera(a, s.camera), p;
 }
-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();
+function G(s, e) {
+  const t = x(s, e), o = 3, r = new M().addVectors(t.ray.origin, t.ray.direction.clone().normalize().multiplyScalar(o)), n = t.ray.direction.clone().negate();
   return {
     distance: o,
     point: r,
-    object: new E(),
-    face: new M(0, 0, 0, n)
+    object: new I(),
+    face: new O(0, 0, 0, n)
   };
 }
 export {
-  W as PointSelector
+  N as PointSelector
 };

package/package.json

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