@realsee/dnalogel 2.19.0 → 2.20.0-alpha.0

package/libs/PanoTagPlugin/Components/TagItem.js

@@ -1,4 +1,4 @@
-import { SvelteComponent as Q, init as U, safe_not_equal as W, append_styles as X, element as C, space as Y, attr as d, null_to_empty as B, set_style as h, toggle_class as _, insert as P, append as E, transition_out as y, check_outros as F, transition_in as v, detach as N, getContext as Z, group_outros as G, noop as S, create_component as K, mount_component as M, destroy_component as O } from "../../vendor/svelte/internal/index.js";
+import { SvelteComponent as Q, init as U, safe_not_equal as W, append_styles as X, element as A, space as Y, attr as d, null_to_empty as B, set_style as h, toggle_class as _, insert as C, append as E, transition_out as v, check_outros as F, transition_in as y, detach as N, getContext as Z, group_outros as G, noop as S, create_component as K, mount_component as M, destroy_component as O } from "../../vendor/svelte/internal/index.js";
 import x from "./Tag/index.js";
 import "three";
 import { noTypecheck as H } from "../utils/noTypecheck.js";
@@ -97,10 +97,10 @@ function et(i) {
   let e;
   return {
     c() {
-      e = C("div"), d(e, "data-info", "tag content is disable");
+      e = A("div"), d(e, "data-info", "tag content is disable");
     },
     m(t, o) {
-      P(t, e, o);
+      C(t, e, o);
     },
     p: S,
     i: S,
@@ -163,10 +163,10 @@ function it(i) {
       o[4]), e.$set(m);
     },
     i(o) {
-      t || (v(e.$$.fragment, o), t = !0);
+      t || (y(e.$$.fragment, o), t = !0);
     },
     o(o) {
-      y(e.$$.fragment, o), t = !1;
+      v(e.$$.fragment, o), t = !1;
     },
     d(o) {
       O(e, o);
@@ -177,10 +177,10 @@ function ot(i) {
   let e;
   return {
     c() {
-      e = C("div"), d(e, "data-info", "tag point is disable");
+      e = A("div"), d(e, "data-info", "tag point is disable");
     },
     m(t, o) {
-      P(t, e, o);
+      C(t, e, o);
     },
     p: S,
     i: S,
@@ -209,10 +209,10 @@ function rt(i) {
       o[1]), e.$set(m);
     },
     i(o) {
-      t || (v(e.$$.fragment, o), t = !0);
+      t || (y(e.$$.fragment, o), t = !0);
     },
     o(o) {
-      y(e.$$.fragment, o), t = !1;
+      v(e.$$.fragment, o), t = !1;
     },
     d(o) {
       O(e, o);
@@ -221,24 +221,24 @@ function rt(i) {
 }
 function nt(i) {
   let e, t, o, a, m, s, f, g, w, l;
-  const T = [it, et], u = [];
+  const z = [it, et], u = [];
   function p(n, r) {
     return (
       /*haveContent*/
       n[12] ? 0 : 1
     );
   }
-  o = p(i), a = u[o] = T[o](i);
-  const z = [rt, ot], c = [];
-  function A(n, r) {
+  o = p(i), a = u[o] = z[o](i);
+  const P = [rt, ot], c = [];
+  function T(n, r) {
     return (
       /*havePoint*/
       n[13] ? 0 : 1
     );
   }
-  return s = A(i), f = c[s] = z[s](i), {
+  return s = T(i), f = c[s] = P[s](i), {
     c() {
-      e = C("div"), t = C("div"), a.c(), m = Y(), f.c(), d(t, "class", g = B(J(
+      e = A("div"), t = A("div"), a.c(), m = Y(), f.c(), d(t, "class", g = B(J(
         "wrapper",
         /*tag*/
         i[1].className ? `${/*tag*/
@@ -297,17 +297,17 @@ function nt(i) {
       );
     },
     m(n, r) {
-      P(n, e, r), E(e, t), u[o].m(t, null), E(t, m), c[s].m(t, null), l = !0;
+      C(n, e, r), E(e, t), u[o].m(t, null), E(t, m), c[s].m(t, null), l = !0;
     },
     p(n, [r]) {
       let b = o;
-      o = p(n), o === b ? u[o].p(n, r) : (G(), y(u[b], 1, 1, () => {
+      o = p(n), o === b ? u[o].p(n, r) : (G(), v(u[b], 1, 1, () => {
         u[b] = null;
-      }), F(), a = u[o], a ? a.p(n, r) : (a = u[o] = T[o](n), a.c()), v(a, 1), a.m(t, m));
+      }), F(), a = u[o], a ? a.p(n, r) : (a = u[o] = z[o](n), a.c()), y(a, 1), a.m(t, m));
       let k = s;
-      s = A(n), s === k ? c[s].p(n, r) : (G(), y(c[k], 1, 1, () => {
+      s = T(n), s === k ? c[s].p(n, r) : (G(), v(c[k], 1, 1, () => {
         c[k] = null;
-      }), F(), f = c[s], f ? f.p(n, r) : (f = c[s] = z[s](n), f.c()), v(f, 1), f.m(t, null)), (!l || r & /*tag*/
+      }), F(), f = c[s], f ? f.p(n, r) : (f = c[s] = P[s](n), f.c()), y(f, 1), f.m(t, null)), (!l || r & /*tag*/
       2 && g !== (g = B(J(
         "wrapper",
         /*tag*/
@@ -378,10 +378,10 @@ function nt(i) {
       );
     },
     i(n) {
-      l || (v(a), v(f), l = !0);
+      l || (y(a), y(f), l = !0);
     },
     o(n) {
-      y(a), y(f), l = !1;
+      v(a), v(f), l = !1;
     },
     d(n) {
       n && N(e), u[o].d(), c[s].d();
@@ -389,10 +389,10 @@ function nt(i) {
   };
 }
 function at(i, e, t) {
-  let o, a, m, s, f, g, w, l, T, { withAnimation: u = !1 } = e, { tag: p } = e, { mediaStore: z } = e, { state: c } = e, { temporaryState: A } = e;
+  let o, a, m, s, f, g, w, l, z, { withAnimation: u = !1 } = e, { tag: p } = e, { mediaStore: P } = e, { state: c } = e, { temporaryState: T } = e;
   const n = Z("hooks");
   return i.$$set = (r) => {
-    "withAnimation" in r && t(0, u = r.withAnimation), "tag" in r && t(1, p = r.tag), "mediaStore" in r && t(2, z = r.mediaStore), "state" in r && t(3, c = r.state), "temporaryState" in r && t(4, A = r.temporaryState);
+    "withAnimation" in r && t(0, u = r.withAnimation), "tag" in r && t(1, p = r.tag), "mediaStore" in r && t(2, P = r.mediaStore), "state" in r && t(3, c = r.state), "temporaryState" in r && t(4, T = r.temporaryState);
   }, i.$$.update = () => {
     var r, b, k, L, I, q, D, R;
     i.$$.dirty & /*tag*/
@@ -402,19 +402,19 @@ function at(i, e, t) {
     })()), i.$$.dirty & /*tag*/
     2 && t(12, a = (() => p.stickType === "2DPoint")()), i.$$.dirty & /*tag*/
     2 && t(11, m = p.id), i.$$.dirty & /*tag*/
-    2 && t(10, s = !((r = p.pointTagStyle) != null && r.leftPercent) || !((b = p.pointTagStyle) != null && b.topPercent) || p.enabled === !1 || !p.state), i.$$.dirty & /*tag*/
+    2 && t(10, s = !((r = p.screenPosition) != null && r.leftPercent) || !((b = p.screenPosition) != null && b.topPercent) || p.enabled === !1 || !p.state), i.$$.dirty & /*tag*/
     2 && t(9, f = !((k = p.state) != null && k.visible) || ((L = p.temporaryState) == null ? void 0 : L.visible) === !1), i.$$.dirty & /*tag*/
     2 && t(8, g = (I = p.state) == null ? void 0 : I.unfolded), i.$$.dirty & /*tag*/
-    2 && t(7, w = ((q = p.pointTagStyle) == null ? void 0 : q.leftPercent) + "%"), i.$$.dirty & /*tag*/
-    2 && t(6, l = ((D = p.pointTagStyle) == null ? void 0 : D.topPercent) + "%"), i.$$.dirty & /*tag*/
-    2 && t(5, T = (R = p.state) != null && R.unfolded ? 1 : 0);
+    2 && t(7, w = ((q = p.screenPosition) == null ? void 0 : q.leftPercent) + "%"), i.$$.dirty & /*tag*/
+    2 && t(6, l = ((D = p.screenPosition) == null ? void 0 : D.topPercent) + "%"), i.$$.dirty & /*tag*/
+    2 && t(5, z = (R = p.state) != null && R.unfolded ? 1 : 0);
   }, [
     u,
     p,
-    z,
+    P,
     c,
-    A,
     T,
+    z,
     l,
     w,
     g,

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

@@ -1,6 +1,6 @@
 import type { Five, Mode } from '@realsee/five';
 import * as THREE from 'three';
-import type { Tag, TagElement } from '../typings';
+import type { TagInstance } from '../typings';
 import type { Raycaster } from 'three';
 import { TagUtil } from './TagUtil';
 export declare abstract class TagComputer extends TagUtil {
@@ -9,25 +9,25 @@ export declare abstract class TagComputer extends TagUtil {
     /**
      * @description: 获取是否可见
      */
-    getVisibleByPanoIndex(tag: Tag<any, any>, panoIndex?: number): boolean;
-    getVisibleByFiveMode(tag: TagElement<any, any>, mode?: Mode): boolean;
+    getVisibleByPanoIndex(tag: TagInstance, panoIndex?: number): boolean;
+    getVisibleByFiveMode(tag: TagInstance, mode?: Mode): boolean;
     /**
      * @description 获取标签当前状态
      * @return (this.state.visible && tag.state.visible) ?? true
      */
-    getCurrentVisibleState(tag: TagElement<any, any>): boolean;
-    getVisible(tag: TagElement<any, any>): boolean;
+    getCurrentVisibleState(tag: TagInstance): boolean;
+    getVisible(tag: TagInstance): boolean;
     /** 获取当前点位上模型中的多媒体是否应该展示 */
-    getModelMedialVisibleByPanoIndex(tag: TagElement<any, any>): boolean;
+    getModelMedialVisibleByPanoIndex(tag: TagInstance): boolean;
     /**
      * @description: 获取是否展开
      */
-    getUnfoldedByPanoIndex(tag: TagElement<any>, panoIndex?: number): boolean;
+    getUnfoldedByPanoIndex(tag: TagInstance, panoIndex?: number): boolean;
     /**
      * @description: 获取是否展开
      */
-    getUnfoldedByCamera(tag: TagElement<any, any>): boolean;
-    protected sort<T extends Tag<any, any>>(tags: T[]): T[];
+    getUnfoldedByCamera(tag: TagInstance): boolean;
+    protected sort<T extends TagInstance>(tags: T[]): T[];
     /**
      * @description: 一个点的标签
      */
@@ -39,18 +39,18 @@ export declare abstract class TagComputer extends TagUtil {
     /**
      * @description: 一个点的标签
      */
-    protected getTagProject(tag: TagElement<any, any>): {
+    protected getTagProject(tag: TagInstance): {
         x: number;
         y: number;
         z: number;
     };
     /** 通过射线检测标签可用性 */
-    protected getTagEnableByIntersect(tag: Tag<any, any>, raycaster: Raycaster): {
+    protected getTagEnableByIntersect(tag: TagInstance, raycaster: Raycaster): {
         value: boolean;
         reason: string;
     };
     /** 获取点位看向标签的射线 */
-    protected getRaycasterFromPanoIndex(tag: Tag, panoIndex: number): THREE.Raycaster;
+    protected getRaycasterFromPanoIndex(tag: TagInstance, panoIndex: number): THREE.Raycaster;
     /** 检测是否匹配当前楼层 */
     private getVisibleByFloorIndex;
 }

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -2,26 +2,26 @@ var M = Object.defineProperty, U = Object.defineProperties;
 var R = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
 var B = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
-var g = (c, l, e) => l in c ? M(c, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[l] = e, x = (c, l) => {
+var g = (d, l, e) => l in d ? M(d, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[l] = e, x = (d, l) => {
   for (var e in l || (l = {}))
-    B.call(l, e) && g(c, e, l[e]);
+    B.call(l, e) && g(d, e, l[e]);
   if (P)
     for (var e of P(l))
-      C.call(l, e) && g(c, e, l[e]);
-  return c;
-}, I = (c, l) => U(c, R(l));
-var T = (c, l, e) => (g(c, typeof l != "symbol" ? l + "" : l, e), e);
+      C.call(l, e) && g(d, e, l[e]);
+  return d;
+}, I = (d, l) => U(d, R(l));
+var V = (d, l, e) => (g(d, typeof l != "symbol" ? l + "" : l, e), e);
 import * as D from "three";
 import { is3DTag as j, isMediaModelTag as y } from "../utils/tag/tagCheck.js";
-import { tagPosition as V, getTagPosition as k } from "../utils/tagPosition.js";
+import { tagPosition as T, getTagPosition as k } from "../utils/tagPosition.js";
 import { checkRange as h } from "../utils/checkRange.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 { notNil as S } from "../../shared-utils/isNil.js";
-import { TagUtil as $ } from "./TagUtil.js";
+import { notNil as $ } from "../../shared-utils/isNil.js";
+import { TagUtil as S } from "./TagUtil.js";
 import { getFloorIndex as E } from "../../shared-utils/five/getFloorIndex.js";
 import "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -55,10 +55,10 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/threex/domevents/index.js";
-class Ue extends $ {
+class Ue extends S {
   constructor(e) {
     super(e);
-    T(this, "raycaster", new D.Raycaster());
+    V(this, "raycaster", new D.Raycaster());
   }
   /**
    * @description: 获取是否可见
@@ -71,8 +71,8 @@ class Ue extends $ {
       return s.visible;
     {
       const i = (() => {
-        var d, u, v;
-        const o = (d = this.getTagConfig(e).visibleConfig) != null ? d : {}, f = this.getDistance(e);
+        var c, u, v;
+        const o = (c = this.getTagConfig(e).visibleConfig) != null ? c : {}, f = this.getDistance(e);
         if (typeof o == "function")
           return { value: o(this.five, { tag: e, distance: f }), reason: "config function result" };
         if (o.keep === "hidden")
@@ -172,14 +172,14 @@ class Ue extends $ {
       if (!i)
         return;
       const o = (() => {
-        const d = this.getDistance(e);
+        const c = this.getDistance(e);
         if (typeof i == "function")
-          return i(this.five, { tag: e, distance: d });
+          return i(this.five, { tag: e, distance: c });
         if (i.keep === "folded")
           return !1;
         if (i.keep === "unfolded")
           return !0;
-        if (i.unfoldDistance && h(d, i.unfoldDistance) === !1)
+        if (i.unfoldDistance && h(c, i.unfoldDistance) === !1)
           return !1;
       })();
       n.unfolded = o;
@@ -243,15 +243,15 @@ class Ue extends $ {
     e.length !== 0 && e.forEach((t) => {
       var n;
       if (!((n = t.state) != null && n.visible)) {
-        t.pointTagStyle = null;
+        t.screenPosition = null;
         return;
       }
       const s = this.getTagProject(t);
       if (!s) {
-        t.pointTagStyle = null;
+        t.screenPosition = null;
         return;
       }
-      t.pointTagStyle = { leftPercent: (s.x + 1) / 2 * 100, topPercent: (-s.y + 1) / 2 * 100 };
+      t.screenPosition = { leftPercent: (s.x + 1) / 2 * 100, topPercent: (-s.y + 1) / 2 * 100 };
     });
   }
   setVisible() {
@@ -295,7 +295,7 @@ class Ue extends $ {
   getTagProject(e) {
     if (!this.getVisible(e))
       return;
-    const s = V(e.position);
+    const s = T(e.position);
     if (!s)
       return;
     const { x: n, y: i, z: o } = s.project(this.five.camera);
@@ -311,16 +311,16 @@ class Ue extends $ {
       const a = this.tags.filter(y).map((b) => {
         var m;
         return (m = b.model) == null ? void 0 : m.object;
-      }).filter(S);
+      }).filter($);
       return t.intersectObjects(a, !0)[0];
     })(), f = (() => {
       var a;
       return typeof s == "object" && typeof s.intersectRaycaster == "object" && (a = s.intersectRaycaster.distanceAccuracy) != null ? a : 0.01;
-    })(), d = Math.min((v = i == null ? void 0 : i.distance) != null ? v : 1 / 0, (r = o == null ? void 0 : o.distance) != null ? r : 1 / 0);
-    return d + f < n ? {
+    })(), c = Math.min((v = i == null ? void 0 : i.distance) != null ? v : 1 / 0, (r = o == null ? void 0 : o.distance) != null ? r : 1 / 0);
+    return c + f < n ? {
       value: !1,
       reason: `intersectRaycaster check failed: distance is ${n}, intersection.distance is ${i == null ? void 0 : i.distance}, intersection.point is ${i == null ? void 0 : i.point.toArray()},
-        customModelIntersection.point is ${o == null ? void 0 : o.point.toArray()}, minIntersectionDistance is ${d}`
+        customModelIntersection.point is ${o == null ? void 0 : o.point.toArray()}, minIntersectionDistance is ${c}`
     } : { value: !0, reason: "" };
   }
   /** 获取点位看向标签的射线 */
@@ -329,7 +329,7 @@ class Ue extends $ {
     const s = (o = this.five.work.observers[t]) == null ? void 0 : o.position;
     if (s === void 0)
       throw new Error(`getVisible(): observerPosition is ${s}`);
-    const n = V(e.position);
+    const n = T(e.position);
     if (!n)
       return;
     const i = n.sub(s).normalize();
@@ -337,10 +337,10 @@ class Ue extends $ {
   }
   /** 检测是否匹配当前楼层 */
   getVisibleByFloorIndex(e) {
-    var i, o, f, d, u, v, r;
+    var i, o, f, c, u, v, r;
     let t = 0;
     const s = (i = e.fiveState) == null ? void 0 : i.panoIndex;
-    s !== void 0 ? t = (o = this.five.work.observers[s]) == null ? void 0 : o.floorIndex : t = E(this.five.work.observers, (r = (v = (d = (f = e.model) == null ? void 0 : f.object) == null ? void 0 : d.position) != null ? v : (u = e.mediaPlane) == null ? void 0 : u.position) != null ? r : k(e));
+    s !== void 0 ? t = (o = this.five.work.observers[s]) == null ? void 0 : o.floorIndex : t = E(this.five.work.observers, (r = (v = (c = (f = e.model) == null ? void 0 : f.object) == null ? void 0 : c.position) != null ? v : (u = e.mediaPlane) == null ? void 0 : u.position) != null ? r : k(e));
     const n = this.five.model.shownFloor;
     return n === null || n === t;
   }

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

@@ -1,9 +1,9 @@
 import { TagComputer } from './TagComputer';
-import type { Tag, TagElement, TagGLTFObject, TagObjectGroup, TagGLTFObjectGroup, ImagePlaneGroup } from '../typings';
+import type { Tag, TagInstance, TagGLTFObject, TagObjectGroup, TagGLTFObjectGroup, ImagePlaneGroup, TagContentType } from '../typings';
 import type { TemporaryState } from '../typings';
-import { Object3D } from 'three';
+import { type Object3D } from 'three';
 import TagContainerSvelte from '../Components/TagContainer.svelte';
-import { Five } from '@realsee/five';
+import type { Five } from '@realsee/five';
 export declare abstract class TagRender extends TagComputer {
     protected group: TagObjectGroup;
     protected imagePlaneGroup: ImagePlaneGroup;
@@ -41,7 +41,7 @@ export declare abstract class TagRender extends TagComputer {
      * @param tag 标签
      * @param model 模型
      */
-    protected updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagElement<any, S>, model: Object3D): void;
+    protected updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagInstance<TagContentType, S>, model: Object3D): void;
     /** 添加模型标签 */
     protected addMediaModelTag(tags: Tag[]): Promise<void>;
     /**
@@ -55,5 +55,5 @@ export declare abstract class TagRender extends TagComputer {
      */
     protected clearUnusedPanelTag(): void;
     /** 加载外部模型 */
-    protected loadModel: (tag: TagElement<'Model', 'Model'> | TagElement<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
+    protected loadModel: (tag: TagInstance<'Model', 'Model'> | TagInstance<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
 }

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -19,8 +19,8 @@ var C = (f, h, t) => new Promise((e, o) => {
 });
 import { TagComputer as w } from "./TagComputer.js";
 import { Group as S, Quaternion as O, Vector3 as v, Matrix4 as D } from "three";
-import x from "../Components/TagContainer.js";
-import A from "../Components/Tag/index.js";
+import A from "../Components/TagContainer.js";
+import x from "../Components/Tag/index.js";
 import { arrayPositionToVector3 as y } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { centerPoint as G } from "../../shared-utils/three/centerPoint.js";
 import { isMediaModelTag as P, isStickModelTag as I } from "../utils/tag/tagCheck.js";
@@ -164,7 +164,7 @@ class ti extends w {
           customID: t.id,
           isTagModel: !0,
           removeEventListener: this.addObjectClickHandler(t, r.scene, (g) => {
-            console.log("🐶 ==> tag:", t), this.hooks.emit("click", { target: "TagModel", tag: t, event: g });
+            this.hooks.emit("click", { target: "TagModel", tag: t, event: g });
           })
         });
         return s.visible = this.getCurrentVisibleState(t), new D().fromArray(t.matrix).decompose(s.position, s.quaternion, s.scale), s.updateWorldMatrix(!0, !0), s.visible = this.getVisibleByFiveMode(t), (l = (m = (p = this.config) == null ? void 0 : p.globalConfig) == null ? void 0 : m.modelConfig) != null && l.autoLookAtEnabled && ((d = (c = t.config) == null ? void 0 : c.modelConfig) != null && d.autoLookAtEnabled) && s.lookAt(this.five.camera.position.clone().setY(s.position.y)), s;
@@ -279,7 +279,7 @@ class ti extends w {
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
-        const l = new A({
+        const l = new x({
           target: m.container,
           props: {
             tag: e,
@@ -335,6 +335,8 @@ class ti extends w {
     if (!i)
       return;
     const n = P(t) ? t.data.mediaPosition : t.position;
+    if (!n || n.length !== 4 || !Array.isArray(n[0]) || !Array.isArray(n[2]))
+      return;
     e.updateWorldMatrix(!1, !1);
     const a = e.matrixWorld, r = new v().fromArray(n[0]), s = new v().fromArray(n[2]), u = G(r, s).add(new v(0, 0, 5e-4)), p = new D().setPosition(u), m = new D().makeScale(o, o, o), l = new D().multiply(a).multiply(p).multiply(m);
     l.decompose(i.position, i.quaternion, i.scale);
@@ -360,7 +362,7 @@ class ti extends w {
       const o = (e = this.five.getElement()) == null ? void 0 : e.parentElement;
       if (!o)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new x({
+      this.TagContainerSvelte = new A({
         target: o,
         props: { hooks: this.hooks, tags: t, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });

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

@@ -1,21 +1,21 @@
-import type { TagElement, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
+import type { TagInstance, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
 import * as THREE from 'three';
-import type { Tag, Tags, Point2DElement, Point3DElement, PlaneTagElement, PointTagElement, Point3DTag, ModelElement } from '../typings';
+import type { Tag, Tags, PointTagInstance, Point3DTag } from '../typings';
 import { TagCache } from './TagCache';
 import type { CSS3DRenderPluginExportType } from '../../CSS3DRenderPlugin';
 import type { Five } from '@realsee/five';
 import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
-    tags: TagElement[];
+    tags: TagInstance[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
     protected css3DRenderPlugin?: CSS3DRenderPluginExportType;
     protected store: {
         /** 清理函数数组 */
-        disposers: (() => any)[];
+        disposers: (() => void)[];
         visibleWithAnimation?: boolean;
-        css3DRenderDisposer: Map<TagId, (() => any)[]>;
+        css3DRenderDisposer: Map<TagId, (() => void)[]>;
         eventListenerDisposer?: () => void;
         resizeObserverDisposer?: () => void;
         resizeObserverDisposerAdding: boolean;
@@ -25,20 +25,20 @@ export declare abstract class TagUtil extends TagCache {
     protected domEvents: FiveDomEvents;
     private mouseInfo?;
     protected constructor(five: Five);
-    getTagById<C extends TagContentType = any, S extends StickType = any>(id: TagId): TagElement<C, S> | undefined;
+    getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */
     pauseCurrentMedia(): void;
     /**
      * @description: 获取merge后的配置
      * TODO: 缓存
      */
-    getTagConfig(tag: Tag<any, any>): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", StickType>;
+    getTagConfig(tag: Tag): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
     protected loadVideoFirstFrame(): void;
     protected updateTagConfig(params?: {
         force?: boolean;
     }): void;
-    protected can<T extends TagElement<any, any>>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
-    protected getRenderType(tag: TagElement<any, any>): 'Dom' | 'Mesh' | 'BehindDom';
+    protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
+    protected getRenderType(tag: TagInstance): 'Dom' | 'Mesh' | 'BehindDom';
     /**
      * @description: 获取角度
      */
@@ -46,18 +46,18 @@ export declare abstract class TagUtil extends TagCache {
     /**
      * @description: 获取距离
      */
-    protected getDistance(tag: Tag<any, any>, panoIndex?: number): number;
-    protected getPositions(tag: TagElement<any, any>): any;
+    protected getDistance(tag: TagInstance, panoIndex?: number): number;
+    protected getPositions(tag: TagInstance): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
     protected preventWhenMouseDown: () => false | void;
-    protected addObjectClickHandler(tag: TagElement<any, any>, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
-    protected getTagNormal(tag: TagElement<any, 'Plane'> | TagElement<any, 'Model'> | TagElement<any, '3DPoint'>): THREE.Vector3;
-    protected get filterPointTag(): PointTagElement[];
-    protected get filter2DPointTag(): Point2DElement[];
-    protected get filter3DPointTag(): Point3DElement[];
-    protected get filterImagePlane(): PlaneTagElement<"MediaPlane">[];
-    protected get filterMediaModel(): ModelElement<"MediaModel">[];
-    protected get filterModelTag(): ModelElement[];
-    protected get filterCSS3DTag(): (TagElement<any, "Plane"> | TagElement<any, "Model"> | TagElement<any, "3DPoint">)[];
+    protected addObjectClickHandler(tag: TagInstance, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
+    protected getTagNormal(tag: TagInstance): THREE.Vector3 | undefined;
+    protected get filterPointTag(): PointTagInstance[];
+    protected get filter2DPointTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "2DPoint">[];
+    protected get filter3DPointTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">[];
+    protected get filterImagePlane(): TagInstance<"MediaPlane", "Plane">[];
+    protected get filterMediaModel(): TagInstance<"MediaModel", "Model">[];
+    protected get filterModelTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model">[];
+    protected get filterCSS3DTag(): (TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
     /**
      * @description 检查是否已经销毁
      * @returns isDisposed; 已经销毁返回 true，否则返回 false

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -2,8 +2,8 @@ var y = Object.defineProperty;
 var D = (c, u, e) => u in c ? y(c, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[u] = e;
 var l = (c, u, e) => (D(c, typeof u != "symbol" ? u + "" : u, e), e);
 import { objectAssignDeepExports as T } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as C from "three";
-import { DefaultConfig as P } from "../tag.config.js";
+import * as P from "three";
+import { DefaultConfig as C } from "../tag.config.js";
 import { anyPositionToVector3 as w, arrayPositionToVector3 as h } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { planeNormal as p } from "../utils/planeNormal.js";
 import { tagPosition as E, getTagPosition as M } from "../utils/tagPosition.js";
@@ -11,9 +11,9 @@ import { normalPositionToPositions as k } from "../utils/normalPositionToPositio
 import { TagCache as b } from "./TagCache.js";
 import { writable as I } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as A } from "../../shared-utils/device.js";
-import { isMediaPlaneTag as S, isMediaModelTag as g, isPlaneTag as V } from "../utils/tag/tagCheck.js";
-import { VideoPlane as F } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as L } from "../../shared-utils/five/FiveDomEvents.js";
+import { isMediaPlaneTag as S, isMediaModelTag as g, isPlaneTag as V, isPoint3DTag as F } from "../utils/tag/tagCheck.js";
+import { VideoPlane as L } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as R } from "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
@@ -41,11 +41,11 @@ import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/threex/domevents/index.js";
-class De extends b {
+class Pe extends b {
   constructor(e) {
     super(e);
     l(this, "tags", []);
-    l(this, "config", P);
+    l(this, "config", C);
     l(this, "mediaStore", I({
       currentMediaElement: null
     }));
@@ -57,7 +57,7 @@ class De extends b {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "domEvents", new L(this.five));
+    l(this, "domEvents", new R(this.five));
     l(this, "mouseInfo");
     l(this, "preventWhenMouseDown", () => {
       var e;
@@ -67,7 +67,7 @@ class De extends b {
     this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: i }) => {
       this.tags.forEach((t) => {
         var o;
-        if (t.mediaPlane instanceof F && i !== t.mediaPlane.videoInstance) {
+        if (t.mediaPlane instanceof L && i !== t.mediaPlane.videoInstance) {
           if (!((o = t.mediaPlane.videoInstance) != null && o.src) || i === t.mediaPlane.videoInstance)
             return;
           t.mediaPlane.pause();
@@ -134,7 +134,6 @@ class De extends b {
       i.mergedConfig = t, i.data = T({}, i.data, t.initialData);
     });
   }
-  // eslint-disable-next-line complexity
   can(e, i) {
     const t = i, o = this.getTagConfig(t);
     if (!o || typeof o != "object")
@@ -192,7 +191,7 @@ class De extends b {
       const s = E(e.position);
       if (!s)
         return;
-      const n = new C.Vector3().copy(r).sub(s), m = f.angleTo(n) * 180 / Math.PI;
+      const n = new P.Vector3().copy(r).sub(s), m = f.angleTo(n) * 180 / Math.PI;
       return o.angle = m, o.angle;
     }
   }
@@ -223,12 +222,8 @@ class De extends b {
       return e.position;
     if (g(e))
       return e.data.mediaPosition;
-    const i = e;
-    return k(
-      this.five.camera.position,
-      h(i.position),
-      h(i.normal)
-    );
+    if (F(e))
+      return k(this.five.camera.position, h(e.position), h(e.normal));
   }
   addObjectClickHandler(e, i, t) {
     if (!i || !this.domEvents)
@@ -307,7 +302,9 @@ class De extends b {
     return this.tags.filter((e) => e.stickType === "Model");
   }
   get filterCSS3DTag() {
-    return this.tags.filter((i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel").filter((i) => {
+    return this.tags.filter(
+      (i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel"
+    ).filter((i) => {
       const t = this.getRenderType(i);
       return t === "BehindDom" || t === "Dom";
     });
@@ -321,5 +318,5 @@ class De extends b {
   }
 }
 export {
-  De as TagUtil
+  Pe as TagUtil
 };