@realsee/dnalogel 2.3.5-dev.2 → 2.3.5-dev.4

package/libs/PanoTagPlugin/controller/index.js

@@ -2,38 +2,38 @@ var S = Object.defineProperty, y = Object.defineProperties;
 var P = Object.getOwnPropertyDescriptors;
 var T = Object.getOwnPropertySymbols;
 var w = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
-var g = (h, a, e) => a in h ? S(h, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[a] = e, f = (h, a) => {
+var u = (h, a, e) => a in h ? S(h, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[a] = e, f = (h, a) => {
   for (var e in a || (a = {}))
-    w.call(a, e) && g(h, e, a[e]);
+    w.call(a, e) && u(h, e, a[e]);
   if (T)
     for (var e of T(a))
-      E.call(a, e) && g(h, e, a[e]);
+      E.call(a, e) && u(h, e, a[e]);
   return h;
 }, c = (h, a) => y(h, P(a));
-var l = (h, a, e) => (g(h, typeof a != "symbol" ? a + "" : a, e), e);
+var d = (h, a, e) => (u(h, typeof a != "symbol" ? a + "" : a, e), e);
 var p = (h, a, e) => new Promise((t, i) => {
   var s = (n) => {
     try {
       r(e.next(n));
-    } catch (d) {
-      i(d);
+    } catch (l) {
+      i(l);
     }
   }, o = (n) => {
     try {
       r(e.throw(n));
-    } catch (d) {
-      i(d);
+    } catch (l) {
+      i(l);
     }
   }, r = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, o);
   r((e = e.apply(h, a)).next());
 });
-import { Subscribe as k } from "@realsee/five";
-import { Quaternion as F } from "three";
+import { Subscribe as F } from "@realsee/five";
+import { Quaternion as k } from "three";
 import v from "object-assign-deep";
 import { writable as R } from "../../vendor/svelte/store/index.js";
-import { TagContainer as L } from "../Components/TagContainer.js";
-import { Tag as U } from "../Components/Tag/index.js";
-import { arrayPositionToVector3 as u } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { TagContainer as U } from "../Components/TagContainer.js";
+import { Tag as L } from "../Components/Tag/index.js";
+import { arrayPositionToVector3 as g } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { addDebugPoints as O } from "../utils/addDebugPoints.js";
 import { planeNormal as I } from "../utils/planeNormal.js";
 import { actionAfterFiveModelLoad as B } from "../utils/actionAfterFiveModelLoad.js";
@@ -44,28 +44,28 @@ import { resizeObserver as D } from "../utils/resizeObserver.js";
 import { TagComputer as z } from "./TagComputer.js";
 import { CSS3DRenderPlugin as N } from "../../CSS3DRenderPlugin/index.js";
 import { formatTag as W } from "../utils/tag/format.js";
-const A = "2.0.0-dev.7", m = `DnalogelPlugin-PanoTagPlugin@${A}`, $ = !1, re = (h) => `${m}--${h}`;
-class ae extends z {
+const A = "2.0.0-dev.9", m = `DnalogelPlugin-PanoTagPlugin@${A}`, $ = !1, ae = (h) => `${m}--${h}`;
+class he extends z {
   constructor(e, t) {
     super(e);
-    l(this, "version", A);
-    l(this, "state", { enabled: !0, visible: !0 });
-    l(this, "params");
-    l(this, "debug");
-    l(this, "css3DRenderPlugin");
-    l(this, "TagContainerSvelte");
-    l(this, "temporaryState", { visible: !0 });
-    l(this, "mediaStore", R({
+    d(this, "version", A);
+    d(this, "state", { enabled: !0, visible: !0 });
+    d(this, "params");
+    d(this, "debug");
+    d(this, "css3DRenderPlugin");
+    d(this, "TagContainerSvelte");
+    d(this, "temporaryState", { visible: !0 });
+    d(this, "mediaStore", R({
       currentMediaElement: null
     }));
-    l(this, "isIOSWX", navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1 && navigator.userAgent.toLowerCase().indexOf("iphone") !== -1);
-    l(this, "store", {
+    d(this, "isIOSWX", navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1 && navigator.userAgent.toLowerCase().indexOf("iphone") !== -1);
+    d(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "disposedErrorLog", () => {
+    d(this, "disposedErrorLog", () => {
       console.error(`${m} is disposed`);
     });
     this.params = f({
@@ -85,15 +85,13 @@ class ae extends z {
       const r = this.getTagConfig(o);
       return c(f({}, o), {
         state: f({ visible: void 0, unfolded: $ }, r.initialState),
-        hooks: new k(),
+        hooks: new F(),
         clickable: r.clickable
       });
     }).filter((o) => o.position);
     s.forEach(W), this.tags.push(...s), B(this.five, () => {
-      var r, n, d;
-      this.store.eventListenerDisposer && ((n = (r = this.store).eventListenerDisposer) == null || n.call(r)), this.state.enabled && (this.store.eventListenerDisposer = this.addEventListener());
-      const o = this.five.getCurrentState().mode;
-      o && o !== "Panorama" && this.temporaryHide(), this.addResizeListener(), this.checkPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (d = t == null ? void 0 : t.withAnimation) != null ? d : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags();
+      var o, r, n;
+      this.store.eventListenerDisposer && ((r = (o = this.store).eventListenerDisposer) == null || r.call(o)), this.state.enabled && (this.store.eventListenerDisposer = this.addEventListener()), this.addResizeListener(), this.checkPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (n = t == null ? void 0 : t.withAnimation) != null ? n : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags();
     });
   }
   clearTags() {
@@ -130,8 +128,8 @@ class ae extends z {
   dispose() {
     var e, t, i, s, o, r;
     this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filter3DTag().forEach((n) => {
-      var d;
-      return (d = n.tag3DContentSvelte) == null ? void 0 : d.svelteApp.$destroy();
+      var l;
+      return (l = n.tag3DContentSvelte) == null ? void 0 : l.svelteApp.$destroy();
     }), this.tags = [], (t = this.store.disposers) == null || t.forEach((n) => n == null ? void 0 : n()), this.store.disposers = [], this.store.disposed = !0, (s = (i = this.store).eventListenerDisposer) == null || s.call(i), this.store.eventListenerDisposer = void 0, (r = (o = this.store).resizeObserverDisposer) == null || r.call(o), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.clearCache(), this.hooks.emit("dispose");
   }
   setState(e, t) {
@@ -140,9 +138,18 @@ class ae extends z {
     const { userAction: i = !0, visibleWithAnimation: s = !1 } = t, o = f({}, this.state);
     this.state = Object.assign(this.state, e), this.store.visibleWithAnimation = s, o.visible !== this.state.visible && (e.visible ? this.handleShow() : this.handleHide()), o.enabled !== this.state.enabled && (e.enabled ? this.handleEnable() : this.handleDisable()), this.hooks.emit("stateChange", { state: this.state, prevState: o, userAction: i });
   }
+  changeUnfoldedById(e, t) {
+    var o;
+    const i = this.getTagById(e);
+    if (!i)
+      return;
+    i.state.unfolded = t;
+    const s = this.filterPointTag();
+    (o = this.TagContainerSvelte) == null || o.$set({ tags: s });
+  }
   changeTagNormalById(e, t) {
     const i = this.getTagById(e);
-    !i || !i.tag3DContentSvelte || (i.tag3DContentSvelte.currentNormal = u(t), this.updateRenderPlaneTag());
+    !i || !i.tag3DContentSvelte || (i.tag3DContentSvelte.currentNormal = g(t), this.updateRenderPlaneTag());
   }
   changeDataById(e, t, i = !0) {
     const s = this.getTagById(e);
@@ -153,7 +160,7 @@ class ae extends z {
   }
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
-    !t || (i ? v(s, t) : Object.assign(s, t), (s == null ? void 0 : s.tag3DContentSvelte) && (t == null ? void 0 : t.normal) && (s.tag3DContentSvelte.currentNormal = u(t.normal)), this.updateRenderAllTags(), this.checkPanelTag());
+    !t || (i ? v(s, t) : Object.assign(s, t), (s == null ? void 0 : s.tag3DContentSvelte) && (t == null ? void 0 : t.normal) && (s.tag3DContentSvelte.currentNormal = g(t.normal)), this.updateRenderAllTags(), this.checkPanelTag());
   }
   destroyTagById(e) {
     (Array.isArray(e) ? e : [e]).forEach((i) => {
@@ -166,11 +173,12 @@ class ae extends z {
   }
   setVisibleAndUnfolded() {
     return p(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
-      return this.setVisibleByPanoIndex(), e ? new Promise((t, i) => {
-        setTimeout(() => {
-          this.setUnfoldedByPanoIndex(), t();
-        }, 10);
-      }) : (this.setUnfoldedByPanoIndex(), Promise.resolve());
+      if (!!this.isPanorama)
+        return this.setVisibleByPanoIndex(), e ? new Promise((t, i) => {
+          setTimeout(() => {
+            this.setUnfoldedByPanoIndex(), t();
+          }, 10);
+        }) : (this.setUnfoldedByPanoIndex(), Promise.resolve());
     });
   }
   handleShow() {
@@ -190,9 +198,9 @@ class ae extends z {
     });
   }
   addEventListener() {
-    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), r = this.handleFiveCameraUpdateDebounce(), n = this.handleFivePanoArrived.bind(this), d = this.loadVideoFirstFrame.bind(this), b = this.clickhandler.bind(this);
-    return e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("cameraUpdate", o), e.on("cameraUpdate", r), e.on("panoArrived", n), e.on("panoArrived", d), t.on("click", b), () => {
-      e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("cameraUpdate", o), e.off("cameraUpdate", r), e.off("panoArrived", n), e.off("panoArrived", d), t.off("click", b), this.store.eventListenerDisposer = void 0;
+    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), r = this.handleFiveCameraUpdateDebounce(), n = this.handleFivePanoArrived.bind(this), l = this.loadVideoFirstFrame.bind(this), b = this.clickhandler.bind(this);
+    return this.five.currentMode && (this.isPanorama ? (this.handleFivePanoArrived(), this.temporaryShow({ withAnimation: !0 })) : this.temporaryHide()), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("cameraUpdate", o), e.on("cameraUpdate", r), e.on("panoArrived", n), e.on("panoArrived", l), t.on("click", b), () => {
+      e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("cameraUpdate", o), e.off("cameraUpdate", r), e.off("panoArrived", n), e.off("panoArrived", l), t.off("click", b), this.store.eventListenerDisposer = void 0;
     };
   }
   loadVideoFirstFrame() {
@@ -303,7 +311,7 @@ class ae extends z {
       const i = (t = this.five.getElement()) == null ? void 0 : t.parentElement;
       if (!i)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new L({
+      this.TagContainerSvelte = new U({
         target: i,
         props: { hooks: this.hooks, tags: e, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });
@@ -320,19 +328,19 @@ class ae extends z {
           state: this.state,
           temporaryState: this.temporaryState
         }), !r.equals(n)) {
-          const d = new F().setFromUnitVectors(r, n);
-          o.css3DObject.setRotationFromQuaternion(d);
+          const l = new k().setFromUnitVectors(r, n);
+          o.css3DObject.setRotationFromQuaternion(l);
         }
       } else {
         if (((i = t.state) == null ? void 0 : i.visible) === !1)
           return;
         if (this.css3DRenderPlugin || (this.css3DRenderPlugin = N(this.five)), t.stickType === "3DPoint" && !t.normal)
           return console.error("updateRenderPlaneTag: \u4E09\u7EF4\u70B9\u6807\u7B7E\u7F3A\u5C11\u6CD5\u5411\u91CF\uFF01");
-        const s = t.stickType === "Plane" ? t.position : M(this.five.camera.position, u(t.position), u(t.normal)), o = t.stickType === "Plane" ? I(t.position) : u(t.normal), r = this.getTagConfig(t).tag3DConfig, n = this.css3DRenderPlugin.create3DDomContainer(s, r);
+        const s = t.stickType === "Plane" ? t.position : M(this.five.camera.position, g(t.position), g(t.normal)), o = t.stickType === "Plane" ? I(t.position) : g(t.normal), r = this.getTagConfig(t).tag3DConfig, n = this.css3DRenderPlugin.create3DDomContainer(s, r);
         if (!n)
           return;
         this.store.css3DRenderDisposer.set(t.id, n.dispose), t.tag3DContentSvelte = {
-          svelteApp: new U({
+          svelteApp: new L({
             target: n.container,
             props: {
               tag: t,
@@ -366,6 +374,6 @@ class ae extends z {
   }
 }
 export {
-  ae as PanoTagPluginController,
-  re as pluginFlag
+  he as PanoTagPluginController,
+  ae as pluginFlag
 };

package/libs/PanoTagPlugin/utils/tag/format.js

@@ -1,12 +1,12 @@
-function o(n) {
-  var i, t;
+function r(n) {
+  var i, t, o, p;
   if (!n.stickType) {
     const e = (() => n.pointType === "PointTag" && n.dimensionType === "3D" ? "3DPoint" : n.pointType === "PlaneTag" ? "Plane" : "2DPoint")();
     n.stickType = e;
   }
   if (n.contentType === "VRLink" || n.contentType === "PanoLink" || n.contentType === "Link") {
     const e = n;
-    !((i = e.data) != null && i.icon) && !((t = e.style) != null && t.point) && (e.data.icon = {
+    !((t = (i = e.data) == null ? void 0 : i.icon) != null && t.url) && !((p = (o = e.style) == null ? void 0 : o.point) != null && p.url) && (e.data.icon = {
       url: "//vrlab-static.ljcdn.com/release/web/test.09dee741.png",
       steps: 28
     });
@@ -14,5 +14,5 @@ function o(n) {
   return n;
 }
 export {
-  o as formatTag
+  r as formatTag
 };

package/package.json

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