@realsee/dnalogel 3.20.1 → 3.20.3

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,17 +1,17 @@
-var A = Object.defineProperty, $ = Object.defineProperties;
+var $ = Object.defineProperty, A = Object.defineProperties;
 var E = Object.getOwnPropertyDescriptors;
 var T = Object.getOwnPropertySymbols;
 var L = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable;
-var M = (b, e, i) => e in b ? A(b, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : b[e] = i, x = (b, e) => {
+var D = (b, e, i) => e in b ? $(b, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : b[e] = i, x = (b, e) => {
   for (var i in e || (e = {}))
-    L.call(e, i) && M(b, i, e[i]);
+    L.call(e, i) && D(b, i, e[i]);
   if (T)
     for (var i of T(e))
-      _.call(e, i) && M(b, i, e[i]);
+      _.call(e, i) && D(b, i, e[i]);
   return b;
-}, U = (b, e) => $(b, E(e));
+}, M = (b, e) => A(b, E(e));
 import * as F from "three";
-import { is3DTag as O, isMediaModelTag as D } from "../utils/tag/tagCheck.js";
+import { is3DTag as O, isMediaModelTag as U } from "../utils/tag/tagCheck.js";
 import { getTagCenterPosition as C, getTagPosition as z } from "../utils/tagPosition.js";
 import { checkRange as h } from "../utils/checkRange.js";
 import { isPanoramaLike as y, isModelLike as Z } from "../../shared-utils/five/mode.js";
@@ -81,18 +81,22 @@ class Qe extends H {
       return d.visible;
     {
       const s = [], c = (() => {
-        var r, a, u, m, v, g, P;
+        var r, a, u, p, v, g, P;
         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: s, reason: "config function result" };
+          return {
+            value: n(this.five, { tag: e, distance: this.getDistance(e, f) }),
+            checkedList: s,
+            reason: "config function result"
+          };
         if (n.keep === "hidden")
           return { value: !1, checkedList: s, reason: "config.keep is hidden" };
         if (n.keep === "visible")
           return { value: !0, checkedList: s, reason: "config.keep is visible" };
         if (n.visibleFiveMode !== void 0) {
           const l = typeof n.visibleFiveMode == "function" ? n.visibleFiveMode(e) : n.visibleFiveMode;
-          let p = !1;
-          if (Array.isArray(l) ? p = l.includes(o) : l === "ModelLike" ? p = Z(o) : l === "PanoramaLike" ? p = !y(o) : l === "all" ? p = !0 : typeof l == "string" && (p = l === o), p === !1)
+          let m = !1;
+          if (Array.isArray(l) ? m = l.includes(o) : l === "ModelLike" ? m = Z(o) : l === "PanoramaLike" ? m = !y(o) : l === "all" ? m = !0 : typeof l == "string" && (m = l === o), m === !1)
             return {
               value: !1,
               checkedList: s,
@@ -100,7 +104,7 @@ class Qe extends H {
               visibleFiveMode: n.visibleFiveMode,
               mode: o
             };
-        } else if (n.visibleFiveMode === void 0 && ((a = this.five.getCurrentState()) == null ? void 0 : a.mode) !== ((m = (u = e.fiveState) == null ? void 0 : u.mode) != null ? m : "Panorama"))
+        } else if (n.visibleFiveMode === void 0 && ((a = this.five.getCurrentState()) == null ? void 0 : a.mode) !== ((p = (u = e.fiveState) == null ? void 0 : u.mode) != null ? p : "Panorama"))
           return {
             value: !1,
             checkedList: s,
@@ -125,17 +129,19 @@ class Qe extends H {
             };
         }
         if (n.visibleDistance !== void 0 && (s.push("visibleDistance"), n.visibleDistance !== "unLimited")) {
-          const l = this.getDistance(e);
+          const l = this.getDistance(e, f);
           if (h(l, n.visibleDistance) === !1)
             return {
               value: !1,
               checkedList: s,
-              reason: `distance is not in visibleDistance. distance: ${l}, visibleDistance: ${n.visibleDistance}`
+              panoIndex: t,
+              visibleDistance: n.visibleDistance,
+              reason: `distance is not in visibleDistance. distance: ${l}, visibleDistance: ${n.visibleDistance.min} - ${n.visibleDistance.max}`
             };
         }
         if (y(o) && n.angleRange && O(e)) {
           s.push("angleRange");
-          const l = this.getAngle(e);
+          const l = this.getAngle(e, t);
           if (h(l, n.angleRange) === !1)
             return { value: !1, checkedList: s, reason: `angle is not in angleRange. angle: ${l}, angleRange: ${n.angleRange}` };
         }
@@ -174,12 +180,12 @@ class Qe extends H {
         return;
       const d = (() => {
         if (typeof o == "function")
-          return o(this.five, { tag: e, distance: this.getDistance(e) });
+          return o(this.five, { tag: e, distance: this.getDistance(e, { panoIndex: i }) });
         if (o.keep === "folded")
           return !1;
         if (o.keep === "unfolded")
           return !0;
-        if (o.unfoldDistance && h(this.getDistance(e), o.unfoldDistance) === !1)
+        if (o.unfoldDistance && h(this.getDistance(e, { panoIndex: i }), o.unfoldDistance) === !1)
           return !1;
       })();
       t.unfolded = d;
@@ -213,12 +219,12 @@ class Qe extends H {
             const a = this.getTagProject(r);
             if (!a)
               return !1;
-            const { x: u, y: m, z: v } = a;
-            return !(Math.abs(v) > 1 || Math.abs(u) > 1 || Math.abs(m) > 1);
+            const { x: u, y: p, z: v } = a;
+            return !(Math.abs(v) > 1 || Math.abs(u) > 1 || Math.abs(p) > 1);
           }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: a }) => {
-            var u, m;
-            return !(typeof a == "function" || a.keep || a.autoUnfold === !1 || ((u = a.autoUnfold) == null ? void 0 : u.enable) === !1 || ((m = a.autoUnfold) == null ? void 0 : m.strategy) !== "MinimumDistance");
-          }).map((r) => U(x({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: a }) => {
+            var u, p;
+            return !(typeof a == "function" || a.keep || a.autoUnfold === !1 || ((u = a.autoUnfold) == null ? void 0 : u.enable) === !1 || ((p = a.autoUnfold) == null ? void 0 : p.strategy) !== "MinimumDistance");
+          }).map((r) => M(x({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: a }) => {
             const u = a.autoUnfold.distance;
             return !(u && h(r, u) === !1);
           }).sort((r, a) => r.distance - a.distance).findIndex((r) => r.id === e.id);
@@ -266,7 +272,7 @@ class Qe extends H {
   }
   /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, i) {
-    var n, r, a, u, m;
+    var n, r, a, u, p;
     const f = R(R((n = this.getTagConfig(e).visibleConfig) != null ? n : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, o = y(this.five.getCurrentState().mode) ? this.workUtil.getObserverPosition(t) : this.five.camera.position;
     if (o === void 0)
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
@@ -281,17 +287,17 @@ class Qe extends H {
     for (const v of d) {
       const g = new F.Vector3().subVectors(v, o).normalize();
       I.set(o, g);
-      const P = o.distanceTo(v), [l] = this.five.model.intersectRaycaster(I), p = (() => {
-        if (!D(e))
+      const P = o.distanceTo(v), [l] = this.five.model.intersectRaycaster(I), m = (() => {
+        if (!U(e))
           return;
-        const V = this.tags.filter(D).map((B) => {
+        const V = this.tags.filter(U).map((B) => {
           var k;
           return (k = B.model) == null ? void 0 : k.object;
         }).filter(q), [w] = I.intersectObjects(V, !0);
         return w;
       })(), S = (r = f.distanceAccuracy) != null ? r : 0.01;
-      Math.min((a = l == null ? void 0 : l.distance) != null ? a : 1 / 0, (u = p == null ? void 0 : p.distance) != null ? u : 1 / 0) + S >= P ? s++ : c++;
-      const j = (m = f.needPassed) != null ? m : 1;
+      Math.min((a = l == null ? void 0 : l.distance) != null ? a : 1 / 0, (u = m == null ? void 0 : m.distance) != null ? u : 1 / 0) + S >= P ? s++ : c++;
+      const j = (p = f.needPassed) != null ? p : 1;
       if (s >= j)
         return { value: !0 };
     }

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,12 +1,12 @@
 var q = Object.defineProperty, K = Object.defineProperties;
 var Q = Object.getOwnPropertyDescriptors;
-var x = Object.getOwnPropertySymbols;
+var U = Object.getOwnPropertySymbols;
 var Y = Object.prototype.hasOwnProperty, Z = Object.prototype.propertyIsEnumerable;
-var w = (l, s, e) => s in l ? q(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, k = (l, s) => {
+var w = (l, s, e) => s in l ? q(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, b = (l, s) => {
   for (var e in s || (s = {}))
     Y.call(s, e) && w(l, e, s[e]);
-  if (x)
-    for (var e of x(s))
+  if (U)
+    for (var e of U(s))
       Z.call(s, e) && w(l, e, s[e]);
   return l;
 }, R = (l, s) => K(l, Q(s));
@@ -23,7 +23,7 @@ import { TagCache as re } from "./TagCache.js";
 import { writable as ne } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as se } from "../../shared-utils/device.js";
 import { Five as fe } from "@realsee/five";
-import { isMediaPlaneTag as le, isMediaModelTag as B, isPlaneTag as ce, isPoint3DTag as ae } from "../utils/tag/tagCheck.js";
+import { isMediaPlaneTag as le, isMediaModelTag as B, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
 import { VideoPlane as de } from "../utils/model/mediaPlane.js";
 import { FiveDomEvents as ue } from "../../shared-utils/five/FiveDomEvents.js";
 import N from "../utils/tag/adaptConfig.js";
@@ -116,9 +116,9 @@ class di extends re {
    * @description: 获取标签配置
    */
   getTagConfig(e, i) {
-    var n, f, c;
+    var n, f, a;
     const o = this.calculateTagConfig(e, { useCache: i == null ? void 0 : i.useCache }), t = (n = i == null ? void 0 : i.fiveMode) != null ? n : this.five.getCurrentState().mode, r = (f = o.configWithFiveMode) == null ? void 0 : f[t];
-    return (c = r != null ? r : o) != null ? c : {};
+    return (a = r != null ? r : o) != null ? a : {};
   }
   /**
    * @description 获取标签当前状态
@@ -168,7 +168,7 @@ class di extends re {
         if (le(e)) {
           if (t.length === 1) {
             if (t[0].type === "Video")
-              return "Mesh";
+              return navigator.userAgent.toLowerCase().indexOf("firefox") > -1 && navigator.userAgent.toLowerCase().indexOf("mobile") > -1 ? "Dom" : "Mesh";
             if (t[0].type === "Image")
               return H(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
@@ -198,36 +198,36 @@ class di extends re {
       const f = _(e);
       if (!f)
         return;
-      const c = new ie.Vector3().copy(r).sub(f), g = n.angleTo(c) * 180 / Math.PI;
-      return t.angle = g, t.angle;
+      const a = new ie.Vector3().copy(r).sub(f), h = n.angleTo(a) * 180 / Math.PI;
+      return t.angle = h, t.angle;
     }
   }
   /**
    * @description: 获取距离
    */
   getDistance(e, i) {
-    const o = k(k({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = o, n = A(r) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = o, n = A(r) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((n == null ? void 0 : n.distance) !== void 0)
       return n.distance;
     const f = _(e);
     if (!f)
       return -1;
     if (A(r)) {
-      const c = this.workUtil.getObserverPosition(t);
-      if (c === void 0)
+      const a = this.workUtil.getObserverPosition(t);
+      if (a === void 0)
         return -1;
-      const g = c.distanceTo(f);
-      return n && (n.distance = g), g;
+      const h = a.distanceTo(f);
+      return n && (n.distance = h), h;
     }
     if ($(r))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (ce(e))
+    if (ae(e))
       return e.position;
     if (B(e))
       return e.data.mediaPosition;
-    if (ae(e))
+    if (ce(e))
       return oe(this.five.camera.position, C(e.position), C(e.normal));
   }
   addObjectClickHandler(e, i, o) {
@@ -292,48 +292,48 @@ class di extends re {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var O, j, S, I, W;
+    var O, j, S, x, F;
     const o = (O = i == null ? void 0 : i.useCache) != null ? O : !0;
     if (!e)
       return (j = this.config.globalConfig) != null ? j : {};
     if (o) {
       if ((S = e == null ? void 0 : e.computedConfig) != null && S._isMerged)
         return e.computedConfig;
-      if ((I = e == null ? void 0 : e.config) != null && I._isMerged)
+      if ((x = e == null ? void 0 : e.config) != null && x._isMerged)
         return e.config;
     }
     const t = {}, r = {}, n = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([d, u]) => {
-      var V, L;
-      const a = d, D = a.split("-"), F = d.startsWith("["), T = F ? D[0].slice(1, -1) : void 0, h = F ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (V = r[T]) != null ? V : r[T] = {} : (L = n[T]) != null ? L : n[T] = {} : t;
-      if (!v[a]) {
-        if (h.length === 0 && (v[a] = u), h.length === 1) {
-          const [m] = h;
-          (e.contentType === m || m === "Any") && (v[a] = u);
+      var W, L;
+      const c = d, D = c.split("-"), I = d.startsWith("["), T = I ? D[0].slice(1, -1) : void 0, g = I ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (W = r[T]) != null ? W : r[T] = {} : (L = n[T]) != null ? L : n[T] = {} : t;
+      if (!v[c]) {
+        if (g.length === 0 && (v[c] = u), g.length === 1) {
+          const [m] = g;
+          (e.contentType === m || m === "Any") && (v[c] = u);
         }
-        if (h.length === 2) {
-          const [m = "Any", P = "Any"] = h;
-          m === "Mixin" && e.contentType === P && (v[a] = u), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (v[a] = u);
+        if (g.length === 2) {
+          const [m = "Any", P = "Any"] = g;
+          m === "Mixin" && e.contentType === P && (v[c] = u), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (v[c] = u);
         }
-        if (h.length === 3) {
-          const [m = "Any", P, X] = h;
+        if (g.length === 3) {
+          const [m = "Any", P, X] = g;
           if (P === "Audio" && e.contentType === "Audio") {
-            const U = e;
-            (U.stickType === m || m === "Any") && U.data.appearance === X && (v[a] = u);
+            const V = e;
+            (V.stickType === m || m === "Any") && V.data.appearance === X && (v[c] = u);
           }
         }
       }
     });
-    const f = (W = e.initialConfig) != null ? W : {}, c = y({}, ee, this.config.globalConfig, ...Object.values(t)), g = y({}, c, f), M = {}, G = Object.values(fe.Mode);
+    const f = (F = e.initialConfig) != null ? F : {}, a = y({}, ee, this.config.globalConfig, ...Object.values(t)), h = y({}, a, f), M = {}, G = Object.values(fe.Mode);
     z(r).forEach(([d, u]) => {
-      G.forEach((a) => {
-        (d === "PanoramaLike" && A(a) || d === "ModelLike" && $(a)) && (M[a] = y({}, c, ...Object.values(u), f, { _isMerged: !0 }));
+      G.forEach((c) => {
+        (d === "PanoramaLike" && A(c) || d === "ModelLike" && $(c)) && (M[c] = y({}, a, ...Object.values(u), f, { _isMerged: !0 }));
       });
     }), z(n).forEach(([d, u]) => {
-      M[d] = y({}, c, ...Object.values(u), f, { _isMerged: !0 });
+      M[d] = y({}, a, ...Object.values(u), f, { _isMerged: !0 });
     });
-    const b = R(k({}, g), { configWithFiveMode: M });
-    return N(b), Object.values(M).forEach((d) => N(d)), b._isMerged = !0, b;
+    const k = R(b({}, h), { configWithFiveMode: M });
+    return N(k), Object.values(M).forEach((d) => N(d)), k._isMerged = !0, k;
   }
 }
 export {

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.20.1");
+    i(this, "VERSION", "3.20.3");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/logger.js

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