@realsee/dnalogel 3.10.2 → 3.11.0-dev.0

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -75,6 +75,8 @@ import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
 import "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/five/transformPosition.js";
+import "../../shared-utils/Utils/WorkUtil.js";
+import "../../shared-utils/Utils/BaseUtil.js";
 import "../../shared-utils/five/getFloorIndex.js";
 import "../../shared-utils/safeObj.js";
 import "../../shared-utils/three/loadTexture.js";
@@ -160,7 +162,7 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
 const $ = /* @__PURE__ */ new Map(), q = /* @__PURE__ */ new Map();
-class fi extends I {
+class Ti extends I {
   constructor(t) {
     super(t);
     h(this, "rendererMap", /* @__PURE__ */ new Map());
@@ -493,5 +495,5 @@ class fi extends I {
   }
 }
 export {
-  fi as TagRender
+  Ti as TagRender
 };

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

@@ -7,12 +7,13 @@ import { Five } from '@realsee/five';
 import type { State as FiveState } from '@realsee/five';
 import type { Mode } from '@realsee/five';
 import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
+import { WorkUtil } from '../../shared-utils/Utils/WorkUtil';
 export declare abstract class TagUtil extends TagCache {
     tags: TagInstance[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
     set workCode(workCode: string);
     get workCode(): string;
-    protected get work(): import("@realsee/five").Work;
+    workUtil: WorkUtil;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
     protected css3DRenderPlugin?: CSS3DRenderPluginExportType;
@@ -27,7 +28,6 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected domEvents: FiveDomEvents;
-    private _workCode;
     protected constructor(five: Five);
     getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */
@@ -43,7 +43,6 @@ export declare abstract class TagUtil extends TagCache {
      * @description 获取标签当前状态
      */
     getCurrentVisibleState(tag: TagInstance): boolean;
-    protected getObserverPosition: (index: number) => THREE.Vector3;
     protected loadVideoFirstFrame: () => void;
     protected updateTagConfig(): void;
     protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,40 +1,41 @@
 var K = Object.defineProperty, Q = Object.defineProperties;
 var Y = Object.getOwnPropertyDescriptors;
-var B = Object.getOwnPropertySymbols;
+var R = Object.getOwnPropertySymbols;
 var Z = Object.prototype.hasOwnProperty, ee = Object.prototype.propertyIsEnumerable;
-var w = (a, s, e) => s in a ? K(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, M = (a, s) => {
+var w = (l, s, e) => s in l ? K(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, k = (l, s) => {
   for (var e in s || (s = {}))
-    Z.call(s, e) && w(a, e, s[e]);
-  if (B)
-    for (var e of B(s))
-      ee.call(s, e) && w(a, e, s[e]);
-  return a;
-}, N = (a, s) => Q(a, Y(s));
-var d = (a, s, e) => (w(a, typeof s != "symbol" ? s + "" : s, e), e);
+    Z.call(s, e) && w(l, e, s[e]);
+  if (R)
+    for (var e of R(s))
+      ee.call(s, e) && w(l, e, s[e]);
+  return l;
+}, _ = (l, s) => Q(l, Y(s));
+var p = (l, s, e) => (w(l, typeof s != "symbol" ? s + "" : s, e), e);
 import { defaultGlobalConfig as ie } from "../typings/tag/TagConfig.js";
 import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import * as te from "three";
 import { DefaultConfig as oe } from "../tag.config.js";
-import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
+import { anyPositionToVector3 as P } from "../../shared-utils/positionToVector3.js";
 import { planeNormal as E } from "../utils/planeNormal.js";
-import { getTagCenterPosition as $ } from "../utils/tagPosition.js";
+import { getTagCenterPosition as B } from "../utils/tagPosition.js";
 import { normalPositionToPositions as re } from "../utils/normalPositionToPositions.js";
 import { TagCache as ne } from "./TagCache.js";
 import { writable as se } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as fe } from "../../shared-utils/device.js";
-import { Five as ae } from "@realsee/five";
-import { isMediaPlaneTag as ce, isMediaModelTag as z, isPlaneTag as le, isPoint3DTag as de } from "../utils/tag/tagCheck.js";
+import { Five as le } from "@realsee/five";
+import { isMediaPlaneTag as ae, isMediaModelTag as N, isPlaneTag as ce, isPoint3DTag as de } from "../utils/tag/tagCheck.js";
 import { VideoPlane as ue } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as pe } from "../../shared-utils/five/FiveDomEvents.js";
-import H from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as A, isModelLike as J } from "../../shared-utils/five/mode.js";
+import { FiveDomEvents as me } from "../../shared-utils/five/FiveDomEvents.js";
+import $ from "../utils/tag/adaptConfig.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 U } from "../../shared-utils/typescript/entries.js";
-import { getUrlExt as G } from "../../shared-utils/url/getUrl.js";
-import { transformPosition as O } from "../../shared-utils/five/transformPosition.js";
+import { entries as H } from "../../shared-utils/typescript/entries.js";
+import { getUrlExt as J } from "../../shared-utils/url/getUrl.js";
+import { transformPosition as G } from "../../shared-utils/five/transformPosition.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";
@@ -60,31 +61,26 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
-class ci extends ne {
+import "../../shared-utils/Utils/BaseUtil.js";
+class ui extends ne {
   constructor(e) {
     super(e);
-    d(this, "tags", []);
-    d(this, "config", oe);
-    d(this, "mediaStore", se({
+    p(this, "tags", []);
+    p(this, "config", oe);
+    p(this, "workUtil", new pe(this.five));
+    p(this, "mediaStore", se({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
-    d(this, "css3DRenderPlugin");
-    d(this, "store", {
+    p(this, "css3DRenderPlugin");
+    p(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    d(this, "domEvents", new pe(this.five));
-    d(this, "_workCode");
-    d(this, "getObserverPosition", (e) => {
-      var o, t, r;
-      const i = (o = this.work) == null ? void 0 : o.observers[e];
-      if (i)
-        return O(i.position, (r = (t = this.work) == null ? void 0 : t.options) == null ? void 0 : r.transform);
-    });
-    d(this, "loadVideoFirstFrame", () => {
+    p(this, "domEvents", new me(this.five));
+    p(this, "loadVideoFirstFrame", () => {
       fe && this.hooks.emit("loadVideoFirstFrame");
     });
     this.mediaStore.subscribe(({ currentMediaElement: i }) => {
@@ -99,15 +95,10 @@ class ci extends ne {
     });
   }
   set workCode(e) {
-    this._workCode = e;
+    this.workUtil.workCode = e;
   }
   get workCode() {
-    var e;
-    return (e = this._workCode) != null ? e : this.five.state.workCode;
-  }
-  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 this.workUtil.workCode;
   }
   getTagById(e) {
     const i = this.tags.find((o) => o.id === e);
@@ -125,9 +116,9 @@ class ci extends ne {
    * @description: 获取标签配置
    */
   getTagConfig(e, i) {
-    var n, f, c;
-    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 (c = r != null ? r : o) != null ? c : {};
+    var r, f, a;
+    const o = this.calculateTagConfig(e, i), t = (r = i == null ? void 0 : i.fiveMode) != null ? r : this.five.getCurrentState().mode, n = (f = o.configWithFiveMode) == null ? void 0 : f[t];
+    return (a = n != null ? n : o) != null ? a : {};
   }
   /**
    * @description 获取标签当前状态
@@ -172,15 +163,15 @@ class ci extends ne {
         return;
       const t = e.data.mediaData;
       if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (ce(e)) {
+        if (ae(e)) {
           if (t.length === 1) {
             if (t[0].type === "Video")
               return "Mesh";
             if (t[0].type === "Image")
-              return G(t[0].url) === "gif" ? "Dom" : "Mesh";
+              return J(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
-        } else if (z(e))
-          return t.length === 1 && t[0].type === "Image" ? G(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
+        } else if (N(e))
+          return t.length === 1 && t[0].type === "Image" ? J(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
     return i != null ? i : "Dom";
@@ -196,16 +187,16 @@ class ci extends ne {
     if (t.angle !== void 0)
       return t.angle;
     {
-      const r = this.getObserverPosition(o);
-      if (r === void 0)
-        throw new Error(`getAngle(): observerPosition is ${r}`);
-      const n = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
-      if (!n)
+      const n = this.workUtil.getObserverPosition(o);
+      if (n === void 0)
+        throw new Error(`getAngle(): observerPosition is ${n}`);
+      const r = (() => e.stickType === "3DPoint" ? P(e.normal) : E(e.position))();
+      if (!r)
         return;
-      const f = $(e);
+      const f = B(e);
       if (!f)
         return;
-      const c = new te.Vector3().copy(r).sub(f), g = n.angleTo(c) * 180 / Math.PI;
+      const a = new te.Vector3().copy(n).sub(f), g = r.angleTo(a) * 180 / Math.PI;
       return t.angle = g, t.angle;
     }
   }
@@ -213,47 +204,47 @@ class ci extends ne {
    * @description: 获取距离
    */
   getDistance(e, i) {
-    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;
-    if ((n == null ? void 0 : n.distance) !== void 0)
-      return n.distance;
-    const f = $(e);
+    const o = k(k({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = A(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    if ((r == null ? void 0 : r.distance) !== void 0)
+      return r.distance;
+    const f = B(e);
     if (!f)
       return -1;
-    if (A(r)) {
-      const c = this.getObserverPosition(t);
-      if (c === void 0)
+    if (A(n)) {
+      const a = this.workUtil.getObserverPosition(t);
+      if (a === void 0)
         return -1;
-      const g = c.distanceTo(f);
-      return n && (n.distance = g), g;
+      const g = a.distanceTo(f);
+      return r && (r.distance = g), g;
     }
-    if (J(r))
+    if (z(n))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (le(e))
+    if (ce(e))
       return e.position;
-    if (z(e))
+    if (N(e))
       return e.data.mediaPosition;
     if (de(e))
-      return re(this.five.camera.position, C(e.position), C(e.normal));
+      return re(this.five.camera.position, P(e.position), P(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), n = (r) => {
       if (!t())
         return !1;
-      o(n.origDomEvent);
+      o(r.origDomEvent);
     };
-    return this.domEvents.addEventListener(i, "click", r), () => {
-      var n;
-      (n = this.domEvents) == null || n.removeEventListener(i, "click", r);
+    return this.domEvents.addEventListener(i, "click", n), () => {
+      var r;
+      (r = this.domEvents) == null || r.removeEventListener(i, "click", n);
     };
   }
   getTagNormal(e) {
     if (e.normal)
-      return C(e.normal);
+      return P(e.normal);
     if (e.stickType === "Plane")
       return E(e.position);
     if (e.stickType === "Model")
@@ -283,11 +274,10 @@ class ci extends ne {
     });
   }
   getTransformedPostion(e) {
-    var o, t;
     if (!e)
       return;
-    const i = (t = (o = this.work) == null ? void 0 : o.options) == null ? void 0 : t.transform;
-    return Array.isArray(e) && e.length === 4 ? e.map(C).map((r) => O(r, i)) : O(C(e), i);
+    const i = this.workUtil.transform;
+    return Array.isArray(e) && e.length === 4 ? e.map(P).map((o) => G(o, i)) : G(P(e), i);
   }
   /**
    * @description 检查是否已经销毁
@@ -300,50 +290,50 @@ class ci extends ne {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var j, S, I, W, F, V;
-    const o = (j = i == null ? void 0 : i.useCache) != null ? j : !0;
+    var O, j, S, I, W, F;
+    const o = (O = i == null ? void 0 : i.useCache) != null ? O : !0;
     if (!e)
-      return (S = this.config.globalConfig) != null ? S : {};
+      return (j = this.config.globalConfig) != null ? j : {};
     if (o) {
-      if ((I = e == null ? void 0 : e.computedConfig) != null && I._isMerged)
+      if ((S = e == null ? void 0 : e.computedConfig) != null && S._isMerged)
         return e.computedConfig;
-      if ((W = e == null ? void 0 : e.config) != null && W._isMerged)
+      if ((I = e == null ? void 0 : e.config) != null && I._isMerged)
         return e.config;
     }
-    const t = {}, r = {}, n = {};
-    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, p]) => {
-      var _, x;
-      const l = u, D = l.split("-"), L = u.startsWith("["), T = L ? D[0].slice(1, -1) : void 0, h = L ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (_ = r[T]) != null ? _ : r[T] = {} : (x = n[T]) != null ? x : n[T] = {} : t;
-      if (!v[l]) {
-        if (h.length === 0 && (v[l] = p), h.length === 1) {
+    const t = {}, n = {}, r = {};
+    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([d, u]) => {
+      var L, U;
+      const c = d, D = c.split("-"), V = d.startsWith("["), T = V ? D[0].slice(1, -1) : void 0, h = V ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (L = n[T]) != null ? L : n[T] = {} : (U = r[T]) != null ? U : r[T] = {} : t;
+      if (!v[c]) {
+        if (h.length === 0 && (v[c] = u), h.length === 1) {
           const [m] = h;
-          (e.contentType === m || m === "Any") && (v[l] = p);
+          (e.contentType === m || m === "Any") && (v[c] = u);
         }
         if (h.length === 2) {
-          const [m = "Any", P = "Any"] = h;
-          m === "Mixin" && e.contentType === P && (v[l] = p), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (v[l] = p);
+          const [m = "Any", C = "Any"] = h;
+          m === "Mixin" && e.contentType === C && (v[c] = u), (e.stickType === m || m === "Any") && (e.contentType === C || C === "Any") && (v[c] = u);
         }
         if (h.length === 3) {
-          const [m = "Any", P, q] = h;
-          if (P === "Audio" && e.contentType === "Audio") {
-            const R = e;
-            (R.stickType === m || m === "Any") && R.data.appearance === q && (v[l] = p);
+          const [m = "Any", C, q] = h;
+          if (C === "Audio" && e.contentType === "Audio") {
+            const x = e;
+            (x.stickType === m || m === "Any") && x.data.appearance === q && (v[c] = u);
           }
         }
       }
     });
-    const f = (V = (F = e.initialConfig) != null ? F : e.config) != null ? V : {}, c = y({}, ie, this.config.globalConfig, ...Object.values(t)), g = y({}, c, f), k = {}, X = Object.values(ae.Mode);
-    U(r).forEach(([u, p]) => {
-      X.forEach((l) => {
-        (u === "PanoramaLike" && A(l) || u === "ModelLike" && J(l)) && (k[l] = y({}, c, ...Object.values(p), f, { _isMerged: !0 }));
+    const f = (F = (W = e.initialConfig) != null ? W : e.config) != null ? F : {}, a = y({}, ie, this.config.globalConfig, ...Object.values(t)), g = y({}, a, f), M = {}, X = Object.values(le.Mode);
+    H(n).forEach(([d, u]) => {
+      X.forEach((c) => {
+        (d === "PanoramaLike" && A(c) || d === "ModelLike" && z(c)) && (M[c] = y({}, a, ...Object.values(u), f, { _isMerged: !0 }));
       });
-    }), U(n).forEach(([u, p]) => {
-      k[u] = y({}, c, ...Object.values(p), f, { _isMerged: !0 });
+    }), H(r).forEach(([d, u]) => {
+      M[d] = y({}, a, ...Object.values(u), f, { _isMerged: !0 });
     });
-    const b = N(M({}, g), { configWithFiveMode: k });
-    return H(b), Object.values(k).forEach((u) => H(u)), b._isMerged = !0, b;
+    const b = _(k({}, g), { configWithFiveMode: M });
+    return $(b), Object.values(M).forEach((d) => $(d)), b._isMerged = !0, b;
   }
 }
 export {
-  ci as TagUtil
+  ui as TagUtil
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -90,6 +90,8 @@ import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
 import "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/five/transformPosition.js";
+import "../../shared-utils/Utils/WorkUtil.js";
+import "../../shared-utils/Utils/BaseUtil.js";
 import "../../shared-utils/five/getFloorIndex.js";
 import "../../shared-utils/safeObj.js";
 import "../Components/TagContainer.js";
@@ -169,8 +171,8 @@ import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
-const w = "Dnalogel-PanoTagPlugin", Ui = (d) => `${w}--${d}`;
-class Ii extends z {
+const w = "Dnalogel-PanoTagPlugin", Ri = (d) => `${w}--${d}`;
+class Bi extends z {
   constructor(e, t) {
     super(e);
     /** state */
@@ -544,7 +546,7 @@ class Ii extends z {
   }
 }
 export {
-  Ii as PanoTagPluginController,
-  Ii as default,
-  Ui as pluginFlag
+  Bi as PanoTagPluginController,
+  Bi as default,
+  Ri as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,7 @@
 import r from "./controller/index.js";
-import { pluginFlag as Nt } from "./controller/index.js";
-import { defaultGlobalConfig as Qt } from "./typings/tag/TagConfig.js";
-import { ContentType as St, DimensionType as Ut, PointType as Vt } from "./Archive/deprecated.js";
+import { pluginFlag as Qt } from "./controller/index.js";
+import { defaultGlobalConfig as St } from "./typings/tag/TagConfig.js";
+import { ContentType as Vt, DimensionType as Wt, PointType as Xt } from "./Archive/deprecated.js";
 import "three";
 import "@realsee/five";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
@@ -61,6 +61,8 @@ import "./utils/tag/adaptConfig.js";
 import "../shared-utils/typescript/entries.js";
 import "../shared-utils/url/getUrl.js";
 import "../shared-utils/five/transformPosition.js";
+import "../shared-utils/Utils/WorkUtil.js";
+import "../shared-utils/Utils/BaseUtil.js";
 import "../shared-utils/five/getFloorIndex.js";
 import "../shared-utils/safeObj.js";
 import "./Components/TagContainer.js";
@@ -143,14 +145,14 @@ import "@realsee/five/gltf-loader";
 import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/animationFrame/index.js";
 import "../shared-utils/five/fiveModelLoad.js";
-const Kt = (o, t) => new r(o, t);
+const Mt = (o, t) => new r(o, t);
 export {
-  St as ContentType,
-  Ut as DimensionType,
-  Kt as PanoTagPlugin,
+  Vt as ContentType,
+  Wt as DimensionType,
+  Mt as PanoTagPlugin,
   r as PanoTagPluginController,
-  Vt as PointType,
-  Kt as default,
-  Qt as defaultGlobalConfig,
-  Nt as pluginFlag
+  Xt as PointType,
+  Mt as default,
+  St as defaultGlobalConfig,
+  Qt as pluginFlag
 };

package/libs/base/BasePlugin.d.ts

@@ -57,7 +57,7 @@ declare abstract class Controller<PluginState extends State, PluginEventMap exte
     readonly VERSION: string;
     five: Five;
     /**
-     * 插件事件钩子
+     * @description: 插件事件钩子
      */
     hooks: Subscribe<PluginEventMap>;
     readonly staticPrefix: string;

package/libs/base/BasePlugin.js

@@ -14,10 +14,10 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.10.2");
+    i(this, "VERSION", "3.11.0-dev.0");
     i(this, "five");
     /**
-     * 插件事件钩子
+     * @description: 插件事件钩子
      */
     i(this, "hooks", new a());
     i(this, "staticPrefix", "//vr-image-4.realsee-cdn.cn");