@realsee/dnalogel 3.64.5 → 3.64.6

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

@@ -1,58 +1,58 @@
-var S = Object.defineProperty, W = Object.defineProperties;
-var j = Object.getOwnPropertyDescriptors;
-var L = Object.getOwnPropertySymbols;
-var N = Object.prototype.hasOwnProperty, $ = Object.prototype.propertyIsEnumerable;
-var w = (c, e, t) => e in c ? S(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t, M = (c, e) => {
+var j = Object.defineProperty, F = Object.defineProperties;
+var R = Object.getOwnPropertyDescriptors;
+var G = Object.getOwnPropertySymbols;
+var P = Object.prototype.hasOwnProperty, V = Object.prototype.propertyIsEnumerable;
+var D = (h, e, t) => e in h ? j(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t, L = (h, e) => {
   for (var t in e || (e = {}))
-    N.call(e, t) && w(c, t, e[t]);
-  if (L)
-    for (var t of L(e))
-      $.call(e, t) && w(c, t, e[t]);
-  return c;
-}, H = (c, e) => W(c, j(e));
-var h = (c, e, t) => (w(c, typeof e != "symbol" ? e + "" : e, t), t);
-import { getObjectVisible as F } from "../three/getObjectVisible.js";
-import { calculateThreeMouse as G } from "./calculateThreeMouse.js";
-import { getFiveModel as k } from "./getFiveModel.js";
-import { THREERaycaster as I } from "../three/core/Raycaster.js";
-class X {
+    P.call(e, t) && D(h, t, e[t]);
+  if (G)
+    for (var t of G(e))
+      V.call(e, t) && D(h, t, e[t]);
+  return h;
+}, N = (h, e) => F(h, R(e));
+var a = (h, e, t) => (D(h, typeof e != "symbol" ? e + "" : e, t), t);
+import { getObjectVisible as T } from "../three/getObjectVisible.js";
+import { calculateThreeMouse as B } from "./calculateThreeMouse.js";
+import { getFiveModel as X } from "./getFiveModel.js";
+import { THREERaycaster as S } from "../three/core/Raycaster.js";
+class z {
   constructor(e, t) {
-    h(this, "_five");
+    a(this, "_five");
     /**
      * @description: 拖动中
      */
-    h(this, "dragging", !1);
-    h(this, "boundObject", {});
-    h(this, "config");
-    h(this, "handleWantsGesture", (e, t) => {
+    a(this, "dragging", !1);
+    a(this, "boundObject", {});
+    a(this, "config");
+    a(this, "handleWantsGesture", (e, t) => {
       if (t.length !== 1)
         return;
       const n = t[0];
       if (n.raycaster) {
-        const i = new I();
+        const i = new S();
         i.ray = n.raycaster.ray, i.near = n.raycaster.near, i.far = n.raycaster.far, i.camera = n.raycaster.camera, i.layers = n.raycaster.layers, i.params = n.raycaster.params, n.raycaster = i;
       }
       if (n) {
         if (e === "mouseMove" && this.onDomEvent("hover", n), e === "tap") {
-          const i = new MouseEvent("click", { clientX: n.x, clientY: n.y }), f = this.onDomEvent("click", n, i), o = this.onDomEvent("wantDblclick", n, i, this.boundObject.dblclick);
-          if (f === !1 || o === !1)
+          const i = new MouseEvent("click", { clientX: n.x, clientY: n.y }), d = this.onDomEvent("click", n, i), o = this.onDomEvent("wantDblclick", n, i, this.boundObject.dblclick);
+          if (d === !1 || o === !1)
             return !1;
         }
         if (this.dragging)
           return !1;
       }
     });
-    h(this, "handleDomEvent", (e, t, n) => {
+    a(this, "handleDomEvent", (e, t, n) => {
       const i = { x: t.clientX, y: t.clientY };
       this.onDomEvent(e, i, t, n);
     });
-    h(this, "handleMouseEvent", (e) => {
+    a(this, "handleMouseEvent", (e) => {
       this.handleDomEvent(e.type, e);
     });
-    h(this, "handleMousedown", (e) => {
+    a(this, "handleMousedown", (e) => {
       this.handleDomEvent("mousedown", e), this.handleDomEvent("dragstart", e, this.haveDragEventObject);
     });
-    h(this, "handleMouseup", (e) => {
+    a(this, "handleMouseup", (e) => {
       var t;
       this.dragging = !1, (t = this.haveDragEventObject) == null || t.forEach((n) => {
         n._dragging && (n._dragging = !1, this.notify({
@@ -63,7 +63,7 @@ class X {
         }));
       }), this.handleDomEvent("mouseup", e);
     });
-    h(this, "handleMousemove", (e) => {
+    a(this, "handleMousemove", (e) => {
       var t;
       this.dragging && ((t = this.boundObject.drag) == null || t.forEach((n) => {
         n._dragging && this.notify({
@@ -75,100 +75,111 @@ class X {
       }));
     });
     // eslint-disable-next-line complexity
-    h(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
-      var v, E, g, _, p;
+    a(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
+      var v, _, p, b, y;
       if (!t || !i || (i == null ? void 0 : i.length) === 0)
         return;
-      const f = [];
-      ((v = this.config) == null ? void 0 : v.fiveModels) !== null && ((E = this.config) != null && E.fiveModels ? f.push(...this.config.fiveModels) : f.push(this.model));
-      const o = f.filter((s) => s.loaded), u = (g = t.raycaster) != null ? g : this.getRaycaster(t);
+      const d = [];
+      ((v = this.config) == null ? void 0 : v.fiveModels) !== null && ((_ = this.config) != null && _.fiveModels ? d.push(...this.config.fiveModels) : d.push(this.model));
+      const o = d.filter((m) => m.loaded), u = (p = t.raycaster) != null ? p : this.getRaycaster(t);
       u.params.Points.threshold = 0.04;
-      const r = u.intersectObjects(i, !0), a = [];
-      o.forEach((s) => {
-        const y = s.intersectRaycaster(u);
-        a.push(...y);
+      const s = u.intersectObjects(i, !0), f = [];
+      o.forEach((m) => {
+        const O = m.intersectRaycaster(u);
+        f.push(...O);
       });
       const l = 0.01;
-      if (a.length > 0 && r.length > 0 && a[0].distance + l < r[0].distance)
+      if (f.length > 0 && s.length > 0 && f[0].distance + l < s[0].distance)
         return;
-      const d = (_ = r == null ? void 0 : r[0]) == null ? void 0 : _.object;
+      const c = (b = s == null ? void 0 : s[0]) == null ? void 0 : b.object;
       if (e === "wantDblclick")
         return !1;
-      if ((!d || !this.objectIsBound(d)) && e === "hover")
-        for (const s of (p = this.boundObject.hover) != null ? p : [])
-          s._hovered && this.notify({ eventName: "unHover", object: s });
-      if (d && d && this.notify({ eventName: e, object: d, originEvent: n, raycaster: u, intersects: r }))
+      if ((!c || !this.objectIsBound(c)) && e === "hover")
+        for (const m of (y = this.boundObject.hover) != null ? y : [])
+          m._hovered && this.notify({ eventName: "unHover", object: m });
+      if (c && c && this.notify({ eventName: e, object: c, originEvent: n, raycaster: u, intersects: s, fiveModelIntersects: f }))
         return !1;
     });
-    h(this, "objectIsBound", (e) => {
+    a(this, "objectIsBound", (e) => {
       let t = e._domEvent, n = e.parent;
       for (; typeof t == "undefined" && n; )
         t = n._domEvent, n = n.parent;
       return !!t;
     });
-    h(this, "notify", (e) => {
-      var g, _, p;
-      const { eventName: t, object: n, originEvent: i, raycaster: f, intersects: o } = e;
+    a(this, "notify", (e) => {
+      var b, y, m, O, H;
+      const { eventName: t, object: n, originEvent: i, raycaster: d, intersects: o, fiveModelIntersects: u } = e;
       if (!n)
         return !1;
-      let u = !1, r = [];
-      const a = [], l = () => {
+      let s = !1, f = [];
+      const l = [], c = () => {
         if (!o)
           return !1;
-        const s = o.slice(1);
-        return s[0] ? this.notify(H(M({}, e), { object: s[0].object, intersects: s })) : !1;
+        const r = o.slice(1);
+        return r[0] ? this.notify(N(L({}, e), { object: r[0].object, intersects: r })) : !1;
       };
-      let d = n;
-      for (a.push(d); d.parent; )
-        d = d.parent, a.push(d);
-      const v = a[a.length - 1];
-      if ((g = this.config) != null && g.noEmitWhenNotInScene && v.type !== "Scene")
-        return l();
-      let E = !1;
-      for (const s of a) {
-        if (u)
+      let v = n;
+      for (l.push(v); v.parent; )
+        v = v.parent, l.push(v);
+      const _ = l[l.length - 1];
+      if ((b = this.config) != null && b.noEmitWhenNotInScene && _.type !== "Scene")
+        return c();
+      let p = !1;
+      for (const r of l) {
+        if (s)
           break;
-        s.draggable && (t === "dragstart" && (s._dragging = !0, this.dragging = !0), t === "dragend" && (s._dragging = !1, this.dragging = !1));
-        const y = s._domEvent;
-        if (!y)
+        r.draggable && (t === "dragstart" && (r._dragging = !0, this.dragging = !0), t === "dragend" && (r._dragging = !1, this.dragging = !1));
+        const I = r._domEvent;
+        if (!I)
           continue;
-        const D = y[`${t}Handler`];
-        if (D)
-          for (const [x, m] of D) {
-            if (m != null && m.noEmitWhenNotInScene && v.type !== "Scene" || ((_ = this.config) != null && _.noEmitWhenHide || m != null && m.noEmitWhenHide) && !F(s))
+        const x = I[`${t}Handler`];
+        if (x)
+          for (const [k, E] of x) {
+            if (E != null && E.noEmitWhenNotInScene && _.type !== "Scene")
               continue;
-            if (E = !0, t === "hover") {
-              if (s._hovered)
+            if (E.skipPano && u) {
+              const g = (y = u[0]) == null ? void 0 : y.point;
+              if (g && ((m = this.five.observers[this.five.panoIndex].accessibleNodes) != null && m.some(($) => {
+                var W;
+                const M = (W = this.five.works.getResolvedObserver($)) == null ? void 0 : W.standingPosition;
+                return (M == null ? void 0 : M.distanceTo(g)) < 0.25;
+              })))
                 continue;
-              s._hovered = !0;
-              for (const b of (p = this.boundObject.hover) != null ? p : [])
-                b !== s && b._hovered && this.notify({ eventName: "unHover", object: b });
+            }
+            if (((O = this.config) != null && O.noEmitWhenHide || E != null && E.noEmitWhenHide) && !T(r))
+              continue;
+            if (p = !0, t === "hover") {
+              if (r._hovered)
+                continue;
+              r._hovered = !0;
+              for (const g of (H = this.boundObject.hover) != null ? H : [])
+                g !== r && g._hovered && this.notify({ eventName: "unHover", object: g });
             }
             if (t === "unHover") {
-              if (!s._hovered)
+              if (!r._hovered)
                 continue;
-              s._hovered = !1;
+              r._hovered = !1;
             }
-            const O = x({
+            const w = k({
               type: t,
-              target: s,
+              target: r,
               origDomEvent: i,
-              raycaster: f,
+              raycaster: d,
               intersects: o,
               stopPropagation: () => {
-                u = !0;
+                s = !0;
               }
             });
-            r.push(O != null ? O : !0);
+            f.push(w != null ? w : !0);
           }
       }
-      if (E === !1)
-        return l();
+      if (p === !1)
+        return c();
       if (t === "click" || t === "wantDblclick")
-        return r.some((s) => s === !0);
+        return f.some((r) => r === !0);
     });
     var n;
-    this.five = e, this.config = t, e.on("wantsGesture", this.handleWantsGesture), document.addEventListener("mousedown", this.handleMousedown), document.addEventListener("dblclick", this.handleMouseEvent), document.addEventListener("mouseup", this.handleMouseup), document.addEventListener("mousemove", this.handleMousemove), window.__FIVE_DOM_EVENTS__ = (n = window.__FIVE_DOM_EVENTS__) != null ? n : [], window.__FIVE_DOM_EVENTS__.push(this);
+    this.five = e, this.config = t, console.log("constructor"), e.off("wantsGesture", this.handleWantsGesture), e.on("wantsGesture", this.handleWantsGesture), document.addEventListener("mousedown", this.handleMousedown), document.addEventListener("dblclick", this.handleMouseEvent), document.addEventListener("mouseup", this.handleMouseup), document.addEventListener("mousemove", this.handleMousemove), window.__FIVE_DOM_EVENTS__ = (n = window.__FIVE_DOM_EVENTS__) != null ? n : [], window.__FIVE_DOM_EVENTS__.push(this);
   }
   get five() {
     return this._five;
@@ -181,7 +192,7 @@ class X {
     return [...new Set([this.boundObject.dragend, this.boundObject.drag, this.boundObject.dragstart].flat())].filter(Boolean);
   }
   get model() {
-    return k(this.five);
+    return X(this.five);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
@@ -189,9 +200,9 @@ class X {
    * @todo: added 和 removed 还是不太智能
    */
   addAutoBindEventListener(e, t, n, i) {
-    const f = () => this.addEventListener(e, t, n, i), o = () => this.removeEventListener(e, t, n, i);
-    return e.addEventListener("added", f), e.addEventListener("removed", o), e.addEventListener("dispose", o), () => {
-      e.removeEventListener("added", f), e.removeEventListener("removed", o), e.removeEventListener("dispose", o);
+    const d = () => this.addEventListener(e, t, n, i), o = () => this.removeEventListener(e, t, n, i);
+    return e.addEventListener("added", d), e.addEventListener("removed", o), e.addEventListener("dispose", o), () => {
+      e.removeEventListener("added", d), e.removeEventListener("removed", o), e.removeEventListener("dispose", o);
     };
   }
   /**
@@ -202,24 +213,24 @@ class X {
    * @return {void}
    */
   addEventListener(e, t, n, i) {
-    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), this.boundObject[t].includes(e) || this.boundObject[t].push(e), e._domEvent[`${t}Handler`].push([n, M({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]);
+    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), this.boundObject[t].includes(e) || this.boundObject[t].push(e), e._domEvent[`${t}Handler`].push([n, L({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]);
   }
   removeEventListener(e, t, n, ...i) {
     var o, u;
-    if (!e._domEvent || (t === void 0 && (Object.keys(this.boundObject).forEach((r) => {
-      var l, d;
-      const a = (l = this.boundObject[r]) == null ? void 0 : l.findIndex((v) => v === e);
-      a !== -1 && ((d = this.boundObject[r]) == null || d.splice(a, 1));
+    if (!e._domEvent || (t === void 0 && (Object.keys(this.boundObject).forEach((s) => {
+      var l, c;
+      const f = (l = this.boundObject[s]) == null ? void 0 : l.findIndex((v) => v === e);
+      f !== -1 && ((c = this.boundObject[s]) == null || c.splice(f, 1));
     }), e._domEvent = {}), !e._domEvent[`${t}Handler`]))
       return;
     if (n === void 0) {
       delete e._domEvent[`${t}Handler`];
       return;
     }
-    const f = e._domEvent[`${t}Handler`].findIndex((r) => r[0] === n);
-    if (f !== -1 && (e._domEvent[`${t}Handler`].splice(f, 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 r = (o = this.boundObject[t]) == null ? void 0 : o.findIndex((a) => a === e);
-      r !== -1 && ((u = this.boundObject[t]) == null || u.splice(r, 1));
+    const d = e._domEvent[`${t}Handler`].findIndex((s) => s[0] === n);
+    if (d !== -1 && (e._domEvent[`${t}Handler`].splice(d, 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 = (o = this.boundObject[t]) == null ? void 0 : o.findIndex((f) => f === e);
+      s !== -1 && ((u = this.boundObject[t]) == null || u.splice(s, 1));
     }
   }
   clear() {
@@ -238,10 +249,10 @@ class X {
     const t = this.five.getElement();
     if (!t)
       return;
-    const n = G(e, t), i = new I();
+    const n = B(e, t), i = new S();
     return i.setFromCamera(n, this.five.camera), i;
   }
 }
 export {
-  X as FiveDomEvents
+  z as FiveDomEvents
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.64.5",
+    "%c %c@realsee/dnalogel %cv3.64.6",
     [
       "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.64.5",
+  "version": "3.64.6",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",