@realsee/dnalogel 3.2.0-dev.3 → 3.2.0-dev.4

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,39 +1,39 @@
 var G = Object.defineProperty, X = Object.defineProperties;
-var K = Object.getOwnPropertyDescriptors;
+var q = Object.getOwnPropertyDescriptors;
 var R = Object.getOwnPropertySymbols;
-var Q = Object.prototype.hasOwnProperty, Y = Object.prototype.propertyIsEnumerable;
-var w = (a, s, e) => s in a ? G(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, M = (a, s) => {
-  for (var e in s || (s = {}))
-    Q.call(s, e) && w(a, e, s[e]);
+var K = Object.prototype.hasOwnProperty, Q = Object.prototype.propertyIsEnumerable;
+var E = (a, r, e) => r in a ? G(a, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[r] = e, b = (a, r) => {
+  for (var e in r || (r = {}))
+    K.call(r, e) && E(a, e, r[e]);
   if (R)
-    for (var e of R(s))
-      Y.call(s, e) && w(a, e, s[e]);
+    for (var e of R(r))
+      Q.call(r, e) && E(a, e, r[e]);
   return a;
-}, B = (a, s) => X(a, K(s));
-var h = (a, s, e) => (w(a, typeof s != "symbol" ? s + "" : s, e), e);
-import { defaultGlobalConfig as Z } from "../typings/tag/TagConfig.js";
-import { objectAssignDeepExports as k } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as ee from "three";
-import { DefaultConfig as ie } from "../tag.config.js";
-import { anyPositionToVector3 as te, arrayPositionToVector3 as E } from "../../shared-utils/positionToVector3.js";
+}, B = (a, r) => X(a, q(r));
+var h = (a, r, e) => (E(a, typeof r != "symbol" ? r + "" : r, e), e);
+import { defaultGlobalConfig as Y } from "../typings/tag/TagConfig.js";
+import { objectAssignDeepExports as C } 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 w } from "../../shared-utils/positionToVector3.js";
 import { planeNormal as j } from "../utils/planeNormal.js";
 import { getTagCenterPosition as N } from "../utils/tagPosition.js";
-import { normalPositionToPositions as oe } from "../utils/normalPositionToPositions.js";
-import { TagCache as ne } from "./TagCache.js";
-import { writable as re } 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 ae, isMediaModelTag as _, isPlaneTag as ce, isPoint3DTag as le } 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 { 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 _, 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 A, isModelLike as q } from "../../shared-utils/five/mode.js";
+import { isPanoramaLike as A, isModelLike as z } 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 z } from "../../shared-utils/typescript/entries.js";
-import { getUrlExt as H } from "../../shared-utils/url/getUrl.js";
+import { entries as H } from "../../shared-utils/typescript/entries.js";
+import { getUrlExt as J } from "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
@@ -59,14 +59,12 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
-var J;
-class fi extends ne {
+class si extends oe {
   constructor(e) {
     super(e);
     h(this, "tags", []);
-    h(this, "config", ie);
-    h(this, "workCode", (J = this.five.work) == null ? void 0 : J.workCode);
-    h(this, "mediaStore", re({
+    h(this, "config", ee);
+    h(this, "mediaStore", ne({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
@@ -77,29 +75,24 @@ class fi extends ne {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    h(this, "domEvents", new ue(this.five));
+    h(this, "domEvents", new de(this.five));
     h(this, "loadVideoFirstFrame", () => {
-      se && this.hooks.emit("loadVideoFirstFrame");
+      re && this.hooks.emit("loadVideoFirstFrame");
     });
-    const i = ({ state: o }) => {
-      this.workCode = o.workCode;
-    };
-    this.five.on("pano.request", i), this.mediaStore.subscribe(({ currentMediaElement: o }) => {
-      this.tags.forEach((t) => {
-        var r;
-        if (t.mediaPlane instanceof de && o !== t.mediaPlane.videoInstance) {
-          if (!((r = t.mediaPlane.videoInstance) != null && r.src) || o === t.mediaPlane.videoInstance)
+    this.mediaStore.subscribe(({ currentMediaElement: i }) => {
+      this.tags.forEach((o) => {
+        var t;
+        if (o.mediaPlane instanceof le && i !== o.mediaPlane.videoInstance) {
+          if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
             return;
-          t.mediaPlane.pause();
+          o.mediaPlane.pause();
         }
       });
-    }), this.store.disposers.push(() => {
-      this.five.off("pano.request", i);
     });
   }
   get work() {
     var e, i;
-    return (i = (e = this.five.works) == null ? void 0 : e.find((o) => o.workCode === this.workCode)) != null ? i : this.five.work;
+    return (i = (e = this.five.works) == null ? void 0 : e.find((o) => o.workCode === this.five.state.workCode)) != null ? i : this.five.work;
   }
   getTagById(e) {
     const i = this.tags.find((o) => o.id === e);
@@ -118,8 +111,8 @@ class fi extends ne {
    */
   getTagConfig(e, i) {
     var n, f;
-    const o = this.calculateTagConfig(e, i), t = (n = i == null ? void 0 : i.fiveMode) != null ? n : this.five.getCurrentState().mode, r = (f = o.configWithFiveMode) == null ? void 0 : f[t];
-    return r != null ? r : o;
+    const o = this.calculateTagConfig(e, i), t = (n = i == null ? void 0 : i.fiveMode) != null ? n : this.five.getCurrentState().mode, s = (f = o.configWithFiveMode) == null ? void 0 : f[t];
+    return s != null ? s : o;
   }
   /**
    * @description 获取标签当前状态
@@ -133,7 +126,7 @@ class fi extends ne {
       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 ? k(e.data, t, i.initialData) : k(e.data, i.initialData, t);
+        e.data = (o = i.initialData) != null && o.important ? C(e.data, t, i.initialData) : C(e.data, i.initialData, t);
       }
     });
   }
@@ -164,15 +157,15 @@ class fi extends ne {
         return;
       const t = e.data.mediaData;
       if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (ae(e)) {
+        if (fe(e)) {
           if (t.length === 1) {
             if (t[0].type === "Video")
               return "Mesh";
             if (t[0].type === "Image")
-              return H(t[0].url) === "gif" ? "Dom" : "Mesh";
+              return J(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
         } else if (_(e))
-          return t.length === 1 && t[0].type === "Image" ? H(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
+          return t.length === 1 && t[0].type === "Image" ? J(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
     return i != null ? i : "Dom";
@@ -181,7 +174,7 @@ class fi extends ne {
    * @description: 获取角度
    */
   getAngle(e, i) {
-    var r, n;
+    var s, n;
     const o = i != null ? i : this.five.getCurrentState().panoIndex;
     if (o === void 0)
       throw new Error(`getAngle(): fivePanoIndex is ${o}`);
@@ -189,16 +182,16 @@ class fi extends ne {
     if (t.angle !== void 0)
       return t.angle;
     {
-      const f = (n = (r = this.work) == null ? void 0 : r.observers[o]) == null ? void 0 : n.position;
+      const f = (n = (s = this.work) == null ? void 0 : s.observers[o]) == null ? void 0 : n.position;
       if (f === void 0)
         throw new Error(`getAngle(): observerPosition is ${f}`);
-      const d = (() => e.stickType === "3DPoint" ? te(e.normal) : j(e.position))();
+      const d = (() => e.stickType === "3DPoint" ? ie(e.normal) : j(e.position))();
       if (!d)
         return;
       const g = N(e);
       if (!g)
         return;
-      const l = new ee.Vector3().copy(f).sub(g), v = d.angleTo(l) * 180 / Math.PI;
+      const l = new Z.Vector3().copy(f).sub(g), v = d.angleTo(l) * 180 / Math.PI;
       return t.angle = v, t.angle;
     }
   }
@@ -207,47 +200,47 @@ class fi extends ne {
    */
   getDistance(e, i) {
     var d, g;
-    const o = M(M({}, 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: s } = o, n = A(s) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((n == null ? void 0 : n.distance) !== void 0)
       return n.distance;
     const f = N(e);
     if (!f)
       return -1;
-    if (A(r)) {
+    if (A(s)) {
       const l = (g = (d = this.work) == null ? void 0 : d.observers[t]) == null ? void 0 : g.position;
       if (l === void 0)
         return -1;
       const v = l.distanceTo(f);
       return n && (n.distance = v), v;
     }
-    if (q(r))
+    if (z(s))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (ce(e))
+    if (ae(e))
       return e.position;
     if (_(e))
       return e.data.mediaPosition;
-    if (le(e))
-      return oe(this.five.camera.position, E(e.position), E(e.normal));
+    if (ce(e))
+      return te(this.five.camera.position, w(e.position), w(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
       return () => {
       };
-    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), r = (n) => {
+    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), s = (n) => {
       if (!t())
         return !1;
       o(n.origDomEvent);
     };
-    return this.domEvents.addEventListener(i, "click", r), () => {
+    return this.domEvents.addEventListener(i, "click", s), () => {
       var n;
-      (n = this.domEvents) == null || n.removeEventListener(i, "click", r);
+      (n = this.domEvents) == null || n.removeEventListener(i, "click", s);
     };
   }
   getTagNormal(e) {
     if (e.normal)
-      return E(e.normal);
+      return w(e.normal);
     if (e.stickType === "Plane")
       return j(e.position);
     if (e.stickType === "Model")
@@ -287,46 +280,46 @@ class fi extends ne {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var S, O, I, W;
+    var S, O, I, V;
     const o = (S = i == null ? void 0 : i.useCache) != null ? S : !0;
     if (!e)
       return (O = this.config.globalConfig) != null ? O : {};
     if (o && ((I = e.config) != null && I._isMerged))
       return e.config;
-    const t = {}, r = {}, n = {};
+    const t = {}, s = {}, n = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, p]) => {
       var F, L;
-      const c = u, D = c.split("-"), V = u.startsWith("["), y = V ? D[0].slice(1, -1) : void 0, T = V ? D.slice(1) : D, C = y ? ["PanoramaLike", "ModelLike"].includes(y) ? (F = r[y]) != null ? F : r[y] = {} : (L = n[y]) != null ? L : n[y] = {} : t;
-      if (!C[c]) {
-        if (T.length === 0 && (C[c] = p), T.length === 1) {
+      const c = u, D = c.split("-"), W = u.startsWith("["), y = W ? D[0].slice(1, -1) : void 0, T = W ? D.slice(1) : D, P = y ? ["PanoramaLike", "ModelLike"].includes(y) ? (F = s[y]) != null ? F : s[y] = {} : (L = n[y]) != null ? L : n[y] = {} : t;
+      if (!P[c]) {
+        if (T.length === 0 && (P[c] = p), T.length === 1) {
           const [m] = T;
-          (e.contentType === m || m === "Any") && (C[c] = p);
+          (e.contentType === m || m === "Any") && (P[c] = p);
         }
         if (T.length === 2) {
-          const [m = "Any", P = "Any"] = T;
-          m === "Mixin" && e.contentType === P && (C[c] = p), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (C[c] = p);
+          const [m = "Any", M = "Any"] = T;
+          m === "Mixin" && e.contentType === M && (P[c] = p), (e.stickType === m || m === "Any") && (e.contentType === M || M === "Any") && (P[c] = p);
         }
         if (T.length === 3) {
-          const [m = "Any", P, U] = T;
-          if (P === "Audio" && e.contentType === "Audio") {
+          const [m = "Any", M, U] = T;
+          if (M === "Audio" && e.contentType === "Audio") {
             const x = e;
-            (x.stickType === m || m === "Any") && x.data.appearance === U && (C[c] = p);
+            (x.stickType === m || m === "Any") && x.data.appearance === U && (P[c] = p);
           }
         }
       }
     });
-    const f = (W = e.config) != null && W._isMerged ? e.initialConfig : e.config, d = k({}, Z, this.config.globalConfig, ...Object.values(t)), g = k({}, d, f), l = {}, v = Object.values(fe.Mode);
-    z(r).forEach(([u, p]) => {
+    const f = (V = e.config) != null && V._isMerged ? e.initialConfig : e.config, d = C({}, Y, this.config.globalConfig, ...Object.values(t)), g = C({}, d, f), l = {}, v = Object.values(se.Mode);
+    H(s).forEach(([u, p]) => {
       v.forEach((c) => {
-        (u === "PanoramaLike" && A(c) || u === "ModelLike" && q(c)) && (l[c] = k({}, d, ...Object.values(p), f));
+        (u === "PanoramaLike" && A(c) || u === "ModelLike" && z(c)) && (l[c] = C({}, d, ...Object.values(p), f));
       });
-    }), z(n).forEach(([u, p]) => {
-      l[u] = k({}, d, ...Object.values(p), f);
+    }), H(n).forEach(([u, p]) => {
+      l[u] = C({}, d, ...Object.values(p), f);
     });
-    const b = B(M({}, g), { configWithFiveMode: l });
-    return $(b, e), Object.values(l).forEach((u) => $(u, e)), b._isMerged = !0, b;
+    const k = B(b({}, g), { configWithFiveMode: l });
+    return $(k, e), Object.values(l).forEach((u) => $(u, e)), k._isMerged = !0, k;
   }
 }
 export {
-  fi as TagUtil
+  si as TagUtil
 };

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.2.0-dev.3",
+    "%c %c@realsee/dnalogel %cv3.2.0-dev.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/package.json

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