@realsee/dnalogel 3.0.0-3 → 3.0.0-5

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,38 +1,38 @@
 var H = Object.defineProperty, J = Object.defineProperties;
 var U = Object.getOwnPropertyDescriptors;
-var F = Object.getOwnPropertySymbols;
-var _ = Object.prototype.hasOwnProperty, X = Object.prototype.propertyIsEnumerable;
+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) => {
   for (var e in r || (r = {}))
-    _.call(r, e) && k(a, e, r[e]);
-  if (F)
-    for (var e of F(r))
-      X.call(r, e) && k(a, e, r[e]);
+    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]);
   return a;
-}, L = (a, r) => J(a, U(r));
+}, x = (a, r) => J(a, U(r));
 var d = (a, r, e) => (k(a, typeof r != "symbol" ? r + "" : r, e), e);
-import { defaultGlobalConfig as q } from "../typings/tag/TagConfig.js";
+import { defaultGlobalConfig as K } from "../typings/tag/TagConfig.js";
 import { objectAssignDeepExports as b } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as K from "three";
-import { DefaultConfig as Q } from "../tag.config.js";
-import { anyPositionToVector3 as Y, arrayPositionToVector3 as w } from "../../shared-utils/positionToVector3.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 x } from "../utils/tagPosition.js";
-import { normalPositionToPositions as Z } from "../utils/normalPositionToPositions.js";
-import { TagCache as ee } from "./TagCache.js";
-import { writable as ie } from "../../vendor/svelte/store/index.js";
-import { isIOSWX as te } from "../../shared-utils/device.js";
-import { Five as oe } from "@realsee/five";
-import { isMediaPlaneTag as ne, isMediaModelTag as B, isPlaneTag as re, isPoint3DTag as se } from "../utils/tag/tagCheck.js";
-import { VideoPlane as fe } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as ae } from "../../shared-utils/five/FiveDomEvents.js";
-import R from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as W, isModelLike as N } from "../../shared-utils/five/mode.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";
 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 G } from "../../shared-utils/typescript/entries.js";
+import { entries as _ } from "../../shared-utils/typescript/entries.js";
 import { getUrlExt as $ } from "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.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 ti extends ee {
+class oi extends ie {
   constructor(e) {
     super(e);
     d(this, "tags", []);
-    d(this, "config", Q);
-    d(this, "mediaStore", ie({
+    d(this, "config", Y);
+    d(this, "mediaStore", te({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
@@ -74,10 +74,10 @@ class ti extends ee {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    d(this, "domEvents", new ae(this.five));
+    d(this, "domEvents", new le(this.five));
     d(this, "mouseInfo");
     d(this, "loadVideoFirstFrame", () => {
-      te && this.hooks.emit("loadVideoFirstFrame");
+      oe && this.hooks.emit("loadVideoFirstFrame");
     });
     d(this, "preventWhenMouseDown", () => {
       var e;
@@ -87,7 +87,7 @@ class ti extends ee {
     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 fe && i !== o.mediaPlane.videoInstance) {
+        if (o.mediaPlane instanceof ae && i !== o.mediaPlane.videoInstance) {
           if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
             return;
           o.mediaPlane.pause();
@@ -125,11 +125,12 @@ class ti extends ee {
   }
   updateTagConfig() {
     this.clearCache(), this.tags.forEach((e) => {
-      var t;
+      var o;
       const i = this.getTagConfig(e, { useCache: !1 });
-      e.config = i;
-      const o = JSON.parse(JSON.stringify(e.data));
-      e.data = (t = i.initialData) != null && t.important ? b(e.data, o, i.initialData) : b(e.data, i.initialData, o);
+      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);
+      }
     });
   }
   can(e, i) {
@@ -159,15 +160,15 @@ class ti extends ee {
         return;
       const t = e.data.mediaData;
       if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (ne(e)) {
+        if (re(e)) {
           if (t.length === 1) {
             if (t[0].type === "Video")
               return "Mesh";
             if (t[0].type === "Image")
-              return $(t[0].url) === "gif" ? "BehindDom" : "Mesh";
+              return $(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
         } else if (B(e))
-          return t.length === 1 && t[0].type === "Image" ? $(t[0].url) === "gif" ? "BehindDom" : "Mesh" : "BehindDom";
+          return t.length === 1 && t[0].type === "Image" ? $(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
     return i != null ? i : "Dom";
@@ -187,13 +188,13 @@ class ti extends ee {
       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" ? Y(e.normal) : E(e.position))();
+      const c = (() => e.stickType === "3DPoint" ? Z(e.normal) : E(e.position))();
       if (!c)
         return;
-      const g = x(e);
+      const g = R(e);
       if (!g)
         return;
-      const u = new K.Vector3().copy(f).sub(g), v = c.angleTo(u) * 180 / Math.PI;
+      const u = new Q.Vector3().copy(f).sub(g), v = c.angleTo(u) * 180 / Math.PI;
       return t.angle = v, t.angle;
     }
   }
@@ -205,7 +206,7 @@ class ti extends ee {
     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;
     if ((n == null ? void 0 : n.distance) !== void 0)
       return n.distance;
-    const f = x(e);
+    const f = R(e);
     if (!f)
       return -1;
     if (W(s)) {
@@ -215,16 +216,16 @@ class ti extends ee {
       const v = u.distanceTo(f);
       return n && (n.distance = v), v;
     }
-    if (N(s))
+    if (G(s))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (re(e))
+    if (se(e))
       return e.position;
     if (B(e))
       return e.data.mediaPosition;
-    if (se(e))
-      return Z(this.five.camera.position, w(e.position), w(e.normal));
+    if (fe(e))
+      return ee(this.five.camera.position, w(e.position), w(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
@@ -282,7 +283,7 @@ class ti extends ee {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var v, j, A;
+    var v, j, A, S;
     const o = (v = i == null ? void 0 : i.useCache) != null ? v : !0;
     if (!e)
       return (j = this.config.globalConfig) != null ? j : {};
@@ -290,8 +291,8 @@ class ti extends ee {
       return e.config;
     const t = {}, s = {}, n = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([p, h]) => {
-      var I, O;
-      const l = p, D = l.split("-"), S = p.startsWith("["), y = S ? D[0].slice(1, -1) : void 0, T = S ? D.slice(1) : D, M = y ? ["PanoramaLike", "ModelLike"].includes(y) ? (I = s[y]) != null ? I : s[y] = {} : (O = n[y]) != null ? O : n[y] = {} : t;
+      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;
@@ -304,30 +305,30 @@ class ti extends ee {
         if (T.length === 3) {
           const [m = "Any", P, z] = T;
           if (P === "Audio" && e.contentType === "Audio") {
-            const V = e;
-            (V.stickType === m || m === "Any") && V.data.appearance === z && (M[l] = h);
+            const F = e;
+            (F.stickType === m || m === "Any") && F.data.appearance === z && (M[l] = h);
           }
         }
       }
     });
     const f = b(
       {},
-      q,
+      K,
       this.config.globalConfig,
       ...Object.values(t),
-      e.config
-    ), c = {}, g = Object.values(oe.Mode);
-    G(s).forEach(([p, h]) => {
+      (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" && N(l)) && (c[l] = b({}, f, ...Object.values(h)));
+        (p === "PanoramaLike" && W(l) || p === "ModelLike" && G(l)) && (c[l] = b({}, f, ...Object.values(h)));
       });
-    }), G(n).forEach(([p, h]) => {
+    }), _(n).forEach(([p, h]) => {
       c[p] = b({}, f, ...Object.values(h));
     });
-    const u = L(C({}, f), { configWithFiveMode: c });
-    return R(u, e), Object.values(c).forEach((p) => R(p, e)), u._isMerged = !0, u;
+    const u = x(C({}, f), { configWithFiveMode: c });
+    return N(u, e), Object.values(c).forEach((p) => N(p, e)), u._isMerged = !0, u;
   }
 }
 export {
-  ti as TagUtil
+  oi as TagUtil
 };

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/five/FiveDomEvents.js

@@ -1,30 +1,29 @@
-var O = Object.defineProperty, g = Object.defineProperties;
-var H = Object.getOwnPropertyDescriptors;
+var b = Object.defineProperty;
 var m = Object.getOwnPropertySymbols;
-var L = Object.prototype.hasOwnProperty, $ = Object.prototype.propertyIsEnumerable;
-var f = (i, e, t) => e in i ? O(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, p = (i, e) => {
+var O = Object.prototype.hasOwnProperty, g = Object.prototype.propertyIsEnumerable;
+var f = (d, e, t) => e in d ? b(d, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[e] = t, p = (d, e) => {
   for (var t in e || (e = {}))
-    L.call(e, t) && f(i, t, e[t]);
+    O.call(e, t) && f(d, t, e[t]);
   if (m)
     for (var t of m(e))
-      $.call(e, t) && f(i, t, e[t]);
-  return i;
-}, _ = (i, e) => g(i, H(e));
-var u = (i, e, t) => (f(i, typeof e != "symbol" ? e + "" : e, t), t);
-import { getObjectVisible as x } from "../three/getObjectVisible.js";
-class G {
+      g.call(e, t) && f(d, t, e[t]);
+  return d;
+};
+var u = (d, e, t) => (f(d, typeof e != "symbol" ? e + "" : e, t), t);
+import { getObjectVisible as H } from "../three/getObjectVisible.js";
+class I {
   constructor(e) {
     u(this, "five");
     u(this, "boundObject", {});
     u(this, "handleWantsTapGesture", (e) => {
-      var d;
+      var s;
       const t = "click", n = this.boundObject[t];
       if (!n || (n == null ? void 0 : n.length) === 0)
         return;
-      const o = this.five.model.intersectRaycaster(e), s = e.intersectObjects(n, !0);
-      if (o.length > 0 && s.length > 0 && o[0].distance < s[0].distance)
+      const o = this.five.model.intersectRaycaster(e), i = e.intersectObjects(n, !0);
+      if (o.length > 0 && i.length > 0 && o[0].distance < i[0].distance)
         return;
-      const r = (d = s[0]) == null ? void 0 : d.object;
+      const r = (s = i[0]) == null ? void 0 : s.object;
       if (!r || !this.objectIsBound(r))
         return;
       if (this.notify(t, r))
@@ -38,29 +37,29 @@ class G {
     });
     // eslint-disable-next-line max-params
     u(this, "notify", (e, t, n, o) => {
-      let s = !1, r = [];
+      let i = !1, r = [];
       const l = [t];
-      let d = t;
-      for (; d.parent; )
-        d = d.parent, l.push(d);
+      let s = t;
+      for (; s.parent; )
+        s = s.parent, l.push(s);
       for (const a of l) {
-        if (s)
+        if (i)
           break;
         const h = a._domEvent;
         if (!h)
           continue;
         const E = h[`${e}Handler`];
         if (E)
-          for (const [b, v] of E) {
-            if (v != null && v.checkVisible && !x(a))
+          for (const [_, v] of E) {
+            if (v != null && v.checkVisible && !H(a))
               continue;
-            const c = b({
+            const c = _({
               type: e,
               target: a,
               origDomEvent: n,
               intersect: o,
               stopPropagation: () => {
-                s = !0;
+                i = !0;
               }
             });
             r.push(c != null ? c : !0);
@@ -93,17 +92,17 @@ class G {
    * @return {void}
    */
   addEventListener(e, t, n, o) {
-    var s;
-    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, _(p({}, o), { checkVisible: !0 })]), (s = this.boundObject[t]) == null || s.push(e);
+    var i;
+    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, p({ checkVisible: !0 }, o)]), (i = this.boundObject[t]) == null || i.push(e);
   }
   removeEventListener(e, t, n, ...o) {
     var r, l;
     if (!e._domEvent || !e._domEvent[`${t}Handler`])
       return;
-    const s = e._domEvent[`${t}Handler`].findIndex((d) => d[0] === n);
-    if (s !== -1 && (e._domEvent[`${t}Handler`].splice(s, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
-      const d = (r = this.boundObject[t]) == null ? void 0 : r.findIndex((a) => a === e);
-      d !== -1 && ((l = this.boundObject[t]) == null || l.splice(d, 1));
+    const i = e._domEvent[`${t}Handler`].findIndex((s) => s[0] === n);
+    if (i !== -1 && (e._domEvent[`${t}Handler`].splice(i, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
+      const s = (r = this.boundObject[t]) == null ? void 0 : r.findIndex((a) => a === e);
+      s !== -1 && ((l = this.boundObject[t]) == null || l.splice(s, 1));
     }
   }
   dispose() {
@@ -111,5 +110,5 @@ class G {
   }
 }
 export {
-  G as FiveDomEvents
+  I as FiveDomEvents
 };

package/libs/shared-utils/logger.js

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

@@ -1,9 +1,9 @@
-import { Vector3 as s } from "three";
-function p(o, r = 1) {
+import { Vector3 as u } from "three";
+function p(o, r) {
   if (o.length < 3)
-    return console.error("points.length < 3"), new s(0, 0, 0);
-  const [t, n, e] = o, l = t.clone().sub(n), c = e.clone().sub(n);
-  return l.cross(c).normalize().multiplyScalar(r);
+    return console.error("points.length < 3"), new u(0, 0, 0);
+  const [n, t, c] = o, l = n.clone().sub(t), s = n.clone().sub(c), e = l.cross(s).normalize();
+  return typeof r == "number" ? e.multiplyScalar(r) : e;
 }
 export {
   p as getNormal

package/package.json

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