@realsee/dnalogel 2.6.7-dev.1 → 2.6.7-dev.10

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,24 +1,24 @@
-var j = Object.defineProperty, B = Object.defineProperties;
-var U = Object.getOwnPropertyDescriptors;
+var B = Object.defineProperty, V = Object.defineProperties;
+var j = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
-var R = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
-var T = (g, d, e) => d in g ? j(g, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : g[d] = e, C = (g, d) => {
+var U = Object.prototype.hasOwnProperty, R = Object.prototype.propertyIsEnumerable;
+var T = (g, d, e) => d in g ? B(g, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : g[d] = e, C = (g, d) => {
   for (var e in d || (d = {}))
-    R.call(d, e) && T(g, e, d[e]);
+    U.call(d, e) && T(g, e, d[e]);
   if (P)
     for (var e of P(d))
-      w.call(d, e) && T(g, e, d[e]);
+      R.call(d, e) && T(g, e, d[e]);
   return g;
-}, I = (g, d) => B(g, U(d));
-var y = (g, d, e) => (T(g, typeof d != "symbol" ? d + "" : d, e), e);
+}, I = (g, d) => V(g, j(d));
+var m = (g, d, e) => (T(g, typeof d != "symbol" ? d + "" : d, e), e);
 import x from "object-assign-deep";
 import * as k from "three";
-import { DefaultConfig as V } from "../tag.config.js";
-import { isMediaModelTag as m, is3DTag as $ } from "../utils/tag/tagCheck.js";
-import { anyPositionToVector3 as E } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { planeNormal as A } from "../utils/planeNormal.js";
+import { DefaultConfig as w } from "../tag.config.js";
+import { isMediaModelTag as b, is3DTag as $ } from "../utils/tag/tagCheck.js";
+import { anyPositionToVector3 as A } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { planeNormal as E } from "../utils/planeNormal.js";
 import { getTagPosition as D, tagPosition as M } from "../utils/tagPosition.js";
-import { checkRange as b } from "../utils/checkRange.js";
+import { checkRange as y } from "../utils/checkRange.js";
 import { TagCacheController as F } from "./TagCacheController.js";
 import "hammerjs";
 import "@realsee/five";
@@ -44,9 +44,9 @@ import "../../shared-utils/animationFrame/index.js";
 class ve extends F {
   constructor(e) {
     super(e);
-    y(this, "tags", []);
-    y(this, "config", V);
-    y(this, "raycaster", new k.Raycaster());
+    m(this, "tags", []);
+    m(this, "config", w);
+    m(this, "raycaster", new k.Raycaster());
   }
   get isPanorama() {
     return this.five.currentMode === "Panorama";
@@ -65,13 +65,13 @@ class ve extends F {
   getVisibleByPanoIndex(e, t) {
     var n;
     const i = this.getCache({ panoIndex: t, id: e.id }), o = (n = this.five.panoIndex) != null ? n : t;
-    if (m(e))
+    if (b(e))
       return !0;
     if (i.visible !== void 0)
       return i.visible;
     {
-      const a = (() => {
-        var c, u, f;
+      const f = (() => {
+        var c, u, a;
         const s = (c = this.getTagConfig(e).visibleConfig) != null ? c : {}, l = this.getDistance(e);
         if (typeof s == "function")
           return { value: s(this.five, { tag: e, distance: l }), reason: "config function result" };
@@ -88,10 +88,10 @@ class ve extends F {
           if (s.visiblePanoIndex === "current" && o !== ((u = e.fiveState) == null ? void 0 : u.panoIndex))
             return {
               value: !1,
-              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${o}, tag.panoIndex: ${(f = e.fiveState) == null ? void 0 : f.panoIndex}`
+              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${o}, tag.panoIndex: ${(a = e.fiveState) == null ? void 0 : a.panoIndex}`
             };
         }
-        if (s.visibleDistance !== void 0 && s.visibleDistance !== "unLimited" && b(l, s.visibleDistance) === !1)
+        if (s.visibleDistance !== void 0 && s.visibleDistance !== "unLimited" && y(l, s.visibleDistance) === !1)
           return {
             value: !1,
             reason: `distance is not in visibleDistance. distance: ${l}, visibleDistance: ${s.visibleDistance}`
@@ -108,7 +108,7 @@ class ve extends F {
         }
         if (s.angleRange && $(e)) {
           const r = this.getAngle(e);
-          if (b(r, s.angleRange) === !1)
+          if (y(r, s.angleRange) === !1)
             return { value: !1, reason: `angle is not in angleRange. angle: ${r}, angleRange: ${s.angleRange}` };
         }
         return {
@@ -116,10 +116,10 @@ class ve extends F {
           reason: "all check passed"
         };
       })();
-      return i.visible = a.value, i.__debug_visible_reason__ = a, i.visible;
+      return i.visible = f.value, i.__debug_visible_reason__ = f, i.visible;
     }
   }
-  getVisibelByFiveMode(e, t) {
+  getVisibleByFiveMode(e, t) {
     var n;
     const i = (n = this.getTagConfig(e).visibleConfig) != null ? n : {};
     if (typeof i == "function")
@@ -127,6 +127,18 @@ class ve extends F {
     const o = i == null ? void 0 : i.visibleFiveMode;
     return o ? o.includes(t) : t === "Panorama";
   }
+  getVisibleByFloorIndex(e) {
+    var f;
+    const t = e.fiveState;
+    if (!t)
+      return !0;
+    const i = t.panoIndex, o = (f = this.five.work.observers[i]) == null ? void 0 : f.floorIndex, n = this.five.model.shownFloor;
+    return n === null || n === o;
+  }
+  getVisible(e) {
+    const t = this.five.getCurrentState(), i = this.getVisibleByFiveMode(e, t.mode), o = b(e) ? this.getVisibleByFloorIndex(e) : !0, n = t.mode === "Panorama" ? this.getVisibleByPanoIndex(e, t.panoIndex) : !0;
+    return i && n && o;
+  }
   getModelMedialVisibleByPanoIndex(e) {
     const t = this.five.getCurrentState().panoIndex, i = this.getCache({ panoIndex: t, id: e.id });
     if (i.modelMedialVisible !== void 0)
@@ -144,7 +156,7 @@ class ve extends F {
       const n = this.getTagConfig(e).unfoldedConfig;
       if (!n)
         return;
-      const a = (() => {
+      const f = (() => {
         const l = this.getDistance(e);
         if (typeof n == "function")
           return n(this.five, { tag: e, distance: l });
@@ -152,17 +164,17 @@ class ve extends F {
           return !1;
         if (n.keep === "unfolded")
           return !0;
-        if (n.unfoldDistance && b(l, n.unfoldDistance) === !1)
+        if (n.unfoldDistance && y(l, n.unfoldDistance) === !1)
           return !1;
       })();
-      o.unfolded = a;
+      o.unfolded = f;
       const s = this.getUnfoldedByCamera(e);
       return s !== void 0 ? s : o.unfolded;
     }
   }
   getUnfoldedByCamera(e) {
     return this.getVisibleByPanoIndex(e) ? (() => {
-      var a;
+      var f;
       const o = this.getDistance(e), n = this.getTagConfig(e).unfoldedConfig;
       if (!!n) {
         if (typeof n == "function")
@@ -175,24 +187,24 @@ class ve extends F {
           return;
         if (n.autoUnfold.strategy === "ScreenPostion") {
           const s = this.getTagProject(e);
-          if (s && b(s.x, n.autoUnfold.autoUnfoldProjectX) === !1)
+          if (s && y(s.x, n.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
         if (n.autoUnfold.strategy === "MinimumDistance") {
-          const c = this.filterPointTag().filter((f) => this.getVisibleByPanoIndex(f)).filter((f) => {
-            const r = this.getTagProject(f);
+          const c = this.filterPointTag().filter((a) => this.getVisibleByPanoIndex(a)).filter((a) => {
+            const r = this.getTagProject(a);
             if (!r)
               return !1;
             const { x: p, y: v, z: h } = r;
             return !(Math.abs(h) > 1 || Math.abs(p) > 1 || Math.abs(v) > 1);
-          }).map((f) => ({ tag: f, id: f.id, tagConfig: this.getTagConfig(f).unfoldedConfig })).filter(({ tag: f, tagConfig: r }) => {
+          }).map((a) => ({ tag: a, id: a.id, tagConfig: this.getTagConfig(a).unfoldedConfig })).filter(({ tag: a, tagConfig: r }) => {
             var p, v;
             return !(typeof r != "object" || r.keep || r.autoUnfold === !1 || ((p = r.autoUnfold) == null ? void 0 : p.enable) === !1 || ((v = r.autoUnfold) == null ? void 0 : v.strategy) !== "MinimumDistance");
-          }).map((f) => I(C({}, f), { distance: this.getDistance(f.tag) })).filter(({ distance: f, tagConfig: r }) => {
+          }).map((a) => I(C({}, a), { distance: this.getDistance(a.tag) })).filter(({ distance: a, tagConfig: r }) => {
             var p, v;
-            return !(f === void 0 || typeof r != "object" || r.autoUnfold === !1 || ((p = r.autoUnfold) == null ? void 0 : p.enable) === !1 || ((v = r.autoUnfold) == null ? void 0 : v.strategy) !== "MinimumDistance" || r.autoUnfold.distance && b(f, r.autoUnfold.distance) === !1);
-          }).sort((f, r) => f.distance - r.distance).findIndex((f) => f.id === e.id);
-          if (c === -1 || c <= ((a = n.autoUnfold.maxNumber) != null ? a : 1) - 1 === !1)
+            return !(a === void 0 || typeof r != "object" || r.autoUnfold === !1 || ((p = r.autoUnfold) == null ? void 0 : p.enable) === !1 || ((v = r.autoUnfold) == null ? void 0 : v.strategy) !== "MinimumDistance" || r.autoUnfold.distance && y(a, r.autoUnfold.distance) === !1);
+          }).sort((a, r) => a.distance - r.distance).findIndex((a) => a.id === e.id);
+          if (c === -1 || c <= ((f = n.autoUnfold.maxNumber) != null ? f : 1) - 1 === !1)
             return !1;
         }
         return !0;
@@ -200,7 +212,7 @@ class ve extends F {
     })() : void 0;
   }
   getDistance(e, t) {
-    var n, a, s;
+    var n, f, s;
     const i = (n = this.five.panoIndex) != null ? n : t;
     if (i === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${i}`);
@@ -208,7 +220,7 @@ class ve extends F {
     if (o.distance !== void 0)
       return o.distance;
     {
-      const l = (s = (a = this.five.work) == null ? void 0 : a.observers[i]) == null ? void 0 : s.position;
+      const l = (s = (f = this.five.work) == null ? void 0 : f.observers[i]) == null ? void 0 : s.position;
       if (l === void 0)
         throw new Error(`getDistance(): observerPosition is ${l}`);
       const c = D(e), u = l.distanceTo(c);
@@ -216,7 +228,7 @@ class ve extends F {
     }
   }
   getAngle(e, t) {
-    var n, a, s;
+    var n, f, s;
     const i = (n = this.five.panoIndex) != null ? n : t;
     if (i === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${i}`);
@@ -224,14 +236,14 @@ class ve extends F {
     if (o.angle !== void 0)
       return o.angle;
     {
-      const l = (s = (a = this.five.work) == null ? void 0 : a.observers[i]) == null ? void 0 : s.position;
+      const l = (s = (f = this.five.work) == null ? void 0 : f.observers[i]) == null ? void 0 : s.position;
       if (l === void 0)
         throw new Error(`getAngleRange(): observerPosition is ${l}`);
-      const c = (() => e.stickType === "3DPoint" ? E(e.normal) : A(e.position))();
+      const c = (() => e.stickType === "3DPoint" ? A(e.normal) : E(e.position))();
       if (!c)
         return;
-      const u = new k.Vector3().copy(l).sub(M(e.position)), f = c.angleTo(u) * 180 / Math.PI;
-      return o.angle = f, o.angle;
+      const u = new k.Vector3().copy(l).sub(M(e.position)), a = c.angleTo(u) * 180 / Math.PI;
+      return o.angle = a, o.angle;
     }
   }
   getTagConfig(e) {
@@ -239,8 +251,8 @@ class ve extends F {
     if (!e)
       return (o = this.config.globalConfig) != null ? o : {};
     const t = {};
-    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((a) => {
-      const s = a;
+    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((f) => {
+      const s = f;
       if (t[s])
         return;
       const l = s.split("-");
@@ -253,10 +265,10 @@ class ve extends F {
         (e.stickType === c || c === "Any") && (e.contentType === u || u === "Any") && (t[s] = this.config.contentTypeConfig[s]);
       }
       if (l.length === 3) {
-        const [c = "Any", u, f] = l;
+        const [c = "Any", u, a] = l;
         if (u === "Audio" && e.contentType === "Audio") {
           const r = e;
-          (r.stickType === c || c === "Any") && r.data.appearance === f && (t[s] = this.config.contentTypeConfig[s]);
+          (r.stickType === c || c === "Any") && r.data.appearance === a && (t[s] = this.config.contentTypeConfig[s]);
         }
       }
     });
@@ -311,7 +323,7 @@ class ve extends F {
   }
   setModelMedialVisibleByPanoIndex() {
     this.tags.forEach((e) => {
-      if (!m(e))
+      if (!b(e))
         return;
       const t = this.getModelMedialVisibleByPanoIndex(e);
       e.mediaVisible = t;
@@ -329,9 +341,9 @@ class ve extends F {
   getTagProject(e) {
     if (!this.getVisibleByPanoIndex(e))
       return;
-    const i = M(e.position), { x: o, y: n, z: a } = i.project(this.five.camera);
-    if (!(a > 1))
-      return { x: o, y: n, z: a };
+    const i = M(e.position), { x: o, y: n, z: f } = i.project(this.five.camera);
+    if (!(f > 1))
+      return { x: o, y: n, z: f };
   }
   filterPointTag() {
     return this.tags.filter((e) => e.stickType === "2DPoint" || e.stickType === "3DPoint");
@@ -358,11 +370,11 @@ class ve extends F {
     });
   }
   getTagEnableByIntersect(e, t) {
-    var c, u, f;
-    const i = (c = this.getTagConfig(e).visibleConfig) != null ? c : {}, o = this.getDistance(e), [n] = this.five.model.intersectRaycaster(t), a = (() => {
-      if (!m(e))
+    var c, u, a;
+    const i = (c = this.getTagConfig(e).visibleConfig) != null ? c : {}, o = this.getDistance(e), [n] = this.five.model.intersectRaycaster(t), f = (() => {
+      if (!b(e))
         return;
-      const r = this.tags.filter(m).map((v) => {
+      const r = this.tags.filter(b).map((v) => {
         var h;
         return (h = v.model) == null ? void 0 : h.object;
       }).filter(S);
@@ -371,9 +383,10 @@ class ve extends F {
       var r;
       return typeof i == "object" && typeof i.intersectRaycaster == "object" && (r = i.intersectRaycaster.distanceAccuracy) != null ? r : 0.01;
     })();
-    return Math.min((u = n == null ? void 0 : n.distance) != null ? u : 1 / 0, (f = a == null ? void 0 : a.distance) != null ? f : 1 / 0) + s < o ? {
+    return Math.min((u = n == null ? void 0 : n.distance) != null ? u : 1 / 0, (a = f == null ? void 0 : f.distance) != null ? a : 1 / 0) + s < o ? {
       value: !1,
-      reason: `intersectRaycaster check failed: distance is ${o}, intersection.point is ${n.point.toArray()}, distanceError is ${s}`
+      reason: `intersectRaycaster check failed: distance is ${o}, intersection.point is ${n.point.toArray()},
+        customModelIntersection.point is ${f == null ? void 0 : f.point.toArray()} distanceError is ${s}`
     } : { value: !0, reason: "" };
   }
   getRaycasterFromPanoIndex(e, t) {
@@ -384,14 +397,6 @@ class ve extends F {
     const o = D(e).sub(i).normalize();
     return this.raycaster.set(i, o), this.raycaster;
   }
-  checkFloorIndex(e) {
-    var a;
-    const t = e.fiveState;
-    if (!t)
-      return !0;
-    const i = t.panoIndex, o = (a = this.five.work.observers[i]) == null ? void 0 : a.floorIndex, n = this.five.model.shownFloor;
-    return n === null || n === o;
-  }
 }
 export {
   ve as TagComputer

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

@@ -109,6 +109,7 @@ declare class PanoTagPluginController extends TagComputer {
      * @param scale css3DObject 原始缩放比例
      */
     updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagElement<any, S>, model: Object3D): void;
+    private updateTagCss3DObjectVisible;
     /**
      * @description: 设置 visible 和 unfolded
      */