@realsee/dnalogel 3.0.0-10 → 3.0.0-12

package/dist/index.js

@@ -39,7 +39,7 @@ import dl from "animejs";
 import { GLTFLoader as Zf } from "@realsee/five/gltf-loader";
 function qf() {
   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",
@@ -6848,7 +6848,7 @@ let Vn = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    u(this, "VERSION", "3.0.0-10");
+    u(this, "VERSION", "3.0.0-12");
     u(this, "five");
     /**
      * 插件事件钩子
@@ -17121,18 +17121,36 @@ class N1 {
   constructor(t) {
     u(this, "five");
     u(this, "boundObject", {});
-    u(this, "handleWantsTapGesture", (t) => {
-      var l;
-      const e = "click", i = this.boundObject[e];
-      if (!i || (i == null ? void 0 : i.length) === 0)
+    u(this, "handleWantsGesture", (t, e) => {
+      if (e.length !== 1)
         return;
-      const s = this.five.model.intersectRaycaster(t), o = t.intersectObjects(i, !0);
-      if (s.length > 0 && o.length > 0 && s[0].distance < o[0].distance)
+      const i = e[0];
+      if (i) {
+        if (t === "mouseMove")
+          return this.onDomEvent("hover", i.raycaster);
+        if (t === "tap")
+          return this.onDomEvent("click", i.raycaster);
+      }
+    });
+    u(this, "onDomEvent", (t, e) => {
+      const i = this.boundObject[t];
+      if (!i || (i == null ? void 0 : i.length) === 0)
         return;
-      const r = (l = o[0]) == null ? void 0 : l.object;
-      if (!r || !this.objectIsBound(r))
+      const s = (() => {
+        var l;
+        const r = e.intersectObjects(i, !0);
+        if (r.length === 0)
+          return;
+        const a = this.five.model.intersectRaycaster(e);
+        if (!(a.length > 0 && r.length > 0 && a[0].distance < r[0].distance))
+          return (l = r[0]) == null ? void 0 : l.object;
+      })();
+      if (!s || !this.objectIsBound(s)) {
+        for (const r of this.boundObject.hover)
+          r._hovered && this.notify("unHover", r);
         return;
-      if (this.notify(e, r))
+      }
+      if (this.notify(t, s))
         return !1;
     });
     u(this, "objectIsBound", (t) => {
@@ -17144,9 +17162,9 @@ class N1 {
     // eslint-disable-next-line max-params
     u(this, "notify", (t, e, i, s) => {
       let o = !1, r = [];
-      const a = [e];
+      const a = [];
       let l = e;
-      for (; l.parent; )
+      for (a.push(l); l.parent; )
         l = l.parent, a.push(l);
       for (const c of a) {
         if (o)
@@ -17159,6 +17177,18 @@ class N1 {
           for (const [f, m] of h) {
             if (m != null && m.checkVisible && !Ea(c))
               continue;
+            if (t === "hover") {
+              if (c._hovered)
+                continue;
+              c._hovered = !0;
+              for (const A of this.boundObject.hover)
+                A !== c && A._hovered && this.notify("unHover", A);
+            }
+            if (t === "unHover") {
+              if (!c._hovered)
+                continue;
+              c._hovered = !1;
+            }
             const p = f({
               type: t,
               target: c,
@@ -17171,24 +17201,21 @@ class N1 {
             r.push(p != null ? p : !0);
           }
       }
-      return r.some((c) => c === !0);
+      if (t === "click")
+        return r.some((c) => c === !0);
     });
-    this.five = t, t.on("wantsTapGesture", this.handleWantsTapGesture);
+    this.five = t, t.on("wantsGesture", this.handleWantsGesture);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
    * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
    * @todo: added 和 removed 还是不太智能
    */
-  addAutoBindEventListener(...t) {
-    const e = t[0];
-    e.addEventListener("added", () => {
-      this.addEventListener(...t);
-    }), e.addEventListener("removed", () => {
-      this.removeEventListener(...t);
-    }), e.addEventListener("dispose", () => {
-      this.removeEventListener(...t);
-    });
+  addAutoBindEventListener(t, e, i, s) {
+    const o = () => this.addEventListener(t, e, i, s), r = () => this.removeEventListener(t, e, i, s);
+    return t.addEventListener("added", o), t.addEventListener("removed", r), t.addEventListener("dispose", r), () => {
+      t.removeEventListener("added", o), t.removeEventListener("removed", r), t.removeEventListener("dispose", r);
+    };
   }
   /**
    * @description: add event listener
@@ -17212,7 +17239,8 @@ class N1 {
     }
   }
   dispose() {
-    this.five.off("wantsTapGesture", this.handleWantsTapGesture), this.boundObject = {};
+    var t;
+    (t = this.five) == null || t.off("wantsGesture", this.handleWantsGesture), this.boundObject = {};
   }
 }
 function ed(n, t) {
@@ -17662,7 +17690,9 @@ class F1 extends H1 {
     })() : void 0;
   }
   setTagZIndex(t) {
-    console.log("🐶 ==> setTagZIndex:");
+    return t.forEach((e) => {
+      e.zIndex = this.calculateTagZIndex(e);
+    });
   }
   calculateTagZIndex(t) {
     const e = this.getDistance(t);
@@ -27303,16 +27333,16 @@ class FP extends F1 {
         return;
       e.loading = !0;
       const s = NP(i).then((l) => {
-        var h, f, m, p, A;
+        var h, f;
         const c = Object.assign(l.scene, {
           customID: e.id,
           isTagModel: !0,
           removeEventListener: e.config.clickable === !1 ? () => {
-          } : this.addObjectClickHandler(e, l.scene, (g) => {
-            this.hooks.emit("click", { target: "TagModel", tag: e, event: g });
+          } : this.addObjectClickHandler(e, l.scene, (m) => {
+            this.hooks.emit("click", { target: "TagModel", tag: e, event: m });
           })
         });
-        return c.visible = this.getCurrentVisibleState(e), new rs().fromArray(e.matrix).decompose(c.position, c.quaternion, c.scale), c.updateWorldMatrix(!0, !0), c.visible = this.getVisible(e), (m = (f = (h = this.config) == null ? void 0 : h.globalConfig) == null ? void 0 : f.modelConfig) != null && m.autoLookAtEnabled && ((A = (p = e.config) == null ? void 0 : p.modelConfig) != null && A.autoLookAtEnabled) && c.lookAt(this.five.camera.position.clone().setY(c.position.y)), c;
+        return c.visible = this.getCurrentVisibleState(e), new rs().fromArray(e.matrix).decompose(c.position, c.quaternion, c.scale), c.updateWorldMatrix(!0, !0), c.visible = this.getVisible(e), (f = (h = e.config) == null ? void 0 : h.modelConfig) != null && f.autoLookAtEnabled && c.lookAt(this.five.camera.position.clone().setY(c.position.y)), c;
       });
       e.model = { promise: s };
       const o = yield s;
@@ -27672,24 +27702,23 @@ class va extends FP {
       this.updatePointTagPosition();
     });
     u(this, "handleFivePanoArrived", () => _(this, null, function* () {
-      var e, i, s;
-      this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((o) => {
-        o.temporaryState = pe(V({}, o.temporaryState), { visible: !0 });
-      }), (s = (i = (e = this.config) == null ? void 0 : e.globalConfig) == null ? void 0 : i.modelConfig) != null && s.autoLookAtEnabled && this.tags.filter(b1).filter((o) => {
-        var r, a;
-        return (a = (r = o.config) == null ? void 0 : r.modelConfig) == null ? void 0 : a.autoLookAtEnabled;
-      }).forEach((o) => {
-        var f;
-        const r = new I.Mesh(new I.BoxGeometry(), new I.MeshBasicMaterial()), a = (f = o.model) == null ? void 0 : f.object;
-        if (!a)
+      this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
+        e.temporaryState = pe(V({}, e.temporaryState), { visible: !0 });
+      }), this.tags.filter(b1).filter((e) => {
+        var i, s;
+        return (s = (i = e.config) == null ? void 0 : i.modelConfig) == null ? void 0 : s.autoLookAtEnabled;
+      }).forEach((e) => {
+        var c;
+        const i = new I.Mesh(new I.BoxGeometry(), new I.MeshBasicMaterial()), s = (c = e.model) == null ? void 0 : c.object;
+        if (!s)
           return;
-        r.position.copy(a.position), r.quaternion.copy(a.quaternion);
-        const l = this.five.camera.position;
-        r.lookAt(l.clone().setY(r.position.y));
-        const c = a.quaternion.clone(), d = r.quaternion.clone(), h = An();
-        h.onUpdate(({ progress: m }) => {
-          a.quaternion.copy(c.clone().slerp(d, m));
-        }), h.play();
+        i.position.copy(s.position), i.quaternion.copy(s.quaternion);
+        const o = this.five.camera.position;
+        i.lookAt(o.clone().setY(i.position.y));
+        const r = s.quaternion.clone(), a = i.quaternion.clone(), l = An();
+        l.onUpdate(({ progress: d }) => {
+          s.quaternion.copy(r.clone().slerp(a, d));
+        }), l.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     }));
     /** 楼层切换时，需要更新标签可见性 */