@realsee/dnalogel 3.0.0-14 → 3.0.0-16

package/libs/shared-utils/five/FiveDomEvents.d.ts

@@ -64,6 +64,7 @@ export declare class FiveDomEvents {
     addEventListener<T extends EventName>(object: Object3DWithEvent, event: T, callback: EventMap[T], config?: EventHandlerConfig): void;
     removeEventListener(object: Object3DWithEvent, event: EventName, callback: (e: CallbackEvent) => any, ...args: any[]): void;
     dispose(): void;
+    private getRaycaster;
     private handleWantsGesture;
     private onDomEvent;
     private objectIsBound;

package/libs/shared-utils/five/FiveDomEvents.js

@@ -1,16 +1,16 @@
-var H = Object.defineProperty;
+var g = Object.defineProperty;
 var _ = Object.getOwnPropertySymbols;
-var L = Object.prototype.hasOwnProperty, g = Object.prototype.propertyIsEnumerable;
-var m = (f, e, t) => e in f ? H(f, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[e] = t, b = (f, e) => {
+var y = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
+var E = (u, e, t) => e in u ? g(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t, b = (u, e) => {
   for (var t in e || (e = {}))
-    L.call(e, t) && m(f, t, e[t]);
+    y.call(e, t) && E(u, t, e[t]);
   if (_)
     for (var t of _(e))
-      g.call(e, t) && m(f, t, e[t]);
-  return f;
+      H.call(e, t) && E(u, t, e[t]);
+  return u;
 };
-var v = (f, e, t) => (m(f, typeof e != "symbol" ? e + "" : e, t), t);
-import * as y from "three";
+var v = (u, e, t) => (E(u, typeof e != "symbol" ? e + "" : e, t), t);
+import * as L from "three";
 import { getObjectVisible as $ } from "../three/getObjectVisible.js";
 import { calculateThreeMouse as x } from "./calculateThreeMouse.js";
 class D {
@@ -21,41 +21,33 @@ class D {
       if (t.length !== 1)
         return;
       const n = t[0];
-      if (!n)
-        return;
-      let o = n.raycaster;
-      if (!o) {
-        const i = this.five.getElement();
-        if (!i)
-          return;
-        const s = x(n, i), r = new y.Raycaster();
-        r.setFromCamera(s, this.five.camera), o = r;
+      if (n) {
+        if (e === "mouseMove")
+          return this.onDomEvent("hover", n);
+        if (e === "tap")
+          return this.onDomEvent("click", n);
       }
-      if (e === "mouseMove")
-        return this.onDomEvent("hover", n.raycaster);
-      if (e === "tap")
-        return this.onDomEvent("click", n.raycaster);
     });
     v(this, "onDomEvent", (e, t) => {
-      var s;
+      var f, i;
       const n = this.boundObject[e];
       if (!n || (n == null ? void 0 : n.length) === 0 || !t)
         return;
-      const o = (() => {
-        var a;
-        const r = t.intersectObjects(n, !0);
-        if (r.length === 0)
+      const s = (f = t.raycaster) != null ? f : this.getRaycaster(t), r = (() => {
+        var h;
+        const d = s.intersectObjects(n, !0);
+        if (d.length === 0)
           return;
-        const d = this.five.model.intersectRaycaster(t);
-        if (!(d.length > 0 && r.length > 0 && d[0].distance < r[0].distance))
-          return (a = r[0]) == null ? void 0 : a.object;
+        const o = this.five.model.intersectRaycaster(s);
+        if (!(o.length > 0 && d.length > 0 && o[0].distance < d[0].distance))
+          return (h = d[0]) == null ? void 0 : h.object;
       })();
-      if (!o || !this.objectIsBound(o)) {
-        for (const r of (s = this.boundObject.hover) != null ? s : [])
-          r._hovered && this.notify("unHover", r);
+      if (!r || !this.objectIsBound(r)) {
+        for (const d of (i = this.boundObject.hover) != null ? i : [])
+          d._hovered && this.notify("unHover", d);
         return;
       }
-      if (this.notify(e, o))
+      if (this.notify(e, r))
         return !1;
     });
     v(this, "objectIsBound", (e) => {
@@ -65,50 +57,50 @@ class D {
       return !!t;
     });
     // eslint-disable-next-line max-params
-    v(this, "notify", (e, t, n, o) => {
-      var a;
-      let i = !1, s = [];
-      const r = [];
-      let d = t;
-      for (r.push(d); d.parent; )
-        d = d.parent, r.push(d);
-      for (const u of r) {
-        if (i)
+    v(this, "notify", (e, t, n, s) => {
+      var d;
+      let r = !1, a = [];
+      const f = [];
+      let i = t;
+      for (f.push(i); i.parent; )
+        i = i.parent, f.push(i);
+      for (const o of f) {
+        if (r)
           break;
-        const E = u._domEvent;
-        if (!E)
+        const h = o._domEvent;
+        if (!h)
           continue;
-        const p = E[`${e}Handler`];
+        const p = h[`${e}Handler`];
         if (p)
-          for (const [O, c] of p) {
-            if (c != null && c.checkVisible && !$(u))
+          for (const [O, l] of p) {
+            if (l != null && l.checkVisible && !$(o))
               continue;
             if (e === "hover") {
-              if (u._hovered)
+              if (o._hovered)
                 continue;
-              u._hovered = !0;
-              for (const h of (a = this.boundObject.hover) != null ? a : [])
-                h !== u && h._hovered && this.notify("unHover", h);
+              o._hovered = !0;
+              for (const c of (d = this.boundObject.hover) != null ? d : [])
+                c !== o && c._hovered && this.notify("unHover", c);
             }
             if (e === "unHover") {
-              if (!u._hovered)
+              if (!o._hovered)
                 continue;
-              u._hovered = !1;
+              o._hovered = !1;
             }
-            const l = O({
+            const m = O({
               type: e,
-              target: u,
+              target: o,
               origDomEvent: n,
-              intersect: o,
+              intersect: s,
               stopPropagation: () => {
-                i = !0;
+                r = !0;
               }
             });
-            s.push(l != null ? l : !0);
+            a.push(m != null ? m : !0);
           }
       }
       if (e === "click")
-        return s.some((u) => u === !0);
+        return a.some((o) => o === !0);
     });
     this.five = e, e.on("wantsGesture", this.handleWantsGesture);
   }
@@ -117,10 +109,10 @@ class D {
    * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
    * @todo: added 和 removed 还是不太智能
    */
-  addAutoBindEventListener(e, t, n, o) {
-    const i = () => this.addEventListener(e, t, n, o), s = () => this.removeEventListener(e, t, n, o);
-    return e.addEventListener("added", i), e.addEventListener("removed", s), e.addEventListener("dispose", s), () => {
-      e.removeEventListener("added", i), e.removeEventListener("removed", s), e.removeEventListener("dispose", s);
+  addAutoBindEventListener(e, t, n, s) {
+    const r = () => this.addEventListener(e, t, n, s), a = () => this.removeEventListener(e, t, n, s);
+    return e.addEventListener("added", r), e.addEventListener("removed", a), e.addEventListener("dispose", a), () => {
+      e.removeEventListener("added", r), e.removeEventListener("removed", a), e.removeEventListener("dispose", a);
     };
   }
   /**
@@ -130,24 +122,31 @@ class D {
    * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
    * @return {void}
    */
-  addEventListener(e, t, n, o) {
-    var i;
-    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, b({ checkVisible: !0 }, o)]), (i = this.boundObject[t]) == null || i.push(e);
+  addEventListener(e, t, n, s) {
+    var r;
+    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, b({ checkVisible: !0 }, s)]), (r = this.boundObject[t]) == null || r.push(e);
   }
-  removeEventListener(e, t, n, ...o) {
-    var s, r;
+  removeEventListener(e, t, n, ...s) {
+    var a, f;
     if (!e._domEvent || !e._domEvent[`${t}Handler`])
       return;
-    const i = e._domEvent[`${t}Handler`].findIndex((d) => d[0] === n);
-    if (i !== -1 && (e._domEvent[`${t}Handler`].splice(i, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
-      const d = (s = this.boundObject[t]) == null ? void 0 : s.findIndex((a) => a === e);
-      d !== -1 && ((r = this.boundObject[t]) == null || r.splice(d, 1));
+    const r = e._domEvent[`${t}Handler`].findIndex((i) => i[0] === n);
+    if (r !== -1 && (e._domEvent[`${t}Handler`].splice(r, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
+      const i = (a = this.boundObject[t]) == null ? void 0 : a.findIndex((d) => d === e);
+      i !== -1 && ((f = this.boundObject[t]) == null || f.splice(i, 1));
     }
   }
   dispose() {
     var e;
     (e = this.five) == null || e.off("wantsGesture", this.handleWantsGesture), this.boundObject = {};
   }
+  getRaycaster(e) {
+    const t = this.five.getElement();
+    if (!t)
+      return;
+    const n = x(e, t), s = new L.Raycaster();
+    return s.setFromCamera(n, this.five.camera), s;
+  }
 }
 export {
   D as FiveDomEvents

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-16",
     [
       "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-16",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",