@realsee/dnalogel 3.44.0 → 3.44.1

package/libs/PanoTagPlugin/controller/Tag/BaseTag.js

@@ -2,14 +2,14 @@ var Z = Object.defineProperty, _ = Object.defineProperties;
 var G = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
 var D = Object.prototype.hasOwnProperty, j = Object.prototype.propertyIsEnumerable;
-var x = (u, i, e) => i in u ? Z(u, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[i] = e, p = (u, i) => {
+var M = (u, i, e) => i in u ? Z(u, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[i] = e, p = (u, i) => {
   for (var e in i || (i = {}))
-    D.call(i, e) && x(u, e, i[e]);
+    D.call(i, e) && M(u, e, i[e]);
   if (y)
     for (var e of y(i))
-      j.call(i, e) && x(u, e, i[e]);
+      j.call(i, e) && M(u, e, i[e]);
   return u;
-}, M = (u, i) => _(u, G(i));
+}, I = (u, i) => _(u, G(i));
 var B = (u, i) => {
   var e = {};
   for (var t in u)
@@ -19,8 +19,8 @@ var B = (u, i) => {
       i.indexOf(t) < 0 && j.call(u, t) && (e[t] = u[t]);
   return e;
 };
-var f = (u, i, e) => (x(u, typeof i != "symbol" ? i + "" : i, e), e);
-var I = (u, i, e) => new Promise((t, r) => {
+var f = (u, i, e) => (M(u, typeof i != "symbol" ? i + "" : i, e), e);
+var U = (u, i, e) => new Promise((t, r) => {
   var n = (s) => {
     try {
       o(e.next(s));
@@ -37,9 +37,9 @@ var I = (u, i, e) => new Promise((t, r) => {
   o((e = e.apply(u, i)).next());
 });
 import { Subscribe as K } from "../../../shared-utils/Subscribe.js";
-import { calculateTagConfig as U } from "../../utils/tag/calculateTagConfig.js";
+import { calculateTagConfig as w } from "../../utils/tag/calculateTagConfig.js";
 import { getTagStickType as Y } from "../../utils/tag/format.js";
-import { isPanoramaLike as w, isModelLike as T } from "../../../shared-utils/five/mode.js";
+import { isPanoramaLike as T, isModelLike as P } from "../../../shared-utils/five/mode.js";
 import * as S from "three";
 import "hammerjs";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -56,7 +56,7 @@ import { uuid as oe } from "../../../shared-utils/uuid.js";
 import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import { objectAssignDeepExports as b } from "../../../vendor/object-assign-deep/objectAssignDeep.js";
 import { getTagPosition as L, getTagCenterPosition as $ } from "../../utils/tagPosition.js";
-import { checkRange as P } from "../../utils/checkRange.js";
+import { checkRange as C } from "../../utils/checkRange.js";
 import { isMediaPlaneTag as re, isMediaModelTag as V } from "../../utils/tag/tagCheck.js";
 import { getUrlExt as N } from "../../../shared-utils/url/getUrl.js";
 import { getFloorIndex as le } from "../../../shared-utils/five/getFloorIndex.js";
@@ -74,8 +74,8 @@ import "../../../shared-utils/Utils/FiveUtil.js";
 import "../../../shared-utils/Utils/BaseUtil.js";
 import "../../../shared-utils/Utils/WorkUtil.js";
 import "../../../shared-utils/five/getFiveModel.js";
-const C = new S.Raycaster();
-C.params.Points.threshold = 0.1;
+const k = new S.Raycaster();
+k.params.Points.threshold = 0.1;
 class _e {
   constructor(i, e) {
     f(this, "plugin");
@@ -112,7 +112,7 @@ class _e {
     e.stickType = t;
     const r = JSON.parse(JSON.stringify(e.data)), n = (s = e.initialConfig) != null ? s : e.config ? JSON.parse(JSON.stringify(e.config)) : {};
     e.initialConfig = n;
-    const l = U(e, i.config), o = this.getConfig(e);
+    const l = w(e, i.config), o = this.getConfig(e);
     e.config = o, this.id = (a = e.id) != null ? a : oe(), this.enabled = (c = e.enabled) != null ? c : !0, this.contentType = e.contentType, this.data = (g = o.initialData) != null && g.important ? b(e.data, r, o.initialData) : b(e.data, o.initialData, r), this.state = p({
       visible: void 0,
       unfolded: !this.can("fold")
@@ -144,7 +144,7 @@ class _e {
   }
   get currentConfig() {
     var r, n;
-    const i = U(this, this.plugin.config, { useCache: !0 }), e = this.five.getCurrentState().mode, t = (r = i.configWithFiveMode) == null ? void 0 : r[e];
+    const i = w(this, this.plugin.config, { useCache: !0 }), e = this.five.getCurrentState().mode, t = (r = i.configWithFiveMode) == null ? void 0 : r[e];
     return (n = t != null ? t : i) != null ? n : {};
   }
   get currentVisible() {
@@ -163,7 +163,7 @@ class _e {
    * @description 找到标签
    */
   find(i) {
-    return I(this, null, function* () {
+    return U(this, null, function* () {
       var r;
       const e = this.fiveState;
       if (!this.fiveState)
@@ -187,7 +187,7 @@ class _e {
    * @description 闪烁
    */
   blink(i) {
-    return I(this, null, function* () {
+    return U(this, null, function* () {
       var o, s;
       const e = (o = this.enabled) != null ? o : !0, t = (s = this.state) == null ? void 0 : s.visible, r = e && t;
       r === !1 && (this.state.visible = !0, this.enabled = !0, this.applyVisible(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.plugin.render(), yield de(0), this.dom && (this.dom.style.visibility = "hidden"), this.contentDom && (this.contentDom.style.visibility = "hidden"));
@@ -287,7 +287,7 @@ class _e {
   }
   getConfig(i, e) {
     var l, o, s;
-    const t = U(i != null ? i : this, this.plugin.config, { useCache: e == null ? void 0 : e.useCache }), r = (l = e == null ? void 0 : e.fiveMode) != null ? l : this.five.getCurrentState().mode, n = (o = t.configWithFiveMode) == null ? void 0 : o[r];
+    const t = w(i != null ? i : this, this.plugin.config, { useCache: e == null ? void 0 : e.useCache }), r = (l = e == null ? void 0 : e.fiveMode) != null ? l : this.five.getCurrentState().mode, n = (o = t.configWithFiveMode) == null ? void 0 : o[r];
     return (s = n != null ? n : t) != null ? s : {};
   }
   getDistance(i, e = 3) {
@@ -376,7 +376,7 @@ class _e {
           if (h === !1)
             return p({ value: !1, checkedList: n, reason: "followModelVisibility check failed" }, v);
         }
-        if (w(r) && s.visiblePanoIndex !== void 0 && s.visiblePanoIndex !== "all" && t !== void 0) {
+        if (T(r) && s.visiblePanoIndex !== void 0 && s.visiblePanoIndex !== "all" && t !== void 0) {
           if (n.push("visiblePanoIndex"), Array.isArray(s.visiblePanoIndex) && !s.visiblePanoIndex.includes(t))
             return {
               value: !1,
@@ -392,7 +392,7 @@ class _e {
         }
         if (s.visibleDistance !== void 0 && (n.push("visibleDistance"), s.visibleDistance !== "unLimited")) {
           const h = this.getDistance(e, 1);
-          if (P(h, s.visibleDistance) === !1)
+          if (C(h, s.visibleDistance) === !1)
             return {
               value: !1,
               checkedList: n,
@@ -430,9 +430,9 @@ class _e {
       if (n || (n = (o = (l = this.fiveState) == null ? void 0 : l.mode) != null ? o : this.workUtil.observers.length ? "Panorama" : "ModelLike"), Array.isArray(n))
         return n.includes(e);
       if (n === "ModelLike")
-        return T(e);
+        return P(e);
       if (n === "PanoramaLike")
-        return !w(e);
+        return !T(e);
       if (n === "all")
         return !0;
       if (typeof n == "string")
@@ -442,7 +442,7 @@ class _e {
       var l;
       const n = t();
       if (E((l = this.fiveState) == null ? void 0 : l.panoIndex) && i.entryFromModel) {
-        if (T(e) && n ? this.entryFromModel = !1 : this.entryFromModel = !0, T(e))
+        if (P(e) && n ? this.entryFromModel = !1 : this.entryFromModel = !0, P(e))
           return !0;
       } else
         this.entryFromModel = !1;
@@ -458,7 +458,7 @@ class _e {
   /** 通过射线检测标签可用性 */
   computeVisibleByIntersect(i) {
     var s, a, c, g;
-    const e = z(z((s = this.getConfig().visibleConfig) != null ? s : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, r = w(this.five.getCurrentState().mode) ? this.workUtil.getObserverPosition(t) : this.five.camera.position;
+    const e = z(z((s = this.getConfig().visibleConfig) != null ? s : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, r = T(this.five.getCurrentState().mode) ? this.workUtil.getObserverPosition(t) : this.five.camera.position;
     if (r === void 0)
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
     const n = ae(
@@ -472,19 +472,19 @@ class _e {
     for (const d of n) {
       const m = new S.Vector3().subVectors(d, r).normalize();
       let h;
-      C.set(r, m);
-      const [v] = this.fiveUtil.model.intersectRaycaster(C);
+      k.set(r, m);
+      const [v] = this.fiveUtil.model.intersectRaycaster(k);
       h = v == null ? void 0 : v.distance;
-      const k = (() => {
+      const x = (() => {
         if (!V(this))
           return;
         const q = this.plugin.tags.filter(V).map((X) => {
           var F;
           return (F = X.model) == null ? void 0 : F.object;
-        }).filter(E), [Q] = C.intersectObjects(q, !0);
+        }).filter(E), [Q] = k.intersectObjects(q, !0);
         return Q;
       })(), J = r.distanceTo(d), W = (a = e.distanceAccuracy) != null ? a : 0.01;
-      h = Math.min(h != null ? h : 1 / 0, (c = k == null ? void 0 : k.distance) != null ? c : 1 / 0), h + W >= J ? l++ : o++;
+      h = Math.min(h != null ? h : 1 / 0, (c = x == null ? void 0 : x.distance) != null ? c : 1 / 0), h + W >= J ? l++ : o++;
       const H = (g = e.needPassed) != null ? g : 1;
       if (l >= H)
         return { value: !0 };
@@ -526,12 +526,14 @@ class _e {
         return !1;
       if (e.keep === "unfolded")
         return !0;
-      if (e.unfoldDistance && P(this.getDistance({ panoIndex: i }), e.unfoldDistance) === !1)
+      if (e.unfoldDistance && C(this.getDistance({ panoIndex: i }), e.unfoldDistance) === !1)
         return !1;
     }
   }
   computeUnfoldedByCamera() {
     var e;
+    if (this.entryFromModel && P(this.five.state.mode))
+      return !1;
     const i = this.getConfig().unfoldedConfig;
     if (i) {
       if (typeof i == "function")
@@ -544,7 +546,7 @@ class _e {
         return;
       if (i.autoUnfold.strategy === "ScreenPostion") {
         const t = this.computeTagProject();
-        if (t && P(t.x, i.autoUnfold.autoUnfoldProjectX) === !1)
+        if (t && C(t.x, i.autoUnfold.autoUnfoldProjectX) === !1)
           return !1;
       }
       if (i.autoUnfold.strategy === "MinimumDistance") {
@@ -557,9 +559,9 @@ class _e {
         }).map((o) => ({ tag: o, id: o.id, tagConfig: o.getConfig().unfoldedConfig })).filter(({ tagConfig: o }) => {
           var s, a;
           return !(typeof o == "function" || o.keep || o.autoUnfold === !1 || ((s = o.autoUnfold) == null ? void 0 : s.enable) === !1 || ((a = o.autoUnfold) == null ? void 0 : a.strategy) !== "MinimumDistance");
-        }).map((o) => M(p({}, o), { distance: o.tag.getDistance() })).filter(({ distance: o, tagConfig: s }) => {
+        }).map((o) => I(p({}, o), { distance: o.tag.getDistance() })).filter(({ distance: o, tagConfig: s }) => {
           const a = s.autoUnfold.distance;
-          return !(a && P(o, a) === !1);
+          return !(a && C(o, a) === !1);
         }).sort((o, s) => o.distance - s.distance).findIndex((o) => o.id === this.id);
         if (n === -1 || n <= ((e = i.autoUnfold.maxNumber) != null ? e : 1) - 1 === !1)
           return !1;
@@ -597,7 +599,7 @@ class _e {
       return { reason: `plugin.state.visible is ${this.plugin.state.visible}` };
     if (!this.enabled)
       return { reason: `tag ${this.id} enabled is: ${this.enabled}` };
-    const i = M(p({}, this.computeVisible()), {
+    const i = I(p({}, this.computeVisible()), {
       tagInstance: this
     });
     return i.value !== this.state.visible ? { reason: "插件故障，请联系维护人员, err: 0", info: i } : this.state.visible ? { reason: "应该是能看见才对", info: i } : i.value === !0 ? { reason: "插件故障，请联系维护人员, err: 1", info: i } : { reason: (e = i.reason.type) != null ? e : i.reason, info: i };

package/libs/base/BasePlugin.js

@@ -16,7 +16,7 @@ let c = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "3.44.0");
+    e(this, "VERSION", "3.44.1");
     e(this, "NAME");
     e(this, "five");
     e(this, "workUtil");

package/libs/shared-utils/logger.js

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