@realsee/dnalogel 2.26.2 → 2.27.0-dev.0

package/libs/PanoTagPlugin/controller/index.js

@@ -2,16 +2,16 @@ var E = Object.defineProperty, F = Object.defineProperties;
 var w = Object.getOwnPropertyDescriptors;
 var C = Object.getOwnPropertySymbols;
 var U = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
-var b = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, f = (d, a) => {
+var v = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, m = (d, a) => {
   for (var e in a || (a = {}))
-    U.call(a, e) && b(d, e, a[e]);
+    U.call(a, e) && v(d, e, a[e]);
   if (C)
     for (var e of C(a))
-      I.call(a, e) && b(d, e, a[e]);
+      I.call(a, e) && v(d, e, a[e]);
   return d;
-}, u = (d, a) => F(d, w(a));
-var g = (d, a, e) => (b(d, typeof a != "symbol" ? a + "" : a, e), e);
-var p = (d, a, e) => new Promise((t, i) => {
+}, b = (d, a) => F(d, w(a));
+var g = (d, a, e) => (v(d, typeof a != "symbol" ? a + "" : a, e), e);
+var f = (d, a, e) => new Promise((t, i) => {
   var o = (r) => {
     try {
       n(e.next(r));
@@ -29,8 +29,8 @@ var p = (d, a, e) => new Promise((t, i) => {
 });
 import * as T from "three";
 import { Subscribe as B } from "@realsee/five";
-import { objectAssignDeepExports as c } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import { arrayPositionToVector3 as A } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { objectAssignDeepExports as p } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { arrayPositionToVector3 as A } from "../../shared-utils/positionToVector3.js";
 import { addDebugPoints as R } from "../utils/addDebugPoints.js";
 import { isMediaModelTag as y, isModelTag as O } from "../utils/tag/tagCheck.js";
 import { waitFiveModelLoaded as k } from "../utils/actionAfterFiveModelLoad.js";
@@ -38,8 +38,8 @@ import { debounce as D } from "../utils/debounce.js";
 import { throttle as _ } from "../utils/throttle.js";
 import { resizeObserver as S } from "../utils/resizeObserver.js";
 import L from "../utils/tag/format.js";
-import { generateBlankAudio as G, AudioNamespace as N } from "../../shared-utils/audio.js";
-import { TagRender as V } from "./TagRender.js";
+import { generateBlankAudio as V, AudioNamespace as G } from "../../shared-utils/audio.js";
+import { TagRender as N } from "./TagRender.js";
 import { uuid as z } from "../../shared-utils/uuid.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -52,6 +52,7 @@ import "../../shared-utils/three/centerPoint.js";
 import "../utils/checkRange.js";
 import "../../shared-utils/isNil.js";
 import "./TagUtil.js";
+import "../typings/tag/TagConfig.js";
 import "../tag.config.js";
 import "../utils/planeNormal.js";
 import "../utils/normalPositionToPositions.js";
@@ -82,6 +83,8 @@ import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/threex/domevents/index.js";
 import "../../shared-utils/five/getFloorIndex.js";
+import "../../shared-utils/safeObj.js";
+import "../../shared-utils/util.js";
 import "../Components/TagContainer.js";
 import "../../vendor/svelte/src/runtime/internal/dom.js";
 import "../../vendor/svelte/src/runtime/internal/transitions.js";
@@ -171,8 +174,8 @@ import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
-const M = "Dnalogel-PanoTagPlugin", Mi = (d) => `${M}--${d}`;
-class Pi extends V {
+const P = "Dnalogel-PanoTagPlugin", Fi = (d) => `${P}--${d}`;
+class wi extends N {
   constructor(e, t) {
     super(e);
     /** state */
@@ -182,8 +185,8 @@ class Pi extends V {
     /** debug */
     g(this, "debug");
     /** 更改 tag 模型 */
-    g(this, "changeTagModel", (e, t) => p(this, null, function* () {
-      e.data = c({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
+    g(this, "changeTagModel", (e, t) => f(this, null, function* () {
+      e.data = p({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
     g(this, "handleFiveInitAnimationEnded", () => {
       const e = this.five.getCurrentState().mode;
@@ -199,7 +202,7 @@ class Pi extends V {
         typeof t == "object" && ((i = t.visibleFiveMode) != null && i.includes("Floorplan") || (o = t.visibleFiveMode) != null && o.includes("Mapview")) && (e.state.visible = this.getVisibleByFiveMode(e));
       }), this.updateRenderAllTags();
     });
-    this.params = c({}, { debug: !1, config: this.config }, f({}, t)), this.debug = this.params.debug, this.config = this.params.config, G(1, { namespace: N.PlayAudio });
+    this.params = p({}, { debug: !1, config: this.config }, m({}, t)), this.debug = this.params.debug, this.config = this.params.config, V(1, { namespace: G.PlayAudio });
     try {
       const i = window;
       Array.isArray(i.__PANOTAGPLUGIN_DEBUG_LIST__) || (i.__PANOTAGPLUGIN_DEBUG_LIST__ = []), i.__PANOTAGPLUGIN_DEBUG_LIST__.push(this), i.__PANOTAGPLUGIN_DEBUG__ = this;
@@ -210,9 +213,9 @@ class Pi extends V {
    * @description: 加载数据
    */
   load(e, t) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       var o, s;
-      this.clearTags(), console.debug(M, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = c({}, this.config, {
+      this.clearTags(), console.debug(P, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
         globalConfig: (o = e.globalConfig) != null ? o : {},
         contentTypeConfig: (s = e.contentTypeConfig) != null ? s : {}
       });
@@ -230,15 +233,15 @@ class Pi extends V {
    * @description: 添加标签
    */
   addTag(e, t) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       const o = (Array.isArray(e) ? e : [e]).map((s) => {
-        var l, m;
+        var l, c;
         const n = this.getTagConfig(s), r = JSON.parse(JSON.stringify(s.data));
-        return u(f({}, s), {
+        return b(m({}, s), {
           enabled: (l = s.enabled) != null ? l : !0,
-          id: (m = s.id) != null ? m : z(),
-          data: c(s.data, n.initialData, r),
-          state: f({
+          id: (c = s.id) != null ? c : z(),
+          data: p(s.data, n.initialData, r),
+          state: m({
             visible: void 0,
             unfolded: !this.can("fold", s)
           }, n.initialState),
@@ -250,10 +253,10 @@ class Pi extends V {
           enable: () => this.changeEnabledById(s.id, !0),
           disable: () => this.changeEnabledById(s.id, !1),
           destroy: () => this.destroyTagById(s.id),
-          changeData: (v) => this.changeDataById(s.id, v)
+          changeData: (u) => this.changeDataById(s.id, u)
         });
       }).filter((s) => s.position);
-      return o.forEach(L), this.tags.push(...o), k(this.five).then(() => p(this, null, function* () {
+      return o.forEach(L), this.tags.push(...o), k(this.five).then(() => f(this, null, function* () {
         var s, n, r;
         this.store.eventListenerDisposer && ((n = (s = this.store).eventListenerDisposer) == null || n.call(s)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (r = t == null ? void 0 : t.withAnimation) != null ? r : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags(), yield this.addMediaModelTag(o);
       }));
@@ -263,22 +266,22 @@ class Pi extends V {
    * @description: 改变配置
    */
   changeConfig(e, t = !0) {
-    t ? this.config = c({}, this.config, e) : this.config = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    t ? this.config = p({}, this.config, e) : this.config = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
   }
   /**
    * @description: 改变全局配置
    */
   changeGlobalConfig(e, t = !0) {
-    t ? this.config.globalConfig = c({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    t ? this.config.globalConfig = p({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
   }
   /**
    * @description: 改变类型配置
    */
   changeContentTypeConfig(e, t, i = !0) {
-    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = c({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = p({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
   }
   show(e) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       if (this.checkDisposed())
         return;
       const { userAction: t = !0, withAnimation: i = !1 } = e != null ? e : {};
@@ -286,7 +289,7 @@ class Pi extends V {
     });
   }
   hide(e) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       if (this.checkDisposed())
         return;
       const { userAction: t = !0, withAnimation: i = !1 } = e != null ? e : {};
@@ -308,7 +311,7 @@ class Pi extends V {
   setState(e, t) {
     if (this.checkDisposed())
       return;
-    const { userAction: i = !0, visibleWithAnimation: o = !1 } = t, s = f({}, this.state);
+    const { userAction: i = !0, visibleWithAnimation: o = !1 } = t, s = m({}, this.state);
     this.state = Object.assign(this.state, e), this.store.visibleWithAnimation = o, s.visible !== this.state.visible && (e.visible ? this.handleShow() : this.handleHide()), s.enabled !== this.state.enabled && (e.enabled ? this.handleEnable() : this.handleDisable()), this.hooks.emit("stateChange", { state: this.state, prevState: s, userAction: i });
   }
   /**
@@ -351,7 +354,7 @@ class Pi extends V {
   changeDataById(e, t, i = !0) {
     const o = this.getTagById(e);
     let s = !1;
-    o && (o.data && (s = !0), i ? o.data = c(o.data, t) : o.data = f(f({}, o.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags(), s && o.hooks.emit("dataChanged", o.data));
+    o && (o.data && (s = !0), i ? o.data = p(o.data, t) : o.data = m(m({}, o.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags(), s && o.hooks.emit("dataChanged", o.data));
   }
   /**
    * @description: 改变tag的stickType
@@ -365,7 +368,7 @@ class Pi extends V {
   changeTagById(e, t, i = !0) {
     const o = this.getTagById(e);
     let s = !1;
-    t && (t.data && (s = !0), i ? c(o, t) : Object.assign(o, t), o != null && o.tag3DContentSvelte && (t != null && t.normal) && (o.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag(), s && o.hooks.emit("dataChanged", o.data));
+    t && (t.data && (s = !0), i ? p(o, t) : Object.assign(o, t), o != null && o.tag3DContentSvelte && (t != null && t.normal) && (o.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag(), s && o.hooks.emit("dataChanged", o.data));
   }
   /**
    * @description: 销毁tag
@@ -380,7 +383,7 @@ class Pi extends V {
    * @description: 设置 visible 和 unfolded
    */
   setVisibleAndUnfolded() {
-    return p(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
+    return f(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
       if (this.isPanorama)
         return this.setVisible(), e ? new Promise((t) => {
           setTimeout(() => {
@@ -412,8 +415,8 @@ class Pi extends V {
    * @description: 添加 cameraUpdate, panoArrived 等事件监听
    */
   addEventListener() {
-    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), o = this.handleFiveModeChange.bind(this), s = this.handleFiveCameraUpdate.bind(this), n = this.handleFiveCameraUpdateDebounce(), r = this.handleFivePanoArrived.bind(this), h = this.loadVideoFirstFrame.bind(this), l = this.clickhandler.bind(this), m = this.five.currentMode;
-    return m && this.handleFiveModeChange(m), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", o), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", s), e.on("cameraUpdate", n), e.on("panoArrived", r), e.on("panoArrived", h), t.on("click", l), () => {
+    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), o = this.handleFiveModeChange.bind(this), s = this.handleFiveCameraUpdate.bind(this), n = this.handleFiveCameraUpdateDebounce(), r = this.handleFivePanoArrived.bind(this), h = this.loadVideoFirstFrame.bind(this), l = this.clickhandler.bind(this), c = this.five.currentMode;
+    return c && this.handleFiveModeChange(c), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", o), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", s), e.on("cameraUpdate", n), e.on("panoArrived", r), e.on("panoArrived", h), t.on("click", l), () => {
       e.off("wantsMoveToPano", i), e.off("modeChange", o), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", s), e.off("cameraUpdate", n), e.off("panoArrived", r), e.off("panoArrived", h), t.off("click", l), this.store.eventListenerDisposer = void 0;
     };
   }
@@ -453,11 +456,12 @@ class Pi extends V {
       y(t) && e !== "Panorama" && this.changeTagMode(t, "behind"), t.state.visible = this.getVisible(t);
     }), this.updateRenderAllTags();
   }
-  handleFiveWantsMoveToPano() {
-    this.tags.forEach((e) => {
-      const t = this.getTagConfig(e);
-      typeof t.visibleConfig == "object" && (t.visibleConfig.keep ? e.temporaryState = u(f({}, e.temporaryState), { visible: t.visibleConfig.keep === "visible" }) : e.temporaryState = u(f({}, e.temporaryState), { visible: !!t.visibleConfig.alwaysShowWhenMovePano }));
-    }), this.updateTagContainerVisible();
+  handleFiveWantsMoveToPano(e) {
+    this.tags.forEach((t) => {
+      t.state.visible = this.getVisible(t, { panoIndex: e });
+      const i = this.getTagConfig(t);
+      typeof i.visibleConfig == "object" && (i.visibleConfig.keep ? t.temporaryState.visible = i.visibleConfig.keep === "visible" : t.temporaryState.visible = !!i.visibleConfig.alwaysShowWhenMovePano);
+    }), this.updateTagContainerVisible(), this.updateRenderImagePlane(), this.updateRenderVideoPlane();
   }
   /**
    * @description: 走点/切换模型后显示
@@ -494,25 +498,25 @@ class Pi extends V {
     this.updateRenderPointTag();
   }
   handleFivePanoArrived() {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       var e, t, i;
       this.setModelMedialVisible(), yield this.setVisibleAndUnfolded(), this.tags.forEach((o) => {
-        o.temporaryState = u(f({}, o.temporaryState), { visible: !0 });
+        o.temporaryState = b(m({}, o.temporaryState), { visible: !0 });
       }), (i = (t = (e = this.config) == null ? void 0 : e.globalConfig) == null ? void 0 : t.modelConfig) != null && i.autoLookAtEnabled && this.tags.filter(O).filter((o) => {
         var s, n;
         return (n = (s = o.config) == null ? void 0 : s.modelConfig) == null ? void 0 : n.autoLookAtEnabled;
       }).forEach((o) => {
-        var v;
-        const s = new T.Mesh(new T.BoxGeometry(), new T.MeshBasicMaterial()), n = (v = o.model) == null ? void 0 : v.object;
+        var u;
+        const s = new T.Mesh(new T.BoxGeometry(), new T.MeshBasicMaterial()), n = (u = o.model) == null ? void 0 : u.object;
         if (!n)
           return;
         s.position.copy(n.position), s.quaternion.copy(n.quaternion);
         const r = this.five.camera.position;
         s.lookAt(r.clone().setY(s.position.y));
-        const h = n.quaternion.clone(), l = s.quaternion.clone(), m = x();
-        m.onUpdate(({ progress: P }) => {
-          n.quaternion.copy(h.clone().slerp(l, P));
-        }), m.play();
+        const h = n.quaternion.clone(), l = s.quaternion.clone(), c = x();
+        c.onUpdate(({ progress: M }) => {
+          n.quaternion.copy(h.clone().slerp(l, M));
+        }), c.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     });
   }
@@ -528,11 +532,11 @@ class Pi extends V {
   }
   changeTagMode(e, t) {
     var i, o, s, n, r, h;
-    ((i = this.getTagConfig(e)) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (s = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : s.css3DObject) == null ? void 0 : n.mode) !== t && ((r = e.config) != null && r.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (h = this.store.css3DRenderDisposer.get(e.id)) == null || h.forEach((l) => l == null ? void 0 : l()), e.tag3DContentSvelte = void 0);
+    ((i = e.config) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (s = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : s.css3DObject) == null ? void 0 : n.mode) !== t && ((r = e.config) != null && r.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (h = this.store.css3DRenderDisposer.get(e.id)) == null || h.forEach((l) => l == null ? void 0 : l()), e.tag3DContentSvelte = void 0);
   }
 }
 export {
-  Pi as PanoTagPluginController,
-  Pi as default,
-  Mi as pluginFlag
+  wi as PanoTagPluginController,
+  wi as default,
+  Fi as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,10 +1,11 @@
 import r from "./controller/index.js";
-import { pluginFlag as Rt } from "./controller/index.js";
-import { ContentType as Ut, DimensionType as Vt, PointType as Wt } from "./Archive/deprecated.js";
+import { pluginFlag as Ut } from "./controller/index.js";
+import { defaultGlobalConfig as Wt } from "./typings/tag/TagConfig.js";
+import { ContentType as Yt, DimensionType as Zt, PointType as _t } from "./Archive/deprecated.js";
 import "three";
 import "@realsee/five";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
-import "../CSS3DRenderPlugin/utils/positionToVector3.js";
+import "../shared-utils/positionToVector3.js";
 import "./utils/addDebugPoints.js";
 import "./utils/tag/tagCheck.js";
 import "./utils/actionAfterFiveModelLoad.js";
@@ -54,6 +55,8 @@ import "../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../shared-utils/five/FiveDomEvents.js";
 import "../shared-utils/threex/domevents/index.js";
 import "../shared-utils/five/getFloorIndex.js";
+import "../shared-utils/safeObj.js";
+import "../shared-utils/util.js";
 import "./Components/TagContainer.js";
 import "../vendor/svelte/src/runtime/internal/dom.js";
 import "../vendor/svelte/src/runtime/internal/transitions.js";
@@ -145,13 +148,14 @@ import "../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/animationFrame/index.js";
-const Nt = (o, t) => new r(o, t);
+const Qt = (o, t) => new r(o, t);
 export {
-  Ut as ContentType,
-  Vt as DimensionType,
-  Nt as PanoTagPlugin,
+  Yt as ContentType,
+  Zt as DimensionType,
+  Qt as PanoTagPlugin,
   r as PanoTagPluginController,
-  Wt as PointType,
-  Nt as default,
-  Rt as pluginFlag
+  _t as PointType,
+  Qt as default,
+  Wt as defaultGlobalConfig,
+  Ut as pluginFlag
 };

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

@@ -4,6 +4,7 @@ import type * as BasePlugin from '../../base/BasePlugin';
 import type { Writable } from 'svelte/store';
 import type { TagId } from './tag/Utils';
 import type { TagContentType } from './tag/TagData';
+import type { Vector3 } from 'three';
 export type TagHooks = InstanceType<typeof PanoTagPluginController>['hooks'];
 export interface State extends BasePlugin.State {
 }
@@ -69,12 +70,13 @@ export interface TagCacheInterface {
     unfolded?: boolean;
     minimumDistanceResult?: boolean;
     distance?: number;
+    distanceMap?: Map<Vector3, number>;
     angle?: number;
     /** MedialModelTag 中，多媒体的隐藏 & 展示 */
     modelMedialVisible?: boolean;
     __debug_visible_reason__?: {
         value: boolean;
-        reason?: string;
+        reason?: any;
     };
 }
 export type MediaStore = Writable<{

package/libs/PanoTagPlugin/typings/index.js

@@ -1,6 +1,8 @@
-import { ContentType as o, DimensionType as p, PointType as t } from "../Archive/deprecated.js";
+import { defaultGlobalConfig as n } from "./tag/TagConfig.js";
+import { ContentType as p, DimensionType as f, PointType as i } from "../Archive/deprecated.js";
 export {
-  o as ContentType,
-  p as DimensionType,
-  t as PointType
+  p as ContentType,
+  f as DimensionType,
+  i as PointType,
+  n as defaultGlobalConfig
 };

package/libs/PanoTagPlugin/typings/tag/Tag.d.ts

@@ -1,7 +1,7 @@
 import type { State as FiveState } from '@realsee/five';
 import type { TagConfig } from './TagConfig';
 import type { ContentTypeMap, TagContentType } from './TagData';
-import type { Position, TagId, StickType, TagStyle, ElementRenderer, PickTagContentTypeInContentTypeConfigKey, ContentTypeConfigKey } from './Utils';
+import type { Position, TagId, StickType, TagStyle, ElementRenderer, TagConfigByKey, ContentTypeConfigKey } from './Utils';
 import type { ContentType, DeprecatedTagProperty } from '../../Archive/deprecated';
 export interface Tags {
     version?: string;
@@ -10,7 +10,7 @@ export interface Tags {
     globalConfig?: TagConfig;
     /** 按type配置 */
     contentTypeConfig?: {
-        [key in ContentTypeConfigKey]?: PickTagContentTypeInContentTypeConfigKey<key> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<key>> : unknown;
+        [key in ContentTypeConfigKey]?: TagConfigByKey<key>;
     };
     /** 标签列表配置 */
     tagList: Tag[];

package/libs/PanoTagPlugin/typings/tag/TagConfig.d.ts

@@ -4,6 +4,7 @@ import type { ContentTypeMap, TagContentType } from './TagData';
 import type { MinMax } from './Utils';
 import type { TagInstance } from './TagInstance';
 import type { PartialObjectDeep } from '../../../typings/typings';
+import type { Vector3 } from 'three';
 type ConfigFunction = (five: Five, tagState: {
     tag: TagInstance<any>;
     /** 标签点或中心点的到摄像机的距离 */
@@ -62,6 +63,16 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
              * @default 0.01
              */
             distanceAccuracy?: number;
+            /**
+             * @description: 碰撞检测的点
+             * @default 'center'
+             */
+            checkPoints?: 'center' | 'corner' | Vector3[];
+            /**
+             * @description: 碰撞检测策略，多少点通过检测则认为碰撞通过
+             * @default 1
+             */
+            needPassed?: number;
         };
         /**
          * @description 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角，范围内自动展开，范围外自动收起
@@ -104,9 +115,15 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
             enable?: boolean;
             /** 自动展开：最近标签自动展开 */
             strategy?: 'MinimumDistance';
-            /** 展开的最大数量, 默认为1 */
+            /**
+             * @description: 展开的最大数量
+             * @default 1
+             */
             maxNumber?: number;
-            /** 展开的最大距离, 默认为无限制 */
+            /**
+             * @description: 展开的最大距离
+             * @default 无限制
+             */
             distance?: MinMax;
         };
     } | ConfigFunction;
@@ -117,17 +134,22 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
         /** 展开/收起 */
         unfolded?: boolean;
     };
-    initialData?: PartialObjectDeep<ContentTypeMap[C]>;
+    initialData?: C extends any ? {} : PartialObjectDeep<ContentTypeMap[C]>;
     tag3DConfig?: Create3DDomContainerParamsType['config'];
     modelConfig?: {
         autoLookAtEnabled?: boolean;
     };
-    /** 当图片为一张时可以通过Mesh渲染 */
+    /**
+     * @description: 当图片为一张时可以选择通过Mesh渲染
+     * @default 'Dom'
+     */
     renderType?: 'Mesh' | 'Dom';
     /**
      * @description: 是否可以点击
      * @default true
      */
     clickable?: boolean;
+    isMerged?: boolean;
 }
+export declare const defaultGlobalConfig: TagConfig<any>;
 export {};

package/libs/PanoTagPlugin/typings/tag/TagConfig.js

@@ -1 +1,13 @@
-
+const e = {
+  visibleConfig: {
+    intersectRaycaster: {
+      enabled: !0,
+      distanceAccuracy: 0.01,
+      checkPoints: "corner",
+      needPassed: 1
+    }
+  }
+};
+export {
+  e as defaultGlobalConfig
+};

package/libs/PanoTagPlugin/typings/tag/Utils.d.ts

@@ -3,6 +3,7 @@ import type { Group } from 'three';
 import type { TagContentType } from './TagData';
 import type { ImagePlane } from '../../utils/model/mediaPlane';
 import type { TagInstance } from './TagInstance';
+import type { TagConfig } from '../..';
 export type TagId = string | number;
 export type ArrayPosition = number[];
 export type Position = ArrayPosition;
@@ -65,6 +66,7 @@ export type ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any
  * @description: 从 ContentTypeConfigKey 中提取 ContentTypeConfigKey 对应的 TagContentType 是啥，没找到就是 never
  */
 export type PickTagContentTypeInContentTypeConfigKey<T extends ContentTypeConfigKey> = T extends `${any}-Audio-${any}` ? 'Audio' : T extends `Mixin-${string}` ? string : T extends `${any}-${infer C}` ? C : T extends TagContentType ? T : never;
+export type TagConfigByKey<T extends ContentTypeConfigKey> = PickTagContentTypeInContentTypeConfigKey<T> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<T>> : TagConfig<any>;
 export type ContentTypeConfigKeySplit = [StickType | 'Any', TagContentType | 'Any'] | ['Mixin', string] | [TagContentType] | [StickType | 'Any', 'Audio', AudioAppearance];
 export type PointTag<C extends TagContentType = TagContentType> = TagInstance<C, '2DPoint' | '3DPoint'>;
 /** 二维标签 */

package/libs/PanoTagPlugin/utils/addDebugPoints.js

@@ -1,4 +1,4 @@
-import { arrayPositionToVector3 as c } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { arrayPositionToVector3 as c } from "../../shared-utils/positionToVector3.js";
 import * as o from "three";
 function M(h, p) {
   p.forEach((t) => {

package/libs/PanoTagPlugin/utils/index.js

@@ -1,17 +1,17 @@
 import { even as a } from "../../CSS3DRenderPlugin/utils/even.js";
-import { random as p } from "../../CSS3DRenderPlugin/utils/random.js";
-import { anyPositionToVector3 as f, arrayPositionToVector3 as s, positionToVector3 as x } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { random as n } from "../../CSS3DRenderPlugin/utils/random.js";
+import { anyPositionToVector3 as f, arrayPositionToVector3 as s, positionToVector3 as x } from "../../shared-utils/positionToVector3.js";
 import { addDebugPoints as c } from "./addDebugPoints.js";
-import { noTypecheck as P } from "./noTypecheck.js";
-import { planeNormal as g } from "./planeNormal.js";
-import { getTagPosition as v, tagPosition as V } from "./tagPosition.js";
+import { noTypecheck as T } from "./noTypecheck.js";
+import { planeNormal as P } from "./planeNormal.js";
+import { getTagCenterPosition as v, getTagPosition as V } from "./tagPosition.js";
 import { checkRange as u } from "./checkRange.js";
 import { actionAfterFiveModelLoad as F, fiveModelLoaded as L, waitFiveModelLoaded as M } from "./actionAfterFiveModelLoad.js";
 import { normalPositionToPositions as S } from "./normalPositionToPositions.js";
 import { debounce as z } from "./debounce.js";
 import { throttle as B } from "./throttle.js";
-import { binarySearchFirstBig as N, searchFirstValueSmallThanLastValue as O } from "./search.js";
-import { resizeObserver as j } from "./resizeObserver.js";
+import { binarySearchFirstBig as D, searchFirstValueSmallThanLastValue as N } from "./search.js";
+import { resizeObserver as R } from "./resizeObserver.js";
 import "three";
 import "../../shared-utils/three/centerPoint.js";
 import "./tag/tagCheck.js";
@@ -20,20 +20,20 @@ export {
   c as addDebugPoints,
   f as anyPositionToVector3,
   s as arrayPositionToVector3,
-  N as binarySearchFirstBig,
+  D as binarySearchFirstBig,
   u as checkRange,
   z as debounce,
   a as even,
   L as fiveModelLoaded,
-  v as getTagPosition,
-  P as noTypecheck,
+  v as getTagCenterPosition,
+  V as getTagPosition,
+  T as noTypecheck,
   S as normalPositionToPositions,
-  g as planeNormal,
+  P as planeNormal,
   x as positionToVector3,
-  p as random,
-  j as resizeObserver,
-  O as searchFirstValueSmallThanLastValue,
-  V as tagPosition,
+  n as random,
+  R as resizeObserver,
+  N as searchFirstValueSmallThanLastValue,
   B as throttle,
   M as waitFiveModelLoaded
 };

package/libs/PanoTagPlugin/utils/planeNormal.js

@@ -1,4 +1,4 @@
-import { anyPositionToVector3 as e } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { anyPositionToVector3 as e } from "../../shared-utils/positionToVector3.js";
 import "three";
 function i(r) {
   if (!r || r.length < 3)

package/libs/PanoTagPlugin/utils/tagPosition.d.ts

@@ -1,5 +1,4 @@
 import { Vector3 } from 'three';
-import { type AnyPosition } from '.';
 import type { TagInstance } from '../typings';
-export declare function tagPosition(position: AnyPosition | [AnyPosition, AnyPosition, AnyPosition, AnyPosition]): Vector3;
-export declare function getTagPosition(tag: TagInstance): Vector3;
+export declare function getTagPosition(tag: TagInstance): Vector3 | Vector3[];
+export declare function getTagCenterPosition(tag: TagInstance): Vector3;

package/libs/PanoTagPlugin/utils/tagPosition.js

@@ -1,23 +1,22 @@
-import { Matrix4 as a, Vector3 as m } from "three";
-import { anyPositionToVector3 as i } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { centerPoint as n } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as s } from "./tag/tagCheck.js";
-function c(r) {
-  if (r)
-    if (Array.isArray(r) && r.length === 4) {
-      const o = r.map(i);
-      return n(o[0], o[2]);
+import { Matrix4 as n, Vector3 as e } from "three";
+import { centerPoint as a } from "../../shared-utils/three/centerPoint.js";
+import { isMediaModelTag as m } from "./tag/tagCheck.js";
+import { vector3Position as s } from "../../shared-utils/positionToVector3.js";
+function p(r) {
+  const o = (() => {
+    if (m(r) && r.matrix) {
+      const i = new n().fromArray(r.matrix);
+      return r.data.mediaPosition.map((t) => new e().fromArray(t).applyMatrix4(i));
     } else
-      return i(r);
+      return r.position;
+  })();
+  return s(o);
 }
-function y(r) {
-  if (s(r) && r.matrix) {
-    const t = new a().fromArray(r.matrix), o = r.data.mediaPosition.map((e) => new m().fromArray(e).applyMatrix4(t));
-    return n(o[0], o[2]);
-  } else
-    return c(r.position);
+function P(r) {
+  const o = p(r);
+  return a(...Array.isArray(o) ? o : [o]);
 }
 export {
-  y as getTagPosition,
-  c as tagPosition
+  P as getTagCenterPosition,
+  p as getTagPosition
 };

package/libs/PanoVideoPlugin/Controller.js

@@ -25,7 +25,7 @@ import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../CSS3DRenderPlugin/utils/even.js";
 import "../shared-utils/Subscribe.js";
-import "../CSS3DRenderPlugin/utils/positionToVector3.js";
+import "../shared-utils/positionToVector3.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../shared-utils/three/centerPoint.js";

package/libs/PanoVideoPlugin/VideoMeshController.js

@@ -16,7 +16,7 @@ import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../CSS3DRenderPlugin/utils/even.js";
 import "../shared-utils/Subscribe.js";
-import "../CSS3DRenderPlugin/utils/positionToVector3.js";
+import "../shared-utils/positionToVector3.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../shared-utils/three/centerPoint.js";