@realsee/dnalogel 3.20.2 → 3.20.4

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.2");
+    i(this, "VERSION", "3.20.4");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.20.2",
+    "%c %c@realsee/dnalogel %cv3.20.4",
     [
       "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/vendor/classnames/index.js

@@ -1,9 +1,9 @@
-var a = {}, f = {
+var o = {}, u = {
   get exports() {
-    return a;
+    return o;
   },
-  set exports(e) {
-    a = e;
+  set exports(s) {
+    o = s;
   }
 };
 /*!
@@ -11,37 +11,37 @@ var a = {}, f = {
 	Licensed under the MIT License (MIT), see
 	http://jedwatson.github.io/classnames
 */
-(function(e) {
+(function(s) {
   (function() {
-    var l = {}.hasOwnProperty;
-    function t() {
-      for (var n = [], o = 0; o < arguments.length; o++) {
-        var s = arguments[o];
-        if (s) {
-          var i = typeof s;
-          if (i === "string" || i === "number")
-            n.push(s);
-          else if (Array.isArray(s)) {
-            if (s.length) {
-              var c = t.apply(null, s);
-              c && n.push(c);
-            }
-          } else if (i === "object") {
-            if (s.toString !== Object.prototype.toString && !s.toString.toString().includes("[native code]")) {
-              n.push(s.toString());
-              continue;
-            }
-            for (var r in s)
-              l.call(s, r) && s[r] && n.push(r);
-          }
-        }
+    var f = {}.hasOwnProperty;
+    function e() {
+      for (var t = "", r = 0; r < arguments.length; r++) {
+        var n = arguments[r];
+        n && (t = i(t, c(n)));
       }
-      return n.join(" ");
+      return t;
     }
-    e.exports ? (t.default = t, e.exports = t) : window.classNames = t;
+    function c(t) {
+      if (typeof t == "string" || typeof t == "number")
+        return t;
+      if (typeof t != "object")
+        return "";
+      if (Array.isArray(t))
+        return e.apply(null, t);
+      if (t.toString !== Object.prototype.toString && !t.toString.toString().includes("[native code]"))
+        return t.toString();
+      var r = "";
+      for (var n in t)
+        f.call(t, n) && t[n] && (r = i(r, n));
+      return r;
+    }
+    function i(t, r) {
+      return r ? t ? t + " " + r : t + r : t;
+    }
+    s.exports ? (e.default = e, s.exports = e) : window.classNames = e;
   })();
-})(f);
-const u = a;
+})(u);
+const a = o;
 export {
-  u as classnames
+  a as classnames
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "alpha",
+    "@realsee/five": "6.0.0-alpha.74",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",