@realsee/dnalogel 3.0.0-13 → 3.0.0-14

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

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

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

@@ -0,0 +1,11 @@
+import * as THREE from 'three';
+/**
+ * 计算 three 中的 mouse 的值
+ * @param  mouseXY - 鼠标相对屏幕位置
+ * @param  element - canvas元素（three的展示元素）
+ */
+declare function calculateThreeMouse(mouseXY: {
+    x: number;
+    y: number;
+}, element: HTMLElement): THREE.Vector2;
+export { calculateThreeMouse };

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

@@ -0,0 +1,8 @@
+import * as i from "three";
+function h(t, e) {
+  const { top: n, left: o, width: r, height: c } = e.getBoundingClientRect();
+  return new i.Vector2((t.x - o) / r * 2 - 1, -(t.y - n) / c * 2 + 1);
+}
+export {
+  h as calculateThreeMouse
+};

package/libs/shared-utils/logger.js

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

@@ -3,10 +3,11 @@ import { Subscribe } from '@realsee/five';
 import { Magnifier, PointHelper, PointDomHelper } from '.';
 import type { Intersection } from '../../typings/typings';
 interface Options {
-    magnifier: Magnifier | null;
-    magnifierParams: ConstructorParameters<typeof Magnifier>[1];
-    pointHelper: PointHelper | null;
-    pointDomHelper: PointDomHelper | null;
+    magnifier?: Magnifier | null;
+    magnifierParams?: ConstructorParameters<typeof Magnifier>[1];
+    pointHelper?: PointHelper | null;
+    pointDomHelper?: PointDomHelper | null;
+    container?: Element;
 }
 type EventMap = {
     intersectionUpdate: (intersection: PointIntersection) => void;
@@ -27,7 +28,7 @@ export declare class PointSelectorHelper {
     private pointDomHelper;
     private state;
     private group;
-    constructor(five: Five, options?: Partial<Options>);
+    constructor(five: Five, options?: Options);
     show: () => void;
     hide: () => void;
     enable(): void;

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

@@ -3,8 +3,8 @@ var l = (r, i, e) => i in r ? a(r, i, { enumerable: !0, configurable: !0, writab
 var t = (r, i, e) => (l(r, typeof i != "symbol" ? i + "" : i, e), e);
 import * as h from "three";
 import { Subscribe as p } from "@realsee/five";
-import { Magnifier as o } from "./Magnifier.js";
-import { PointHelper as d } from "./PointHelper.js";
+import { Magnifier as d } from "./Magnifier.js";
+import { PointHelper as o } from "./PointHelper.js";
 import { PointDomHelper as f } from "./PointDomHelper.js";
 class v {
   constructor(i, e) {
@@ -30,8 +30,8 @@ class v {
     });
     t(this, "abortUpdateMagnifier", () => {
     });
-    var s;
-    this.five = i, this.magnifier = (e == null ? void 0 : e.magnifier) !== void 0 ? e.magnifier : new o(i, (s = e == null ? void 0 : e.magnifierParams) != null ? s : { dragEnabled: !0 }), this.pointHelper = (e == null ? void 0 : e.pointHelper) !== void 0 ? e.pointHelper : new d(), this.pointDomHelper = (e == null ? void 0 : e.pointDomHelper) !== void 0 ? e.pointDomHelper : new f(i), this.group.name = "five-point-selector", this.five.scene.add(this.group), this.magnifier.appendTo(document.body);
+    var s, n;
+    this.five = i, this.magnifier = (e == null ? void 0 : e.magnifier) !== void 0 ? e.magnifier : new d(i, (s = e == null ? void 0 : e.magnifierParams) != null ? s : { dragEnabled: !0 }), this.pointHelper = (e == null ? void 0 : e.pointHelper) !== void 0 ? e.pointHelper : new o(), this.pointDomHelper = (e == null ? void 0 : e.pointDomHelper) !== void 0 ? e.pointDomHelper : new f(i), this.group.name = "five-point-selector", this.five.scene.add(this.group), this.magnifier.appendTo((n = e.container) != null ? n : document.body);
   }
   enable() {
     var i, e;

package/package.json

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

package/dist/shared-utils/five/adapt.d.ts

@@ -1,9 +0,0 @@
-/**
- * @description: 一些函数，来适配 Five@5.x 和 Five@6.x 的差异
- */
-import type { Five } from '@realsee/five';
-export declare function adaptPanoId(five: Five, func: (params?: {
-    panoIndex: number;
-    panoId: string;
-    derivedId: number;
-}, ...args: any[]) => any): (panoIdOrPanoIndex: string | number, ...args: any[]) => void;

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

@@ -1,9 +0,0 @@
-/**
- * @description: 一些函数，来适配 Five@5.x 和 Five@6.x 的差异
- */
-import type { Five } from '@realsee/five';
-export declare function adaptPanoId(five: Five, func: (params?: {
-    panoIndex: number;
-    panoId: string;
-    derivedId: number;
-}, ...args: any[]) => any): (panoIdOrPanoIndex: string | number, ...args: any[]) => void;

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

@@ -1,16 +0,0 @@
-function k(t, p) {
-  return function(n, ...s) {
-    var e, a;
-    if (typeof n == "number") {
-      const o = n, d = t.work.observers[n], c = (e = d == null ? void 0 : d.panoId) != null ? e : `${t.work.workCode}[${o}]`, i = d == null ? void 0 : d.derivedId;
-      p({ panoIndex: o, panoId: c, derivedId: i }, ...s);
-    } else if (typeof n == "string") {
-      const o = n, d = t.work.observers.find((f) => f.panoId === o), c = (a = d == null ? void 0 : d.index) != null ? a : d == null ? void 0 : d.panoIndex, i = d == null ? void 0 : d.derivedId;
-      p({ panoIndex: c, panoId: o, derivedId: i }, ...s);
-    } else
-      console.error(`adaptPano error: panoIdOrPanoIndex is ${n}`);
-  };
-}
-export {
-  k as adaptPanoId
-};