@realsee/dnalogel 2.19.0-2 → 2.19.0

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,32 +1,32 @@
 var k = Object.defineProperty;
 var E = (f, h, t) => h in f ? k(f, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[h] = t;
-var g = (f, h, t) => (E(f, typeof h != "symbol" ? h + "" : h, t), t);
-var D = (f, h, t) => new Promise((e, o) => {
+var b = (f, h, t) => (E(f, typeof h != "symbol" ? h + "" : h, t), t);
+var C = (f, h, t) => new Promise((e, o) => {
   var i = (r) => {
     try {
-      n(t.next(r));
+      a(t.next(r));
     } catch (s) {
       o(s);
     }
-  }, a = (r) => {
+  }, n = (r) => {
     try {
-      n(t.throw(r));
+      a(t.throw(r));
     } catch (s) {
       o(s);
     }
-  }, n = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, a);
-  n((t = t.apply(f, h)).next());
+  }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, n);
+  a((t = t.apply(f, h)).next());
 });
 import { TagComputer as w } from "./TagComputer.js";
-import { Group as P, Quaternion as O, Vector3 as v, Matrix4 as T } from "three";
+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 { arrayPositionToVector3 as C } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { arrayPositionToVector3 as y } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { centerPoint as G } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as S, isStickModelTag as I } from "../utils/tag/tagCheck.js";
+import { isMediaModelTag as P, isStickModelTag as I } from "../utils/tag/tagCheck.js";
 import { CSS3DRenderPlugin as V } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as F } from "../../shared-utils/three/GLTFLoader.js";
-import { VideoPlane as R, ImagePlane as j } from "../utils/model/mediaPlane.js";
+import { VideoPlane as j, ImagePlane as R } from "../utils/model/mediaPlane.js";
 import "../utils/tagPosition.js";
 import "../utils/checkRange.js";
 import "hammerjs";
@@ -143,42 +143,42 @@ const L = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
 class ti extends w {
   constructor(t) {
     super(t);
-    g(this, "group", new P());
-    g(this, "imagePlaneGroup", new P());
-    g(this, "gltfObjectGroup", new P());
+    b(this, "group", new S());
+    b(this, "imagePlaneGroup", new S());
+    b(this, "gltfObjectGroup", new S());
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
-    g(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
+    b(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
     /** 临时状态 */
-    g(this, "temporaryState", { visible: !0 });
+    b(this, "temporaryState", { visible: !0 });
     /** 点标签 */
-    g(this, "TagContainerSvelte");
+    b(this, "TagContainerSvelte");
     /** 加载外部模型 */
-    g(this, "loadModel", (t) => D(this, null, function* () {
-      var n;
+    b(this, "loadModel", (t) => C(this, null, function* () {
+      var a;
       const e = t.data.modelUrl;
       if (!e)
         return;
       const o = F(e).then((r) => {
-        var m, u, p, d, c;
+        var p, m, l, c, d;
         const s = Object.assign(r.scene, {
           customID: t.id,
           isTagModel: !0,
-          removeEventListener: this.addObjectClickHandler(t, r.scene, (b) => {
-            this.hooks.emit("click", { target: "TagModel", tag: t, event: b });
+          removeEventListener: this.addObjectClickHandler(t, r.scene, (g) => {
+            console.log("🐶 ==> tag:", t), this.hooks.emit("click", { target: "TagModel", tag: t, event: g });
           })
         });
-        return s.visible = this.getCurrentVisibleState(t), new T().fromArray(t.matrix).decompose(s.position, s.quaternion, s.scale), s.updateWorldMatrix(!0, !0), s.visible = this.getVisibleByFiveMode(t), (p = (u = (m = this.config) == null ? void 0 : m.globalConfig) == null ? void 0 : u.modelConfig) != null && p.autoLookAtEnabled && ((c = (d = t.config) == null ? void 0 : d.modelConfig) != null && c.autoLookAtEnabled) && s.lookAt(this.five.camera.position.clone().setY(s.position.y)), s;
+        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;
       });
       t.model = { promise: o };
       const i = yield o;
-      if (((n = t.model) == null ? void 0 : n.promise) !== o || !this.tags.includes(t))
+      if (((a = t.model) == null ? void 0 : a.promise) !== o || !this.tags.includes(t))
         return;
       t.model.object = i;
-      const a = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
-      if (a && (this.gltfObjectGroup.remove(a), a.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(), P(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), {
+          const r = t.data.mediaPosition.map(y);
+          t.mediaPlane = new R(t.data.mediaData[0].url, t.data.mediaPosition.map(y), {
             objectFit: t.data.objectFit
           });
           const s = new v().addVectors(r[0], r[2]).divideScalar(2);
@@ -207,32 +207,32 @@ class ti extends w {
    */
   updateRenderImagePlane() {
     this.sort(this.filterImagePlane).forEach((e) => {
-      var r, s, l, m, u;
+      var r, s, u, p, m;
       const o = e.data.mediaData[0];
       if (!o)
         return;
-      const { url: i, type: a } = o;
-      if (!i || (e.mediaPlane && (e.mediaPlane.visible = (s = (r = e.state) == null ? void 0 : r.visible) != null ? s : !0, e.mediaPlane.visible || e.mediaPlane instanceof R && ((l = e.data.autoplayConfig) != null && l.autoplayVideo || e.mediaPlane.pause())), ((m = e.mediaPlane) == null ? void 0 : m.src) === i))
+      const { url: i, type: n } = o;
+      if (!i || (e.mediaPlane && (e.mediaPlane.visible = (s = (r = e.state) == null ? void 0 : r.visible) != null ? s : !0, e.mediaPlane.visible || e.mediaPlane instanceof j && ((u = e.data.autoplayConfig) != null && u.autoplayVideo || e.mediaPlane.pause())), ((p = e.mediaPlane) == null ? void 0 : p.src) === i))
         return;
-      const n = e.position.map(C);
-      if (e.mediaPlane && e.mediaPlane.removeFromParent(), a === "Image")
-        e.mediaPlane = new j(i, n, { objectFit: e.data.objectFit }), this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (p) => {
-          this.hooks.emit("click", { tag: e, target: "TagContent", event: p.origDomEvent });
+      const a = e.position.map(y);
+      if (e.mediaPlane && e.mediaPlane.removeFromParent(), n === "Image")
+        e.mediaPlane = new R(i, a, { objectFit: e.data.objectFit }), this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (l) => {
+          this.hooks.emit("click", { tag: e, target: "TagContent", event: l.origDomEvent });
         });
-      else if (a === "Video") {
-        const p = new R(i, n, {
+      else if (n === "Video") {
+        const l = new j(i, a, {
           videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
-          paused: !((u = e.data.autoplayConfig) != null && u.autoplayVideo),
+          paused: !((m = e.data.autoplayConfig) != null && m.autoplayVideo),
           objectFit: e.data.objectFit,
           videoTextureMap: L,
           ImageTextureMap: B
         });
-        p.onVideoReady = (c) => {
-          c.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: p.videoInstance }));
-        }, p.initialDomEvents(this.domEvents);
-        const d = (c) => (this.five.on("renderFrame", c), () => this.five.off("renderFrame", c));
-        p.initialRenderHooks(d), e.mediaPlane = p;
+        l.onVideoReady = (d) => {
+          d.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: l.videoInstance }));
+        }, l.initialDomEvents(this.domEvents);
+        const c = (d) => (this.five.on("renderFrame", d), () => this.five.off("renderFrame", d));
+        l.initialRenderHooks(c), e.mediaPlane = l;
       }
       this.imagePlaneGroup.add(e.mediaPlane);
     });
@@ -242,44 +242,44 @@ class ti extends w {
    */
   updateRender3DDomTag() {
     this.sort([...this.filterCSS3DTag]).forEach((e) => {
-      var o, i, a;
+      var o, i, n, a;
       if (e.tag3DContentSvelte) {
-        const { svelteApp: n, css3DInstance: r, initialNormal: s, currentNormal: l } = e.tag3DContentSvelte;
-        if (n.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !s.equals(l)) {
-          const m = new O().setFromUnitVectors(s, l);
-          r.css3DObject.setRotationFromQuaternion(m);
+        const { svelteApp: r, css3DInstance: s, initialNormal: u, currentNormal: p } = e.tag3DContentSvelte;
+        if (r.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !u.equals(p)) {
+          const m = new O().setFromUnitVectors(u, p);
+          s.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
-        if (S(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled)
+        if (P(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled)
           return;
         if (this.css3DRenderPlugin || (this.css3DRenderPlugin = V(this.five)), e.stickType === "3DPoint" && !e.normal)
           return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
-        const n = this.getPositions(e);
-        if (!n)
-          return;
-        const r = this.getTagNormal(e);
+        const r = this.getPositions(e);
         if (!r)
           return;
-        const l = (a = this.getTagConfig(e).tag3DConfig) != null ? a : {};
+        const s = this.getTagNormal(e);
+        if (!s)
+          return;
+        const p = (n = this.getTagConfig(e).tag3DConfig) != null ? n : {};
         if (this.getRenderType(e) === "BehindDom") {
-          l.mode = "behind", l.container = document.createElement("div");
-          const p = "black";
-          l.container.style.backgroundColor = p, l.container.style.border = `3px solid ${p}`, this.css3DRenderPlugin.hooks.on("render", () => {
+          p.mode = "behind", p.container = document.createElement("div");
+          const c = "black";
+          p.container.style.backgroundColor = c, p.container.style.border = `3px solid ${c}`, this.css3DRenderPlugin.hooks.on("render", () => {
             var d;
             if (m.css3DObject.opacityMesh) {
-              const c = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (b) => {
-                this.hooks.emit("click", { event: b, target: "TagContent", tag: e });
+              const g = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (T) => {
+                this.hooks.emit("click", { event: T, target: "TagContent", tag: e });
               });
-              (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.push(c);
+              (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.push(g);
             }
           });
         }
-        const m = this.css3DRenderPlugin.create3DDomContainer(n, l);
+        const m = this.css3DRenderPlugin.create3DDomContainer(r, p);
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
-        const u = new A({
+        const l = new A({
           target: m.container,
           props: {
             tag: e,
@@ -291,15 +291,15 @@ class ti extends w {
           }
         });
         e.tag3DContentSvelte = {
-          svelteApp: u,
+          svelteApp: l,
           domContainer: m,
           css3DInstance: m,
-          initialNormal: r,
-          currentNormal: r,
+          initialNormal: s,
+          currentNormal: s,
           dispose: () => {
-            u.$destroy(), m.dispose();
+            l.$destroy(), m.dispose();
           }
-        };
+        }, P(e) && ((a = e.model) != null && a.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
       }
     }), this.clearUnusedPanelTag();
   }
@@ -313,9 +313,9 @@ class ti 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 a;
-      (a = i.model) == null || a.promise.then((n) => {
-        n.visible = this.getCurrentVisibleState(i);
+      var n;
+      (n = i.model) == null || n.promise.then((a) => {
+        a.visible = this.getCurrentVisibleState(i);
       });
     }), this.five.needsRender = !0;
   }
@@ -330,20 +330,20 @@ class ti extends w {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, e) {
-    var c, b, y, M;
-    const o = (y = (b = (c = t.mergedConfig) == null ? void 0 : c.tag3DConfig) == null ? void 0 : b.ratio) != null ? y : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
+    var d, g, T, M;
+    const o = (T = (g = (d = t.mergedConfig) == null ? void 0 : d.tag3DConfig) == null ? void 0 : g.ratio) != null ? T : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
     if (!i)
       return;
-    const a = S(t) ? t.data.mediaPosition : t.position;
+    const n = P(t) ? t.data.mediaPosition : t.position;
     e.updateWorldMatrix(!1, !1);
-    const n = e.matrixWorld, r = new v().fromArray(a[0]), s = new v().fromArray(a[2]), l = G(r, s).add(new v(0, 0, 5e-4)), m = new T().setPosition(l), u = new T().makeScale(o, o, o), p = new T().multiply(n).multiply(m).multiply(u);
-    p.decompose(i.position, i.quaternion, i.scale);
-    const d = i.opacityMesh;
-    d && p.decompose(d.position, d.quaternion, d.scale);
+    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);
+    const c = i.opacityMesh;
+    c && l.decompose(c.position, c.quaternion, c.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {
-    return D(this, null, function* () {
+    return C(this, null, function* () {
       const e = t.filter(I).map((o) => this.loadModel(o));
       yield Promise.all(e), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
@@ -373,8 +373,8 @@ class ti extends w {
       temporaryState: this.temporaryState,
       withAnimation: this.store.visibleWithAnimation
     }), this.filterCSS3DTag.forEach((e) => {
-      var o, i, a, n, r;
-      (n = (i = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : i.css3DObject) == null || n.setVisible((this.state.visible && ((a = e.state) == null ? void 0 : a.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

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let n = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "2.19.0-2");
+    e(this, "VERSION", "2.19.0");
     e(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.info(
-    "%c %c@realsee/dnalogel %cv2.19.0-2",
+    "%c %c@realsee/dnalogel %cv2.19.0",
     [
       "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": "2.19.0-2",
+  "version": "2.19.0",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",