@realsee/dnalogel 3.3.0-dev.3 → 3.3.0-dev.5

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,9 +1,9 @@
-var E = Object.defineProperty;
+var V = Object.defineProperty;
 var R = Object.getOwnPropertySymbols;
-var V = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
-var C = (c, l, t) => l in c ? E(c, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[l] = t, j = (c, l) => {
+var E = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
+var C = (c, l, t) => l in c ? V(c, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[l] = t, j = (c, l) => {
   for (var t in l || (l = {}))
-    V.call(l, t) && C(c, t, l[t]);
+    E.call(l, t) && C(c, t, l[t]);
   if (R)
     for (var t of R(l))
       A.call(l, t) && C(c, t, l[t]);
@@ -27,15 +27,15 @@ var S = (c, l, t) => new Promise((e, o) => {
   a((t = t.apply(c, l)).next());
 });
 import { TagComputer as x } from "./TagComputer.js";
-import { Group as y, Quaternion as O, Vector3 as b, Matrix4 as v } from "three";
+import { Group as y, Quaternion as O, Vector3 as T, Matrix4 as v } from "three";
 import I from "../Components/TagContainer.js";
 import G from "../Components/Tag/index.js";
 import { CSS3DRenderPlugin as F } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as L } from "../../shared-utils/three/GLTFLoader.js";
-import { isMediaModelTag as g, isStickModelTag as W } from "../utils/tag/tagCheck.js";
+import { isMediaModelTag as D, isStickModelTag as W } from "../utils/tag/tagCheck.js";
 import { VideoPlane as w, ImagePlane as k } from "../utils/model/mediaPlane.js";
 import { centerPoint as $ } from "../../shared-utils/three/centerPoint.js";
-import { arrayPositionToVector3 as D } from "../../shared-utils/positionToVector3.js";
+import { arrayPositionToVector3 as g } from "../../shared-utils/positionToVector3.js";
 import "../utils/tagPosition.js";
 import "../utils/checkRange.js";
 import "../../shared-utils/five/mode.js";
@@ -197,13 +197,13 @@ class ui extends x {
         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(), g(t)) {
+      if (s && (this.gltfObjectGroup.remove(s), s.removeEventListener()), this.updateRender3DDomTag(), D(t)) {
         if (this.getRenderType(t) === "Mesh" && !t.mediaPlane) {
-          const r = t.data.mediaPosition.map(D);
-          t.mediaPlane = new k(t.data.mediaData[0].url, t.data.mediaPosition.map(D), {
+          const r = t.data.mediaPosition.map(g);
+          t.mediaPlane = new k(t.data.mediaData[0].url, t.data.mediaPosition.map(g), {
             objectFit: t.data.objectFit
           });
-          const n = new b().addVectors(r[0], r[2]).divideScalar(2);
+          const n = new T().addVectors(r[0], r[2]).divideScalar(2);
           t.mediaPlane.position.copy(n), i.add(t.mediaPlane);
         }
         this.getRenderType(t) !== "Mesh" && (i.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(t, i), i.updateTagCss3DObjectMatrix());
@@ -248,7 +248,7 @@ class ui extends x {
       if (!i)
         return;
       e.mediaPlane && !((h = (m = e.state) == null ? void 0 : m.visible) == null || h) && e.mediaPlane instanceof w && e.mediaPlane.pause();
-      const s = e.position.map(D), a = this.getCurrentVisibleState(e), r = (() => !!(e.mediaPlane && !a))(), n = (() => !!(!e.mediaPlane && a))(), p = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
+      const s = e.position.map(g), a = this.getCurrentVisibleState(e), r = (() => !!(e.mediaPlane && !a))(), n = (() => !!(!e.mediaPlane && a))(), p = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
       if ((r || p) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), n || p) {
         const d = new w(i, s, {
           videoCoverSrc: o.videoCoverUrl,
@@ -262,8 +262,8 @@ class ui extends x {
         d.onVideoReady = (u) => {
           u.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: d.videoInstance }));
         };
-        const T = (u) => (this.five.on("renderFrame", u), () => this.five.off("renderFrame", u));
-        d.initialRenderHooks(T), e.mediaPlane = d, this.imagePlaneGroup.add(e.mediaPlane);
+        const b = (u) => (this.five.on("renderFrame", u), () => this.five.off("renderFrame", u));
+        d.initialRenderHooks(b), e.mediaPlane = d, this.imagePlaneGroup.add(e.mediaPlane);
       }
     });
   }
@@ -278,7 +278,7 @@ class ui extends x {
       const { url: o } = e.data.mediaData[0];
       if (!o)
         return;
-      const i = e.position.map(D), s = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !s))(), r = (() => !!(!e.mediaPlane && s))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== o))();
+      const i = e.position.map(g), s = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !s))(), r = (() => !!(!e.mediaPlane && s))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== o))();
       (a || n) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), (r || n) && (e.mediaPlane = new k(o, i, { objectFit: e.data.objectFit }), this.getTagConfig(e).clickable !== !1 && this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (p) => {
         this.hooks.emit("click", { tag: e, target: "TagContent", event: p.origDomEvent });
       }), this.imagePlaneGroup.add(e.mediaPlane));
@@ -298,7 +298,7 @@ class ui extends x {
         }
         return;
       } else {
-        if (g(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled)
+        if (D(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled || !e.model.object.visible)
           return;
         if (this.css3DRenderPlugin || (this.css3DRenderPlugin = F(this.five)), e.stickType === "3DPoint" && !e.normal)
           return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
@@ -315,10 +315,10 @@ class ui extends x {
           p.container.style.backgroundColor = P, p.container.style.border = `3px solid ${P}`, this.css3DRenderPlugin.hooks.on("render", () => {
             var d;
             if (m.css3DObject.opacityMesh && n.clickable !== !1) {
-              const T = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (u) => {
+              const b = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (u) => {
                 this.hooks.emit("click", { event: u, target: "TagContent", tag: e });
               });
-              (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.push(T);
+              (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.push(b);
             }
           });
         }
@@ -346,7 +346,7 @@ class ui extends x {
           dispose: () => {
             h.$destroy(), m.dispose();
           }
-        }, g(e) && ((s = e.model) != null && s.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
+        }, D(e) && ((s = e.model) != null && s.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
       }
     }), this.clearUnusedPanelTag();
   }
@@ -368,8 +368,9 @@ class ui extends x {
   }
   updateTagModelVisible() {
     this.tags.forEach((t) => {
-      var e;
-      t.mediaPlane && (t.mediaPlane.visible = this.getCurrentVisibleState(t)), (e = t.model) != null && e.object && (t.model.object.visible = this.getCurrentVisibleState(t));
+      var o;
+      const e = this.getCurrentVisibleState(t);
+      e === !0 && this.getRenderType(t) && !t.tag3DContentSvelte && this.updateRender3DDomTag(), t.mediaPlane ? t.mediaPlane.visible = e : t.tag3DContentSvelte && (t.tag3DContentSvelte.css3DInstance.setVisible(e), this.updateDomView()), (o = t.model) != null && o.object && (t.model.object.visible = e);
     });
   }
   /** 更新标签中多媒体面片的位置
@@ -377,15 +378,15 @@ class ui extends x {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, e) {
-    var T, u, M;
-    const o = (u = (T = this.getTagConfig(t).tag3DConfig) == null ? void 0 : T.ratio) != null ? u : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
+    var b, u, M;
+    const o = (u = (b = this.getTagConfig(t).tag3DConfig) == null ? void 0 : b.ratio) != null ? u : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
     if (!i)
       return;
-    const s = g(t) ? t.data.mediaPosition : t.position;
+    const s = D(t) ? t.data.mediaPosition : t.position;
     if (!s || s.length !== 4 || !Array.isArray(s[0]) || !Array.isArray(s[2]))
       return;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, r = new b().fromArray(s[0]), n = new b().fromArray(s[2]), p = $(r, n).add(new b(0, 0, 5e-4)), m = new v().setPosition(p), h = new v().makeScale(o, o, o), P = new v().multiply(a).multiply(m).multiply(h);
+    const a = e.matrixWorld, r = new T().fromArray(s[0]), n = new T().fromArray(s[2]), p = $(r, n).add(new T(0, 0, 5e-4)), m = new v().setPosition(p), h = new v().makeScale(o, o, o), P = new v().multiply(a).multiply(m).multiply(h);
     P.decompose(i.position, i.quaternion, i.scale);
     const d = i.opacityMesh;
     d && P.decompose(d.position, d.quaternion, d.scale);

package/libs/PanoTagPlugin/controller/index.js

@@ -268,7 +268,7 @@ class Ei extends z {
       this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "onFiveEveryReady", () => {
-      this.setUnfoldedByCamera(), $(this.five.getCurrentState().mode) && (this.setTagZIndex(this.filterPointTag), this.setVisible(), this.setPointTagPosition()), this.updateDomView({ withAnimation: !0 }), this.updateRenderVideoPlane(), this.updateRenderImagePlane(), this.updateRenderModelTag();
+      this.setUnfoldedByCamera(), $(this.five.getCurrentState().mode) && (this.setTagZIndex(this.filterPointTag), this.setVisible(), this.setPointTagPosition()), this.updateDomView({ withAnimation: !0 }), this.updateRenderVideoPlane(), this.updateRenderImagePlane(), this.updateTagModelVisible();
     });
     this.params = p({}, { debug: !1, config: this.config }, c({}, t)), this.debug = this.params.debug, this.config = this.params.config, G(1, { namespace: N.PlayAudio });
     try {

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.3.0-dev.3");
+    i(this, "VERSION", "3.3.0-dev.5");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.3.0-dev.3",
+    "%c %c@realsee/dnalogel %cv3.3.0-dev.5",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/libs/shared-utils/three/getIntersect.d.ts

@@ -1,6 +1,5 @@
-import * as THREE from 'three';
-import type { Five } from '@realsee/five';
+import type { Five, Intersection } from '@realsee/five';
 export declare function getIntersectFromRelativePosition(five: Five, position: {
     x: number;
     y: number;
-}): THREE.Intersection;
+}): Intersection;

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.3.0-dev.3",
+  "version": "3.3.0-dev.5",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.0.0-alpha.24",
+    "@realsee/five": "6.0.0-alpha.34",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^20.0.3",