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

package/libs/MeasurePlugin/Controller.js

@@ -99,13 +99,13 @@ const S = {
   opacity: 0.2,
   lengthUnit: "m"
 };
-class mt extends I {
+class lt extends I {
   constructor(e) {
     super();
     t(this, "name", "MeasurePlugin");
+    t(this, "currentMeasureMesh");
     t(this, "five");
     t(this, "group");
-    t(this, "currentMeasureMesh");
     t(this, "_pointSelector");
     t(this, "_fiveDomEvents");
     t(this, "_cursor");
@@ -117,8 +117,8 @@ class mt extends I {
       this.removeEventListener();
       const e = new z();
       this.currentMeasureMesh = e, this.pointSelector.actionIfNoIntersection = "disable", this.updateSelectAdsorbedHelper();
-      const p = new k(), m = new P(f(v({}, S), { dashed: !0 })), c = new A(B), h = new P(f(v({}, S), { lineOpacity: 0.5, dashed: !0 })), l = new P(f(v({}, S), { lineOpacity: 0.5, dashed: !0 })), d = () => {
-        p.removeFromParent(), m.removeFromParent(), c.removeFromParent(), h.removeFromParent(), l.removeFromParent();
+      const p = new k(), l = new P(f(v({}, S), { dashed: !0 })), c = new A(B), h = new P(f(v({}, S), { lineOpacity: 0.5, dashed: !0 })), m = new P(f(v({}, S), { lineOpacity: 0.5, dashed: !0 })), d = () => {
+        p.removeFromParent(), l.removeFromParent(), c.removeFromParent(), h.removeFromParent(), m.removeFromParent();
       };
       this.group.add(e);
       const g = (i) => {
@@ -127,18 +127,18 @@ class mt extends I {
           return;
         }
         if (e.points.length === 0 && (this.pointSelector.actionIfNoIntersection = "disable", this.group.addIfNotExists(p), p.position.copy(i.point)), e.points.length >= 1)
-          if (this.pointSelector.actionIfNoIntersection = "virtualPoint", p.removeFromParent(), this.group.addIfNotExists(m), m.setPoints([e.points.at(-1), i.point]), i.isAdsorbed)
-            h.removeFromParent(), l.removeFromParent();
+          if (this.pointSelector.actionIfNoIntersection = "virtualPoint", p.removeFromParent(), this.group.addIfNotExists(l), l.setPoints([e.points.at(-1), i.point]), i.isAdsorbed)
+            h.removeFromParent(), m.removeFromParent();
           else {
             const n = e.points.at(-1);
             if (Math.abs(i.point.y - n.y) > 0.2) {
               const u = new r.Vector3(i.point.x, n.y, i.point.z);
-              h.setPoints([n, u]), l.setPoints([u, i.point]);
+              h.setPoints([n, u]), m.setPoints([u, i.point]);
             } else {
               let u = new r.Vector3();
-              Math.abs(i.point.x - n.x) < Math.abs(i.point.z - n.z) ? u = new r.Vector3(i.point.x, n.y, n.z) : u = new r.Vector3(n.x, n.y, i.point.z), h.setPoints([n, u]), l.setPoints([u, i.point]);
+              Math.abs(i.point.x - n.x) < Math.abs(i.point.z - n.z) ? u = new r.Vector3(i.point.x, n.y, n.z) : u = new r.Vector3(n.x, n.y, i.point.z), h.setPoints([n, u]), m.setPoints([u, i.point]);
             }
-            this.group.addIfNotExists(h, l);
+            this.group.addIfNotExists(h, m);
           }
         if (e.points.length >= 2) {
           const n = [...e.points, i.point];
@@ -189,23 +189,23 @@ class mt extends I {
       this.fiveDomEvents.clear();
     });
     t(this, "onClick", ({ origDomEvent: e, target: p }) => {
-      const m = p;
-      if (!m)
+      const l = p;
+      if (!l)
         return;
       let c, h;
       if (e instanceof TouchEvent ? (c = e.touches[0].clientX, h = e.touches[0].clientY) : e instanceof MouseEvent && (c = e.clientX, h = e.clientY), c === void 0 || h === void 0)
         return;
-      this.group.children.forEach((d) => d.unselect()), m.select();
-      const l = () => {
-        m.removeFromParent(), this.cursor.removeDeleteButton(), this.five.needsRender = !0, a.unbind("delete, backspace");
+      this.group.children.forEach((d) => d.unselect()), l.select();
+      const m = () => {
+        l.removeFromParent(), this.cursor.removeDeleteButton(), this.five.needsRender = !0, a.unbind("delete, backspace");
       };
-      a("delete, backspace", l), this.cursor.showDeleteButton({
+      a("delete, backspace", m), this.cursor.showDeleteButton({
         clientX: c,
         clientY: h,
         container: this.five.getElement().parentElement,
-        onClick: l
+        onClick: m
       }), this.five.once("cameraUpdate", () => {
-        m.unselect(), this.cursor.removeDeleteButton();
+        l.unselect(), this.cursor.removeDeleteButton();
       });
     });
     t(this, "onHover", ({ target: e }) => {
@@ -252,14 +252,14 @@ class mt extends I {
     return this._pointSelector ? this._pointSelector : (this._pointSelector = new V(this.five, { mode: "cursor", helper: { pointHelper: "highlight" } }), this._pointSelector);
   }
   get fiveDomEvents() {
-    return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new U(this.five), this._fiveDomEvents);
+    return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new U(this.five, { fiveModels: null }), this._fiveDomEvents);
   }
   get cursor() {
     return this._cursor ? this._cursor : (this._cursor = new C(), this._cursor);
   }
 }
 export {
-  mt as MeasureController,
+  lt as MeasureController,
   S as lineStyle,
   B as polygonStyle
 };

package/libs/MeasurePlugin/utils/MeasureMesh.d.ts

@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import type * as THREE from 'three';
 import { IObject3D } from '../../shared-utils/three/IObject3D';
 export declare class MeasureMesh extends IObject3D {
     readonly name = "MeasureMesh";

package/libs/base/BasePlugin.js

@@ -21,7 +21,7 @@ let E = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.64.5-alpha.3");
+    i(this, "VERSION", "3.64.5-alpha.5");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/five/FiveDomEvents.d.ts

@@ -76,7 +76,7 @@ export interface FiveDomEvent {
 }
 type Object3DWithEvent = THREE.Object3D & {
     _domEvent?: {
-        [key in `${EventName | 'wantDblclick'}Handler`]?: Array<[FiveDomEventMap[EventName], EventHandlerConfig]>;
+        [key in `${EventName | 'wantDblclick'}Handler`]?: Array<[FiveDomEventMap[EventName], Omit<EventHandlerConfig, 'fiveModels'>]>;
     };
     _hovered?: boolean;
     _dragging?: boolean;
@@ -100,7 +100,7 @@ export declare class FiveDomEvents {
      * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
      * @todo: added 和 removed 还是不太智能
      */
-    addAutoBindEventListener<T extends EventName = EventName>(object: Object3DWithEvent, event: T, callback: FiveDomEventMap[T], config?: EventHandlerConfig): () => void;
+    addAutoBindEventListener<T extends EventName = EventName>(object: Object3DWithEvent, event: T, callback: FiveDomEventMap[T], config?: Omit<EventHandlerConfig, 'fiveModels'>): () => void;
     /**
      * @description: add event listener
      * @param params.object: object
@@ -108,7 +108,7 @@ export declare class FiveDomEvents {
      * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
      * @return {void}
      */
-    addEventListener<T extends EventName = EventName>(object: Object3DWithEvent, event: T, callback: FiveDomEventMap[T], config?: EventHandlerConfig): void;
+    addEventListener<T extends EventName = EventName>(object: Object3DWithEvent, event: T, callback: FiveDomEventMap[T], config?: Omit<EventHandlerConfig, 'fiveModels'>): void;
     removeEventListener(object: Object3DWithEvent, event?: EventName, callback?: (e: FiveDomEvent) => any, ...args: any[]): void;
     clear(): void;
     dispose(): void;

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

@@ -2,15 +2,15 @@ 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) => {
+var D = (c, e, t) => e in c ? S(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t, w = (c, e) => {
   for (var t in e || (e = {}))
-    $.call(e, t) && M(c, t, e[t]);
+    $.call(e, t) && D(c, t, e[t]);
   if (L)
     for (var t of L(e))
-      F.call(e, t) && M(c, t, e[t]);
+      F.call(e, t) && D(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);
+var h = (c, e, t) => (D(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 k } from "./getFiveModel.js";
@@ -76,28 +76,28 @@ class X {
     });
     // eslint-disable-next-line complexity
     h(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
-      var v, E, g, _, p;
+      var m, g, _, p, y, s;
       if (!t || !i || (i == null ? void 0 : i.length) === 0)
         return;
-      console.log("onDomEvent", e, t, n, O({}, n));
+      console.log("onDomEvent", e, t, n, w({}, n), (m = this.config) == null ? void 0 : m.fiveModels);
       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);
+      ((g = this.config) == null ? void 0 : g.fiveModels) !== null && ((_ = this.config) != null && _.fiveModels ? f.push(...this.config.fiveModels) : f.push(this.model));
+      const o = f.filter((u) => u.loaded), l = (p = t.raycaster) != null ? p : 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);
+      o.forEach((u) => {
+        const b = u.intersectRaycaster(l);
+        d.push(...b);
       });
-      const u = 0.01;
-      if (d.length > 0 && r.length > 0 && d[0].distance + u < r[0].distance)
+      const v = 0.01;
+      if (d.length > 0 && r.length > 0 && d[0].distance + v < r[0].distance)
         return;
-      const a = (_ = r == null ? void 0 : r[0]) == null ? void 0 : _.object;
+      const a = (y = r == null ? void 0 : r[0]) == null ? void 0 : y.object;
       if (console.log("object", a, i), e === "wantDblclick")
         return !1;
       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 });
+        for (const u of (s = this.boundObject.hover) != null ? s : [])
+          u._hovered && this.notify({ eventName: "unHover", object: u });
       if (a && a && this.notify({ eventName: e, object: a, originEvent: n, raycaster: l, intersects: r }))
         return !1;
     });
@@ -108,49 +108,49 @@ class X {
       return !!t;
     });
     h(this, "notify", (e) => {
-      var g, _, p;
+      var _, p, y;
       const { eventName: t, object: n, originEvent: i, raycaster: f, intersects: o } = e;
       if (!n)
         return !1;
       let l = !1, r = [];
-      const d = [], u = () => {
+      const d = [], v = () => {
         if (!o)
           return !1;
         const s = o.slice(1);
-        return s[0] ? this.notify(H(O({}, e), { object: s[0].object, intersects: s })) : !1;
+        return s[0] ? this.notify(H(w({}, e), { object: s[0].object, intersects: s })) : !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 u();
-      let E = !1;
+      const m = d[d.length - 1];
+      if ((_ = this.config) != null && _.noEmitWhenNotInScene && m.type !== "Scene")
+        return v();
+      let g = !1;
       for (const s of d) {
         if (l)
           break;
         s.draggable && (t === "dragstart" && (s._dragging = !0, this.dragging = !0), t === "dragend" && (s._dragging = !1, this.dragging = !1));
-        const y = s._domEvent;
-        if (!y)
+        const u = s._domEvent;
+        if (!u)
           continue;
-        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))
+        const b = u[`${t}Handler`];
+        if (b)
+          for (const [x, E] of b) {
+            if (E != null && E.noEmitWhenNotInScene && m.type !== "Scene" || ((p = this.config) != null && p.noEmitWhenHide || E != null && E.noEmitWhenHide) && !G(s))
               continue;
-            if (E = !0, t === "hover") {
+            if (g = !0, t === "hover") {
               if (s._hovered)
                 continue;
               s._hovered = !0;
-              for (const b of (p = this.boundObject.hover) != null ? p : [])
-                b !== s && b._hovered && this.notify({ eventName: "unHover", object: b });
+              for (const O of (y = this.boundObject.hover) != null ? y : [])
+                O !== s && O._hovered && this.notify({ eventName: "unHover", object: O });
             }
             if (t === "unHover") {
               if (!s._hovered)
                 continue;
               s._hovered = !1;
             }
-            const w = x({
+            const M = x({
               type: t,
               target: s,
               origDomEvent: i,
@@ -160,11 +160,11 @@ class X {
                 l = !0;
               }
             });
-            r.push(w != null ? w : !0);
+            r.push(M != null ? M : !0);
           }
       }
-      if (E === !1)
-        return u();
+      if (g === !1)
+        return v();
       if (t === "click" || t === "wantDblclick")
         return r.some((s) => s === !0);
     });
@@ -203,13 +203,13 @@ class X {
    * @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, O({ 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, w({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]);
   }
   removeEventListener(e, t, n, ...i) {
     var o, l;
     if (!e._domEvent || (t === void 0 && (Object.keys(this.boundObject).forEach((r) => {
-      var u, a;
-      const d = (u = this.boundObject[r]) == null ? void 0 : u.findIndex((v) => v === e);
+      var v, a;
+      const d = (v = this.boundObject[r]) == null ? void 0 : v.findIndex((m) => m === e);
       d !== -1 && ((a = this.boundObject[r]) == null || a.splice(d, 1));
     }), e._domEvent = {}), !e._domEvent[`${t}Handler`]))
       return;

package/libs/shared-utils/logger.js

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