@realsee/dnalogel 2.26.2 → 2.27.0-dev.0

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,28 +1,28 @@
 var k = Object.defineProperty;
-var E = (b, u, t) => u in b ? k(b, u, { enumerable: !0, configurable: !0, writable: !0, value: t }) : b[u] = t;
-var P = (b, u, t) => (E(b, typeof u != "symbol" ? u + "" : u, t), t);
-var M = (b, u, t) => new Promise((e, o) => {
+var E = (b, f, t) => f in b ? k(b, f, { enumerable: !0, configurable: !0, writable: !0, value: t }) : b[f] = t;
+var P = (b, f, t) => (E(b, typeof f != "symbol" ? f + "" : f, t), t);
+var M = (b, f, t) => new Promise((e, o) => {
   var i = (r) => {
     try {
       a(t.next(r));
-    } catch (n) {
-      o(n);
+    } catch (s) {
+      o(s);
     }
-  }, s = (r) => {
+  }, n = (r) => {
     try {
       a(t.throw(r));
-    } catch (n) {
-      o(n);
+    } catch (s) {
+      o(s);
     }
-  }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, s);
-  a((t = t.apply(b, u)).next());
+  }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, n);
+  a((t = t.apply(b, f)).next());
 });
 import { TagComputer as w } from "./TagComputer.js";
-import { Group as y, Quaternion as O, Vector3 as g, Matrix4 as D } from "three";
+import { Group as y, Quaternion as O, Vector3 as D, Matrix4 as g } from "three";
 import A from "../Components/TagContainer.js";
-import x from "../Components/Tag/index.js";
-import { arrayPositionToVector3 as C } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { centerPoint as V } from "../../shared-utils/three/centerPoint.js";
+import V from "../Components/Tag/index.js";
+import { arrayPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
+import { centerPoint as x } from "../../shared-utils/three/centerPoint.js";
 import { isMediaModelTag as S, isStickModelTag as G } from "../utils/tag/tagCheck.js";
 import { CSS3DRenderPlugin as I } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as F } from "../../shared-utils/three/GLTFLoader.js";
@@ -46,6 +46,7 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/isNil.js";
 import "./TagUtil.js";
+import "../typings/tag/TagConfig.js";
 import "../../vendor/object-assign-deep/objectAssignDeep.js";
 import "../tag.config.js";
 import "../utils/planeNormal.js";
@@ -59,6 +60,8 @@ import "../../shared-utils/device.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 "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
 import "../../shared-utils/math/pointIsRectangle.js";
@@ -153,7 +156,7 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
 const L = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-class ui extends w {
+class bi extends w {
   constructor(t) {
     super(t);
     P(this, "group", new y());
@@ -173,30 +176,30 @@ class ui extends w {
       if (!e)
         return;
       const o = F(e).then((r) => {
-        var p, m, c, l, h;
-        const n = Object.assign(r.scene, {
+        var p, m, h, l, u;
+        const s = Object.assign(r.scene, {
           customID: t.id,
           isTagModel: !0,
-          removeEventListener: this.addObjectClickHandler(t, r.scene, (d) => {
-            this.hooks.emit("click", { target: "TagModel", tag: t, event: d });
+          removeEventListener: this.addObjectClickHandler(t, r.scene, (c) => {
+            this.hooks.emit("click", { target: "TagModel", tag: t, event: c });
           })
         });
-        return n.visible = this.getCurrentVisibleState(t), new D().fromArray(t.matrix).decompose(n.position, n.quaternion, n.scale), n.updateWorldMatrix(!0, !0), n.visible = this.getVisibleByFiveMode(t), (c = (m = (p = this.config) == null ? void 0 : p.globalConfig) == null ? void 0 : m.modelConfig) != null && c.autoLookAtEnabled && ((h = (l = t.config) == null ? void 0 : l.modelConfig) != null && h.autoLookAtEnabled) && n.lookAt(this.five.camera.position.clone().setY(n.position.y)), n;
+        return s.visible = this.getCurrentVisibleState(t), new g().fromArray(t.matrix).decompose(s.position, s.quaternion, s.scale), s.updateWorldMatrix(!0, !0), s.visible = this.getVisibleByFiveMode(t), (h = (m = (p = this.config) == null ? void 0 : p.globalConfig) == null ? void 0 : m.modelConfig) != null && h.autoLookAtEnabled && ((u = (l = t.config) == null ? void 0 : l.modelConfig) != null && u.autoLookAtEnabled) && s.lookAt(this.five.camera.position.clone().setY(s.position.y)), s;
       });
       t.model = { promise: o };
       const i = yield o;
       if (((a = t.model) == null ? void 0 : a.promise) !== o || !this.tags.includes(t))
         return;
       t.model.object = i;
-      const s = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
-      if (s && (this.gltfObjectGroup.remove(s), s.removeEventListener()), this.updateRender3DDomTag(), S(t)) {
+      const n = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
+      if (n && (this.gltfObjectGroup.remove(n), n.removeEventListener()), this.updateRender3DDomTag(), S(t)) {
         if (this.getRenderType(t) === "Mesh" && !t.mediaPlane) {
           const r = t.data.mediaPosition.map(C);
           t.mediaPlane = new j(t.data.mediaData[0].url, t.data.mediaPosition.map(C), {
             objectFit: t.data.objectFit
           });
-          const n = new g().addVectors(r[0], r[2]).divideScalar(2);
-          t.mediaPlane.position.copy(n), i.add(t.mediaPlane);
+          const s = new D().addVectors(r[0], r[2]).divideScalar(2);
+          t.mediaPlane.position.copy(s), i.add(t.mediaPlane);
         }
         this.getRenderType(t) !== "Mesh" && (i.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(t, i), i.updateTagCss3DObjectMatrix());
       }
@@ -232,7 +235,7 @@ class ui extends w {
       var o, i;
       return ((i = (o = e.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : i.type) === "Video";
     }).forEach((e) => {
-      var p, m, c, l, h;
+      var p, m, h, l, u;
       const o = e.data.mediaData[0];
       if (!o)
         return;
@@ -240,22 +243,22 @@ class ui extends w {
       if (!i)
         return;
       e.mediaPlane && !((m = (p = e.state) == null ? void 0 : p.visible) == null || m) && e.mediaPlane instanceof R && e.mediaPlane.pause();
-      const s = e.position.map(C), a = this.getCurrentVisibleState(e), r = (() => !!(e.mediaPlane && !a))(), n = (() => !!(!e.mediaPlane && a))(), f = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
-      if ((r || f) && (e.mediaPlane && this.imagePlaneGroup.remove(e.mediaPlane), (c = e.mediaPlane) == null || c.dispose(), (l = e.mediaPlane) == null || l.removeFromParent(), e.mediaPlane = void 0), n || f) {
-        const d = new R(i, s, {
+      const n = e.position.map(C), a = this.getCurrentVisibleState(e), r = (() => !!(e.mediaPlane && !a))(), s = (() => !!(!e.mediaPlane && a))(), d = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
+      if ((r || d) && (e.mediaPlane && this.imagePlaneGroup.remove(e.mediaPlane), (h = e.mediaPlane) == null || h.dispose(), (l = e.mediaPlane) == null || l.removeFromParent(), e.mediaPlane = void 0), s || d) {
+        const c = new R(i, n, {
           videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
-          paused: !((h = e.data.autoplayConfig) != null && h.autoplayVideo),
+          paused: !((u = e.data.autoplayConfig) != null && u.autoplayVideo),
           objectFit: e.data.objectFit,
           videoTextureMap: L,
           ImageTextureMap: B,
           domEvents: this.domEvents
         });
-        d.onVideoReady = (v) => {
-          v.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: d.videoInstance }));
+        c.onVideoReady = (T) => {
+          T.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: c.videoInstance }));
         };
-        const T = (v) => (this.five.on("renderFrame", v), () => this.five.off("renderFrame", v));
-        d.initialRenderHooks(T), e.mediaPlane = d, this.imagePlaneGroup.add(e.mediaPlane);
+        const v = (T) => (this.five.on("renderFrame", T), () => this.five.off("renderFrame", T));
+        c.initialRenderHooks(v), e.mediaPlane = c, this.imagePlaneGroup.add(e.mediaPlane);
       }
     });
   }
@@ -267,13 +270,13 @@ class ui extends w {
       var o, i;
       return ((i = (o = e.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : i.type) === "Image";
     }).forEach((e) => {
-      var s;
+      var d, p;
       const { url: o } = e.data.mediaData[0];
       if (!o)
         return;
-      const i = e.position.map(C);
-      ((s = e.mediaPlane) == null ? void 0 : s.src) !== o && (e.mediaPlane && e.mediaPlane.removeFromParent(), e.mediaPlane = new j(o, i, { objectFit: e.data.objectFit }), e.config.clickable !== !1 && this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (a) => {
-        this.hooks.emit("click", { tag: e, target: "TagContent", event: a.origDomEvent });
+      const i = e.position.map(C), n = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !n))(), r = (() => !!(!e.mediaPlane && n))(), s = (() => !!(e.mediaPlane && e.mediaPlane.src !== o))();
+      (a || s) && (e.mediaPlane && this.imagePlaneGroup.remove(e.mediaPlane), (d = e.mediaPlane) == null || d.dispose(), (p = e.mediaPlane) == null || p.removeFromParent(), e.mediaPlane = void 0), (r || s) && (e.mediaPlane = new j(o, i, { objectFit: e.data.objectFit }), e.config.clickable !== !1 && this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (m) => {
+        this.hooks.emit("click", { tag: e, target: "TagContent", event: m.origDomEvent });
       }), this.imagePlaneGroup.add(e.mediaPlane));
     });
   }
@@ -282,12 +285,12 @@ class ui extends w {
    */
   updateRender3DDomTag() {
     this.sort([...this.filterCSS3DTag]).forEach((e) => {
-      var o, i, s, a;
+      var o, i, n, a;
       if (e.tag3DContentSvelte) {
-        const { svelteApp: r, css3DInstance: n, initialNormal: f, currentNormal: p } = e.tag3DContentSvelte;
-        if (r.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !f.equals(p)) {
-          const m = new O().setFromUnitVectors(f, p);
-          n.css3DObject.setRotationFromQuaternion(m);
+        const { svelteApp: r, css3DInstance: s, initialNormal: d, currentNormal: p } = e.tag3DContentSvelte;
+        if (r.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !d.equals(p)) {
+          const m = new O().setFromUnitVectors(d, p);
+          s.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
@@ -298,20 +301,20 @@ class ui extends w {
         const r = this.getPositions(e);
         if (!r)
           return;
-        const n = this.getTagNormal(e);
-        if (!n)
+        const s = this.getTagNormal(e);
+        if (!s)
           return;
-        const p = (s = this.getTagConfig(e).tag3DConfig) != null ? s : {};
+        const p = (n = this.getTagConfig(e).tag3DConfig) != null ? n : {};
         if (this.getRenderType(e) === "BehindDom") {
           p.mode = "behind", p.container = document.createElement("div");
           const l = "black";
           p.container.style.backgroundColor = l, p.container.style.border = `3px solid ${l}`, this.css3DRenderPlugin.hooks.on("render", () => {
-            var h;
+            var u;
             if (m.css3DObject.opacityMesh) {
-              const d = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (T) => {
-                this.hooks.emit("click", { event: T, target: "TagContent", tag: e });
+              const c = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (v) => {
+                this.hooks.emit("click", { event: v, target: "TagContent", tag: e });
               });
-              (h = this.store.css3DRenderDisposer.get(e.id)) == null || h.push(d);
+              (u = this.store.css3DRenderDisposer.get(e.id)) == null || u.push(c);
             }
           });
         }
@@ -319,7 +322,7 @@ class ui extends w {
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
-        const c = new x({
+        const h = new V({
           target: m.container,
           props: {
             tag: e,
@@ -331,13 +334,13 @@ class ui extends w {
           }
         });
         e.tag3DContentSvelte = {
-          svelteApp: c,
+          svelteApp: h,
           domContainer: m,
           css3DInstance: m,
-          initialNormal: n,
-          currentNormal: n,
+          initialNormal: s,
+          currentNormal: s,
           dispose: () => {
-            c.$destroy(), m.dispose();
+            h.$destroy(), m.dispose();
           }
         }, S(e) && ((a = e.model) != null && a.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
       }
@@ -353,8 +356,8 @@ class ui extends w {
   updateRenderModelTag() {
     const t = (i) => !this.enabledModelTagSet.has(i.customID), e = this.gltfObjectGroup.children.filter(t);
     e.forEach((i) => i.removeEventListener()), this.gltfObjectGroup.remove(...e), this.tags.filter((i) => i.stickType === "Model").forEach((i) => {
-      var s;
-      (s = i.model) == null || s.promise.then((a) => {
+      var n;
+      (n = i.model) == null || n.promise.then((a) => {
         a.visible = this.getCurrentVisibleState(i);
       });
     }), this.five.needsRender = !0;
@@ -370,18 +373,18 @@ class ui extends w {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, e) {
-    var h, d, T;
-    const o = (d = (h = t.config.tag3DConfig) == null ? void 0 : h.ratio) != null ? d : 216e-5, i = (T = t.tag3DContentSvelte) == null ? void 0 : T.css3DInstance.css3DObject;
+    var u, c, v;
+    const o = (c = (u = t.config.tag3DConfig) == null ? void 0 : u.ratio) != null ? c : 216e-5, i = (v = t.tag3DContentSvelte) == null ? void 0 : v.css3DInstance.css3DObject;
     if (!i)
       return;
-    const s = S(t) ? t.data.mediaPosition : t.position;
-    if (!s || s.length !== 4 || !Array.isArray(s[0]) || !Array.isArray(s[2]))
+    const n = S(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 g().fromArray(s[0]), n = new g().fromArray(s[2]), f = V(r, n).add(new g(0, 0, 5e-4)), p = new D().setPosition(f), m = new D().makeScale(o, o, o), c = new D().multiply(a).multiply(p).multiply(m);
-    c.decompose(i.position, i.quaternion, i.scale);
+    const a = e.matrixWorld, r = new D().fromArray(n[0]), s = new D().fromArray(n[2]), d = x(r, s).add(new D(0, 0, 5e-4)), p = new g().setPosition(d), m = new g().makeScale(o, o, o), h = new g().multiply(a).multiply(p).multiply(m);
+    h.decompose(i.position, i.quaternion, i.scale);
     const l = i.opacityMesh;
-    l && c.decompose(l.position, l.quaternion, l.scale);
+    l && h.decompose(l.position, l.quaternion, l.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {
@@ -422,8 +425,8 @@ class ui extends w {
       temporaryState: this.temporaryState,
       withAnimation: this.store.visibleWithAnimation
     }), this.filterCSS3DTag.forEach((e) => {
-      var o, i, s, a, r;
-      (a = (i = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : i.css3DObject) == null || a.setVisible((this.state.visible && ((s = e.state) == null ? void 0 : s.visible)) !== !1), (r = e.tag3DContentSvelte) == null || r.svelteApp.$set({
+      var o, i, n, a, r;
+      (a = (i = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : i.css3DObject) == null || a.setVisible((this.state.visible && ((n = e.state) == null ? void 0 : n.visible)) !== !1), (r = e.tag3DContentSvelte) == null || r.svelteApp.$set({
         state: this.state,
         temporaryState: this.temporaryState,
         withAnimation: this.store.visibleWithAnimation
@@ -450,5 +453,5 @@ class ui extends w {
   }
 }
 export {
-  ui as TagRender
+  bi as TagRender
 };

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

@@ -30,9 +30,14 @@ export declare abstract class TagUtil extends TagCache {
     pauseCurrentMedia(): void;
     /**
      * @description: 获取merge后的配置
-     * TODO: 缓存
      */
-    getTagConfig(tag: Tag): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
+    getTagConfig(tag: Tag, params?: {
+        useCache: boolean;
+    }): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
+    /**
+     * @description 获取标签当前状态
+     */
+    getCurrentVisibleState(tag: TagInstance): boolean;
     protected loadVideoFirstFrame(): void;
     protected updateTagConfig(params?: {
         force?: boolean;