@realsee/dnalogel 3.0.0-5 → 3.0.0-7

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,39 +1,39 @@
-var H = Object.defineProperty, J = Object.defineProperties;
-var U = Object.getOwnPropertyDescriptors;
-var L = Object.getOwnPropertySymbols;
-var X = Object.prototype.hasOwnProperty, q = Object.prototype.propertyIsEnumerable;
-var k = (a, r, e) => r in a ? H(a, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[r] = e, C = (a, r) => {
+var U = Object.defineProperty, X = Object.defineProperties;
+var q = Object.getOwnPropertyDescriptors;
+var R = Object.getOwnPropertySymbols;
+var K = Object.prototype.hasOwnProperty, Q = Object.prototype.propertyIsEnumerable;
+var w = (a, r, e) => r in a ? U(a, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[r] = e, C = (a, r) => {
   for (var e in r || (r = {}))
-    X.call(r, e) && k(a, e, r[e]);
-  if (L)
-    for (var e of L(r))
-      q.call(r, e) && k(a, e, r[e]);
+    K.call(r, e) && w(a, e, r[e]);
+  if (R)
+    for (var e of R(r))
+      Q.call(r, e) && w(a, e, r[e]);
   return a;
-}, x = (a, r) => J(a, U(r));
-var d = (a, r, e) => (k(a, typeof r != "symbol" ? r + "" : r, e), e);
-import { defaultGlobalConfig as K } from "../typings/tag/TagConfig.js";
-import { objectAssignDeepExports as b } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as Q from "three";
-import { DefaultConfig as Y } from "../tag.config.js";
-import { anyPositionToVector3 as Z, arrayPositionToVector3 as w } from "../../shared-utils/positionToVector3.js";
-import { planeNormal as E } from "../utils/planeNormal.js";
-import { getTagCenterPosition as R } from "../utils/tagPosition.js";
-import { normalPositionToPositions as ee } from "../utils/normalPositionToPositions.js";
-import { TagCache as ie } from "./TagCache.js";
-import { writable as te } from "../../vendor/svelte/store/index.js";
-import { isIOSWX as oe } from "../../shared-utils/device.js";
-import { Five as ne } from "@realsee/five";
-import { isMediaPlaneTag as re, isMediaModelTag as B, isPlaneTag as se, isPoint3DTag as fe } from "../utils/tag/tagCheck.js";
-import { VideoPlane as ae } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as le } from "../../shared-utils/five/FiveDomEvents.js";
-import N from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as W, isModelLike as G } from "../../shared-utils/five/mode.js";
+}, B = (a, r) => X(a, q(r));
+var d = (a, r, e) => (w(a, typeof r != "symbol" ? r + "" : r, e), e);
+import { defaultGlobalConfig as Y } from "../typings/tag/TagConfig.js";
+import { objectAssignDeepExports as P } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import * as Z from "three";
+import { DefaultConfig as ee } from "../tag.config.js";
+import { anyPositionToVector3 as ie, arrayPositionToVector3 as E } from "../../shared-utils/positionToVector3.js";
+import { planeNormal as W } from "../utils/planeNormal.js";
+import { getTagCenterPosition as N } from "../utils/tagPosition.js";
+import { normalPositionToPositions as te } from "../utils/normalPositionToPositions.js";
+import { TagCache as oe } from "./TagCache.js";
+import { writable as ne } from "../../vendor/svelte/store/index.js";
+import { isIOSWX as re } from "../../shared-utils/device.js";
+import { Five as se } from "@realsee/five";
+import { isMediaPlaneTag as fe, isMediaModelTag as G, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
+import { VideoPlane as le } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as de } from "../../shared-utils/five/FiveDomEvents.js";
+import _ from "../utils/tag/adaptConfig.js";
+import { isPanoramaLike as j, isModelLike as $ } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { entries as _ } from "../../shared-utils/typescript/entries.js";
-import { getUrlExt as $ } from "../../shared-utils/url/getUrl.js";
+import { entries as z } from "../../shared-utils/typescript/entries.js";
+import { getUrlExt as H } from "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
@@ -58,12 +58,12 @@ import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
-class oi extends ie {
+class ri extends oe {
   constructor(e) {
     super(e);
     d(this, "tags", []);
-    d(this, "config", Y);
-    d(this, "mediaStore", te({
+    d(this, "config", ee);
+    d(this, "mediaStore", ne({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
@@ -74,10 +74,10 @@ class oi extends ie {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    d(this, "domEvents", new le(this.five));
+    d(this, "domEvents", new de(this.five));
     d(this, "mouseInfo");
     d(this, "loadVideoFirstFrame", () => {
-      oe && this.hooks.emit("loadVideoFirstFrame");
+      re && this.hooks.emit("loadVideoFirstFrame");
     });
     d(this, "preventWhenMouseDown", () => {
       var e;
@@ -87,7 +87,7 @@ class oi extends ie {
     this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: i }) => {
       this.tags.forEach((o) => {
         var t;
-        if (o.mediaPlane instanceof ae && i !== o.mediaPlane.videoInstance) {
+        if (o.mediaPlane instanceof le && i !== o.mediaPlane.videoInstance) {
           if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
             return;
           o.mediaPlane.pause();
@@ -129,7 +129,7 @@ class oi extends ie {
       const i = this.getTagConfig(e, { useCache: !1 });
       if (e.config = i, e.config.initialData) {
         const t = JSON.parse(JSON.stringify(e.data));
-        e.data = (o = i.initialData) != null && o.important ? b(e.data, t, i.initialData) : b(e.data, i.initialData, t);
+        e.data = (o = i.initialData) != null && o.important ? P(e.data, t, i.initialData) : P(e.data, i.initialData, t);
       }
     });
   }
@@ -160,15 +160,15 @@ class oi extends ie {
         return;
       const t = e.data.mediaData;
       if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (re(e)) {
+        if (fe(e)) {
           if (t.length === 1) {
             if (t[0].type === "Video")
               return "Mesh";
             if (t[0].type === "Image")
-              return $(t[0].url) === "gif" ? "Dom" : "Mesh";
+              return H(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
-        } else if (B(e))
-          return t.length === 1 && t[0].type === "Image" ? $(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
+        } else if (G(e))
+          return t.length === 1 && t[0].type === "Image" ? H(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
     return i != null ? i : "Dom";
@@ -188,44 +188,44 @@ class oi extends ie {
       const f = (n = (s = this.five.work) == null ? void 0 : s.observers[o]) == null ? void 0 : n.position;
       if (f === void 0)
         throw new Error(`getAngle(): observerPosition is ${f}`);
-      const c = (() => e.stickType === "3DPoint" ? Z(e.normal) : E(e.position))();
-      if (!c)
+      const u = (() => e.stickType === "3DPoint" ? ie(e.normal) : W(e.position))();
+      if (!u)
         return;
-      const g = R(e);
+      const g = N(e);
       if (!g)
         return;
-      const u = new Q.Vector3().copy(f).sub(g), v = c.angleTo(u) * 180 / Math.PI;
-      return t.angle = v, t.angle;
+      const l = new Z.Vector3().copy(f).sub(g), T = u.angleTo(l) * 180 / Math.PI;
+      return t.angle = T, t.angle;
     }
   }
   /**
    * @description: 获取距离
    */
   getDistance(e, i) {
-    var c, g;
-    const o = C(C({}, this.five.getCurrentState()), i), { panoIndex: t, mode: s } = o, n = W(s) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    var u, g;
+    const o = C(C({}, this.five.getCurrentState()), i), { panoIndex: t, mode: s } = o, n = j(s) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((n == null ? void 0 : n.distance) !== void 0)
       return n.distance;
-    const f = R(e);
+    const f = N(e);
     if (!f)
       return -1;
-    if (W(s)) {
-      const u = (g = (c = this.five.work) == null ? void 0 : c.observers[t]) == null ? void 0 : g.position;
-      if (u === void 0)
+    if (j(s)) {
+      const l = (g = (u = this.five.work) == null ? void 0 : u.observers[t]) == null ? void 0 : g.position;
+      if (l === void 0)
         return -1;
-      const v = u.distanceTo(f);
-      return n && (n.distance = v), v;
+      const T = l.distanceTo(f);
+      return n && (n.distance = T), T;
     }
-    if (G(s))
+    if ($(s))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (se(e))
+    if (ae(e))
       return e.position;
-    if (B(e))
+    if (G(e))
       return e.data.mediaPosition;
-    if (fe(e))
-      return ee(this.five.camera.position, w(e.position), w(e.normal));
+    if (ce(e))
+      return te(this.five.camera.position, E(e.position), E(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
@@ -243,11 +243,11 @@ class oi extends ie {
   }
   getTagNormal(e) {
     if (e.normal)
-      return w(e.normal);
+      return E(e.normal);
     if (e.stickType === "Plane")
-      return E(e.position);
+      return W(e.position);
     if (e.stickType === "Model")
-      return E(this.getPositions(e));
+      return W(this.getPositions(e));
   }
   // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
@@ -283,52 +283,46 @@ class oi extends ie {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var v, j, A, S;
-    const o = (v = i == null ? void 0 : i.useCache) != null ? v : !0;
+    var A, I, S, O;
+    const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
     if (!e)
-      return (j = this.config.globalConfig) != null ? j : {};
-    if (o && ((A = e.config) != null && A._isMerged))
+      return (I = this.config.globalConfig) != null ? I : {};
+    if (o && ((S = e.config) != null && S._isMerged))
       return e.config;
     const t = {}, s = {}, n = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([p, h]) => {
-      var O, V;
-      const l = p, D = l.split("-"), I = p.startsWith("["), y = I ? D[0].slice(1, -1) : void 0, T = I ? D.slice(1) : D, M = y ? ["PanoramaLike", "ModelLike"].includes(y) ? (O = s[y]) != null ? O : s[y] = {} : (V = n[y]) != null ? V : n[y] = {} : t;
-      if (!M[l]) {
-        if (T.length === 0 && (M[l] = h), T.length === 1) {
-          const [m] = T;
-          (e.contentType === m || m === "Any") && (M[l] = h);
+      var F, L;
+      const c = p, k = c.split("-"), V = p.startsWith("["), y = V ? k[0].slice(1, -1) : void 0, v = V ? k.slice(1) : k, M = y ? ["PanoramaLike", "ModelLike"].includes(y) ? (F = s[y]) != null ? F : s[y] = {} : (L = n[y]) != null ? L : n[y] = {} : t;
+      if (!M[c]) {
+        if (v.length === 0 && (M[c] = h), v.length === 1) {
+          const [m] = v;
+          (e.contentType === m || m === "Any") && (M[c] = h);
         }
-        if (T.length === 2) {
-          const [m = "Any", P = "Any"] = T;
-          m === "Mixin" && e.contentType === P && (M[l] = h), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (M[l] = h);
+        if (v.length === 2) {
+          const [m = "Any", b = "Any"] = v;
+          m === "Mixin" && e.contentType === b && (M[c] = h), (e.stickType === m || m === "Any") && (e.contentType === b || b === "Any") && (M[c] = h);
         }
-        if (T.length === 3) {
-          const [m = "Any", P, z] = T;
-          if (P === "Audio" && e.contentType === "Audio") {
-            const F = e;
-            (F.stickType === m || m === "Any") && F.data.appearance === z && (M[l] = h);
+        if (v.length === 3) {
+          const [m = "Any", b, J] = v;
+          if (b === "Audio" && e.contentType === "Audio") {
+            const x = e;
+            (x.stickType === m || m === "Any") && x.data.appearance === J && (M[c] = h);
           }
         }
       }
     });
-    const f = b(
-      {},
-      K,
-      this.config.globalConfig,
-      ...Object.values(t),
-      (S = e.config) != null && S._isMerged ? e.initialConfig : e.config
-    ), c = {}, g = Object.values(ne.Mode);
-    _(s).forEach(([p, h]) => {
-      g.forEach((l) => {
-        (p === "PanoramaLike" && W(l) || p === "ModelLike" && G(l)) && (c[l] = b({}, f, ...Object.values(h)));
+    const f = (O = e.config) != null && O._isMerged ? e.initialConfig : e.config, u = P({}, Y, this.config.globalConfig, ...Object.values(t)), g = P({}, u, f), l = {}, T = Object.values(se.Mode);
+    z(s).forEach(([p, h]) => {
+      T.forEach((c) => {
+        (p === "PanoramaLike" && j(c) || p === "ModelLike" && $(c)) && (l[c] = P({}, u, ...Object.values(h), f));
       });
-    }), _(n).forEach(([p, h]) => {
-      c[p] = b({}, f, ...Object.values(h));
+    }), z(n).forEach(([p, h]) => {
+      l[p] = P({}, u, ...Object.values(h), f);
     });
-    const u = x(C({}, f), { configWithFiveMode: c });
-    return N(u, e), Object.values(c).forEach((p) => N(p, e)), u._isMerged = !0, u;
+    const D = B(C({}, g), { configWithFiveMode: l });
+    return _(D, e), Object.values(l).forEach((p) => _(p, e)), D._isMerged = !0, D;
   }
 }
 export {
-  oi as TagUtil
+  ri as TagUtil
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -181,7 +181,7 @@ class Di extends N {
       e.data = f({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
     l(this, "whyHide", (e) => {
-      var i, s;
+      var i, s, o;
       if (!this.state.enabled)
         return { reason: `plugin.state.enabled is ${this.state.enabled}` };
       if (!this.state.visible)
@@ -192,8 +192,8 @@ class Di extends N {
       if (!t.enabled)
         return { reason: `tag ${e} enabled is ${t.enabled}` };
       if (!t.state.visible) {
-        const o = (i = this.getPanoIndexCache({ panoIndex: this.five.panoIndex, id: e })) == null ? void 0 : i.__debug_visible_reason__.reason;
-        return { reason: (s = o.type) != null ? s : o, reasonObj: o };
+        const n = (s = (i = this.getPanoIndexCache({ panoIndex: this.five.panoIndex, id: e })) == null ? void 0 : i.__debug_visible_reason__) == null ? void 0 : s.reason;
+        return { reason: (o = n.type) != null ? o : n, reasonObj: n };
       }
       return t.stickType === "Model" || t.stickType === "Plane" ? { reason: "maybe blocked by the five model" } : { reason: "check your eyes" };
     });
@@ -241,7 +241,7 @@ class Di extends N {
     });
     l(this, "handleFivePanoArrived", () => p(this, null, function* () {
       var e, t, i;
-      this.setVisible(), yield this.setVisibleAndUnfolded(), this.tags.forEach((s) => {
+      this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((s) => {
         s.temporaryState = T(c({}, s.temporaryState), { visible: !0 });
       }), (i = (t = (e = this.config) == null ? void 0 : e.globalConfig) == null ? void 0 : t.modelConfig) != null && i.autoLookAtEnabled && this.tags.filter(R).filter((s) => {
         var o, n;

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.0.0-5",
+    "%c %c@realsee/dnalogel %cv3.0.0-7",
     [
       "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

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.0.0-5",
+  "version": "3.0.0-7",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",