@realsee/dnalogel 3.20.0 → 3.20.2

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/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.20.0",
+    "%c %c@realsee/dnalogel %cv3.20.2",
     [
       "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 o = {}, u = {
+var a = {}, f = {
   get exports() {
-    return o;
+    return a;
   },
-  set exports(s) {
-    o = s;
+  set exports(e) {
+    a = e;
   }
 };
 /*!
@@ -11,37 +11,37 @@ var o = {}, u = {
 	Licensed under the MIT License (MIT), see
 	http://jedwatson.github.io/classnames
 */
-(function(s) {
+(function(e) {
   (function() {
-    var f = {}.hasOwnProperty;
-    function e() {
-      for (var t = "", r = 0; r < arguments.length; r++) {
-        var n = arguments[r];
-        n && (t = i(t, c(n)));
+    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);
+          }
+        }
       }
-      return t;
+      return n.join(" ");
     }
-    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;
+    e.exports ? (t.default = t, e.exports = t) : window.classNames = t;
   })();
-})(u);
-const a = o;
+})(f);
+const u = a;
 export {
-  a as classnames
+  u as classnames
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.20.0",
+  "version": "3.20.2",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",