@realsee/dnalogel 3.64.23-alpha.3 → 3.64.23-ke-webgpu.1

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -3,7 +3,6 @@ var a = (p, i, t) => i in p ? n(p, i, { enumerable: !0, configurable: !0, writab
 var o = (p, i, t) => (a(p, typeof i != "symbol" ? i + "" : i, t), t);
 import { Group as s } from "three";
 import { TagUtil as l } from "./TagUtil.js";
-import "../typings/tag/TagConfig.js";
 import "../tag.config.js";
 import "../../shared-utils/positionToVector3.js";
 import "../utils/tag/tagCheck.js";
@@ -11,7 +10,6 @@ import "../utils/normalPositionToPositions.js";
 import "../../vendor/svelte/store/index.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/device.js";
-import "@realsee/five";
 import "../utils/model/mediaPlane.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/three/loadTexture.js";
@@ -23,16 +21,21 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/constants.js";
+import "../../shared-utils/five/FiveDomEvents.js";
+import "../../shared-utils/three/getObjectVisible.js";
+import "../../shared-utils/five/calculateThreeMouse.js";
+import "../../shared-utils/five/getFiveModel.js";
+import "../../shared-utils/three/core/Raycaster.js";
+import "../utils/Cache.js";
+import "../../base/BasePlugin.js";
+import "../../shared-utils/Subscribe.js";
 import "../../shared-utils/tag.js";
 import "../../shared-utils/five/vector3ToScreen.js";
-import "../../shared-utils/five/getFiveModel.js";
 import "../../shared-utils/Utils/FiveUtil.js";
 import "../../shared-utils/Utils/BaseUtil.js";
-import "../../shared-utils/Subscribe.js";
 import "../../shared-utils/Utils/WorkUtil.js";
 import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/three/temp.js";
-import "../../shared-utils/three/core/Raycaster.js";
 import "../../shared-utils/dom/resizeObserver.js";
 import "../../shared-utils/five/fiveEveryReadyListener.js";
 import "../../shared-utils/throttle.js";
@@ -41,58 +44,48 @@ import "../../shared-utils/three/PointSelector/index.js";
 import "../../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../../shared-utils/three/Magnifier.js";
 import "../../shared-utils/three/PointSelector/utils/PointHelper.js";
+import "three/webgpu";
+import "three/tsl";
 import "../../shared-utils/three/Assets/index.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../shared-utils/even.js";
 import "../../shared-utils/CSS3DRender/OpacityMesh.js";
-import "../../shared-utils/three/getObjectVisible.js";
 import "../../shared-utils/three/CSS3DRenderer/index.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "@realsee/five/line";
+import "three/examples/jsm/lines/LineGeometry.js";
 import "../../shared-utils/isNil.js";
-import "../../shared-utils/three/core/Five_LineMaterial2.js";
+import "three/examples/jsm/lines/webgpu/Line2.js";
 import "../../shared-utils/three/core/Sphere.js";
 import "../../vendor/animejs/lib/anime.es.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import "../../shared-utils/CSS3DRender/CSS3DRenderer.js";
-import "../../shared-utils/createResizeObserver.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
-import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
-import "../../shared-utils/util.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "../../shared-utils/five/FivePuppet.js";
+import "@realsee/five-webgpu";
+import "../../shared-utils/five/fiveModelLoad.js";
 import "../../shared-utils/three/PointSelector/utils/html.js";
 import "../../shared-utils/CSS3DRender/index.js";
-import "../../shared-utils/five/fiveModelLoad.js";
+import "../../shared-utils/CSS3DRender/CSS3DRenderer.js";
+import "../../shared-utils/createResizeObserver.js";
 import "../../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../../Sculpt/Meshes/Line.js";
 import "../../Sculpt/typings/style.js";
 import "../../shared-utils/three/IObject3D.js";
 import "../../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../../shared-utils/three/applyObjectMatrixWorld.js";
+import "../../shared-utils/util.js";
 import "../../shared-utils/three/core/LineGeometry.js";
 import "../../shared-utils/three/core/LineMaterial.js";
 import "../../shared-utils/three/core/Line2.js";
 import "../../shared-utils/three/core/LineMaterial2.js";
 import "../../Sculpt/utils/unit.js";
 import "../../Sculpt/utils/renderDom.js";
-import "../../shared-utils/five/FivePuppet.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../../Sculpt/utils/three/rayOnLine.js";
-import "../../shared-utils/five/mode.js";
-import "../../shared-utils/five/FiveDomEvents.js";
-import "../../shared-utils/five/calculateThreeMouse.js";
-import "../utils/Cache.js";
-import "../../base/BasePlugin.js";
 import "../../shared-utils/url/absoluteUrl.js";
-import "../../vendor/object-assign-deep/objectAssignDeep.js";
-import "../../shared-utils/typescript/entries.js";
-import "../utils/tag/adaptConfig.js";
-class Xt extends l {
+class Ht extends l {
   constructor(t) {
     super(t);
     o(this, "rendererMap", /* @__PURE__ */ new Map());
@@ -116,9 +109,9 @@ class Xt extends l {
    * @param config.usePoint 是否需要标签点, 默认为 false
    * @note 优先级低于 tag.element
    */
-  registerRenderer(t, r, m) {
-    var e;
-    this.rendererMap.set(t, { renderer: r, usePoint: (e = m == null ? void 0 : m.usePoint) != null ? e : !1 });
+  registerRenderer(t, r, e) {
+    var m;
+    this.rendererMap.set(t, { renderer: r, usePoint: (m = e == null ? void 0 : e.usePoint) != null ? m : !1 });
   }
   bindRenderer(t, r) {
     this.contentTypeMap.set(t, r);
@@ -137,11 +130,11 @@ class Xt extends l {
       (r = t.tag3DContentSvelte) == null || r.dispose(), t.tag3DContentSvelte = void 0;
     });
     for (const [t, r] of this.store.css3DRenderDisposer) {
-      const m = this.getTagById(t);
-      (!m || m.stickType === "2DPoint") && (r == null || r.forEach((e) => e == null ? void 0 : e()), this.store.css3DRenderDisposer.delete(t));
+      const e = this.getTagById(t);
+      (!e || e.stickType === "2DPoint") && (r == null || r.forEach((m) => m == null ? void 0 : m()), this.store.css3DRenderDisposer.delete(t));
     }
   }
 }
 export {
-  Xt as TagRender
+  Ht as TagRender
 };

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

@@ -1,8 +1,8 @@
-import { type TagContentType, type StickType, type TagId, type MediaStore, type State, type PluginEventMap, type TagInstance, type Tag, type TagConfig } from '../typings';
-import type * as THREE from 'three';
+import type { TagContentType, StickType, TagId, MediaStore, State, PluginEventMap, TagInstance, ArrayPosition } from '../typings';
+import * as THREE from 'three';
 import type { Tags } from '../typings';
-import { Five, type Mode } from '@realsee/five';
-import { FiveDomEvents } from '../../shared-utils';
+import { Five } from '@realsee/five-webgpu';
+import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 import type { BaseTag } from './Tag/BaseTag';
 import { Cache } from '../utils/Cache';
 import * as BasePlugin from '../../base/BasePlugin';
@@ -67,15 +67,8 @@ export declare abstract class TagUtil extends BasePlugin.Controller<State, Plugi
     };
     /** 暂停当前标签内进行的所有多媒体 */
     pauseCurrentMedia(): void;
-    /**
-     * @description 获取标签配置
-     */
-    getTagConfig(tag: Tag, params?: {
-        useCache?: boolean;
-        fiveMode?: Mode;
-    }): TagConfig<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
     protected loadVideoFirstFrame: () => void;
-    protected getPositions(tag: BaseTag): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
+    protected getPositions(tag: BaseTag): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [ArrayPosition, ArrayPosition, ArrayPosition, ArrayPosition];
     protected addObjectClickHandler(tag: BaseTag, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
     protected tagsDo: (tags: TagInstance[], func: (tag: TagInstance) => any, isUpdateing?: boolean) => void;
     /**
@@ -83,11 +76,5 @@ export declare abstract class TagUtil extends BasePlugin.Controller<State, Plugi
      * @returns isDisposed; 已经销毁返回 true，否则返回 false
      */
     protected checkDisposed(): boolean;
-    /**
-     * @description 获取merge后的配置
-     */
-    protected calculateTagConfig(tag: Tag | TagInstance, params?: {
-        useCache?: boolean;
-    }): TagInstance['computedConfig'];
 }
 export {};

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,45 +1,17 @@
-var $ = Object.defineProperty, q = Object.defineProperties;
-var z = Object.getOwnPropertyDescriptors;
-var S = Object.getOwnPropertySymbols;
-var G = Object.prototype.hasOwnProperty, X = Object.prototype.propertyIsEnumerable;
-var D = (a, n, e) => n in a ? $(a, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[n] = e, W = (a, n) => {
-  for (var e in n || (n = {}))
-    G.call(n, e) && D(a, e, n[e]);
-  if (S)
-    for (var e of S(n))
-      X.call(n, e) && D(a, e, n[e]);
-  return a;
-}, Q = (a, n) => q(a, z(n));
-var s = (a, n, e) => (D(a, typeof n != "symbol" ? n + "" : n, e), e);
-import { defaultGlobalConfig as J } from "../typings/tag/TagConfig.js";
-import { DefaultConfig as K } from "../tag.config.js";
+var g = Object.defineProperty;
+var T = (c, a, t) => a in c ? g(c, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[a] = t;
+var r = (c, a, t) => (T(c, typeof a != "symbol" ? a + "" : a, t), t);
+import { DefaultConfig as D } from "../tag.config.js";
 import "three";
-import { anyPositionToVector3 as V } from "../../shared-utils/positionToVector3.js";
-import { isPlaneTag as N, isMediaModelTag as U, isPoint3DTag as Y } from "../utils/tag/tagCheck.js";
-import { normalPositionToPositions as Z } from "../utils/normalPositionToPositions.js";
-import { writable as ee } from "../../vendor/svelte/store/index.js";
-import { isIOSWX as te } from "../../shared-utils/device.js";
-import { Five as ie } from "@realsee/five";
-import { VideoPlane as oe } from "../utils/model/mediaPlane.js";
-import "../../shared-utils/tag.js";
-import { isPanoramaLike as re, isModelLike as ne } from "../../shared-utils/five/mode.js";
-import "../../vendor/hammerjs/hammer.js";
-import "../../shared-utils/three/PointSelector/index.js";
-import "../../shared-utils/three/CSS3DRenderer/index.js";
-import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "@realsee/five/line";
-import "../../shared-utils/three/core/Five_LineMaterial2.js";
-import "../../shared-utils/three/core/Sphere.js";
-import "../../vendor/animejs/lib/anime.es.js";
-import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import { FiveDomEvents as x } from "../../shared-utils/five/FiveDomEvents.js";
-import "../../shared-utils/five/FivePuppet.js";
-import { Cache as se } from "../utils/Cache.js";
-import { Controller as ce } from "../../base/BasePlugin.js";
-import { objectAssignDeepExports as P } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import { entries as B } from "../../shared-utils/typescript/entries.js";
-import H from "../utils/tag/adaptConfig.js";
+import { anyPositionToVector3 as u } from "../../shared-utils/positionToVector3.js";
+import { isPlaneTag as P, isMediaModelTag as _, isPoint3DTag as y } from "../utils/tag/tagCheck.js";
+import { normalPositionToPositions as v } from "../utils/normalPositionToPositions.js";
+import { writable as E } from "../../vendor/svelte/store/index.js";
+import { isIOSWX as k } from "../../shared-utils/device.js";
+import { VideoPlane as w } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as f } from "../../shared-utils/five/FiveDomEvents.js";
+import { Cache as I } from "../utils/Cache.js";
+import { Controller as S } from "../../base/BasePlugin.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/three/loadTexture.js";
@@ -51,28 +23,43 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/constants.js";
-import "../../shared-utils/five/vector3ToScreen.js";
+import "../../shared-utils/three/getObjectVisible.js";
+import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../shared-utils/five/getFiveModel.js";
+import "../../shared-utils/three/core/Raycaster.js";
+import "../../shared-utils/Subscribe.js";
+import "../../shared-utils/tag.js";
+import "../../shared-utils/five/vector3ToScreen.js";
 import "../../shared-utils/Utils/FiveUtil.js";
 import "../../shared-utils/Utils/BaseUtil.js";
-import "../../shared-utils/Subscribe.js";
 import "../../shared-utils/Utils/WorkUtil.js";
 import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/three/temp.js";
-import "../../shared-utils/three/core/Raycaster.js";
 import "../../shared-utils/dom/resizeObserver.js";
 import "../../shared-utils/five/fiveEveryReadyListener.js";
 import "../../shared-utils/throttle.js";
-import "../../shared-utils/five/fiveModelLoad.js";
+import "../../vendor/hammerjs/hammer.js";
+import "../../shared-utils/three/PointSelector/index.js";
 import "../../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../../shared-utils/three/Magnifier.js";
 import "../../shared-utils/three/PointSelector/utils/PointHelper.js";
+import "three/webgpu";
+import "three/tsl";
 import "../../shared-utils/three/Assets/index.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../shared-utils/even.js";
 import "../../shared-utils/CSS3DRender/OpacityMesh.js";
-import "../../shared-utils/three/getObjectVisible.js";
+import "../../shared-utils/three/CSS3DRenderer/index.js";
+import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "three/examples/jsm/lines/LineGeometry.js";
 import "../../shared-utils/isNil.js";
+import "three/examples/jsm/lines/webgpu/Line2.js";
+import "../../shared-utils/three/core/Sphere.js";
+import "../../vendor/animejs/lib/anime.es.js";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
+import "../../shared-utils/five/FivePuppet.js";
+import "@realsee/five-webgpu";
+import "../../shared-utils/five/fiveModelLoad.js";
 import "../../shared-utils/three/PointSelector/utils/html.js";
 import "../../shared-utils/CSS3DRender/index.js";
 import "../../shared-utils/CSS3DRender/CSS3DRenderer.js";
@@ -96,73 +83,67 @@ import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../../Sculpt/utils/three/rayOnLine.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
-import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../shared-utils/url/absoluteUrl.js";
-class zt extends ce {
-  constructor(e) {
-    super(e);
-    s(this, "tags", []);
-    s(this, "cache", new se());
-    s(this, "config", K);
-    s(this, "renderQueue", /* @__PURE__ */ new Map());
+class oe extends S {
+  constructor(t) {
+    super(t);
+    r(this, "tags", []);
+    r(this, "cache", new I());
+    r(this, "config", D);
+    r(this, "renderQueue", /* @__PURE__ */ new Map());
     /** 插件参数 */
-    s(this, "params");
-    // eslint-disable-next-line @typescript-eslint/member-ordering
-    s(this, "mediaStore", ee({
+    r(this, "params");
+    r(this, "mediaStore", E({
       currentMediaElement: null
     }));
-    s(this, "store", {
+    r(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    // eslint-disable-next-line @typescript-eslint/member-ordering
-    s(this, "domEvents", new x(this.five));
-    s(this, "_cache_pointTag");
-    s(this, "_cache_2DPointTag");
-    s(this, "_cache_css3DTag");
-    s(this, "_container", null);
-    s(this, "timeoutIds", []);
-    s(this, "whyHide", (e) => {
-      const t = this.getTagById(e);
-      return t ? t.whyHide() : { reason: `tag ${e} not found` };
+    r(this, "domEvents", new f(this.five));
+    r(this, "_cache_pointTag");
+    r(this, "_cache_2DPointTag");
+    r(this, "_cache_css3DTag");
+    r(this, "_container", null);
+    r(this, "timeoutIds", []);
+    r(this, "whyHide", (t) => {
+      const e = this.getTagById(t);
+      return e ? e.whyHide() : { reason: `tag ${t} not found` };
     });
-    s(this, "loadVideoFirstFrame", () => {
-      te && this.hooks.emit("loadVideoFirstFrame");
+    r(this, "loadVideoFirstFrame", () => {
+      k && this.hooks.emit("loadVideoFirstFrame");
     });
-    s(this, "tagsDo", (e, t, i = !0) => {
-      let o = [...e != null ? e : this.tags].sort((r, f) => r.getSquaredDistance() - f.getSquaredDistance());
-      this.timeoutIds.forEach((r) => clearTimeout(r)), this.timeoutIds.length = 0;
-      for (let r = 0; r < 20; r++) {
-        const f = o[r];
-        f && (t(f), i && (f._updating = !1));
+    r(this, "tagsDo", (t, e, i = !0) => {
+      let o = [...t != null ? t : this.tags].sort((s, m) => s.getSquaredDistance() - m.getSquaredDistance());
+      this.timeoutIds.forEach((s) => clearTimeout(s)), this.timeoutIds.length = 0;
+      for (let s = 0; s < 20; s++) {
+        const m = o[s];
+        m && (e(m), i && (m._updating = !1));
       }
       o = o.slice(20);
-      const c = o.length > 1e3, p = c ? 30 : 17, l = c ? 1 : 3;
-      for (let r = 0; r < o.length; r += l) {
-        const f = [];
-        for (let d = 0; d < l; d++)
-          o[r + d] && f.push(o[r + d]);
-        f.forEach((d) => {
-          i && (d._updating = !0);
+      const d = o.length > 1e3, n = d ? 30 : 17, l = d ? 1 : 3;
+      for (let s = 0; s < o.length; s += l) {
+        const m = [];
+        for (let p = 0; p < l; p++)
+          o[s + p] && m.push(o[s + p]);
+        m.forEach((p) => {
+          i && (p._updating = !0);
         });
-        const T = setTimeout(() => {
-          f.forEach((d) => {
-            t(d), i && (d._updating = !1);
+        const h = setTimeout(() => {
+          m.forEach((p) => {
+            e(p), i && (p._updating = !1);
           });
-        }, r * p);
-        this.timeoutIds.push(T);
+        }, s * n);
+        this.timeoutIds.push(h);
       }
     });
-    this.mediaStore.subscribe(({ currentMediaElement: t }) => {
+    this.mediaStore.subscribe(({ currentMediaElement: e }) => {
       this.tags.forEach((i) => {
         var o;
-        if (i.mediaPlane instanceof oe && t !== i.mediaPlane.videoInstance) {
-          if (!((o = i.mediaPlane.videoInstance) != null && o.src) || t === i.mediaPlane.videoInstance)
+        if (i.mediaPlane instanceof w && e !== i.mediaPlane.videoInstance) {
+          if (!((o = i.mediaPlane.videoInstance) != null && o.src) || e === i.mediaPlane.videoInstance)
             return;
           i.mediaPlane.pause();
         }
@@ -170,84 +151,76 @@ class zt extends ce {
     });
   }
   get container() {
-    var e;
-    return this._container || ((e = this.five.getElement()) == null ? void 0 : e.parentElement);
+    var t;
+    return this._container || ((t = this.five.getElement()) == null ? void 0 : t.parentElement);
   }
-  set container(e) {
-    this._container = e;
+  set container(t) {
+    this._container = t;
   }
   // eslint-disable-next-line accessor-pairs
-  set tagsLengthWillUpdate(e) {
-    e && (this._cache_pointTag = this.tags.filter((t) => t.stickType === "2DPoint" || t.stickType === "3DPoint").filter((t) => t.position), this._cache_2DPointTag = this.tags.filter((t) => t.stickType === "2DPoint").filter((t) => t.position), this._cache_css3DTag = this.tags.filter(
-      (t) => t.stickType === "3DPoint" || t.stickType === "Plane" || t.stickType === "Model" && t.contentType === "MediaModel"
-    ).filter((t) => {
-      const i = t.computeRenderType();
+  set tagsLengthWillUpdate(t) {
+    t && (this._cache_pointTag = this.tags.filter((e) => e.stickType === "2DPoint" || e.stickType === "3DPoint").filter((e) => e.position), this._cache_2DPointTag = this.tags.filter((e) => e.stickType === "2DPoint").filter((e) => e.position), this._cache_css3DTag = this.tags.filter(
+      (e) => e.stickType === "3DPoint" || e.stickType === "Plane" || e.stickType === "Model" && e.contentType === "MediaModel"
+    ).filter((e) => {
+      const i = e.computeRenderType();
       return i === "BehindDom" || i === "Dom";
     }));
   }
   get filterPointTag() {
-    var e;
-    return (e = this._cache_pointTag) != null ? e : [];
+    var t;
+    return (t = this._cache_pointTag) != null ? t : [];
   }
   get filter2DPointTag() {
-    var e;
-    return (e = this._cache_2DPointTag) != null ? e : [];
+    var t;
+    return (t = this._cache_2DPointTag) != null ? t : [];
   }
   get filterCSS3DTag() {
-    var e;
-    return (e = this._cache_css3DTag) != null ? e : [];
-  }
-  updateFive(e) {
-    super.updateFive(e), this.domEvents.dispose(), this.domEvents = new x(e);
-  }
-  addRenderQueue(e) {
-    var c, p;
-    const { type: t, keys: i = [], tags: o = [] } = e;
-    this.renderQueue.has(t) ? this.renderQueue.set(t, {
-      keys: Array.from(/* @__PURE__ */ new Set([...(c = this.renderQueue.get(t).keys) != null ? c : [], ...i])),
-      tags: Array.from(/* @__PURE__ */ new Set([...(p = this.renderQueue.get(t).tags) != null ? p : [], ...o]))
-    }) : this.renderQueue.set(t, { keys: i, tags: o });
-  }
-  getTagById(e) {
-    const t = this.tags.find((i) => i.id === e);
-    if (!t) {
-      console.warn(`getTagById Error: can't find tag id: ${e}`);
+    var t;
+    return (t = this._cache_css3DTag) != null ? t : [];
+  }
+  updateFive(t) {
+    super.updateFive(t), this.domEvents.dispose(), this.domEvents = new f(t);
+  }
+  addRenderQueue(t) {
+    var d, n;
+    const { type: e, keys: i = [], tags: o = [] } = t;
+    this.renderQueue.has(e) ? this.renderQueue.set(e, {
+      keys: Array.from(/* @__PURE__ */ new Set([...(d = this.renderQueue.get(e).keys) != null ? d : [], ...i])),
+      tags: Array.from(/* @__PURE__ */ new Set([...(n = this.renderQueue.get(e).tags) != null ? n : [], ...o]))
+    }) : this.renderQueue.set(e, { keys: i, tags: o });
+  }
+  getTagById(t) {
+    const e = this.tags.find((i) => i.id === t);
+    if (!e) {
+      console.warn(`getTagById Error: can't find tag id: ${t}`);
       return;
     }
-    return t;
+    return e;
   }
   /** 暂停当前标签内进行的所有多媒体 */
   pauseCurrentMedia() {
     this.mediaStore.set({ currentMediaElement: null });
   }
-  /**
-   * @description 获取标签配置
-   */
-  getTagConfig(e, t) {
-    var p, l, r;
-    const i = this.calculateTagConfig(e, { useCache: t == null ? void 0 : t.useCache }), o = (p = t == null ? void 0 : t.fiveMode) != null ? p : this.five.getCurrentState().mode, c = (l = i.configWithFiveMode) == null ? void 0 : l[o];
-    return (r = c != null ? c : i) != null ? r : {};
-  }
-  getPositions(e) {
-    if (N(e))
-      return e.position;
-    if (U(e))
-      return e.data.mediaPosition;
-    if (Y(e))
-      return Z(this.five.camera.position, V(e.position), V(e.normal));
+  getPositions(t) {
+    if (P(t))
+      return t.position;
+    if (_(t))
+      return t.data.mediaPosition;
+    if (y(t))
+      return v(this.five.camera.position, u(t.position), u(t.normal));
   }
-  addObjectClickHandler(e, t, i) {
-    if (!t || !this.domEvents)
+  addObjectClickHandler(t, e, i) {
+    if (!e || !this.domEvents)
       return () => {
       };
-    const o = () => !(!e.currentVisible || e.loading), c = (p) => {
+    const o = () => !(!t.currentVisible || t.loading), d = (n) => {
       if (!o())
         return !1;
-      i(p.origDomEvent);
+      i(n.origDomEvent);
     };
-    return this.domEvents.addEventListener(t, "click", c), () => {
-      var p;
-      (p = this.domEvents) == null || p.removeEventListener(t, "click", c);
+    return this.domEvents.addEventListener(e, "click", d), () => {
+      var n;
+      (n = this.domEvents) == null || n.removeEventListener(e, "click", d);
     };
   }
   /**
@@ -257,55 +230,7 @@ class zt extends ce {
   checkDisposed() {
     return this.store.disposed ? (console.error("PanoTagPluginController has been disposed"), !0) : !1;
   }
-  /**
-   * @description 获取merge后的配置
-   */
-  calculateTagConfig(e, t) {
-    var E, b, I, A, F;
-    const i = (E = t == null ? void 0 : t.useCache) != null ? E : !0;
-    if (!e)
-      return (b = this.config.globalConfig) != null ? b : {};
-    if (i) {
-      if ((I = e == null ? void 0 : e.computedConfig) != null && I._isMerged)
-        return e.computedConfig;
-      if ((A = e == null ? void 0 : e.config) != null && A._isMerged)
-        return e.config;
-    }
-    const o = {}, c = {}, p = {};
-    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, h]) => {
-      var w, L;
-      const m = u, C = m.split("-"), j = u.startsWith("["), v = j ? C[0].slice(1, -1) : void 0, y = j ? C.slice(1) : C, M = v ? ["PanoramaLike", "ModelLike"].includes(v) ? (w = c[v]) != null ? w : c[v] = {} : (L = p[v]) != null ? L : p[v] = {} : o;
-      if (!M[m]) {
-        if (y.length === 0 && (M[m] = h), y.length === 1) {
-          const [g] = y;
-          (e.contentType === g || g === "Any") && (M[m] = h);
-        }
-        if (y.length === 2) {
-          const [g = "Any", _ = "Any"] = y;
-          g === "Mixin" && e.contentType === _ && (M[m] = h), (e.stickType === g || g === "Any") && (e.contentType === _ || _ === "Any") && (M[m] = h);
-        }
-        if (y.length === 3) {
-          const [g = "Any", _, R] = y;
-          if (_ === "Audio" && e.contentType === "Audio") {
-            const O = e;
-            (O.stickType === g || g === "Any") && O.data.appearance === R && (M[m] = h);
-          }
-        }
-      }
-    });
-    const l = (F = e.initialConfig) != null ? F : {}, r = P({}, J, this.config.globalConfig, ...Object.values(o)), f = P({}, r, l), T = {}, d = Object.values(ie.Mode);
-    B(c).forEach(([u, h]) => {
-      d.forEach((m) => {
-        (u === "PanoramaLike" && re(m) || u === "ModelLike" && ne(m)) && (T[m] = P({}, r, ...Object.values(h), l, { _isMerged: !0 }));
-      });
-    }), B(p).forEach(([u, h]) => {
-      const m = T[u];
-      T[u] = P({}, r, m, ...Object.values(h), l, { _isMerged: !0 });
-    });
-    const k = Q(W({}, f), { configWithFiveMode: T });
-    return H(k), Object.values(T).forEach((u) => H(u)), k._isMerged = !0, k;
-  }
 }
 export {
-  zt as TagUtil
+  oe as TagUtil
 };

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

@@ -1,7 +1,7 @@
 import type { Tag, TagId, Tags, State, ContentTypeConfigKey } from '../typings';
 import type { TagClickParams, TagConfigByKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
-import { type Five } from '@realsee/five';
+import { type Five } from '@realsee/five-webgpu';
 import { TagRender } from './TagRender';
 import type { PartialObjectDeep } from '../../typings/typings';
 export declare const pluginFlag: (name: string) => string;