@realsee/dnalogel 3.35.0-dev.1 → 3.35.0

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,22 +1,22 @@
 var Z = Object.defineProperty, q = Object.defineProperties;
 var K = Object.getOwnPropertyDescriptors;
-var L = Object.getOwnPropertySymbols;
+var _ = Object.getOwnPropertySymbols;
 var Q = Object.prototype.hasOwnProperty, Y = Object.prototype.propertyIsEnumerable;
-var _ = (l, s, e) => s in l ? Z(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, D = (l, s) => {
+var E = (l, s, e) => s in l ? Z(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, b = (l, s) => {
   for (var e in s || (s = {}))
-    Q.call(s, e) && _(l, e, s[e]);
-  if (L)
-    for (var e of L(s))
-      Y.call(s, e) && _(l, e, s[e]);
+    Q.call(s, e) && E(l, e, s[e]);
+  if (_)
+    for (var e of _(s))
+      Y.call(s, e) && E(l, e, s[e]);
   return l;
 }, U = (l, s) => q(l, K(s));
-var f = (l, s, e) => (_(l, typeof s != "symbol" ? s + "" : s, e), e);
+var d = (l, s, e) => (E(l, typeof s != "symbol" ? s + "" : s, e), e);
 import { defaultGlobalConfig as ee } from "../typings/tag/TagConfig.js";
-import { objectAssignDeepExports as P } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import * as ie from "three";
 import { DefaultConfig as te } from "../tag.config.js";
-import { anyPositionToVector3 as y } from "../../shared-utils/positionToVector3.js";
-import { planeNormal as E } from "../utils/planeNormal.js";
+import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
+import { planeNormal as w } from "../utils/planeNormal.js";
 import { getTagCenterPosition as V } from "../utils/tagPosition.js";
 import { normalPositionToPositions as oe } from "../utils/normalPositionToPositions.js";
 import { TagCache as ne } from "./TagCache.js";
@@ -24,18 +24,18 @@ import { writable as re } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as se } from "../../shared-utils/device.js";
 import { CSS3DRenderPlugin as fe } from "../../CSS3DRenderPlugin/index.js";
 import { Five as ae } from "@realsee/five";
-import { isMediaPlaneTag as ce, isMediaModelTag as B, isPlaneTag as le, isPoint3DTag as de } from "../utils/tag/tagCheck.js";
+import { isMediaPlaneTag as le, isMediaModelTag as B, isPlaneTag as ce, isPoint3DTag as de } from "../utils/tag/tagCheck.js";
 import { VideoPlane as ue } from "../utils/model/mediaPlane.js";
 import { FiveDomEvents as me } from "../../shared-utils/five/FiveDomEvents.js";
 import N from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as w, isModelLike as z } from "../../shared-utils/five/mode.js";
+import { isPanoramaLike as S, isModelLike as z } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "animejs";
 import { entries as $ } from "../../shared-utils/typescript/entries.js";
 import { getUrlExt as H } from "../../shared-utils/url/getUrl.js";
 import { transformPosition as J } from "../../shared-utils/five/transformPosition.js";
-import { WorkUtil as he } from "../../shared-utils/Utils/WorkUtil.js";
+import { WorkUtil as pe } from "../../shared-utils/Utils/WorkUtil.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
@@ -66,32 +66,37 @@ import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../shared-utils/Utils/BaseUtil.js";
-class gi extends ne {
+class hi extends ne {
   constructor(e) {
     super(e);
-    f(this, "tags", []);
-    f(this, "config", te);
-    f(this, "workUtil", new he(this.five));
+    d(this, "tags", []);
+    d(this, "config", te);
+    d(this, "tagsLengthWillUpdate", !0);
+    d(this, "workUtil", new pe(this.five));
     /** 插件参数 */
-    f(this, "params");
-    f(this, "mediaStore", re({
+    d(this, "params");
+    d(this, "mediaStore", re({
       currentMediaElement: null
     }));
-    f(this, "store", {
+    d(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    f(this, "domEvents", new me(this.five));
-    f(this, "_cache_pointTag");
-    f(this, "_cache_2DPointTag");
-    f(this, "_cache_imagePlane");
-    f(this, "_cache_mediaModel");
-    f(this, "_cache_css3DTag");
-    f(this, "_container", null);
-    f(this, "_css3DRenderPlugin");
-    f(this, "loadVideoFirstFrame", () => {
+    d(this, "domEvents", new me(this.five));
+    // private _cache_pointTag?: PointTagInstance[]
+    // private _cache_2DPointTag?: TagInstance<TagContentType, '2DPoint'>[]
+    // private _cache_imagePlane?: TagInstance<'MediaPlane', 'Plane'>[]
+    // private _cache_mediaModel?: TagInstance<'MediaModel', 'Model'>[]
+    // private _cache_css3DTag?: (
+    //   | TagInstance<TagContentType, 'Plane'>
+    //   | TagInstance<TagContentType, 'Model'>
+    //   | TagInstance<TagContentType, '3DPoint'>
+    // )[]
+    d(this, "_container", null);
+    d(this, "_css3DRenderPlugin");
+    d(this, "loadVideoFirstFrame", () => {
       se && this.hooks.emit("loadVideoFirstFrame");
     });
     this.mediaStore.subscribe(({ currentMediaElement: i }) => {
@@ -112,17 +117,6 @@ class gi extends ne {
   set container(e) {
     this._container = e;
   }
-  // eslint-disable-next-line accessor-pairs
-  set tagsLengthWillUpdate(e) {
-    e && (this._cache_pointTag = this.tags.filter((i) => i.stickType === "2DPoint" || i.stickType === "3DPoint").filter((i) => i.position), this._cache_2DPointTag = this.tags.filter((i) => i.stickType === "2DPoint").filter((i) => i.position), this._cache_imagePlane = this.tags.filter(
-      (i) => i.contentType === "MediaPlane" && i.stickType === "Plane" && this.getRenderType(i) === "Mesh"
-    ), this._cache_mediaModel = this.tags.filter((i) => i.stickType === "Model" && i.contentType === "MediaModel"), this._cache_css3DTag = this.tags.filter(
-      (i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel"
-    ).filter((i) => {
-      const o = this.getRenderType(i);
-      return o === "BehindDom" || o === "Dom";
-    }));
-  }
   set workCode(e) {
     this.workUtil.workCode = e;
   }
@@ -138,21 +132,6 @@ class gi extends ne {
     }
     return this._css3DRenderPlugin;
   }
-  get filterPointTag() {
-    return this._cache_pointTag;
-  }
-  get filter2DPointTag() {
-    return this._cache_2DPointTag;
-  }
-  get filterImagePlane() {
-    return this._cache_imagePlane;
-  }
-  get filterMediaModel() {
-    return this._cache_mediaModel;
-  }
-  get filterCSS3DTag() {
-    return this._cache_css3DTag;
-  }
   getTagById(e) {
     const i = this.tags.find((o) => o.id === e);
     if (!i) {
@@ -169,9 +148,9 @@ class gi extends ne {
    * @description 获取标签配置
    */
   getTagConfig(e, i) {
-    var r, a, d;
-    const o = this.calculateTagConfig(e, { useCache: i == null ? void 0 : i.useCache }), t = (r = i == null ? void 0 : i.fiveMode) != null ? r : this.five.getCurrentState().mode, n = (a = o.configWithFiveMode) == null ? void 0 : a[t];
-    return (d = n != null ? n : o) != null ? d : {};
+    var r, f, c;
+    const o = this.calculateTagConfig(e, { useCache: i == null ? void 0 : i.useCache }), t = (r = i == null ? void 0 : i.fiveMode) != null ? r : this.five.getCurrentState().mode, n = (f = o.configWithFiveMode) == null ? void 0 : f[t];
+    return (c = n != null ? n : o) != null ? c : {};
   }
   /**
    * @description 获取标签当前状态
@@ -187,7 +166,7 @@ class gi extends ne {
       const o = this.getTagConfig(e);
       if (e.config = o, e.config.initialData) {
         const n = JSON.parse(JSON.stringify(e.data));
-        e.data = (t = o.initialData) != null && t.important ? P(e.data, n, o.initialData) : P(e.data, o.initialData, n);
+        e.data = (t = o.initialData) != null && t.important ? y(e.data, n, o.initialData) : y(e.data, o.initialData, n);
       }
     });
   }
@@ -218,7 +197,7 @@ class gi extends ne {
         return;
       const t = e.data.mediaData;
       if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (ce(e)) {
+        if (le(e)) {
           if (t.length === 1) {
             if (t[0].type === "Video")
               return navigator.userAgent.toLowerCase().indexOf("firefox") > -1 && navigator.userAgent.toLowerCase().indexOf("mobile") > -1 ? "Dom" : "Mesh";
@@ -245,43 +224,43 @@ class gi extends ne {
       const n = this.workUtil.getObserverPosition(o);
       if (n === void 0)
         throw new Error(`getAngle(): observerPosition is ${n}`);
-      const r = (() => e.stickType === "3DPoint" ? y(e.normal) : E(e.position))();
+      const r = (() => e.stickType === "3DPoint" ? C(e.normal) : w(e.position))();
       if (!r)
         return;
-      const a = V(e);
-      if (!a)
+      const f = V(e);
+      if (!f)
         return;
-      const d = new ie.Vector3().copy(n).sub(a), g = r.angleTo(d) * 180 / Math.PI;
-      return t.angle = g, t.angle;
+      const c = new ie.Vector3().copy(n).sub(f), h = r.angleTo(c) * 180 / Math.PI;
+      return t.angle = h, t.angle;
     }
   }
   /**
    * @description 获取距离
    */
   getDistance(e, i) {
-    const o = D(D({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = w(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = S(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((r == null ? void 0 : r.distance) !== void 0)
       return r.distance;
-    const a = V(e);
-    if (!a)
+    const f = V(e);
+    if (!f)
       return -1;
-    if (w(n)) {
-      const d = this.workUtil.getObserverPosition(t);
-      if (d === void 0)
+    if (S(n)) {
+      const c = this.workUtil.getObserverPosition(t);
+      if (c === void 0)
         return -1;
-      const g = d.distanceTo(a);
-      return r && (r.distance = g), g;
+      const h = c.distanceTo(f);
+      return r && (r.distance = h), h;
     }
     if (z(n))
-      return this.five.camera.position.distanceTo(a);
+      return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (le(e))
+    if (ce(e))
       return e.position;
     if (B(e))
       return e.data.mediaPosition;
     if (de(e))
-      return oe(this.five.camera.position, y(e.position), y(e.normal));
+      return oe(this.five.camera.position, C(e.position), C(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
@@ -299,17 +278,39 @@ class gi extends ne {
   }
   getTagNormal(e) {
     if (e.normal)
-      return y(e.normal);
+      return C(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));
+  }
+  get filterPointTag() {
+    return this.tags.filter((i) => i.stickType === "2DPoint" || i.stickType === "3DPoint").filter((i) => i.position);
+  }
+  get filter2DPointTag() {
+    return this.tags.filter((i) => i.stickType === "2DPoint").filter((i) => i.position);
+  }
+  get filterImagePlane() {
+    return this.tags.filter(
+      (i) => i.contentType === "MediaPlane" && i.stickType === "Plane" && this.getRenderType(i) === "Mesh"
+    );
+  }
+  get filterMediaModel() {
+    return this.tags.filter((i) => i.stickType === "Model" && i.contentType === "MediaModel");
+  }
+  get filterCSS3DTag() {
+    return this.tags.filter(
+      (i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel"
+    ).filter((i) => {
+      const o = this.getRenderType(i);
+      return o === "BehindDom" || o === "Dom";
+    });
   }
   getTransformedPostion(e) {
     if (!e)
       return;
     const i = this.workUtil.transform;
-    return Array.isArray(e) && e.length === 4 ? e.map(y).map((o) => J(o, i)) : J(y(e), i);
+    return Array.isArray(e) && e.length === 4 ? e.map(C).map((o) => J(o, i)) : J(C(e), i);
   }
   /**
    * @description 检查是否已经销毁
@@ -322,51 +323,51 @@ class gi extends ne {
    * @description 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var S, A, O, I, W;
-    const o = (S = i == null ? void 0 : i.useCache) != null ? S : !0;
+    var A, O, I, W, j;
+    const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
     if (!e)
-      return (A = this.config.globalConfig) != null ? A : {};
+      return (O = this.config.globalConfig) != null ? O : {};
     if (o) {
-      if ((O = e == null ? void 0 : e.computedConfig) != null && O._isMerged)
+      if ((I = e == null ? void 0 : e.computedConfig) != null && I._isMerged)
         return e.computedConfig;
-      if ((I = e == null ? void 0 : e.config) != null && I._isMerged)
+      if ((W = e == null ? void 0 : e.config) != null && W._isMerged)
         return e.config;
     }
     const t = {}, n = {}, r = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, m]) => {
-      var x, R;
-      const c = u, k = c.split("-"), j = u.startsWith("["), T = j ? k[0].slice(1, -1) : void 0, p = j ? k.slice(1) : k, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (x = n[T]) != null ? x : n[T] = {} : (R = r[T]) != null ? R : r[T] = {} : t;
-      if (!v[c]) {
-        if (p.length === 0 && (v[c] = m), p.length === 1) {
-          const [h] = p;
-          (e.contentType === h || h === "Any") && (v[c] = m);
+      var R, F;
+      const a = u, D = a.split("-"), x = u.startsWith("["), T = x ? D[0].slice(1, -1) : void 0, g = x ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (R = n[T]) != null ? R : n[T] = {} : (F = r[T]) != null ? F : r[T] = {} : t;
+      if (!v[a]) {
+        if (g.length === 0 && (v[a] = m), g.length === 1) {
+          const [p] = g;
+          (e.contentType === p || p === "Any") && (v[a] = m);
         }
-        if (p.length === 2) {
-          const [h = "Any", M = "Any"] = p;
-          h === "Mixin" && e.contentType === M && (v[c] = m), (e.stickType === h || h === "Any") && (e.contentType === M || M === "Any") && (v[c] = m);
+        if (g.length === 2) {
+          const [p = "Any", M = "Any"] = g;
+          p === "Mixin" && e.contentType === M && (v[a] = m), (e.stickType === p || p === "Any") && (e.contentType === M || M === "Any") && (v[a] = m);
         }
-        if (p.length === 3) {
-          const [h = "Any", M, X] = p;
+        if (g.length === 3) {
+          const [p = "Any", M, X] = g;
           if (M === "Audio" && e.contentType === "Audio") {
-            const F = e;
-            (F.stickType === h || h === "Any") && F.data.appearance === X && (v[c] = m);
+            const L = e;
+            (L.stickType === p || p === "Any") && L.data.appearance === X && (v[a] = m);
           }
         }
       }
     });
-    const a = (W = e.initialConfig) != null ? W : {}, d = P({}, ee, this.config.globalConfig, ...Object.values(t)), g = P({}, d, a), C = {}, G = Object.values(ae.Mode);
+    const f = (j = e.initialConfig) != null ? j : {}, c = y({}, ee, this.config.globalConfig, ...Object.values(t)), h = y({}, c, f), P = {}, G = Object.values(ae.Mode);
     $(n).forEach(([u, m]) => {
-      G.forEach((c) => {
-        (u === "PanoramaLike" && w(c) || u === "ModelLike" && z(c)) && (C[c] = P({}, d, ...Object.values(m), a, { _isMerged: !0 }));
+      G.forEach((a) => {
+        (u === "PanoramaLike" && S(a) || u === "ModelLike" && z(a)) && (P[a] = y({}, c, ...Object.values(m), f, { _isMerged: !0 }));
       });
     }), $(r).forEach(([u, m]) => {
-      const c = C[u];
-      C[u] = P({}, d, c, ...Object.values(m), a, { _isMerged: !0 });
+      const a = P[u];
+      P[u] = y({}, c, a, ...Object.values(m), f, { _isMerged: !0 });
     });
-    const b = U(D({}, g), { configWithFiveMode: C });
-    return N(b), Object.values(C).forEach((u) => N(u)), b._isMerged = !0, b;
+    const k = U(b({}, h), { configWithFiveMode: P });
+    return N(k), Object.values(P).forEach((u) => N(u)), k._isMerged = !0, k;
   }
 }
 export {
-  gi as TagUtil
+  hi as TagUtil
 };

package/libs/PanoTagPlugin/controller/index.d.ts

@@ -138,7 +138,6 @@ declare class PanoTagPluginController extends TagRender {
     private addResizeListener;
     private addResizeObserver;
     private updateVisible;
-    private handleFiveModeChange;
     private handleFiveWantsMoveToPano;
     /**
      * @description 走点/切换模型后显示