@realsee/dnalogel 3.75.0-alpha.1 → 3.75.1

package/dist/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 { Intersection, Vector3 } from 'three';
+import type { Vector3 } from 'three';
 import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
@@ -39,10 +39,6 @@ interface Config {
      * @default false
      */
     skipPanorama: boolean;
-    /**
-     * five 6.7.0 特性，可配置是否自定义拾取点过滤函数
-     */
-    hitFilter: (intersect: Intersection) => boolean;
 }
 export type PointSelectorConfig = Partial<Config>;
 type EventMap = {

package/libs/PanoDoorLabelPlugin/Controller.js

@@ -1,22 +1,22 @@
 var N = Object.defineProperty, Q = Object.defineProperties;
 var j = Object.getOwnPropertyDescriptors;
 var O = Object.getOwnPropertySymbols;
-var R = Object.prototype.hasOwnProperty, $ = Object.prototype.propertyIsEnumerable;
+var F = Object.prototype.hasOwnProperty, R = Object.prototype.propertyIsEnumerable;
 var L = (a, l, t) => l in a ? N(a, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[l] = t, E = (a, l) => {
   for (var t in l || (l = {}))
-    R.call(l, t) && L(a, t, l[t]);
+    F.call(l, t) && L(a, t, l[t]);
   if (O)
     for (var t of O(l))
-      $.call(l, t) && L(a, t, l[t]);
+      R.call(l, t) && L(a, t, l[t]);
   return a;
 }, U = (a, l) => Q(a, j(l));
 var B = (a, l) => {
   var t = {};
   for (var i in a)
-    R.call(a, i) && l.indexOf(i) < 0 && (t[i] = a[i]);
+    F.call(a, i) && l.indexOf(i) < 0 && (t[i] = a[i]);
   if (a != null && O)
     for (var i of O(a))
-      l.indexOf(i) < 0 && $.call(a, i) && (t[i] = a[i]);
+      l.indexOf(i) < 0 && R.call(a, i) && (t[i] = a[i]);
   return t;
 };
 var p = (a, l, t) => (L(a, typeof l != "symbol" ? l + "" : l, t), t);
@@ -111,22 +111,25 @@ class wi extends Y {
     p(this, "doorLabels");
     p(this, "roomObservers");
     p(this, "loadData", (t, i) => {
-      i && (this.MaxVisibledistance = i.MaxVisibledistance, this.MinVisibledistance = i.MinVisibledistance, this.OffsetHeight = i.OffsetHeight), this.labelItems = [], this.doorLabels = [], this.floorplanServerData = t, et(this.five).then(() => {
+      i && (this.MaxVisibledistance = i.MaxVisibledistance, this.MinVisibledistance = i.MinVisibledistance, this.OffsetHeight = i.OffsetHeight), this.labelItems.forEach((r) => {
+        var e;
+        return (e = r.svelteApp) == null ? void 0 : e.$destroy();
+      }), this.labelItems = [], this.doorLabels = [], this.floorplanServerData = t, et(this.five).then(() => {
         this.initData(), this.fixDoorVisibleAndPosition(), this.applyState();
       });
     });
     p(this, "dispose", () => {
-      var t, i, r, o, n, s, e;
-      (t = this.five) == null || t.off("wantsToMoveToPano", this.hideAllLabels), (i = this.five) == null || i.off("modelLoaded", this.fixDoorVisibleAndPosition), (r = this.five) == null || r.off("panoArrived", this.fixDoorVisibleAndPosition), (o = this.five) == null || o.off("initAnimationEnded", this.fixDoorPosition), (n = this.five) == null || n.off("cameraUpdate", this.fixDoorPosition), (s = this.five) == null || s.off("mouseWheel", this.fixDoorPosition), (e = this.five) == null || e.off("pinchGesture", this.fixDoorPosition), this.applyState({ enabled: !1 });
+      var t, i, r, e, n, s, o;
+      (t = this.five) == null || t.off("wantsToMoveToPano", this.hideAllLabels), (i = this.five) == null || i.off("modelLoaded", this.fixDoorVisibleAndPosition), (r = this.five) == null || r.off("panoArrived", this.fixDoorVisibleAndPosition), (e = this.five) == null || e.off("initAnimationEnded", this.fixDoorPosition), (n = this.five) == null || n.off("cameraUpdate", this.fixDoorPosition), (s = this.five) == null || s.off("mouseWheel", this.fixDoorPosition), (o = this.five) == null || o.off("pinchGesture", this.fixDoorPosition), this.applyState({ enabled: !1 });
     });
     p(this, "initRoomObservers", () => {
-      var o, n;
-      const t = this.floorplanServerData.computed_data.floor_datas || [], r = (((n = (o = this.five) == null ? void 0 : o.work) == null ? void 0 : n.observers) || []).map((s) => {
-        const e = s.panoIndex, v = s.floorIndex, c = t == null ? void 0 : t.find((h) => h.floor_index === v);
+      var e, n;
+      const t = this.floorplanServerData.computed_data.floor_datas || [], r = (((n = (e = this.five) == null ? void 0 : e.work) == null ? void 0 : n.observers) || []).map((s) => {
+        const o = s.panoIndex, v = s.floorIndex, c = t == null ? void 0 : t.find((h) => h.floor_index === v);
         if (c) {
-          const h = c.rooms.find((m) => m.observer_indexs.includes(e));
+          const h = c.rooms.find((m) => m.observer_indexs.includes(o));
           if (h)
-            return { panoIndex: e, floorIndex: v, name: h.name };
+            return { panoIndex: o, floorIndex: v, name: h.name };
         }
       }).filter(Boolean);
       this.roomObservers = r;
@@ -141,30 +144,30 @@ class wi extends Y {
       const { panoIndex: t } = this.five;
       if (!this.state.visible || this.five.model.empty || t === null || !this.roomObservers.find((s) => s.panoIndex === t))
         return;
-      const i = this.roomObservers.find((s) => s.panoIndex === t), o = this.five.work.observers.find((s) => s.panoIndex === t).position.clone(), n = (() => {
+      const i = this.roomObservers.find((s) => s.panoIndex === t), e = this.five.work.observers.find((s) => s.panoIndex === t).position.clone(), n = (() => {
         if (this.visibleLabelMap.has(t))
           return this.visibleLabelMap.get(t);
         {
           const s = [];
-          return this.doorLabels.forEach((e, v) => {
-            if (e.roomName === i.name)
+          return this.doorLabels.forEach((o, v) => {
+            if (o.roomName === i.name)
               return;
-            const c = e.position.clone(), h = c.distanceTo(o);
+            const c = o.position.clone(), h = c.distanceTo(e);
             if (h < this.MinVisibledistance || h > this.MaxVisibledistance)
               return;
-            const m = new q(), d = c.clone().sub(o).normalize();
-            m.set(o, d);
+            const m = new q(), d = c.clone().sub(e).normalize();
+            m.set(e, d);
             const [b] = this.five.model.intersectRaycaster(m);
             b && b.distance + 0.1 < h || s.push(v);
           }), this.visibleLabelMap.set(t, s), s;
         }
       })();
-      this.labelItems.forEach((s, e) => {
-        s.visible = n.includes(e);
+      this.labelItems.forEach((s, o) => {
+        s.visible = n.includes(o);
       }), this.fixDoorPosition();
     });
     p(this, "fixDoorPosition", () => {
-      var v, c, h, m, d, b, x, _, k, H, W, z;
+      var v, c, h, m, d, b, x, _, k, H, W, $;
       if (!this.state.enabled || !this.state.visible)
         return;
       const { panoIndex: t, camera: i } = this.five;
@@ -172,35 +175,35 @@ class wi extends Y {
         return;
       if (this.five.currentMode !== "Panorama")
         return this.hideAllLabels();
-      const r = this.five.getElement(), o = r.clientWidth, n = r.clientHeight, s = i.getWorldDirection(new A()), e = [];
+      const r = this.five.getElement(), e = r.clientWidth, n = r.clientHeight, s = i.getWorldDirection(new A()), o = [];
       if (this.labelItems.forEach((f, u) => {
         var I;
         if (f.visible) {
-          const g = i.position.distanceTo(f.position), S = f.position.clone().add(new A(0, this.OffsetHeight, 0)), w = S.clone().sub(i.position).normalize().angleTo(s), y = S.clone().project(i), P = (y.x + 1) / 2.2 * 100, T = (-y.y + 1) / 2.2 * 100, F = P >= 0 && P <= 100 && T >= 0 && T <= 100 && g > this.MinVisibledistance && g <= this.MaxVisibledistance;
-          f.left = P, f.top = T, f.inSight = F && w < Math.PI / 2, f.cameraToward = J(this.five), F ? e.push({ disFromCameraToLabel: g, left: P, top: T, index: u }) : f.transform = "translate(-50%, -50%)";
+          const g = i.position.distanceTo(f.position), M = f.position.clone().add(new A(0, this.OffsetHeight, 0)), w = M.clone().sub(i.position).normalize().angleTo(s), V = M.clone().project(i), P = (V.x + 1) / 2.2 * 100, T = (-V.y + 1) / 2.2 * 100, z = P >= 0 && P <= 100 && T >= 0 && T <= 100 && g > this.MinVisibledistance && g <= this.MaxVisibledistance;
+          f.left = P, f.top = T, f.inSight = z && w < Math.PI / 2, f.cameraToward = J(this.five), z ? o.push({ disFromCameraToLabel: g, left: P, top: T, index: u }) : f.transform = "translate(-50%, -50%)";
         } else
           f.inSight = !1;
-        const M = f, { svelteApp: D } = M, C = B(M, ["svelteApp"]);
+        const y = f, { svelteApp: D } = y, C = B(y, ["svelteApp"]);
         (I = f.svelteApp) == null || I.$set({ props: C });
-      }), e.length > 1) {
+      }), o.length > 1) {
         let f = 0;
-        e.sort((u, D) => D.disFromCameraToLabel - u.disFromCameraToLabel);
-        for (let u = 1; u < e.length; u++) {
-          const { index: D, left: C, top: M } = e[u - 1], { index: I, left: g, top: S } = e[u], V = this.container.children[D], w = this.container.children[I];
-          if (!V || !w)
+        o.sort((u, D) => D.disFromCameraToLabel - u.disFromCameraToLabel);
+        for (let u = 1; u < o.length; u++) {
+          const { index: D, left: C, top: y } = o[u - 1], { index: I, left: g, top: M } = o[u], S = this.container.children[D], w = this.container.children[I];
+          if (!S || !w)
             return;
-          const y = {
-            left: o * C / 100,
-            top: n * M / 100,
-            width: (h = (c = (v = V.children) == null ? void 0 : v[0]) == null ? void 0 : c.clientWidth) != null ? h : 0,
-            height: (b = (d = (m = V.children) == null ? void 0 : m[0]) == null ? void 0 : d.clientHeight) != null ? b : 0
+          const V = {
+            left: e * C / 100,
+            top: n * y / 100,
+            width: (h = (c = (v = S.children) == null ? void 0 : v[0]) == null ? void 0 : c.clientWidth) != null ? h : 0,
+            height: (b = (d = (m = S.children) == null ? void 0 : m[0]) == null ? void 0 : d.clientHeight) != null ? b : 0
           }, P = {
-            left: o * g / 100,
-            top: n * S / 100,
+            left: e * g / 100,
+            top: n * M / 100,
             width: (k = (_ = (x = w.children) == null ? void 0 : x[0]) == null ? void 0 : _.clientWidth) != null ? k : 0,
-            height: (z = (W = (H = w.children) == null ? void 0 : H[0]) == null ? void 0 : W.clientHeight) != null ? z : 0
+            height: ($ = (W = (H = w.children) == null ? void 0 : H[0]) == null ? void 0 : W.clientHeight) != null ? $ : 0
           };
-          K(y, P) && (f++, this.labelItems[D].transform = `translate(-50%, ${(f - 1) * 100 - 50}%)`, this.labelItems[I].transform = `translate(-50%, ${f * 100 - 50}%)`);
+          K(V, P) && (f++, this.labelItems[D].transform = `translate(-50%, ${(f - 1) * 100 - 50}%)`, this.labelItems[I].transform = `translate(-50%, ${f * 100 - 50}%)`);
         }
       }
     });
@@ -208,45 +211,45 @@ class wi extends Y {
       if (!this.roomObservers)
         return;
       const { work: r } = this.five;
-      let o, n, s = 1 / 0;
-      for (const e of r.observers)
-        if (this.roomObservers.find((c) => c.panoIndex === e.panoIndex && c.name === t)) {
-          const c = e.standingPosition, h = i.distanceTo(c);
-          h < s && (o = e.panoIndex, n = c.clone().sub(i).normalize(), s = h);
+      let e, n, s = 1 / 0;
+      for (const o of r.observers)
+        if (this.roomObservers.find((c) => c.panoIndex === o.panoIndex && c.name === t)) {
+          const c = o.standingPosition, h = i.distanceTo(c);
+          h < s && (e = o.panoIndex, n = c.clone().sub(i).normalize(), s = h);
         }
-      if (n !== void 0 && o !== void 0) {
-        const e = {};
+      if (n !== void 0 && e !== void 0) {
+        const o = {};
         if (s > 0) {
           const c = new A(0, 0, -1), h = n.clone(), m = new X();
           m.setFromUnitVectors(c, h);
           const d = new G();
-          d.setFromQuaternion(m, "YXZ"), e.longitude = d.y;
+          d.setFromQuaternion(m, "YXZ"), o.longitude = d.y;
         }
-        this.five.emit("wantsToMoveToPano", o, {}, !0) || this.five.moveToPano(o, { longitude: e.longitude });
+        this.five.emit("wantsToMoveToPano", e, {}, !0) || this.five.moveToPano(e, { longitude: o.longitude });
       }
     });
     p(this, "initData", () => {
-      var o;
+      var e;
       this.doorLabels = [], this.labelItems.forEach((n) => {
         var s;
         return (s = n.svelteApp) == null ? void 0 : s.$destroy();
       }), this.labelItems = [];
       const t = this.five.panoIndex, i = this.floorplanServerData.computed_data.observers[t].floor_index, r = this.floorplanServerData.computed_data.floor_datas[i];
-      (o = this.floorplanServerData.computed_data.doors) == null || o.forEach((n) => {
+      (e = this.floorplanServerData.computed_data.doors) == null || e.forEach((n) => {
         const s = this.five.work.observers.filter((m, d) => {
           var b;
           return !!((b = r == null ? void 0 : r.rooms) != null && b.find((x) => x.observer_indexs.includes(d)));
-        }), e = n.position;
+        }), o = n.position;
         let v = 1 / 0, c;
         s.forEach((m) => {
           const d = m.standingPosition, b = {
             x: d.x,
             y: d.y,
             z: d.z
-          }, x = tt(e, b);
+          }, x = tt(o, b);
           x < v && (v = x, c = b);
-        }), c && (e.y = c.y + 0.01);
-        const h = new A(e.x, e.y, e.z);
+        }), c && (o.y = c.y + 0.01);
+        const h = new A(o.x, o.y, o.z);
         h.add(new A(-0.2, 1.8, 0).applyEuler(new G(0, n.rad, 0))), this.doorLabels.push({
           roomName: n.name,
           name: n.name,
@@ -269,8 +272,8 @@ class wi extends Y {
   setState(t, i) {
     const r = this.state;
     this.state = E(E({}, r), t);
-    const o = r.enabled && r.visible, n = this.state.enabled && this.state.visible;
-    o !== n && this.applyState();
+    const e = r.enabled && r.visible, n = this.state.enabled && this.state.visible;
+    e !== n && this.applyState();
   }
   show() {
     this.setState({ visible: !0 });
@@ -296,18 +299,18 @@ class wi extends Y {
   }
   applyState(t) {
     const i = t != null ? t : this.state;
-    i.enabled !== !1 && i.visible !== !1 ? (this.labelItems.forEach((o) => {
-      o.svelteApp = new Z({
+    i.enabled !== !1 && i.visible !== !1 ? (this.labelItems.forEach((e) => {
+      e.svelteApp = new Z({
         target: this.container,
         props: {
-          props: o,
+          props: e,
           onClick: () => {
-            this.onClick(o.name, o.position);
+            this.onClick(e.name, e.position);
           }
         }
       });
-    }), this.fixDoorPosition()) : this.labelItems.forEach((o) => {
-      o.svelteApp.$destroy();
+    }), this.fixDoorPosition()) : this.labelItems.forEach((e) => {
+      e.svelteApp.$destroy();
     });
   }
   initState() {

package/libs/PanoMeasurePlugin/utils/isIntersecting.js

@@ -1,48 +1,52 @@
-function a(n, t) {
-  const s = Array.isArray(t) ? t : [t];
-  for (let u = 0; u < s.length; u++) {
-    const r = n.start, e = n.end, c = s[u].start, o = s[u].end;
-    if (!(f(r, c) || f(r, o) || f(e, c) || f(e, o) || f(r, e)) && d([r.x, r.y, r.z], [e.x, e.y, e.z], [c.x, c.y, c.z], [o.x, o.y, o.z]))
+function m(n, s) {
+  const o = Array.isArray(s) ? s : [s];
+  for (let u = 0; u < o.length; u++) {
+    const t = n.start, c = n.end, r = o[u].start, e = o[u].end;
+    if (!(f(t, r) || f(t, e) || f(c, r) || f(c, e) || f(t, c)) && M([t.x, t.y, t.z], [c.x, c.y, c.z], [r.x, r.y, r.z], [e.x, e.y, e.z]))
       return !0;
   }
   return !1;
 }
-function d(n, t, s, u) {
-  const r = [t[0] - n[0], t[1] - n[1], t[2] - n[2]], e = [u[0] - s[0], u[1] - s[1], u[2] - s[2]], c = [
-    [r[0], -e[0]],
-    [r[1], -e[1]],
-    [r[2], -e[2]]
-  ], o = [s[0] - n[0], s[1] - n[1], s[2] - n[2]], i = g(c, o);
-  if (i === null)
-    return !1;
-  const [x, z] = i;
-  return !!(y(x) && y(z));
-}
-function g(n, t) {
-  if (q(n) === 0)
-    return null;
-  const u = I(n);
-  return V(u, t);
+function M(n, s, o, u) {
+  const t = [s[0] - n[0], s[1] - n[1], s[2] - n[2]], c = [u[0] - o[0], u[1] - o[1], u[2] - o[2]], r = [
+    { a: [t[0], -c[0]], b: o[0] - n[0] },
+    { a: [t[1], -c[1]], b: o[1] - n[1] },
+    { a: [t[2], -c[2]], b: o[2] - n[2] }
+  ], e = [
+    [0, 1],
+    // X 和 Y
+    [0, 2],
+    // X 和 Z
+    [1, 2]
+    // Y 和 Z
+  ];
+  for (const [i, y] of e) {
+    const b = [r[i].a, r[y].a], z = [r[i].b, r[y].b], a = V(b);
+    if (Math.abs(a) < 1e-10)
+      continue;
+    const g = h(b, a), [q, I] = j(g, z);
+    return !!(x(q) && x(I));
+  }
+  return !1;
 }
-function q(n) {
+function V(n) {
   return n[0][0] * n[1][1] - n[0][1] * n[1][0];
 }
-function I(n) {
-  const t = n[0][0] * n[1][1] - n[0][1] * n[1][0];
+function h(n, s) {
   return [
-    [n[1][1] / t, -n[0][1] / t],
-    [-n[1][0] / t, n[0][0] / t]
+    [n[1][1] / s, -n[0][1] / s],
+    [-n[1][0] / s, n[0][0] / s]
   ];
 }
-function V(n, t) {
-  return [n[0][0] * t[0] + n[0][1] * t[1], n[1][0] * t[0] + n[1][1] * t[1]];
+function j(n, s) {
+  return [n[0][0] * s[0] + n[0][1] * s[1], n[1][0] * s[0] + n[1][1] * s[1]];
 }
-function y(n) {
+function x(n) {
   return n >= 0 && n <= 1;
 }
-function f(n, t) {
-  return n.x === t.x && n.y === t.y && n.z === t.z;
+function f(n, s) {
+  return n.x === s.x && n.y === s.y && n.z === s.z;
 }
 export {
-  a as isIntersecting
+  m as isIntersecting
 };

package/libs/Sculpt/Objects/Polygon/index.d.ts

@@ -14,11 +14,24 @@ export type PolygonCreateConfig = Partial<PolygonStyle & CreateLimitConfig & Pol
     onPointPlaced?: (points: THREE.Vector3[]) => void;
     onUndo?: () => void;
     onRedo?: () => void;
+    /**
+     * @description 检测到自相交时的回调
+     * @param point 尝试添加但被拒绝的点坐标
+     */
+    __onSelfIntersect?: (point: THREE.Vector3) => void;
+    /**
+     * @description 将要添加的下一个点
+     */
+    __onWillAddPoint?: (point: THREE.Vector3, points: THREE.Vector3[]) => void;
     /**
      * @description 检测是否自相交，如果自交，禁止添加下一个点
      * @default false
      */
     experimental_self_intersect_check?: boolean;
+    /**
+     * 最多允许能添加的点数
+     */
+    experimental_max_point_count?: number;
 };
 export declare class Polygon extends BaseObject<PolygonImportData> {
     readonly type = "Polygon";