@realsee/dnalogel 3.64.5-alpha.1 → 3.64.5-alpha.3

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

@@ -1,68 +1,58 @@
-var I = Object.defineProperty, j = Object.defineProperties;
-var $ = Object.getOwnPropertyDescriptors;
-var D = Object.getOwnPropertySymbols;
-var W = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
-var O = (u, e, t) => e in u ? I(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t, M = (u, e) => {
+var S = Object.defineProperty, W = Object.defineProperties;
+var j = Object.getOwnPropertyDescriptors;
+var L = Object.getOwnPropertySymbols;
+var $ = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
+var M = (c, e, t) => e in c ? S(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t, O = (c, e) => {
   for (var t in e || (e = {}))
-    W.call(e, t) && O(u, t, e[t]);
-  if (D)
-    for (var t of D(e))
-      k.call(e, t) && O(u, t, e[t]);
-  return u;
-}, H = (u, e) => j(u, $(e));
-var a = (u, e, t) => (O(u, typeof e != "symbol" ? e + "" : e, t), t);
-import { getObjectVisible as S } from "../three/getObjectVisible.js";
+    $.call(e, t) && M(c, t, e[t]);
+  if (L)
+    for (var t of L(e))
+      F.call(e, t) && M(c, t, e[t]);
+  return c;
+}, H = (c, e) => W(c, j(e));
+var h = (c, e, t) => (M(c, typeof e != "symbol" ? e + "" : e, t), t);
+import { getObjectVisible as G } from "../three/getObjectVisible.js";
 import { calculateThreeMouse as N } from "./calculateThreeMouse.js";
-import { getFiveModel as R } from "./getFiveModel.js";
-import { THREERaycaster as x } from "../three/core/Raycaster.js";
-class Y {
-  // 事件由five触发时，用来补充 originEvent 属性
+import { getFiveModel as k } from "./getFiveModel.js";
+import { THREERaycaster as I } from "../three/core/Raycaster.js";
+class X {
   constructor(e, t) {
-    a(this, "five");
+    h(this, "_five");
     /**
      * @description: 拖动中
      */
-    a(this, "dragging", !1);
-    a(this, "boundObject", {});
-    a(this, "config");
-    a(this, "lastMouseDownEvent");
-    // 事件由five触发时，用来补充 originEvent 属性
-    a(this, "lastTouchEvent");
-    a(this, "handleWantsGesture", (e, t) => {
-      var o;
+    h(this, "dragging", !1);
+    h(this, "boundObject", {});
+    h(this, "config");
+    h(this, "handleWantsGesture", (e, t) => {
       if (t.length !== 1)
         return;
       const n = t[0];
       if (n.raycaster) {
-        const s = new x();
-        s.ray = n.raycaster.ray, s.near = n.raycaster.near, s.far = n.raycaster.far, s.camera = n.raycaster.camera, s.layers = n.raycaster.layers, s.params = n.raycaster.params, n.raycaster = s;
+        const i = new I();
+        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") {
-          let s;
-          s || (s = (o = this.lastMouseDownEvent) != null ? o : this.lastTouchEvent), s || (s = new MouseEvent("click", { clientX: n.x, clientY: n.y }));
-          const d = this.onDomEvent("click", n, s), l = this.onDomEvent("wantDblclick", n, s, this.boundObject.dblclick);
-          if (d === !1 || l === !1)
+          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)
             return !1;
         }
         if (this.dragging)
           return !1;
       }
     });
-    a(this, "handleDomEvent", (e, t, n) => {
-      const o = { x: t.clientX, y: t.clientY };
-      this.onDomEvent(e, o, t, n);
+    h(this, "handleDomEvent", (e, t, n) => {
+      const i = { x: t.clientX, y: t.clientY };
+      this.onDomEvent(e, i, t, n);
     });
-    a(this, "handleMouseEvent", (e) => {
+    h(this, "handleMouseEvent", (e) => {
       this.handleDomEvent(e.type, e);
     });
-    a(this, "handleMousedown", (e) => {
-      this.lastMouseDownEvent = e, this.handleDomEvent("mousedown", e), this.handleDomEvent("dragstart", e, this.haveDragEventObject);
+    h(this, "handleMousedown", (e) => {
+      this.handleDomEvent("mousedown", e), this.handleDomEvent("dragstart", e, this.haveDragEventObject);
     });
-    a(this, "setLastTouchEvent", (e) => {
-      this.lastTouchEvent = e;
-    });
-    a(this, "handleMouseup", (e) => {
+    h(this, "handleMouseup", (e) => {
       var t;
       this.dragging = !1, (t = this.haveDragEventObject) == null || t.forEach((n) => {
         n._dragging && (n._dragging = !1, this.notify({
@@ -73,7 +63,7 @@ class Y {
         }));
       }), this.handleDomEvent("mouseup", e);
     });
-    a(this, "handleMousemove", (e) => {
+    h(this, "handleMousemove", (e) => {
       var t;
       this.dragging && ((t = this.boundObject.drag) == null || t.forEach((n) => {
         n._dragging && this.notify({
@@ -85,115 +75,124 @@ class Y {
       }));
     });
     // eslint-disable-next-line complexity
-    a(this, "onDomEvent", (e, t, n, o = this.boundObject[e]) => {
-      var v, E, g, p, y;
-      if (!t || !o || (o == null ? void 0 : o.length) === 0)
+    h(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
+      var v, E, g, _, p;
+      if (!t || !i || (i == null ? void 0 : i.length) === 0)
         return;
-      const s = [];
-      ((v = this.config) == null ? void 0 : v.fiveModels) !== null && ((E = this.config) != null && E.fiveModels ? s.push(...this.config.fiveModels) : s.push(this.model));
-      const d = s.filter((i) => i.loaded), l = (g = t.raycaster) != null ? g : this.getRaycaster(t);
-      l.params.Points.threshold = 0.02;
-      const r = l.intersectObjects(o, !0), h = [];
-      d.forEach((i) => {
-        const b = i.intersectRaycaster(l);
-        h.push(...b);
+      console.log("onDomEvent", e, t, n, O({}, n));
+      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), l = (g = t.raycaster) != null ? g : this.getRaycaster(t);
+      l.params.Points.threshold = 0.04;
+      const r = l.intersectObjects(i, !0), d = [];
+      o.forEach((s) => {
+        const y = s.intersectRaycaster(l);
+        d.push(...y);
       });
-      const f = 0.01;
-      if (h.length > 0 && r.length > 0 && h[0].distance + f < r[0].distance)
+      const u = 0.01;
+      if (d.length > 0 && r.length > 0 && d[0].distance + u < r[0].distance)
         return;
-      const c = (p = r == null ? void 0 : r[0]) == null ? void 0 : p.object;
-      if (e === "wantDblclick")
+      const a = (_ = r == null ? void 0 : r[0]) == null ? void 0 : _.object;
+      if (console.log("object", a, i), e === "wantDblclick")
         return !1;
-      if ((!c || !this.objectIsBound(c)) && e === "hover")
-        for (const i of (y = this.boundObject.hover) != null ? y : [])
-          i._hovered && this.notify({ eventName: "unHover", object: i });
-      if (c && c && this.notify({ eventName: e, object: c, originEvent: n, raycaster: l, intersects: r }))
+      if ((!a || !this.objectIsBound(a)) && e === "hover")
+        for (const s of (p = this.boundObject.hover) != null ? p : [])
+          s._hovered && this.notify({ eventName: "unHover", object: s });
+      if (a && a && this.notify({ eventName: e, object: a, originEvent: n, raycaster: l, intersects: r }))
         return !1;
     });
-    a(this, "objectIsBound", (e) => {
+    h(this, "objectIsBound", (e) => {
       let t = e._domEvent, n = e.parent;
       for (; typeof t == "undefined" && n; )
         t = n._domEvent, n = n.parent;
       return !!t;
     });
-    a(this, "notify", (e) => {
-      var g, p, y;
-      const { eventName: t, object: n, originEvent: o, raycaster: s, intersects: d } = e;
+    h(this, "notify", (e) => {
+      var g, _, p;
+      const { eventName: t, object: n, originEvent: i, raycaster: f, intersects: o } = e;
       if (!n)
         return !1;
       let l = !1, r = [];
-      const h = [], f = () => {
-        if (!d)
+      const d = [], u = () => {
+        if (!o)
           return !1;
-        const i = d.slice(1);
-        return i[0] ? this.notify(H(M({}, e), { object: i[0].object, intersects: i })) : !1;
+        const s = o.slice(1);
+        return s[0] ? this.notify(H(O({}, e), { object: s[0].object, intersects: s })) : !1;
       };
-      let c = n;
-      for (h.push(c); c.parent; )
-        c = c.parent, h.push(c);
-      const v = h[h.length - 1];
+      let a = n;
+      for (d.push(a); a.parent; )
+        a = a.parent, d.push(a);
+      const v = d[d.length - 1];
       if ((g = this.config) != null && g.noEmitWhenNotInScene && v.type !== "Scene")
-        return f();
+        return u();
       let E = !1;
-      for (const i of h) {
+      for (const s of d) {
         if (l)
           break;
-        i.draggable && (t === "dragstart" && (i._dragging = !0, this.dragging = !0), t === "dragend" && (i._dragging = !1, this.dragging = !1));
-        const b = i._domEvent;
-        if (!b)
+        s.draggable && (t === "dragstart" && (s._dragging = !0, this.dragging = !0), t === "dragend" && (s._dragging = !1, this.dragging = !1));
+        const y = s._domEvent;
+        if (!y)
           continue;
-        const w = b[`${t}Handler`];
-        if (w)
-          for (const [T, m] of w) {
-            if (m != null && m.noEmitWhenNotInScene && v.type !== "Scene" || ((p = this.config) != null && p.noEmitWhenHide || m != null && m.noEmitWhenHide) && !S(i))
+        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) && !G(s))
               continue;
             if (E = !0, t === "hover") {
-              if (i._hovered)
+              if (s._hovered)
                 continue;
-              i._hovered = !0;
-              for (const _ of (y = this.boundObject.hover) != null ? y : [])
-                _ !== i && _._hovered && this.notify({ eventName: "unHover", object: _ });
+              s._hovered = !0;
+              for (const b of (p = this.boundObject.hover) != null ? p : [])
+                b !== s && b._hovered && this.notify({ eventName: "unHover", object: b });
             }
             if (t === "unHover") {
-              if (!i._hovered)
+              if (!s._hovered)
                 continue;
-              i._hovered = !1;
+              s._hovered = !1;
             }
-            const L = T({
+            const w = x({
               type: t,
-              target: i,
-              origDomEvent: o,
-              raycaster: s,
-              intersects: d,
+              target: s,
+              origDomEvent: i,
+              raycaster: f,
+              intersects: o,
               stopPropagation: () => {
                 l = !0;
               }
             });
-            r.push(L != null ? L : !0);
+            r.push(w != null ? w : !0);
           }
       }
       if (E === !1)
-        return f();
+        return u();
       if (t === "click" || t === "wantDblclick")
-        return r.some((i) => i === !0);
+        return r.some((s) => s === !0);
     });
-    this.five = e, this.config = t, e.on("wantsGesture", this.handleWantsGesture), document.addEventListener("mousedown", this.handleMousedown), document.addEventListener("touchstart", this.setLastTouchEvent), document.addEventListener("touchend", this.setLastTouchEvent), document.addEventListener("touchmove", this.setLastTouchEvent), document.addEventListener("dblclick", this.handleMouseEvent), document.addEventListener("mouseup", this.handleMouseup), document.addEventListener("mousemove", this.handleMousemove);
+    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);
+  }
+  get five() {
+    return this._five;
+  }
+  set five(e) {
+    var t;
+    (t = this._five) == null || t.off("wantsGesture", this.handleWantsGesture), this._five = e, this._five.on("wantsGesture", this.handleWantsGesture);
   }
   get haveDragEventObject() {
     return [...new Set([this.boundObject.dragend, this.boundObject.drag, this.boundObject.dragstart].flat())].filter(Boolean);
   }
   get model() {
-    return R(this.five);
+    return k(this.five);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
    * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
    * @todo: added 和 removed 还是不太智能
    */
-  addAutoBindEventListener(e, t, n, o) {
-    const s = () => this.addEventListener(e, t, n, o), d = () => this.removeEventListener(e, t, n, o);
-    return e.addEventListener("added", s), e.addEventListener("removed", d), e.addEventListener("dispose", d), () => {
-      e.removeEventListener("added", s), e.removeEventListener("removed", d), e.removeEventListener("dispose", d);
+  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);
     };
   }
   /**
@@ -203,24 +202,24 @@ class Y {
    * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
    * @return {void}
    */
-  addEventListener(e, t, n, o) {
-    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 }, o)]);
+  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, O({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]);
   }
-  removeEventListener(e, t, n, ...o) {
-    var d, l;
+  removeEventListener(e, t, n, ...i) {
+    var o, l;
     if (!e._domEvent || (t === void 0 && (Object.keys(this.boundObject).forEach((r) => {
-      var f, c;
-      const h = (f = this.boundObject[r]) == null ? void 0 : f.findIndex((v) => v === e);
-      h !== -1 && ((c = this.boundObject[r]) == null || c.splice(h, 1));
+      var u, a;
+      const d = (u = this.boundObject[r]) == null ? void 0 : u.findIndex((v) => v === e);
+      d !== -1 && ((a = this.boundObject[r]) == null || a.splice(d, 1));
     }), e._domEvent = {}), !e._domEvent[`${t}Handler`]))
       return;
     if (n === void 0) {
       delete e._domEvent[`${t}Handler`];
       return;
     }
-    const s = e._domEvent[`${t}Handler`].findIndex((r) => r[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 r = (d = this.boundObject[t]) == null ? void 0 : d.findIndex((h) => h === e);
+    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((d) => d === e);
       r !== -1 && ((l = this.boundObject[t]) == null || l.splice(r, 1));
     }
   }
@@ -229,7 +228,7 @@ class Y {
   }
   dispose() {
     var e;
-    (e = this.five) == null || e.off("wantsGesture", this.handleWantsGesture), document.removeEventListener("mousedown", this.handleMousedown), document.removeEventListener("touchstart", this.setLastTouchEvent), document.removeEventListener("touchend", this.setLastTouchEvent), document.removeEventListener("touchmove", this.setLastTouchEvent), document.removeEventListener("mouseup", this.handleMouseup), document.removeEventListener("mousemove", this.handleMousemove), this.boundObject = {};
+    (e = this.five) == null || e.off("wantsGesture", this.handleWantsGesture), document.removeEventListener("mousedown", this.handleMousedown), document.removeEventListener("mouseup", this.handleMouseup), document.removeEventListener("mousemove", this.handleMousemove), this.boundObject = {};
   }
   toJSON() {
     return {
@@ -240,10 +239,10 @@ class Y {
     const t = this.five.getElement();
     if (!t)
       return;
-    const n = N(e, t), o = new x();
-    return o.setFromCamera(n, this.five.camera), o;
+    const n = N(e, t), i = new I();
+    return i.setFromCamera(n, this.five.camera), i;
   }
 }
 export {
-  Y as FiveDomEvents
+  X as FiveDomEvents
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.64.5-alpha.1",
+    "%c %c@realsee/dnalogel %cv3.64.5-alpha.3",
     [
       "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-alpha.1",
+  "version": "3.64.5-alpha.3",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",