@realsee/dnalogel 3.64.5-alpha.0 → 3.64.5-alpha.2

package/dist/index.js

@@ -43,7 +43,7 @@ import { LineGeometry as PA, LineMaterial as IA, THREE_Line2 as EA, Line as MA }
 import { GLTFLoader as xA } from "@realsee/five/gltf-loader";
 function kA() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.64.5-alpha.0",
+    "%c %c@realsee/dnalogel %cv3.64.5-alpha.2",
     [
       "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",
@@ -5904,33 +5904,26 @@ function yg(n, t) {
   return new y.Vector2((n.x - i) / s * 2 - 1, -(n.y - e) / r * 2 + 1);
 }
 class fr {
-  // 事件由five触发时，用来补充 originEvent 属性
   constructor(t, e) {
-    d(this, "five");
+    d(this, "_five");
     /**
      * @description: 拖动中
      */
     d(this, "dragging", !1);
     d(this, "boundObject", {});
     d(this, "config");
-    d(this, "lastMouseDownEvent");
-    // 事件由five触发时，用来补充 originEvent 属性
-    d(this, "lastTouchEvent");
     d(this, "handleWantsGesture", (t, e) => {
-      var s;
       if (e.length !== 1)
         return;
       const i = e[0];
       if (i.raycaster) {
-        const r = new Da();
-        r.ray = i.raycaster.ray, r.near = i.raycaster.near, r.far = i.raycaster.far, r.camera = i.raycaster.camera, r.layers = i.raycaster.layers, r.params = i.raycaster.params, i.raycaster = r;
+        const s = new Da();
+        s.ray = i.raycaster.ray, s.near = i.raycaster.near, s.far = i.raycaster.far, s.camera = i.raycaster.camera, s.layers = i.raycaster.layers, s.params = i.raycaster.params, i.raycaster = s;
       }
       if (i) {
         if (t === "mouseMove" && this.onDomEvent("hover", i), t === "tap") {
-          let r;
-          r || (r = (s = this.lastMouseDownEvent) != null ? s : this.lastTouchEvent), r || (r = new MouseEvent("click", { clientX: i.x, clientY: i.y }));
-          const o = this.onDomEvent("click", i, r), a = this.onDomEvent("wantDblclick", i, r, this.boundObject.dblclick);
-          if (o === !1 || a === !1)
+          const s = new MouseEvent("click", { clientX: i.x, clientY: i.y }), r = this.onDomEvent("click", i, s), o = this.onDomEvent("wantDblclick", i, s, this.boundObject.dblclick);
+          if (r === !1 || o === !1)
             return !1;
         }
         if (this.dragging)
@@ -5945,10 +5938,7 @@ class fr {
       this.handleDomEvent(t.type, t);
     });
     d(this, "handleMousedown", (t) => {
-      this.lastMouseDownEvent = t, this.handleDomEvent("mousedown", t), this.handleDomEvent("dragstart", t, this.haveDragEventObject);
-    });
-    d(this, "handleTouchStart", (t) => {
-      this.lastTouchEvent = t;
+      this.handleDomEvent("mousedown", t), this.handleDomEvent("dragstart", t, this.haveDragEventObject);
     });
     d(this, "handleMouseup", (t) => {
       var e;
@@ -5977,10 +5967,11 @@ class fr {
       var f, p, v, g, m;
       if (!e || !s || (s == null ? void 0 : s.length) === 0)
         return;
+      console.log("onDomEvent", t, e, i, B({}, i));
       const r = [];
       ((f = this.config) == null ? void 0 : f.fiveModels) !== null && ((p = this.config) != null && p.fiveModels ? r.push(...this.config.fiveModels) : r.push(this.model));
       const o = r.filter((b) => b.loaded), a = (v = e.raycaster) != null ? v : this.getRaycaster(e);
-      a.params.Points.threshold = 0.02;
+      a.params.Points.threshold = 0.04;
       const l = a.intersectObjects(s, !0), c = [];
       o.forEach((b) => {
         const C = b.intersectRaycaster(a);
@@ -5990,7 +5981,7 @@ class fr {
       if (c.length > 0 && l.length > 0 && c[0].distance + h < l[0].distance)
         return;
       const u = (g = l == null ? void 0 : l[0]) == null ? void 0 : g.object;
-      if (t === "wantDblclick")
+      if (console.log("object", u, s), t === "wantDblclick")
         return !1;
       if ((!u || !this.objectIsBound(u)) && t === "hover")
         for (const b of (m = this.boundObject.hover) != null ? m : [])
@@ -6065,7 +6056,15 @@ class fr {
       if (e === "click" || e === "wantDblclick")
         return l.some((b) => b === !0);
     });
-    this.five = t, this.config = e, t.on("wantsGesture", this.handleWantsGesture), document.addEventListener("mousedown", this.handleMousedown), document.addEventListener("touchstart", this.handleTouchStart), document.addEventListener("dblclick", this.handleMouseEvent), document.addEventListener("mouseup", this.handleMouseup), document.addEventListener("mousemove", this.handleMousemove);
+    var i;
+    this.five = t, this.config = e, t.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__ = (i = window.__FIVE_DOM_EVENTS__) != null ? i : [], window.__FIVE_DOM_EVENTS__.push(this);
+  }
+  get five() {
+    return this._five;
+  }
+  set five(t) {
+    var e;
+    (e = this._five) == null || e.off("wantsGesture", this.handleWantsGesture), this._five = t, this._five.on("wantsGesture", this.handleWantsGesture);
   }
   get haveDragEventObject() {
     return [...new Set([this.boundObject.dragend, this.boundObject.drag, this.boundObject.dragstart].flat())].filter(Boolean);
@@ -6117,7 +6116,7 @@ class fr {
   }
   dispose() {
     var t;
-    (t = this.five) == null || t.off("wantsGesture", this.handleWantsGesture), document.removeEventListener("mousedown", this.handleMousedown), document.removeEventListener("touchstart", this.handleTouchStart), document.removeEventListener("mouseup", this.handleMouseup), document.removeEventListener("mousemove", this.handleMousemove), this.boundObject = {};
+    (t = this.five) == null || t.off("wantsGesture", this.handleWantsGesture), document.removeEventListener("mousedown", this.handleMousedown), document.removeEventListener("mouseup", this.handleMouseup), document.removeEventListener("mousemove", this.handleMousemove), this.boundObject = {};
   }
   toJSON() {
     return {
@@ -11693,7 +11692,7 @@ let Zn = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    d(this, "VERSION", "3.64.5-alpha.0");
+    d(this, "VERSION", "3.64.5-alpha.2");
     d(this, "NAME");
     d(this, "five");
     d(this, "workUtil");
@@ -22011,7 +22010,7 @@ class vE extends yt {
       if (!s)
         return;
       let r, o;
-      if (e instanceof TouchEvent ? (r = e.changedTouches[0].clientX, o = e.changedTouches[0].clientY) : e instanceof MouseEvent && (r = e.clientX, o = e.clientY), r === void 0 || o === void 0)
+      if (e instanceof TouchEvent ? (r = e.touches[0].clientX, o = e.touches[0].clientY) : e instanceof MouseEvent && (r = e.clientX, o = e.clientY), r === void 0 || o === void 0)
         return;
       this.group.children.forEach((l) => l.unselect()), s.select();
       const a = () => {