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

package/libs/MeasurePlugin/Controller.js

@@ -89,11 +89,11 @@ import "../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../Sculpt/utils/three/ColoredMesh.js";
 import "../shared-utils/three/geometryUtil.js";
 import "../shared-utils/three/vectorIsEqual.js";
-const g = {
+const S = {
   lengthEnable: !0,
   occlusionVisibility: !0,
   lengthUnit: "m"
-}, T = {
+}, B = {
   lengthEnable: !0,
   occlusionVisibility: !0,
   opacity: 0.2,
@@ -117,11 +117,11 @@ 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({}, g), { dashed: !0 })), c = new A(T), h = new P(f(v({}, g), { lineOpacity: 0.5, dashed: !0 })), l = new P(f(v({}, g), { lineOpacity: 0.5, dashed: !0 })), d = () => {
+      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();
       };
       this.group.add(e);
-      const S = (i) => {
+      const g = (i) => {
         if (!i) {
           d();
           return;
@@ -147,9 +147,9 @@ class mt extends I {
       }, E = (i) => {
         i && (d(), e.setPoints([...e.points, i.point]), this.updateSelectAdsorbedHelper(), e.isPolygon && this.pointSelector.disable());
       }, b = () => {
-        this.pointSelector.off("intersectionUpdate", S), this.pointSelector.off("select", E), this.pointSelector.off("disable", b), d(), e.points.length < 2 && e.removeFromParent(), this.currentMeasureMesh = null, this.addEventListener(), this.emit("measureEnd");
+        this.pointSelector.off("intersectionUpdate", g), this.pointSelector.off("select", E), this.pointSelector.off("disable", b), d(), e.points.length < 2 && e.removeFromParent(), this.currentMeasureMesh = null, this.addEventListener(), this.emit("measureEnd");
       };
-      this.pointSelector.on("intersectionUpdate", S), this.pointSelector.on("select", E), this.pointSelector.on("disable", b), this.pointSelector.enable();
+      this.pointSelector.on("intersectionUpdate", g), this.pointSelector.on("select", E), this.pointSelector.on("disable", b), this.pointSelector.enable();
     });
     /**
      * @description 结束测量
@@ -193,7 +193,7 @@ class mt extends I {
       if (!m)
         return;
       let c, h;
-      if (e instanceof TouchEvent ? (c = e.changedTouches[0].clientX, h = e.changedTouches[0].clientY) : e instanceof MouseEvent && (c = e.clientX, h = e.clientY), c === void 0 || h === void 0)
+      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 = () => {
@@ -260,6 +260,6 @@ class mt extends I {
 }
 export {
   mt as MeasureController,
-  g as lineStyle,
-  T as polygonStyle
+  S as lineStyle,
+  B as polygonStyle
 };

package/libs/base/BasePlugin.js

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

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

@@ -7,7 +7,7 @@
  * 4. 重构之后只会在 wantsTapGesture 事件触发的时候做射线检测
  */
 import type { Five, Model as FiveModel } from '@realsee/five';
-import * as THREE from 'three';
+import type * as THREE from 'three';
 export interface FiveDomEventMap {
     /**
      * @description 点击事件
@@ -120,7 +120,7 @@ export declare class FiveDomEvents {
     private handleDomEvent;
     private handleMouseEvent;
     private handleMousedown;
-    private handleTouchStart;
+    private setLastTouchEvent;
     private handleMouseup;
     private handleMousemove;
     private onDomEvent;

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

@@ -1,17 +1,17 @@
-var S = Object.defineProperty, j = Object.defineProperties;
+var I = Object.defineProperty, j = Object.defineProperties;
 var $ = Object.getOwnPropertyDescriptors;
 var D = Object.getOwnPropertySymbols;
 var W = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
-var M = (u, e, t) => e in u ? S(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t, w = (u, e) => {
+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) => {
   for (var t in e || (e = {}))
-    W.call(e, t) && M(u, t, e[t]);
+    W.call(e, t) && O(u, t, e[t]);
   if (D)
     for (var t of D(e))
-      k.call(e, t) && M(u, t, e[t]);
+      k.call(e, t) && O(u, t, e[t]);
   return u;
 }, H = (u, e) => j(u, $(e));
-var a = (u, e, t) => (M(u, typeof e != "symbol" ? e + "" : e, t), t);
-import { getObjectVisible as T } from "../three/getObjectVisible.js";
+var a = (u, e, t) => (O(u, typeof e != "symbol" ? e + "" : e, t), t);
+import { getObjectVisible as S } 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";
@@ -29,19 +29,19 @@ class Y {
     // 事件由five触发时，用来补充 originEvent 属性
     a(this, "lastTouchEvent");
     a(this, "handleWantsGesture", (e, t) => {
-      var r;
+      var o;
       if (t.length !== 1)
         return;
       const n = t[0];
       if (n.raycaster) {
-        const i = new x();
-        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;
+        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;
       }
       if (n) {
         if (e === "mouseMove" && this.onDomEvent("hover", n), e === "tap") {
-          let i;
-          i || (i = (r = this.lastMouseDownEvent) != null ? r : this.lastTouchEvent), i || (i = new MouseEvent("click", { clientX: n.x, clientY: n.y }));
-          const d = this.onDomEvent("click", n, i), l = this.onDomEvent("wantDblclick", n, i, this.boundObject.dblclick);
+          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)
             return !1;
         }
@@ -50,8 +50,8 @@ class Y {
       }
     });
     a(this, "handleDomEvent", (e, t, n) => {
-      const r = { x: t.clientX, y: t.clientY };
-      this.onDomEvent(e, r, t, n);
+      const o = { x: t.clientX, y: t.clientY };
+      this.onDomEvent(e, o, t, n);
     });
     a(this, "handleMouseEvent", (e) => {
       this.handleDomEvent(e.type, e);
@@ -59,7 +59,7 @@ class Y {
     a(this, "handleMousedown", (e) => {
       this.lastMouseDownEvent = e, this.handleDomEvent("mousedown", e), this.handleDomEvent("dragstart", e, this.haveDragEventObject);
     });
-    a(this, "handleTouchStart", (e) => {
+    a(this, "setLastTouchEvent", (e) => {
       this.lastTouchEvent = e;
     });
     a(this, "handleMouseup", (e) => {
@@ -85,29 +85,29 @@ class Y {
       }));
     });
     // eslint-disable-next-line complexity
-    a(this, "onDomEvent", (e, t, n, r = this.boundObject[e]) => {
+    a(this, "onDomEvent", (e, t, n, o = this.boundObject[e]) => {
       var v, E, g, p, y;
-      if (!t || !r || (r == null ? void 0 : r.length) === 0)
+      if (!t || !o || (o == null ? void 0 : o.length) === 0)
         return;
-      const i = [];
-      ((v = this.config) == null ? void 0 : v.fiveModels) !== null && ((E = this.config) != null && E.fiveModels ? i.push(...this.config.fiveModels) : i.push(this.model));
-      const d = i.filter((s) => s.loaded), l = (g = t.raycaster) != null ? g : this.getRaycaster(t);
+      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 o = l.intersectObjects(r, !0), h = [];
-      d.forEach((s) => {
-        const b = s.intersectRaycaster(l);
+      const r = l.intersectObjects(o, !0), h = [];
+      d.forEach((i) => {
+        const b = i.intersectRaycaster(l);
         h.push(...b);
       });
       const f = 0.01;
-      if (h.length > 0 && o.length > 0 && h[0].distance + f < o[0].distance)
+      if (h.length > 0 && r.length > 0 && h[0].distance + f < r[0].distance)
         return;
-      const c = (p = o == null ? void 0 : o[0]) == null ? void 0 : p.object;
+      const c = (p = r == null ? void 0 : r[0]) == null ? void 0 : p.object;
       if (e === "wantDblclick")
         return !1;
       if ((!c || !this.objectIsBound(c)) && e === "hover")
-        for (const s of (y = this.boundObject.hover) != null ? y : [])
-          s._hovered && this.notify({ eventName: "unHover", object: s });
-      if (c && c && this.notify({ eventName: e, object: c, originEvent: n, raycaster: l, intersects: o }))
+        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 }))
         return !1;
     });
     a(this, "objectIsBound", (e) => {
@@ -118,15 +118,15 @@ class Y {
     });
     a(this, "notify", (e) => {
       var g, p, y;
-      const { eventName: t, object: n, originEvent: r, raycaster: i, intersects: d } = e;
+      const { eventName: t, object: n, originEvent: o, raycaster: s, intersects: d } = e;
       if (!n)
         return !1;
-      let l = !1, o = [];
+      let l = !1, r = [];
       const h = [], f = () => {
         if (!d)
           return !1;
-        const s = d.slice(1);
-        return s[0] ? this.notify(H(w({}, e), { object: s[0].object, intersects: s })) : !1;
+        const i = d.slice(1);
+        return i[0] ? this.notify(H(M({}, e), { object: i[0].object, intersects: i })) : !1;
       };
       let c = n;
       for (h.push(c); c.parent; )
@@ -135,49 +135,49 @@ class Y {
       if ((g = this.config) != null && g.noEmitWhenNotInScene && v.type !== "Scene")
         return f();
       let E = !1;
-      for (const s of h) {
+      for (const i of h) {
         if (l)
           break;
-        s.draggable && (t === "dragstart" && (s._dragging = !0, this.dragging = !0), t === "dragend" && (s._dragging = !1, this.dragging = !1));
-        const b = s._domEvent;
+        i.draggable && (t === "dragstart" && (i._dragging = !0, this.dragging = !0), t === "dragend" && (i._dragging = !1, this.dragging = !1));
+        const b = i._domEvent;
         if (!b)
           continue;
-        const L = b[`${t}Handler`];
-        if (L)
-          for (const [I, m] of L) {
-            if (m != null && m.noEmitWhenNotInScene && v.type !== "Scene" || ((p = this.config) != null && p.noEmitWhenHide || m != null && m.noEmitWhenHide) && !T(s))
+        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))
               continue;
             if (E = !0, t === "hover") {
-              if (s._hovered)
+              if (i._hovered)
                 continue;
-              s._hovered = !0;
+              i._hovered = !0;
               for (const _ of (y = this.boundObject.hover) != null ? y : [])
-                _ !== s && _._hovered && this.notify({ eventName: "unHover", object: _ });
+                _ !== i && _._hovered && this.notify({ eventName: "unHover", object: _ });
             }
             if (t === "unHover") {
-              if (!s._hovered)
+              if (!i._hovered)
                 continue;
-              s._hovered = !1;
+              i._hovered = !1;
             }
-            const O = I({
+            const L = T({
               type: t,
-              target: s,
-              origDomEvent: r,
-              raycaster: i,
+              target: i,
+              origDomEvent: o,
+              raycaster: s,
               intersects: d,
               stopPropagation: () => {
                 l = !0;
               }
             });
-            o.push(O != null ? O : !0);
+            r.push(L != null ? L : !0);
           }
       }
       if (E === !1)
         return f();
       if (t === "click" || t === "wantDblclick")
-        return o.some((s) => s === !0);
+        return r.some((i) => i === !0);
     });
-    this.five = e, this.config = t, e.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);
+    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);
   }
   get haveDragEventObject() {
     return [...new Set([this.boundObject.dragend, this.boundObject.drag, this.boundObject.dragstart].flat())].filter(Boolean);
@@ -190,10 +190,10 @@ class Y {
    * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
    * @todo: added 和 removed 还是不太智能
    */
-  addAutoBindEventListener(e, t, n, r) {
-    const i = () => this.addEventListener(e, t, n, r), d = () => this.removeEventListener(e, t, n, r);
-    return e.addEventListener("added", i), e.addEventListener("removed", d), e.addEventListener("dispose", d), () => {
-      e.removeEventListener("added", i), e.removeEventListener("removed", d), e.removeEventListener("dispose", d);
+  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);
     };
   }
   /**
@@ -203,25 +203,25 @@ class Y {
    * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
    * @return {void}
    */
-  addEventListener(e, t, n, r) {
-    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 }, r)]);
+  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)]);
   }
-  removeEventListener(e, t, n, ...r) {
+  removeEventListener(e, t, n, ...o) {
     var d, l;
-    if (!e._domEvent || (t === void 0 && (Object.keys(this.boundObject).forEach((o) => {
+    if (!e._domEvent || (t === void 0 && (Object.keys(this.boundObject).forEach((r) => {
       var f, c;
-      const h = (f = this.boundObject[o]) == null ? void 0 : f.findIndex((v) => v === e);
-      h !== -1 && ((c = this.boundObject[o]) == null || c.splice(h, 1));
+      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));
     }), e._domEvent = {}), !e._domEvent[`${t}Handler`]))
       return;
     if (n === void 0) {
       delete e._domEvent[`${t}Handler`];
       return;
     }
-    const i = e._domEvent[`${t}Handler`].findIndex((o) => o[0] === n);
-    if (i !== -1 && (e._domEvent[`${t}Handler`].splice(i, 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 o = (d = this.boundObject[t]) == null ? void 0 : d.findIndex((h) => h === e);
-      o !== -1 && ((l = this.boundObject[t]) == null || l.splice(o, 1));
+    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);
+      r !== -1 && ((l = this.boundObject[t]) == null || l.splice(r, 1));
     }
   }
   clear() {
@@ -229,7 +229,7 @@ class Y {
   }
   dispose() {
     var e;
-    (e = this.five) == null || e.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 = {};
+    (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 = {};
   }
   toJSON() {
     return {
@@ -240,8 +240,8 @@ class Y {
     const t = this.five.getElement();
     if (!t)
       return;
-    const n = N(e, t), r = new x();
-    return r.setFromCamera(n, this.five.camera), r;
+    const n = N(e, t), o = new x();
+    return o.setFromCamera(n, this.five.camera), o;
   }
 }
 export {

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.64.5-alpha.0",
+    "%c %c@realsee/dnalogel %cv3.64.5-alpha.1",
     [
       "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/libs/shared-utils/three/PointSelector/index.d.ts

@@ -1,6 +1,6 @@
 import type { Five } from '@realsee/five';
 import { PointSelectorHelper, type PointIntersection, type PointSelectorHelperConfig } from './utils/PointSelectorHelper';
-import { type Vector3 } from 'three';
+import type { Vector3 } from 'three';
 import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.64.5-alpha.0",
+  "version": "3.64.5-alpha.1",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",