@realsee/dnalogel 3.0.0-11 → 3.0.0-13

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,39 +1,54 @@
-var P = Object.defineProperty;
-var D = (u, d, e) => d in u ? P(u, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[d] = e;
-var l = (u, d, e) => (D(u, typeof d != "symbol" ? d + "" : d, e), e);
-import { defaultGlobalConfig as k } from "../typings/tag/TagConfig.js";
-import { objectAssignDeepExports as m } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as M from "three";
-import { DefaultConfig as w } from "../tag.config.js";
-import { anyPositionToVector3 as E, arrayPositionToVector3 as h } from "../../shared-utils/positionToVector3.js";
-import { planeNormal as T } from "../utils/planeNormal.js";
-import { getTagCenterPosition as C } from "../utils/tagPosition.js";
-import { normalPositionToPositions as S } from "../utils/normalPositionToPositions.js";
-import { TagCache as V } from "./TagCache.js";
-import { writable as A } from "../../vendor/svelte/store/index.js";
-import { isIOSWX as O } from "../../shared-utils/device.js";
-import { isMediaPlaneTag as j, isMediaModelTag as v, isPlaneTag as F, isPoint3DTag as I } from "../utils/tag/tagCheck.js";
-import { VideoPlane as W } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as R } from "../../shared-utils/five/FiveDomEvents.js";
-import { getObjectVisible as $ } from "../../shared-utils/three/getObjectVisible.js";
-import "../../shared-utils/three/centerPoint.js";
-import "../../base/BasePlugin.js";
-import "../../shared-utils/Subscribe.js";
+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 = {}))
+    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;
+}, 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 "@realsee/five";
 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 "../../shared-utils/three/centerPoint.js";
+import "../../base/BasePlugin.js";
+import "../../shared-utils/Subscribe.js";
+import "../../shared-utils/url/absoluteUrl.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
+import "../../shared-utils/util.js";
 import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../CSS3DRenderPlugin/utils/even.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../../shared-utils/three/getObjectVisible.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "../../shared-utils/absoluteUrl.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
@@ -42,34 +57,38 @@ import "../../shared-utils/three/loadVideoTexture.js";
 import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
-class Me extends V {
+import "../../shared-utils/three/getNormal.js";
+class ri extends oe {
   constructor(e) {
     super(e);
-    l(this, "tags", []);
-    l(this, "config", w);
-    l(this, "mediaStore", A({
+    d(this, "tags", []);
+    d(this, "config", ee);
+    d(this, "mediaStore", ne({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
-    l(this, "css3DRenderPlugin");
-    l(this, "store", {
+    d(this, "css3DRenderPlugin");
+    d(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "domEvents", new R(this.five));
-    l(this, "mouseInfo");
-    l(this, "preventWhenMouseDown", () => {
+    d(this, "domEvents", new de(this.five));
+    d(this, "mouseInfo");
+    d(this, "loadVideoFirstFrame", () => {
+      re && this.hooks.emit("loadVideoFirstFrame");
+    });
+    d(this, "preventWhenMouseDown", () => {
       var e;
       if ((e = this.mouseInfo) != null && e.isDown)
         return console.debug("preventWhenMouseDown 2"), !1;
     });
-    this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: t }) => {
+    this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: i }) => {
       this.tags.forEach((o) => {
-        var i;
-        if (o.mediaPlane instanceof W && t !== o.mediaPlane.videoInstance) {
-          if (!((i = o.mediaPlane.videoInstance) != null && i.src) || t === o.mediaPlane.videoInstance)
+        var t;
+        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();
         }
@@ -78,60 +97,25 @@ class Me extends V {
       this.five.off("wantsMoveToPano", this.preventWhenMouseDown), this.five.off("wantsTapGesture", this.preventWhenMouseDown);
     });
   }
-  get isPanorama() {
-    return this.five.currentMode === "Panorama";
-  }
   getTagById(e) {
-    const t = this.tags.find((o) => o.id === e);
-    if (!t) {
+    const i = this.tags.find((o) => o.id === e);
+    if (!i) {
       console.warn(`getTagById Error: can't find tag id: ${e}`);
       return;
     }
-    return t;
+    return i;
   }
   /** 暂停当前标签内进行的所有多媒体 */
   pauseCurrentMedia() {
     this.mediaStore.set({ currentMediaElement: null });
   }
   /**
-   * @description: 获取merge后的配置
+   * @description: 获取标签配置
    */
-  getTagConfig(e, t = { useCache: !0 }) {
-    var s, r, f;
-    if (!e)
-      return (s = this.config.globalConfig) != null ? s : {};
-    if (t.useCache && ((r = e.config) != null && r._isMerged))
-      return e.config;
-    const o = {};
-    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((p) => {
-      const n = p;
-      if (o[n])
-        return;
-      const c = n.split("-");
-      if (c.length === 1) {
-        const [a] = c;
-        e.contentType === a && (o[n] = this.config.contentTypeConfig[n]);
-      }
-      if (c.length === 2) {
-        const [a = "Any", g = "Any"] = c;
-        a === "Mixin" && e.contentType === g && (o[n] = this.config.contentTypeConfig[n]), (e.stickType === a || a === "Any") && (e.contentType === g || g === "Any") && (o[n] = this.config.contentTypeConfig[n]);
-      }
-      if (c.length === 3) {
-        const [a = "Any", g, b] = c;
-        if (g === "Audio" && e.contentType === "Audio") {
-          const y = e;
-          (y.stickType === a || a === "Any") && y.data.appearance === b && (o[n] = this.config.contentTypeConfig[n]);
-        }
-      }
-    });
-    const i = m(
-      {},
-      k,
-      this.config.globalConfig,
-      ...Object.values(o),
-      e.config
-    );
-    return typeof i.visibleConfig == "object" && i.visibleConfig.keep && (i.visibleConfig = { keep: i.visibleConfig.keep, visibleFiveMode: (f = i.visibleConfig) == null ? void 0 : f.visibleFiveMode }), typeof i.unfoldedConfig == "object" && (i.unfoldedConfig.disableFold && (i.unfoldedConfig = { keep: "unfolded" }), i.unfoldedConfig.disableUnfold && (i.unfoldedConfig = { keep: "folded" }), i.unfoldedConfig.keep && (i.unfoldedConfig = { keep: i.unfoldedConfig.keep })), i._isMerged = !0, i;
+  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, s = (f = o.configWithFiveMode) == null ? void 0 : f[t];
+    return s != null ? s : o;
   }
   /**
    * @description 获取标签当前状态
@@ -139,130 +123,131 @@ class Me extends V {
   getCurrentVisibleState(e) {
     return !(!this.state.enabled || !this.state.visible || !e.enabled || !e.state.visible);
   }
-  loadVideoFirstFrame() {
-    O && this.hooks.emit("loadVideoFirstFrame");
-  }
   updateTagConfig() {
     this.clearCache(), this.tags.forEach((e) => {
-      var i;
-      const t = this.getTagConfig(e, { useCache: !1 });
-      e.config = t;
-      const o = JSON.parse(JSON.stringify(e.data));
-      e.data = (i = t.initialData) != null && i.important ? m(e.data, o, t.initialData) : m(e.data, t.initialData, o);
+      var o;
+      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 ? P(e.data, t, i.initialData) : P(e.data, i.initialData, t);
+      }
     });
   }
-  can(e, t) {
-    const o = t, i = this.getTagConfig(o);
-    if (!i || typeof i != "object")
+  can(e, i) {
+    const o = i, t = this.getTagConfig(o);
+    if (!t || typeof t != "object")
       return !0;
     if (e === "show" || e === "hide") {
-      if (!i.visibleConfig || typeof i.visibleConfig != "object")
+      if (!t.visibleConfig || typeof t.visibleConfig != "object")
         return !0;
-      if (e === "show" && i.visibleConfig.keep === "hidden" || e === "hide" && (i.visibleConfig.keep === "visible" || i.visibleConfig.alwaysShowWhenMovePano))
+      if (e === "show" && t.visibleConfig.keep === "hidden" || e === "hide" && (t.visibleConfig.keep === "visible" || t.visibleConfig.alwaysShowWhenMovePano))
         return !1;
     }
     if (e === "fold" || e === "unfold") {
-      if (!i.unfoldedConfig || typeof i.unfoldedConfig != "object")
+      if (!t.unfoldedConfig || typeof t.unfoldedConfig != "object")
         return !0;
-      if (e === "fold" && i.unfoldedConfig.keep === "unfolded" || e === "unfold" && i.unfoldedConfig.keep === "folded")
+      if (e === "fold" && t.unfoldedConfig.keep === "unfolded" || e === "unfold" && t.unfoldedConfig.keep === "folded")
         return !1;
     }
     return !0;
   }
   getRenderType(e) {
-    const t = (() => {
+    const i = (() => {
       if (e.stickType === "3DPoint")
         return "Dom";
       const o = this.getTagConfig(e);
       if (!o || typeof o != "object" || !o.renderType)
         return;
-      const i = e.data.mediaData;
-      if (!(!i || i.length === 0) && o.renderType === "Mesh") {
-        if (j(e)) {
-          if (i.length === 1 && (i[0].type === "Image" || i[0].type === "Video"))
-            return "Mesh";
-        } else if (v(e))
-          return i.length === 1 && i[0].type === "Image" ? "Mesh" : "BehindDom";
+      const t = e.data.mediaData;
+      if (!(!t || t.length === 0) && o.renderType === "Mesh") {
+        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";
+          }
+        } else if (G(e))
+          return t.length === 1 && t[0].type === "Image" ? H(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
-    return t != null ? t : "Dom";
+    return i != null ? i : "Dom";
   }
   /**
    * @description: 获取角度
    */
-  getAngle(e, t) {
-    var s, r;
-    const o = t != null ? t : this.five.getCurrentState().panoIndex;
+  getAngle(e, i) {
+    var s, n;
+    const o = i != null ? i : this.five.getCurrentState().panoIndex;
     if (o === void 0)
-      throw new Error(`getDistance(): fivePanoIndex is ${o}`);
-    const i = this.getCache({ panoIndex: t, id: e.id });
-    if (i.angle !== void 0)
-      return i.angle;
+      throw new Error(`getAngle(): fivePanoIndex is ${o}`);
+    const t = this.getPanoIndexCache({ panoIndex: i, id: e.id });
+    if (t.angle !== void 0)
+      return t.angle;
     {
-      const f = (r = (s = this.five.work) == null ? void 0 : s.observers[o]) == null ? void 0 : r.position;
+      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(`getAngleRange(): observerPosition is ${f}`);
-      const p = (() => e.stickType === "3DPoint" ? E(e.normal) : T(e.position))();
-      if (!p)
+        throw new Error(`getAngle(): observerPosition is ${f}`);
+      const u = (() => e.stickType === "3DPoint" ? ie(e.normal) : W(e.position))();
+      if (!u)
         return;
-      const n = C(e);
-      if (!n)
+      const g = N(e);
+      if (!g)
         return;
-      const c = new M.Vector3().copy(f).sub(n), a = p.angleTo(c) * 180 / Math.PI;
-      return i.angle = a, i.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, t) {
-    var s, r;
-    const o = t != null ? t : this.five.getCurrentState().panoIndex;
-    if (o === void 0)
-      throw new Error(`getDistance(): fivePanoIndex is ${o}`);
-    const i = this.getCache({ panoIndex: t, id: e.id });
-    if (i.distance !== void 0)
-      return i.distance;
-    {
-      const f = (r = (s = this.five.work) == null ? void 0 : s.observers[o]) == null ? void 0 : r.position;
-      if (f === void 0)
-        throw new Error(`getDistance(): observerPosition is ${f}`);
-      const p = C(e);
-      if (!p)
+  getDistance(e, i) {
+    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 = N(e);
+    if (!f)
+      return -1;
+    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 n = f.distanceTo(p);
-      return i.distance = n, n;
+      const T = l.distanceTo(f);
+      return n && (n.distance = T), T;
     }
+    if ($(s))
+      return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (F(e))
+    if (ae(e))
       return e.position;
-    if (v(e))
+    if (G(e))
       return e.data.mediaPosition;
-    if (I(e))
-      return S(this.five.camera.position, h(e.position), h(e.normal));
+    if (ce(e))
+      return te(this.five.camera.position, E(e.position), E(e.normal));
   }
-  addObjectClickHandler(e, t, o) {
-    if (!t || !this.domEvents)
+  addObjectClickHandler(e, i, o) {
+    if (!i || !this.domEvents)
       return () => {
       };
-    const i = () => !(!$(t) || !this.getCurrentVisibleState(e) || v(e) && !e.mediaVisible), s = (r) => {
-      if (!i())
+    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), s = (n) => {
+      if (!t())
         return !1;
-      o(r.origDomEvent);
+      o(n.origDomEvent);
     };
-    return this.domEvents.addEventListener(t, "click", s), () => {
-      var r;
-      (r = this.domEvents) == null || r.removeEventListener(t, "click", s);
+    return this.domEvents.addEventListener(i, "click", s), () => {
+      var n;
+      (n = this.domEvents) == null || n.removeEventListener(i, "click", s);
     };
   }
   getTagNormal(e) {
     if (e.normal)
-      return h(e.normal);
+      return E(e.normal);
     if (e.stickType === "Plane")
-      return T(e.position);
+      return W(e.position);
     if (e.stickType === "Model")
-      return T(this.getPositions(e));
+      return W(this.getPositions(e));
   }
   // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
@@ -281,9 +266,9 @@ class Me extends V {
   }
   get filterCSS3DTag() {
     return this.tags.filter(
-      (t) => t.stickType === "3DPoint" || t.stickType === "Plane" || t.stickType === "Model" && t.contentType === "MediaModel"
-    ).filter((t) => {
-      const o = this.getRenderType(t);
+      (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";
     });
   }
@@ -294,7 +279,50 @@ class Me extends V {
   checkDisposed() {
     return this.store.disposed ? (console.error("PanoTagPluginController has been disposed"), !0) : !1;
   }
+  /**
+   * @description: 获取merge后的配置
+   */
+  calculateTagConfig(e, i) {
+    var A, I, S, O;
+    const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
+    if (!e)
+      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 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 (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 (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 = (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));
+      });
+    }), z(n).forEach(([p, h]) => {
+      l[p] = P({}, u, ...Object.values(h), f);
+    });
+    const D = B(C({}, g), { configWithFiveMode: l });
+    return _(D, e), Object.values(l).forEach((p) => _(p, e)), D._isMerged = !0, D;
+  }
 }
 export {
-  Me as TagUtil
+  ri as TagUtil
 };

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

@@ -108,11 +108,7 @@ declare class PanoTagPluginController extends TagRender {
     private addEventListener;
     private addResizeListener;
     private addResizeObserver;
-    /**
-     * @description: 切换模式处理函数
-     */
-    private handleFiveModeChange;
-    private handleFiveInitAnimationEnded;
+    private updateVisible;
     private handleFiveWantsMoveToPano;
     /**
      * @description: 走点/切换模型后显示
@@ -121,11 +117,11 @@ declare class PanoTagPluginController extends TagRender {
      * @description: 走点/切换模型时临时隐藏
      */
     private clickhandler;
-    private handleFiveCameraUpdateDebounce;
     private handleFiveCameraUpdate;
     private handleFivePanoArrived;
     /** 楼层切换时，需要更新标签可见性 */
     private handleFiveModelShownFloorChange;
+    private onFiveEveryReady;
     private setUnfoldedByCamera;
     private changeTagMode;
 }