@realsee/dnalogel 3.0.0-10 → 3.0.0-12

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

@@ -1,88 +1,115 @@
-var b = Object.defineProperty;
-var m = Object.getOwnPropertySymbols;
-var O = Object.prototype.hasOwnProperty, g = Object.prototype.propertyIsEnumerable;
-var f = (d, e, t) => e in d ? b(d, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[e] = t, p = (d, e) => {
+var O = Object.defineProperty;
+var _ = Object.getOwnPropertySymbols;
+var L = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
+var c = (u, e, t) => e in u ? O(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t, p = (u, e) => {
   for (var t in e || (e = {}))
-    O.call(e, t) && f(d, t, e[t]);
-  if (m)
-    for (var t of m(e))
-      g.call(e, t) && f(d, t, e[t]);
-  return d;
+    L.call(e, t) && c(u, t, e[t]);
+  if (_)
+    for (var t of _(e))
+      H.call(e, t) && c(u, t, e[t]);
+  return u;
 };
-var u = (d, e, t) => (f(d, typeof e != "symbol" ? e + "" : e, t), t);
-import { getObjectVisible as H } from "../three/getObjectVisible.js";
-class I {
+var f = (u, e, t) => (c(u, typeof e != "symbol" ? e + "" : e, t), t);
+import { getObjectVisible as g } from "../three/getObjectVisible.js";
+class x {
   constructor(e) {
-    u(this, "five");
-    u(this, "boundObject", {});
-    u(this, "handleWantsTapGesture", (e) => {
-      var s;
-      const t = "click", n = this.boundObject[t];
-      if (!n || (n == null ? void 0 : n.length) === 0)
+    f(this, "five");
+    f(this, "boundObject", {});
+    f(this, "handleWantsGesture", (e, t) => {
+      if (t.length !== 1)
         return;
-      const o = this.five.model.intersectRaycaster(e), i = e.intersectObjects(n, !0);
-      if (o.length > 0 && i.length > 0 && o[0].distance < i[0].distance)
+      const n = t[0];
+      if (n) {
+        if (e === "mouseMove")
+          return this.onDomEvent("hover", n.raycaster);
+        if (e === "tap")
+          return this.onDomEvent("click", n.raycaster);
+      }
+    });
+    f(this, "onDomEvent", (e, t) => {
+      const n = this.boundObject[e];
+      if (!n || (n == null ? void 0 : n.length) === 0)
         return;
-      const r = (s = i[0]) == null ? void 0 : s.object;
-      if (!r || !this.objectIsBound(r))
+      const d = (() => {
+        var i;
+        const r = t.intersectObjects(n, !0);
+        if (r.length === 0)
+          return;
+        const v = this.five.model.intersectRaycaster(t);
+        if (!(v.length > 0 && r.length > 0 && v[0].distance < r[0].distance))
+          return (i = r[0]) == null ? void 0 : i.object;
+      })();
+      if (!d || !this.objectIsBound(d)) {
+        for (const r of this.boundObject.hover)
+          r._hovered && this.notify("unHover", r);
         return;
-      if (this.notify(t, r))
+      }
+      if (this.notify(e, d))
         return !1;
     });
-    u(this, "objectIsBound", (e) => {
+    f(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
-    u(this, "notify", (e, t, n, o) => {
-      let i = !1, r = [];
-      const l = [t];
-      let s = t;
-      for (; s.parent; )
-        s = s.parent, l.push(s);
-      for (const a of l) {
-        if (i)
+    f(this, "notify", (e, t, n, d) => {
+      let s = !1, r = [];
+      const v = [];
+      let i = t;
+      for (v.push(i); i.parent; )
+        i = i.parent, v.push(i);
+      for (const o of v) {
+        if (s)
           break;
-        const h = a._domEvent;
-        if (!h)
+        const E = o._domEvent;
+        if (!E)
           continue;
-        const E = h[`${e}Handler`];
-        if (E)
-          for (const [_, v] of E) {
-            if (v != null && v.checkVisible && !H(a))
+        const m = E[`${e}Handler`];
+        if (m)
+          for (const [b, a] of m) {
+            if (a != null && a.checkVisible && !g(o))
               continue;
-            const c = _({
+            if (e === "hover") {
+              if (o._hovered)
+                continue;
+              o._hovered = !0;
+              for (const h of this.boundObject.hover)
+                h !== o && h._hovered && this.notify("unHover", h);
+            }
+            if (e === "unHover") {
+              if (!o._hovered)
+                continue;
+              o._hovered = !1;
+            }
+            const l = b({
               type: e,
-              target: a,
+              target: o,
               origDomEvent: n,
-              intersect: o,
+              intersect: d,
               stopPropagation: () => {
-                i = !0;
+                s = !0;
               }
             });
-            r.push(c != null ? c : !0);
+            r.push(l != null ? l : !0);
           }
       }
-      return r.some((a) => a === !0);
+      if (e === "click")
+        return r.some((o) => o === !0);
     });
-    this.five = e, e.on("wantsTapGesture", this.handleWantsTapGesture);
+    this.five = e, e.on("wantsGesture", this.handleWantsGesture);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
    * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
    * @todo: added 和 removed 还是不太智能
    */
-  addAutoBindEventListener(...e) {
-    const t = e[0];
-    t.addEventListener("added", () => {
-      this.addEventListener(...e);
-    }), t.addEventListener("removed", () => {
-      this.removeEventListener(...e);
-    }), t.addEventListener("dispose", () => {
-      this.removeEventListener(...e);
-    });
+  addAutoBindEventListener(e, t, n, d) {
+    const s = () => this.addEventListener(e, t, n, d), r = () => this.removeEventListener(e, t, n, d);
+    return e.addEventListener("added", s), e.addEventListener("removed", r), e.addEventListener("dispose", r), () => {
+      e.removeEventListener("added", s), e.removeEventListener("removed", r), e.removeEventListener("dispose", r);
+    };
   }
   /**
    * @description: add event listener
@@ -91,24 +118,25 @@ class I {
    * @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, p({ checkVisible: !0 }, o)]), (i = this.boundObject[t]) == null || i.push(e);
+  addEventListener(e, t, n, d) {
+    var s;
+    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, p({ checkVisible: !0 }, d)]), (s = this.boundObject[t]) == null || s.push(e);
   }
-  removeEventListener(e, t, n, ...o) {
-    var r, l;
+  removeEventListener(e, t, n, ...d) {
+    var r, v;
     if (!e._domEvent || !e._domEvent[`${t}Handler`])
       return;
-    const i = e._domEvent[`${t}Handler`].findIndex((s) => s[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 s = (r = this.boundObject[t]) == null ? void 0 : r.findIndex((a) => a === e);
-      s !== -1 && ((l = this.boundObject[t]) == null || l.splice(s, 1));
+    const s = e._domEvent[`${t}Handler`].findIndex((i) => i[0] === n);
+    if (s !== -1 && (e._domEvent[`${t}Handler`].splice(s, 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 = (r = this.boundObject[t]) == null ? void 0 : r.findIndex((o) => o === e);
+      i !== -1 && ((v = this.boundObject[t]) == null || v.splice(i, 1));
     }
   }
   dispose() {
-    this.five.off("wantsTapGesture", this.handleWantsTapGesture), this.boundObject = {};
+    var e;
+    (e = this.five) == null || e.off("wantsGesture", this.handleWantsGesture), this.boundObject = {};
   }
 }
 export {
-  I as FiveDomEvents
+  x as FiveDomEvents
 };

package/libs/shared-utils/logger.js

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

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