@realsee/dnalogel 3.3.4 → 3.3.5

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,19 +1,19 @@
-var B = Object.defineProperty, E = Object.defineProperties;
-var $ = Object.getOwnPropertyDescriptors;
-var C = Object.getOwnPropertySymbols;
-var w = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
-var k = (m, e, i) => e in m ? B(m, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : m[e] = i, g = (m, e) => {
+var $ = Object.defineProperty, w = Object.defineProperties;
+var E = Object.getOwnPropertyDescriptors;
+var T = Object.getOwnPropertySymbols;
+var L = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable;
+var k = (p, e, i) => e in p ? $(p, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : p[e] = i, h = (p, e) => {
   for (var i in e || (e = {}))
-    w.call(e, i) && k(m, i, e[i]);
-  if (C)
-    for (var i of C(e))
-      O.call(e, i) && k(m, i, e[i]);
-  return m;
-}, M = (m, e) => E(m, $(e));
-import * as j from "three";
-import { is3DTag as L, isMediaModelTag as D } from "../utils/tag/tagCheck.js";
-import { getTagCenterPosition as x, getTagPosition as z } from "../utils/tagPosition.js";
-import { checkRange as p } from "../utils/checkRange.js";
+    L.call(e, i) && k(p, i, e[i]);
+  if (T)
+    for (var i of T(e))
+      _.call(e, i) && k(p, i, e[i]);
+  return p;
+}, M = (p, e) => w(p, E(e));
+import * as U from "three";
+import { is3DTag as z, isMediaModelTag as D } from "../utils/tag/tagCheck.js";
+import { getTagCenterPosition as P, getTagPosition as O } from "../utils/tagPosition.js";
+import { checkRange as m } from "../utils/checkRange.js";
 import { isPanoramaLike as b, isModelLike as Z } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "@realsee/five";
@@ -64,7 +64,7 @@ import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
 import "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/five/transformPosition.js";
-const I = new j.Raycaster();
+const I = new U.Raycaster();
 class Je extends N {
   constructor(e) {
     super(e);
@@ -73,80 +73,80 @@ class Je extends N {
    * @description: 获取是否可见
    */
   getVisible(e, i) {
-    const l = g(g({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = l, f = b(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
-    if ((f == null ? void 0 : f.visible) !== void 0)
-      return f.visible;
+    const f = h(h({}, this.five.getCurrentState()), i), { panoIndex: t, mode: s } = f, d = b(s) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    if ((d == null ? void 0 : d.visible) !== void 0)
+      return d.visible;
     {
-      const s = [], u = (() => {
-        var r, c, v;
-        const o = (r = this.getTagConfig(e).visibleConfig) != null ? r : {};
-        if (typeof o == "function")
-          return { value: o(this.five, { tag: e, distance: this.getDistance(e) }), checkedList: s, reason: "config function result" };
-        if (o.keep === "hidden")
-          return { value: !1, checkedList: s, reason: "config.keep is hidden" };
-        if (o.keep === "visible")
-          return { value: !0, checkedList: s, reason: "config.keep is visible" };
-        if (o.visibleFiveMode !== void 0) {
-          const a = typeof o.visibleFiveMode == "function" ? o.visibleFiveMode(e) : o.visibleFiveMode;
-          let d = !1;
-          if (Array.isArray(a) ? d = a.includes(n) : a === "ModelLike" ? d = Z(n) : a === "PanoramaLike" ? d = !b(n) : a === "all" ? d = !0 : typeof a == "string" && (d = a === n), d === !1)
+      const o = [], u = (() => {
+        var r, l, v;
+        const n = (r = this.getTagConfig(e).visibleConfig) != null ? r : {};
+        if (typeof n == "function")
+          return { value: n(this.five, { tag: e, distance: this.getDistance(e) }), checkedList: o, reason: "config function result" };
+        if (n.keep === "hidden")
+          return { value: !1, checkedList: o, reason: "config.keep is hidden" };
+        if (n.keep === "visible")
+          return { value: !0, checkedList: o, reason: "config.keep is visible" };
+        if (n.visibleFiveMode !== void 0) {
+          const a = typeof n.visibleFiveMode == "function" ? n.visibleFiveMode(e) : n.visibleFiveMode;
+          let c = !1;
+          if (Array.isArray(a) ? c = a.includes(s) : a === "ModelLike" ? c = Z(s) : a === "PanoramaLike" ? c = !b(s) : a === "all" ? c = !0 : typeof a == "string" && (c = a === s), c === !1)
             return {
               value: !1,
-              checkedList: s,
+              checkedList: o,
               reason: "current mode is not included in visibleFiveMode",
-              visibleFiveMode: o.visibleFiveMode,
-              mode: n
+              visibleFiveMode: n.visibleFiveMode,
+              mode: s
             };
         }
-        if (o.followModelVisibility === !0 && (n === "Floorplan" || n === "Mapview") && this.getVisibleByFloorIndex(e) === !1)
-          return { value: !1, checkedList: s, reason: "followModelVisibility check failed" };
-        if (b(n) && o.visiblePanoIndex !== void 0 && o.visiblePanoIndex !== "all" && t !== void 0) {
-          if (s.push("visiblePanoIndex"), Array.isArray(o.visiblePanoIndex) && !o.visiblePanoIndex.includes(t))
+        if (n.followModelVisibility === !0 && (s === "Floorplan" || s === "Mapview") && this.getVisibleByFloorIndex(e) === !1)
+          return { value: !1, checkedList: o, reason: "followModelVisibility check failed" };
+        if (b(s) && n.visiblePanoIndex !== void 0 && n.visiblePanoIndex !== "all" && t !== void 0) {
+          if (o.push("visiblePanoIndex"), Array.isArray(n.visiblePanoIndex) && !n.visiblePanoIndex.includes(t))
             return {
               value: !1,
-              checkedList: s,
-              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${t}, visiblePanoIndex: ${o.visiblePanoIndex}`
+              checkedList: o,
+              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${t}, visiblePanoIndex: ${n.visiblePanoIndex}`
             };
-          if (o.visiblePanoIndex === "current" && t !== ((c = e.fiveState) == null ? void 0 : c.panoIndex))
+          if (n.visiblePanoIndex === "current" && t !== ((l = e.fiveState) == null ? void 0 : l.panoIndex))
             return {
               value: !1,
-              checkedList: s,
+              checkedList: o,
               reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(v = e.fiveState) == null ? void 0 : v.panoIndex}`
             };
         }
-        if (o.visibleDistance !== void 0 && (s.push("visibleDistance"), o.visibleDistance !== "unLimited")) {
+        if (n.visibleDistance !== void 0 && (o.push("visibleDistance"), n.visibleDistance !== "unLimited")) {
           const a = this.getDistance(e);
-          if (p(a, o.visibleDistance) === !1)
+          if (m(a, n.visibleDistance) === !1)
             return {
               value: !1,
-              checkedList: s,
-              reason: `distance is not in visibleDistance. distance: ${a}, visibleDistance: ${o.visibleDistance}`
+              checkedList: o,
+              reason: `distance is not in visibleDistance. distance: ${a}, visibleDistance: ${n.visibleDistance}`
             };
         }
-        if (b(n) && o.angleRange && L(e)) {
-          s.push("angleRange");
+        if (b(s) && n.angleRange && z(e)) {
+          o.push("angleRange");
           const a = this.getAngle(e);
-          if (p(a, o.angleRange) === !1)
-            return { value: !1, checkedList: s, reason: `angle is not in angleRange. angle: ${a}, angleRange: ${o.angleRange}` };
+          if (m(a, n.angleRange) === !1)
+            return { value: !1, checkedList: o, reason: `angle is not in angleRange. angle: ${a}, angleRange: ${n.angleRange}` };
         }
-        if (o.intersectRaycaster !== !1 && (typeof o.intersectRaycaster != "object" || o.intersectRaycaster.enabled !== !1)) {
-          if (s.push("intersectRaycaster"), t === void 0)
+        if (n.intersectRaycaster !== !1 && (typeof n.intersectRaycaster != "object" || n.intersectRaycaster.enabled !== !1)) {
+          if (o.push("intersectRaycaster"), t === void 0)
             return {
               value: !1,
-              checkedList: s,
+              checkedList: o,
               reason: `intersectRaycaster check failed: panoIndex is ${t}`
             };
           const a = this.getTagEnableByIntersect(e, t);
           if (a.value === !1)
-            return Object.assign(a, { checkedList: s });
+            return Object.assign(a, { checkedList: o });
         }
         return {
           value: !0,
-          checkedList: s,
+          checkedList: o,
           reason: "all check passed"
         };
       })();
-      return f && (f.visible = u.value, f.__debug_visible_reason__ = u), u.value;
+      return d && (d.visible = u.value, d.__debug_visible_reason__ = u), u.value;
     }
   }
   /**
@@ -159,22 +159,22 @@ class Je extends N {
     if (t.unfolded !== void 0)
       return t.unfolded;
     {
-      const n = this.getTagConfig(e).unfoldedConfig;
-      if (!n)
+      const s = this.getTagConfig(e).unfoldedConfig;
+      if (!s)
         return;
-      const f = (() => {
-        if (typeof n == "function")
-          return n(this.five, { tag: e, distance: this.getDistance(e) });
-        if (n.keep === "folded")
+      const d = (() => {
+        if (typeof s == "function")
+          return s(this.five, { tag: e, distance: this.getDistance(e) });
+        if (s.keep === "folded")
           return !1;
-        if (n.keep === "unfolded")
+        if (s.keep === "unfolded")
           return !0;
-        if (n.unfoldDistance && p(this.getDistance(e), n.unfoldDistance) === !1)
+        if (s.unfoldDistance && m(this.getDistance(e), s.unfoldDistance) === !1)
           return !1;
       })();
-      t.unfolded = f;
-      const s = this.getUnfoldedByCamera(e);
-      return s !== void 0 ? s : t.unfolded;
+      t.unfolded = d;
+      const o = this.getUnfoldedByCamera(e);
+      return o !== void 0 ? o : t.unfolded;
     }
   }
   /**
@@ -182,7 +182,7 @@ class Je extends N {
    */
   getUnfoldedByCamera(e) {
     return this.getCurrentVisibleState(e) ? (() => {
-      var n;
+      var s;
       const t = this.getTagConfig(e).unfoldedConfig;
       if (t) {
         if (typeof t == "function")
@@ -194,25 +194,25 @@ class Je extends N {
         if (t.autoUnfold === void 0 || t.autoUnfold === !1 || t.autoUnfold.enable === !1 || !t.autoUnfold.strategy)
           return;
         if (t.autoUnfold.strategy === "ScreenPostion") {
-          const f = this.getTagProject(e);
-          if (f && p(f.x, t.autoUnfold.autoUnfoldProjectX) === !1)
+          const d = this.getTagProject(e);
+          if (d && m(d.x, t.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
         if (t.autoUnfold.strategy === "MinimumDistance") {
           const u = this.filterPointTag.filter((r) => this.getCurrentVisibleState(r)).filter((r) => {
-            const c = this.getTagProject(r);
-            if (!c)
+            const l = this.getTagProject(r);
+            if (!l)
               return !1;
-            const { x: v, y: a, z: d } = c;
-            return !(Math.abs(d) > 1 || Math.abs(v) > 1 || Math.abs(a) > 1);
-          }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: c }) => {
+            const { x: v, y: a, z: c } = l;
+            return !(Math.abs(c) > 1 || Math.abs(v) > 1 || Math.abs(a) > 1);
+          }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: l }) => {
             var v, a;
-            return !(typeof c == "function" || c.keep || c.autoUnfold === !1 || ((v = c.autoUnfold) == null ? void 0 : v.enable) === !1 || ((a = c.autoUnfold) == null ? void 0 : a.strategy) !== "MinimumDistance");
-          }).map((r) => M(g({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: c }) => {
-            const v = c.autoUnfold.distance;
-            return !(v && p(r, v) === !1);
-          }).sort((r, c) => r.distance - c.distance).findIndex((r) => r.id === e.id);
-          if (u === -1 || u <= ((n = t.autoUnfold.maxNumber) != null ? n : 1) - 1 === !1)
+            return !(typeof l == "function" || l.keep || l.autoUnfold === !1 || ((v = l.autoUnfold) == null ? void 0 : v.enable) === !1 || ((a = l.autoUnfold) == null ? void 0 : a.strategy) !== "MinimumDistance");
+          }).map((r) => M(h({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: l }) => {
+            const v = l.autoUnfold.distance;
+            return !(v && m(r, v) === !1);
+          }).sort((r, l) => r.distance - l.distance).findIndex((r) => r.id === e.id);
+          if (u === -1 || u <= ((s = t.autoUnfold.maxNumber) != null ? s : 1) - 1 === !1)
             return !1;
         }
         return !0;
@@ -228,37 +228,18 @@ class Je extends N {
     const i = this.getDistance(e);
     return Math.round((1e4 - (i != null ? i : 0)) * 100);
   }
-  /**
-   * @description: 一个点的标签
-   */
-  setPointTagPosition() {
-    const e = this.filterPointTag;
-    e.length !== 0 && e.forEach((i) => {
-      var f;
-      const l = this.getCurrentVisibleState(i), t = (f = i.__Object__) != null ? f : {
-        timeoutId: void 0,
-        inAnimation: !0
-      };
-      if (i.__Object__ = t, !l && i.screenPosition ? (t.inAnimation = !0, t.timeoutId = setTimeout(() => {
-        this.getCurrentVisibleState(i) || (t.inAnimation = !1, i.screenPosition = null);
-      }, 1e3)) : t.timeoutId && (t.inAnimation = !1, clearTimeout(t.timeoutId)), !l && !t.inAnimation)
-        return;
-      const n = this.getTagProject(i);
-      n ? i.screenPosition = { leftPercent: (n.x + 1) / 2 * 100, topPercent: (-n.y + 1) / 2 * 100 } : i.screenPosition = null;
-    });
-  }
   setVisible(e) {
     (e != null ? e : this.tags).forEach((i) => {
-      const l = this.getVisible(i);
-      i.state && (i.state.visible = l);
+      const f = this.getVisible(i);
+      i.state && (i.state.visible = f);
     });
   }
   setUnfoldedByPanoIndex() {
     this.tags.forEach((e) => {
       const i = this.getUnfoldedByPanoIndex(e);
       if (e.state && (i !== void 0 && (e.state.unfolded = i), i && !e.state.visible)) {
-        const l = this.getTagConfig(e);
-        typeof l.unfoldedConfig == "object" && l.unfoldedConfig.autoFoldWhenHide !== !1 && (e.state.unfolded = !1);
+        const f = this.getTagConfig(e);
+        typeof f.unfoldedConfig == "object" && f.unfoldedConfig.autoFoldWhenHide !== !1 && (e.state.unfolded = !1);
       }
     });
   }
@@ -266,59 +247,59 @@ class Je extends N {
    * @description 一个点的标签
    */
   getTagProject(e) {
-    const i = x(e);
+    const i = P(e);
     if (!i)
       return;
-    const { x: l, y: t, z: n } = i.project(this.five.camera);
-    if (!(n > 1))
-      return { x: l, y: t, z: n };
+    const { x: f, y: t, z: s } = i.project(this.five.camera);
+    if (!(s > 1))
+      return { x: f, y: t, z: s };
   }
   /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, i) {
-    var o, r, c, v, a;
-    const l = R(R((o = this.getTagConfig(e).visibleConfig) != null ? o : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, n = b(this.five.getCurrentState().mode) ? this.getObserverPosition(t) : this.five.camera.position;
-    if (n === void 0)
+    var n, r, l, v, a;
+    const f = R(R((n = this.getTagConfig(e).visibleConfig) != null ? n : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, s = b(this.five.getCurrentState().mode) ? this.getObserverPosition(t) : this.five.camera.position;
+    if (s === void 0)
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
-    const f = W(
+    const d = W(
       (() => {
-        var h;
-        const d = (h = l.checkPoints) != null ? h : "center";
-        return d === "center" ? x(e) : d === "corner" ? z(e) : Array.isArray(d) ? d : [];
+        var g;
+        const c = (g = f.checkPoints) != null ? g : "center";
+        return c === "center" ? P(e) : c === "corner" ? O(e) : Array.isArray(c) ? c : [];
       })()
     );
-    let s = 0, u = 0;
-    for (const d of f) {
-      const h = new j.Vector3().subVectors(d, n).normalize();
-      I.set(n, h);
-      const U = n.distanceTo(d), [y] = this.five.model.intersectRaycaster(I), P = (() => {
+    let o = 0, u = 0;
+    for (const c of d) {
+      const g = new U.Vector3().subVectors(c, s).normalize();
+      I.set(s, g);
+      const F = s.distanceTo(c), [y] = this.five.model.intersectRaycaster(I), x = (() => {
         if (!D(e))
           return;
-        const A = this.tags.filter(D).map((V) => {
-          var T;
-          return (T = V.model) == null ? void 0 : T.object;
-        }).filter(H), [S] = I.intersectObjects(A, !0);
-        return S;
-      })(), _ = (r = l.distanceAccuracy) != null ? r : 0.01;
-      Math.min((c = y == null ? void 0 : y.distance) != null ? c : 1 / 0, (v = P == null ? void 0 : P.distance) != null ? v : 1 / 0) + _ >= U ? s++ : u++;
-      const F = (a = l.needPassed) != null ? a : 1;
-      if (s >= F)
+        const V = this.tags.filter(D).map((A) => {
+          var C;
+          return (C = A.model) == null ? void 0 : C.object;
+        }).filter(H), [B] = I.intersectObjects(V, !0);
+        return B;
+      })(), j = (r = f.distanceAccuracy) != null ? r : 0.01;
+      Math.min((l = y == null ? void 0 : y.distance) != null ? l : 1 / 0, (v = x == null ? void 0 : x.distance) != null ? v : 1 / 0) + j >= F ? o++ : u++;
+      const S = (a = f.needPassed) != null ? a : 1;
+      if (o >= S)
         return { value: !0 };
     }
     return u === 0 ? { value: !0 } : {
       value: !1,
       reason: {
         type: "intersectRaycaster check failed",
-        passedCount: s,
-        needPassed: l.needPassed
+        passedCount: o,
+        needPassed: f.needPassed
       }
     };
   }
   /** 检测是否匹配当前楼层 */
   getVisibleByFloorIndex(e) {
-    var n, f, s, u, o, r, c;
+    var s, d, o, u, n, r, l;
     let i = 0;
-    const l = (n = e.fiveState) == null ? void 0 : n.panoIndex;
-    l !== void 0 ? i = (f = this.work.observers[l]) == null ? void 0 : f.floorIndex : i = q(this.work, (c = (r = (u = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : u.position) != null ? r : (o = e.mediaPlane) == null ? void 0 : o.position) != null ? c : x(e));
+    const f = (s = e.fiveState) == null ? void 0 : s.panoIndex;
+    f !== void 0 ? i = (d = this.work.observers[f]) == null ? void 0 : d.floorIndex : i = q(this.work, (l = (r = (u = (o = e.model) == null ? void 0 : o.object) == null ? void 0 : u.position) != null ? r : (n = e.mediaPlane) == null ? void 0 : n.position) != null ? l : P(e));
     const t = this.five.model.shownFloor;
     return t === null || t === i;
   }

package/libs/PanoTagPlugin/controller/TagRender.d.ts

@@ -55,6 +55,10 @@ export declare abstract class TagRender extends TagComputer {
     protected updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagInstance<TagContentType, S>, model: Object3D): void;
     /** 添加模型标签 */
     protected addMediaModelTag(tags: Tag[]): Promise<void>;
+    /**
+     * @description: 一个点的标签
+     */
+    protected setPointTagPosition(): void;
     /**
      * @description: 渲染单个点的标签
      */