@realsee/dnalogel 3.72.0-alpha.3 → 3.72.0-alpha.4

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

@@ -1,58 +1,61 @@
-var R = Object.defineProperty, P = Object.defineProperties;
+var F = Object.defineProperty, N = Object.defineProperties;
 var V = Object.getOwnPropertyDescriptors;
-var N = Object.getOwnPropertySymbols;
-var T = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var D = (h, e, t) => e in h ? R(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t, L = (h, e) => {
+var j = Object.getOwnPropertySymbols;
+var B = Object.prototype.hasOwnProperty, X = Object.prototype.propertyIsEnumerable;
+var S = (v, e, t) => e in v ? F(v, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : v[e] = t, H = (v, e) => {
   for (var t in e || (e = {}))
-    T.call(e, t) && D(h, t, e[t]);
-  if (N)
-    for (var t of N(e))
-      B.call(e, t) && D(h, t, e[t]);
-  return h;
-}, S = (h, e) => P(h, V(e));
-var a = (h, e, t) => (D(h, typeof e != "symbol" ? e + "" : e, t), t);
-import { getObjectVisible as X } from "../three/getObjectVisible.js";
-import { calculateThreeMouse as Y } from "./calculateThreeMouse.js";
-import { getFiveModel as C } from "./getFiveModel.js";
-import { THREERaycaster as $ } from "../three/core/Raycaster.js";
-class Q {
+    B.call(e, t) && S(v, t, e[t]);
+  if (j)
+    for (var t of j(e))
+      X.call(e, t) && S(v, t, e[t]);
+  return v;
+}, k = (v, e) => N(v, V(e));
+var l = (v, e, t) => (S(v, typeof e != "symbol" ? e + "" : e, t), t);
+import * as T from "three";
+import { getObjectVisible as Y } from "../three/getObjectVisible.js";
+import { calculateThreeMouse as C } from "./calculateThreeMouse.js";
+import { getFiveModel as A } from "./getFiveModel.js";
+import { THREERaycaster as G } from "../three/core/Raycaster.js";
+class U {
   constructor(e, t) {
-    a(this, "_five");
+    l(this, "_five");
     /**
      * @description: 拖动中
      */
-    a(this, "dragging", !1);
-    a(this, "boundObject", {});
-    a(this, "config");
-    a(this, "handleWantsGesture", (e, t) => {
+    l(this, "dragging", !1);
+    l(this, "boundObject", {});
+    l(this, "config");
+    l(this, "dragSelectTempWorld", new T.Vector3());
+    l(this, "dragSelectTempProjected", new T.Vector3());
+    l(this, "handleWantsGesture", (e, t) => {
       if (t.length !== 1)
         return;
       const n = t[0];
       if (n.raycaster) {
-        const i = new $();
+        const i = new G();
         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 }), d = this.onDomEvent("click", n, i), o = this.onDomEvent("wantDblclick", n, i, this.boundObject.dblclick);
-          if (d === !1 || o === !1)
+          const i = new MouseEvent("click", { clientX: n.x, clientY: n.y }), r = this.onDomEvent("click", n, i), a = this.onDomEvent("wantDblclick", n, i, this.boundObject.dblclick);
+          if (r === !1 || a === !1)
             return !1;
         }
         if (this.dragging)
           return !1;
       }
     });
-    a(this, "handleDomEvent", (e, t, n) => {
+    l(this, "handleDomEvent", (e, t, n) => {
       const i = { x: t.clientX, y: t.clientY };
       this.onDomEvent(e, i, t, n);
     });
-    a(this, "handleMouseEvent", (e) => {
+    l(this, "handleMouseEvent", (e) => {
       this.handleDomEvent(e.type, e);
     });
-    a(this, "handleMousedown", (e) => {
+    l(this, "handleMousedown", (e) => {
       this.handleDomEvent("mousedown", e), this.handleDomEvent("dragstart", e, this.haveDragEventObject);
     });
-    a(this, "handleMouseup", (e) => {
+    l(this, "handleMouseup", (e) => {
       var t;
       this.dragging = !1, (t = this.haveDragEventObject) == null || t.forEach((n) => {
         n._dragging && (n._dragging = !1, this.notify({
@@ -63,7 +66,7 @@ class Q {
         }));
       }), this.handleDomEvent("mouseup", e);
     });
-    a(this, "handleMousemove", (e) => {
+    l(this, "handleMousemove", (e) => {
       var t;
       this.dragging && ((t = this.boundObject.drag) == null || t.forEach((n) => {
         n._dragging && this.notify({
@@ -75,111 +78,116 @@ class Q {
       }));
     });
     // eslint-disable-next-line complexity
-    a(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
-      var v, _, p, b, y;
+    l(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
+      var h, p, E, _, g;
       if (!t || !i || (i == null ? void 0 : i.length) === 0)
         return;
-      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);
+      const r = [];
+      ((h = this.config) == null ? void 0 : h.fiveModels) !== null && ((p = this.config) != null && p.fiveModels ? r.push(...this.config.fiveModels) : r.push(this.model));
+      const a = r.filter((c) => c.loaded), u = (E = t.raycaster) != null ? E : this.getRaycaster(t);
       u.params.Points.threshold = 0.04;
-      const s = u.intersectObjects(i, !0), f = [];
-      o.forEach((m) => {
-        const O = m.intersectRaycaster(u);
-        f.push(...O);
+      let s = u.intersectObjects(i, !0);
+      if ((e === "dragstart" || e === "mousedown") && (!s || s.length === 0)) {
+        const c = this.findDragSelectIntersect(i, t, u);
+        c && (s = [c]);
+      }
+      const f = [];
+      a.forEach((c) => {
+        const w = c.intersectRaycaster(u);
+        f.push(...w);
       });
-      const l = 0.01;
-      if (f.length > 0 && s.length > 0 && f[0].distance + l < s[0].distance)
+      const m = 0.01;
+      if (f.length > 0 && s.length > 0 && f[0].distance + m < s[0].distance)
         return;
-      const c = (b = s == null ? void 0 : s[0]) == null ? void 0 : b.object;
+      const o = (_ = s == null ? void 0 : s[0]) == null ? void 0 : _.object;
       if (e === "wantDblclick")
         return !1;
-      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 }))
+      if ((!o || !this.objectIsBound(o)) && e === "hover")
+        for (const c of (g = this.boundObject.hover) != null ? g : [])
+          c._hovered && this.notify({ eventName: "unHover", object: c });
+      if (o && o && this.notify({ eventName: e, object: o, originEvent: n, raycaster: u, intersects: s, fiveModelIntersects: f }))
         return !1;
     });
-    a(this, "objectIsBound", (e) => {
+    l(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 b, y, m, O, H, I, x;
-      const { eventName: t, object: n, originEvent: i, raycaster: d, intersects: o, fiveModelIntersects: u } = e;
+    l(this, "notify", (e) => {
+      var _, g, c, w, D, O, M;
+      const { eventName: t, object: n, originEvent: i, raycaster: r, intersects: a, fiveModelIntersects: u } = e;
       if (!n)
         return !1;
       let s = !1, f = [];
-      const l = [], c = () => {
-        if (!o)
+      const m = [], o = () => {
+        if (!a)
           return !1;
-        const r = o.slice(1);
-        return r[0] ? this.notify(S(L({}, e), { object: r[0].object, intersects: r })) : !1;
+        const d = a.slice(1);
+        return d[0] ? this.notify(k(H({}, e), { object: d[0].object, intersects: d })) : !1;
       };
-      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) {
+      let h = n;
+      for (m.push(h); h.parent; )
+        h = h.parent, m.push(h);
+      const p = m[m.length - 1];
+      if ((_ = this.config) != null && _.noEmitWhenNotInScene && p.type !== "Scene")
+        return o();
+      let E = !1;
+      for (const d of m) {
         if (s)
           break;
-        r.draggable && (t === "dragstart" && (r._dragging = !0, this.dragging = !0), t === "dragend" && (r._dragging = !1, this.dragging = !1));
-        const k = r._domEvent;
-        if (!k)
+        d.draggable && (t === "dragstart" && (d._dragging = !0, this.dragging = !0), t === "dragend" && (d._dragging = !1, this.dragging = !1));
+        const I = d._domEvent;
+        if (!I)
           continue;
-        const W = k[`${t}Handler`];
-        if (W)
-          for (const [j, E] of W) {
-            if (E != null && E.noEmitWhenNotInScene && _.type !== "Scene")
+        const P = I[`${t}Handler`];
+        if (P)
+          for (const [R, y] of P) {
+            if (y != null && y.noEmitWhenNotInScene && p.type !== "Scene")
               continue;
-            if (E.skipPano && u) {
-              const g = (y = u[0]) == null ? void 0 : y.point;
-              if (g && ((H = (O = (m = this.five.observers) == null ? void 0 : m[this.five.panoIndex]) == null ? void 0 : O.accessibleNodes) != null && H.some((F) => {
-                var G;
-                const M = (G = this.five.works.getResolvedObserver({
+            if (y.skipPano && u) {
+              const b = (g = u[0]) == null ? void 0 : g.point;
+              if (b && ((D = (w = (c = this.five.observers) == null ? void 0 : c[this.five.panoIndex]) == null ? void 0 : w.accessibleNodes) != null && D.some(($) => {
+                var W;
+                const L = (W = this.five.works.getResolvedObserver({
                   workCode: this.five.state.workCode,
-                  panoIndex: F
-                })) == null ? void 0 : G.standingPosition;
-                return (M == null ? void 0 : M.distanceTo(g)) < 0.3;
+                  panoIndex: $
+                })) == null ? void 0 : W.standingPosition;
+                return (L == null ? void 0 : L.distanceTo(b)) < 0.3;
               })))
                 continue;
             }
-            if (((I = this.config) != null && I.noEmitWhenHide || E != null && E.noEmitWhenHide) && !X(r))
+            if (((O = this.config) != null && O.noEmitWhenHide || y != null && y.noEmitWhenHide) && !Y(d))
               continue;
-            if (p = !0, t === "hover") {
-              if (r._hovered)
+            if (E = !0, t === "hover") {
+              if (d._hovered)
                 continue;
-              r._hovered = !0;
-              for (const g of (x = this.boundObject.hover) != null ? x : [])
-                g !== r && g._hovered && this.notify({ eventName: "unHover", object: g });
+              d._hovered = !0;
+              for (const b of (M = this.boundObject.hover) != null ? M : [])
+                b !== d && b._hovered && this.notify({ eventName: "unHover", object: b });
             }
             if (t === "unHover") {
-              if (!r._hovered)
+              if (!d._hovered)
                 continue;
-              r._hovered = !1;
+              d._hovered = !1;
             }
-            const w = j({
+            const x = R({
               type: t,
-              target: r,
+              target: d,
               origDomEvent: i,
-              raycaster: d,
-              intersects: o,
+              raycaster: r,
+              intersects: a,
               stopPropagation: () => {
                 s = !0;
               }
             });
-            f.push(w != null ? w : !0);
+            f.push(x != null ? x : !0);
           }
       }
-      if (p === !1)
-        return c();
+      if (E === !1)
+        return o();
       if (t === "click" || t === "wantDblclick")
-        return f.some((r) => r === !0);
+        return f.some((d) => d === !0);
     });
     var n;
     this.five = e, this.config = t, 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);
@@ -195,7 +203,7 @@ class Q {
     return [...new Set([this.boundObject.dragend, this.boundObject.drag, this.boundObject.dragstart].flat())].filter(Boolean);
   }
   get model() {
-    return C(this.five);
+    return A(this.five);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
@@ -203,9 +211,9 @@ class Q {
    * @todo: added 和 removed 还是不太智能
    */
   addAutoBindEventListener(e, t, n, i) {
-    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);
+    const r = () => this.addEventListener(e, t, n, i), a = () => this.removeEventListener(e, t, n, i);
+    return e.addEventListener("added", r), e.addEventListener("removed", a), e.addEventListener("dispose", a), () => {
+      e.removeEventListener("added", r), e.removeEventListener("removed", a), e.removeEventListener("dispose", a);
     };
   }
   /**
@@ -216,23 +224,23 @@ class Q {
    * @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, L({ 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, H({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]);
   }
   removeEventListener(e, t, n, ...i) {
-    var o, u;
+    var a, u;
     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));
+      var m, o;
+      const f = (m = this.boundObject[s]) == null ? void 0 : m.findIndex((h) => h === e);
+      f !== -1 && ((o = this.boundObject[s]) == null || o.splice(f, 1));
     }), e._domEvent = {}), !e._domEvent[`${t}Handler`]))
       return;
     if (n === void 0) {
       delete e._domEvent[`${t}Handler`];
       return;
     }
-    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);
+    const r = e._domEvent[`${t}Handler`].findIndex((s) => s[0] === n);
+    if (r !== -1 && (e._domEvent[`${t}Handler`].splice(r, 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 = (a = this.boundObject[t]) == null ? void 0 : a.findIndex((f) => f === e);
       s !== -1 && ((u = this.boundObject[t]) == null || u.splice(s, 1));
     }
   }
@@ -252,10 +260,53 @@ class Q {
     const t = this.five.getElement();
     if (!t)
       return;
-    const n = Y(e, t), i = new $();
+    const n = C(e, t), i = new G();
     return i.setFromCamera(n, this.five.camera), i;
   }
+  getDragSelectPixelDistance(e) {
+    var n, i;
+    let t = e;
+    for (; t; ) {
+      const r = (n = t.userData) == null ? void 0 : n.dragSelectPixelDistance;
+      if (typeof r == "number")
+        return r;
+      t = (i = t.parent) != null ? i : null;
+    }
+  }
+  findDragSelectIntersect(e, t, n) {
+    var h, p;
+    if (!e || e.length === 0)
+      return;
+    const i = (p = (h = this.five) == null ? void 0 : h.getElement) == null ? void 0 : p.call(h), r = n.camera;
+    if (!i || !r)
+      return;
+    const a = i.clientWidth, u = i.clientHeight, s = i.getBoundingClientRect(), f = t.x - s.left, m = t.y - s.top;
+    let o;
+    for (const E of e) {
+      const _ = this.getDragSelectPixelDistance(E);
+      if (typeof _ != "number")
+        continue;
+      const g = this.dragSelectTempWorld;
+      E.getWorldPosition(g);
+      const c = this.dragSelectTempProjected.copy(g).project(r), w = (c.x * 0.5 + 0.5) * a, D = (1 - (c.y * 0.5 + 0.5)) * u, O = Math.hypot(w - f, D - m);
+      if (O > _)
+        continue;
+      const M = n.ray.distanceToPoint(g);
+      (!o || O < o.pixelDistance) && (o = {
+        pixelDistance: O,
+        object: E,
+        worldPoint: g.clone(),
+        distance: M
+      });
+    }
+    if (o)
+      return {
+        distance: o.distance,
+        object: o.object,
+        point: o.worldPoint
+      };
+  }
 }
 export {
-  Q as FiveDomEvents
+  U as FiveDomEvents
 };

package/libs/shared-utils/logger.js

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