@realsee/dnalogel 3.3.4 → 3.3.5

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,40 +1,40 @@
-var V = Object.defineProperty;
+var A = Object.defineProperty;
 var R = Object.getOwnPropertySymbols;
-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) => {
+var V = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
+var C = (c, l, t) => l in c ? A(c, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[l] = t, j = (c, l) => {
   for (var t in l || (l = {}))
-    E.call(l, t) && C(c, t, l[t]);
+    V.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]);
+      E.call(l, t) && C(c, t, l[t]);
   return c;
 };
 var f = (c, l, t) => (C(c, typeof l != "symbol" ? l + "" : l, t), t);
 var S = (c, l, t) => new Promise((e, o) => {
-  var i = (r) => {
+  var i = (s) => {
     try {
-      a(t.next(r));
+      a(t.next(s));
     } catch (n) {
       o(n);
     }
-  }, s = (r) => {
+  }, r = (s) => {
     try {
-      a(t.throw(r));
+      a(t.throw(s));
     } catch (n) {
       o(n);
     }
-  }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, s);
+  }, a = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(i, r);
   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 I from "../Components/TagContainer.js";
+import { TagComputer as I } from "./TagComputer.js";
+import { Group as y, Quaternion as O, Vector3 as T, Matrix4 as v } from "three";
+import x 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 D, isStickModelTag as W } from "../utils/tag/tagCheck.js";
+import { loadGLTF as _ } from "../../shared-utils/three/GLTFLoader.js";
+import { isMediaModelTag as D, isStickModelTag as L } 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 { centerPoint as W } from "../../shared-utils/three/centerPoint.js";
 import { arrayPositionToVector3 as g } from "../../shared-utils/positionToVector3.js";
 import "../utils/tagPosition.js";
 import "../utils/checkRange.js";
@@ -158,8 +158,8 @@ import "../Components/Tag/CustomTag.js";
 import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
-const q = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-class ui extends x {
+const $ = /* @__PURE__ */ new Map(), q = /* @__PURE__ */ new Map();
+class ui extends I {
   constructor(t) {
     super(t);
     f(this, "group", new y());
@@ -179,13 +179,13 @@ class ui extends x {
       if (!e)
         return;
       t.loading = !0;
-      const o = L(e).then((r) => {
+      const o = _(e).then((s) => {
         var m;
-        const n = Object.assign(r.scene, {
+        const n = Object.assign(s.scene, {
           customID: t.id,
           isTagModel: !0,
           removeEventListener: this.getTagConfig(t).clickable === !1 ? () => {
-          } : this.addObjectClickHandler(t, r.scene, (h) => {
+          } : this.addObjectClickHandler(t, s.scene, (h) => {
             this.hooks.emit("click", { target: "TagModel", tag: t, event: h });
           })
         });
@@ -196,14 +196,14 @@ class ui extends x {
       if (t.loading = !1, ((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(), D(t)) {
+      const r = this.gltfObjectGroup.children.find((s) => s.customID === t.id);
+      if (r && (this.gltfObjectGroup.remove(r), r.removeEventListener()), this.updateRender3DDomTag(), D(t)) {
         if (this.getRenderType(t) === "Mesh" && !t.mediaPlane) {
-          const r = t.data.mediaPosition.map(g);
+          const s = 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(s[0], s[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,22 +248,22 @@ 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(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, {
+      const r = e.position.map(g), a = this.getCurrentVisibleState(e), s = (() => !!(e.mediaPlane && !a))(), n = (() => !!(!e.mediaPlane && a))(), d = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
+      if ((s || d) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), n || d) {
+        const p = new w(i, r, {
           videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
           paused: !((P = e.data.autoplayConfig) != null && P.autoplayVideo),
           objectFit: e.data.objectFit,
-          videoTextureMap: q,
-          ImageTextureMap: B,
+          videoTextureMap: $,
+          ImageTextureMap: q,
           domEvents: this.domEvents
         });
-        d.onVideoReady = (u) => {
-          u.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: d.videoInstance }));
+        p.onVideoReady = (u) => {
+          u.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: p.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));
+        p.initialRenderHooks(b), e.mediaPlane = p, this.imagePlaneGroup.add(e.mediaPlane);
       }
     });
   }
@@ -278,9 +278,9 @@ class ui extends x {
       const { url: o } = e.data.mediaData[0];
       if (!o)
         return;
-      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 });
+      const i = e.position.map(g), r = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !r))(), s = (() => !!(!e.mediaPlane && r))(), 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), (s || n) && (e.mediaPlane = new k(o, i, { objectFit: e.data.objectFit }), this.getTagConfig(e).clickable !== !1 && this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (d) => {
+        this.hooks.emit("click", { tag: e, target: "TagContent", event: d.origDomEvent });
       }), this.imagePlaneGroup.add(e.mediaPlane));
     });
   }
@@ -289,12 +289,12 @@ class ui extends x {
    */
   updateRender3DDomTag() {
     this.filterCSS3DTag.forEach((e) => {
-      var o, i, s;
+      var o, i, r;
       if (e.tag3DContentSvelte) {
-        const { svelteApp: a, css3DInstance: r, initialNormal: n, currentNormal: p } = e.tag3DContentSvelte;
-        if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !n.equals(p)) {
-          const m = new O().setFromUnitVectors(n, p);
-          r.css3DObject.setRotationFromQuaternion(m);
+        const { svelteApp: a, css3DInstance: s, initialNormal: n, currentNormal: d } = e.tag3DContentSvelte;
+        if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !n.equals(d)) {
+          const m = new O().setFromUnitVectors(n, d);
+          s.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
@@ -305,24 +305,24 @@ class ui extends x {
         const a = this.getPositions(e);
         if (!a)
           return;
-        const r = this.getTagNormal(e);
-        if (!r)
+        const s = this.getTagNormal(e);
+        if (!s)
           return;
-        const n = this.getTagConfig(e), p = j({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
-        if (this.getRenderType(e) === "BehindDom" || p.mode === "behind") {
-          p.mode = "behind", p.container = document.createElement("div");
+        const n = this.getTagConfig(e), d = j({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
+        if (this.getRenderType(e) === "BehindDom" || d.mode === "behind") {
+          d.mode = "behind", d.container = document.createElement("div");
           const P = "black";
-          p.container.style.backgroundColor = P, p.container.style.border = `3px solid ${P}`, this.css3DRenderPlugin.hooks.on("render", () => {
-            var d;
+          d.container.style.backgroundColor = P, d.container.style.border = `3px solid ${P}`, this.css3DRenderPlugin.hooks.on("render", () => {
+            var p;
             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);
+              (p = this.store.css3DRenderDisposer.get(e.id)) == null || p.push(b);
             }
           });
         }
-        const m = this.css3DRenderPlugin.create3DDomContainer(a, p);
+        const m = this.css3DRenderPlugin.create3DDomContainer(a, d);
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
@@ -341,12 +341,12 @@ class ui extends x {
           svelteApp: h,
           domContainer: m,
           css3DInstance: m,
-          initialNormal: r,
-          currentNormal: r,
+          initialNormal: s,
+          currentNormal: s,
           dispose: () => {
             h.$destroy(), m.dispose();
           }
-        }, D(e) && ((s = e.model) != null && s.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
+        }, D(e) && ((r = e.model) != null && r.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
       }
     }), this.clearUnusedPanelTag();
   }
@@ -360,8 +360,8 @@ class ui extends x {
   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 r;
+      (r = i.model) == null || r.promise.then((a) => {
         a.visible = this.getCurrentVisibleState(i);
       });
     }), this.five.needsRender = !0;
@@ -378,26 +378,45 @@ 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 = D(t) ? t.data.mediaPosition : t.position;
-    if (!s || s.length !== 4 || !Array.isArray(s[0]) || !Array.isArray(s[2]))
+    const r = D(t) ? t.data.mediaPosition : t.position;
+    if (!r || r.length !== 4 || !Array.isArray(r[0]) || !Array.isArray(r[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, s = new T().fromArray(r[0]), n = new T().fromArray(r[2]), d = W(s, n).add(new T(0, 0, 5e-4)), m = new v().setPosition(d), 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);
+    const p = i.opacityMesh;
+    p && P.decompose(p.position, p.quaternion, p.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {
     return S(this, null, function* () {
-      const e = t.filter(W).map((o) => this.loadModel(o));
+      const e = t.filter(L).map((o) => this.loadModel(o));
       yield Promise.all(e), this.setVisible(), this.updateRenderAllTags();
     });
   }
+  /**
+   * @description: 一个点的标签
+   */
+  setPointTagPosition() {
+    const t = this.filterPointTag;
+    t.length !== 0 && t.forEach((e) => {
+      var a;
+      const o = this.getCurrentVisibleState(e), i = (a = e.__Object__) != null ? a : {
+        timeoutId: void 0,
+        inAnimation: !0
+      };
+      if (e.__Object__ = i, !o && e.screenPosition ? (i.inAnimation = !0, i.timeoutId = setTimeout(() => {
+        this.getCurrentVisibleState(e) || (i.inAnimation = !1, e.screenPosition = null, this.updateDomView());
+      }, 1e3)) : i.timeoutId && (i.inAnimation = !1, clearTimeout(i.timeoutId)), !o && !i.inAnimation)
+        return;
+      const r = this.getTagProject(e);
+      r ? e.screenPosition = { leftPercent: (r.x + 1) / 2 * 100, topPercent: (-r.y + 1) / 2 * 100 } : e.screenPosition = null;
+    });
+  }
   /**
    * @description: 渲染单个点的标签
    */
@@ -415,8 +434,8 @@ class ui extends x {
       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, r, a, s;
+      (a = (i = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : i.css3DObject) == null || a.setVisible((this.state.visible && ((r = e.state) == null ? void 0 : r.visible)) !== !1), (s = e.tag3DContentSvelte) == null || s.svelteApp.$set({
         state: this.state,
         temporaryState: this.temporaryState,
         withAnimation: this.store.visibleWithAnimation
@@ -447,11 +466,11 @@ class ui extends x {
     if (this.TagContainerSvelte)
       this.TagContainerSvelte.$set({ tags: e, state: this.state, temporaryState: this.temporaryState });
     else {
-      const s = (o = this.five.getElement()) == null ? void 0 : o.parentElement;
-      if (!s)
+      const r = (o = this.five.getElement()) == null ? void 0 : o.parentElement;
+      if (!r)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new I({
-        target: s,
+      this.TagContainerSvelte = new x({
+        target: r,
         props: {
           hooks: this.hooks,
           tags: e,

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.3.4",
+    "%c %c@realsee/dnalogel %cv3.3.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/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.3.4",
+  "version": "3.3.5",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",