@realsee/dnalogel 3.50.7 → 3.50.8

package/libs/CruisePlugin/Work.js

@@ -14,18 +14,18 @@ var k = (h, l, t) => (I(h, typeof l != "symbol" ? l + "" : l, t), t);
 var y = (h, l, t) => new Promise((e, r) => {
   var i = (n) => {
     try {
-      m(t.next(n));
-    } catch (o) {
-      r(o);
+      p(t.next(n));
+    } catch (a) {
+      r(a);
     }
   }, s = (n) => {
     try {
-      m(t.throw(n));
-    } catch (o) {
-      r(o);
+      p(t.throw(n));
+    } catch (a) {
+      r(a);
     }
-  }, m = (n) => n.done ? e(n.value) : Promise.resolve(n.value).then(i, s);
-  m((t = t.apply(h, l)).next());
+  }, p = (n) => n.done ? e(n.value) : Promise.resolve(n.value).then(i, s);
+  p((t = t.apply(h, l)).next());
 });
 import { GuideLinePlugin as K } from "../GuideLinePlugin/index.js";
 import { uuid as S } from "../shared-utils/uuid.js";
@@ -256,28 +256,28 @@ class Sr extends G {
    */
   load(t, e, r) {
     return y(this, null, function* () {
-      var a, p;
+      var o, m;
       this.clear();
       const i = this.data ? JSON.parse(JSON.stringify(this.data)) : void 0, s = yield this.formatData(t);
       this.data = g({ id: s.keyframesId }, s), this.hooks.emit("dataChange", s, i);
-      let m = [], n;
-      const o = this.data.keyframes.filter((f) => f.data.panoIndex !== void 0);
-      o.filter((f, u) => {
+      let p = [], n;
+      const a = this.data.keyframes.filter((f) => f.data.panoIndex !== void 0);
+      a.filter((f, u) => {
         var d;
-        return f.data.panoIndex !== ((d = o[u - 1]) == null ? void 0 : d.data.panoIndex);
+        return f.data.panoIndex !== ((d = a[u - 1]) == null ? void 0 : d.data.panoIndex);
       }).map((f) => f.data.panoIndex).forEach((f) => {
         var d, v;
         const u = (d = this.workUtil.getObserver(f)) == null ? void 0 : d.floorIndex;
         if (u !== void 0)
           if (n === u) {
-            const c = m.length - 1;
-            m[c] = [...(v = m[c]) != null ? v : [], f];
+            const c = p.length - 1;
+            p[c] = [...(v = p[c]) != null ? v : [], f];
           } else {
             n = u;
-            const c = m.length;
-            m[c] = [f];
+            const c = p.length;
+            p[c] = [f];
           }
-      }), !this.GuideLine && ((a = this.config) == null ? void 0 : a.useGuideLine) !== !1 && s.useGuildLine !== !1 && (this.GuideLine = K(this.five, this.config)), (p = this.GuideLine) == null || p.load({ routes: m.map((f) => ({ panoIndexList: f })), config: s.guildPluginOptions }), e ? this.setState(e, { userAction: r }) : (this.setState({ playing: !1 }, { userAction: !1 }), this.handleVisible(this.state.visible), this.handleEnable(this.state.enabled), this.changePlayState(this.state.playing, { userAction: !1 }), this.changeSpeed(this.state.speed)), this.clearPauseData(), console.debug("WORKPLUGIN loaded", s), this.hooks.emit("dataLoaded", s);
+      }), !this.GuideLine && ((o = this.config) == null ? void 0 : o.useGuideLine) !== !1 && s.useGuildLine !== !1 && (this.GuideLine = K(this.five, this.config)), (m = this.GuideLine) == null || m.load({ routes: p.map((f) => ({ panoIndexList: f })), config: s.guildPluginOptions }), e ? this.setState(e, { userAction: r }) : (this.setState({ playing: !1 }, { userAction: !1 }), this.handleVisible(this.state.visible), this.handleEnable(this.state.enabled), this.changePlayState(this.state.playing, { userAction: !1 }), this.changeSpeed(this.state.speed)), this.clearPauseData(), console.debug("WORKPLUGIN loaded", s), this.hooks.emit("dataLoaded", s);
     });
   }
   /**
@@ -310,33 +310,33 @@ class Sr extends G {
           keyframesId: S(),
           keyframes: e.keyframes.map((r, i) => {
             var n;
-            const s = e.keyframes[i + 1], m = (() => !s || s.start === void 0 || r.end === void 0 ? 0 : s.start - r.end)();
-            return x(g({ id: (n = r.uuid) != null ? n : S(), moveIndex: i, stay: m, index: i }, r), { guildPluginOptions: e.guildPluginOptions });
+            const s = e.keyframes[i + 1], p = (() => !s || s.start === void 0 || r.end === void 0 ? 0 : s.start - r.end)();
+            return x(g({ id: (n = r.uuid) != null ? n : S(), moveIndex: i, stay: p, index: i }, r), { guildPluginOptions: e.guildPluginOptions });
           })
         };
       if (e.panoIndexList) {
         let r = [];
-        const { moveEffect: i, moveToFirstPanoEffect: s, moveToFirstPanoDuration: m } = e;
-        return this.privateState.moveToFirstPanoEffect = s, this.privateState.moveToFirstPanoDuration = m, e.panoIndexList.forEach((n, o) => {
-          const a = (() => {
+        const { moveEffect: i, moveToFirstPanoEffect: s, moveToFirstPanoDuration: p } = e;
+        return this.privateState.moveToFirstPanoEffect = s, this.privateState.moveToFirstPanoDuration = p, e.panoIndexList.forEach((n, a) => {
+          const o = (() => {
             var v, c;
-            const p = e.panoIndexList.slice(o).find((P) => P !== n);
-            if (p === void 0)
+            const m = e.panoIndexList.slice(a).find((P) => P !== n);
+            if (m === void 0)
               return;
-            const f = this.workUtil.getObserverPosition(n), u = this.workUtil.getObserverPosition(p);
-            if (!u || !f || ((v = this.workUtil.getObserver(n)) == null ? void 0 : v.floorIndex) !== ((c = this.workUtil.getObserver(p)) == null ? void 0 : c.floorIndex))
+            const f = this.workUtil.getObserverPosition(n), u = this.workUtil.getObserverPosition(m);
+            if (!u || !f || ((v = this.workUtil.getObserver(n)) == null ? void 0 : v.floorIndex) !== ((c = this.workUtil.getObserver(m)) == null ? void 0 : c.floorIndex))
               return;
             const d = new U.Vector3().subVectors(u, f);
             return A(d.normalize());
           })();
           e.moveType === void 0 || e.moveType === "justMove" ? r.push({
-            moveIndex: o,
+            moveIndex: a,
             stay: e.stay,
-            data: g({ effect: "Move", panoIndex: n, moveEffect: i }, a != null ? a : {})
-          }) : e.moveType === "moveAndRotate" && (r.push({ moveIndex: o, stay: e.stay, data: { effect: "Move", panoIndex: n, moveEffect: i } }), a && r.push({ moveIndex: o, stay: e.stay, data: g({ effect: "Rotate", panoIndex: n }, a) }));
+            data: g({ effect: "Move", panoIndex: n, moveEffect: i }, o != null ? o : {})
+          }) : e.moveType === "moveAndRotate" && (r.push({ moveIndex: a, stay: e.stay, data: { effect: "Move", panoIndex: n, moveEffect: i } }), o && r.push({ moveIndex: a, stay: e.stay, data: g({ effect: "Rotate", panoIndex: n }, o) }));
         }), {
           keyframesId: S(),
-          keyframes: r.map((n, o) => g({ id: S(), index: o }, n)),
+          keyframes: r.map((n, a) => g({ id: S(), index: a }, n)),
           guildPluginOptions: e.guildPluginOptions,
           useGuildLine: e.useGuildLine
         };
@@ -356,47 +356,47 @@ class Sr extends G {
       const { data: e, state: r, privateState: i, hooks: s } = this;
       if (i.playing || !(e != null && e.keyframes) || (e == null ? void 0 : e.keyframes.length) === 0)
         return;
-      const m = S();
-      i.playId = m, i.playing = !0, i.broke = !1;
-      const n = e.keyframes, o = this.getPauseData();
+      const p = S();
+      i.playId = p, i.playing = !0, i.broke = !1;
+      const n = e.keyframes, a = this.getPauseData();
       (t == null ? void 0 : t.notEmitEvent) !== !0 && s.emit("play", { userAction: (u = t == null ? void 0 : t.userAction) != null ? u : !0 });
-      let a = !1;
+      let o = !1;
       const f = yield (() => y(this, null, function* () {
         var d, v;
         if ((t == null ? void 0 : t.playFromIndex) !== void 0)
           return t.playFromIndex;
         if ((t == null ? void 0 : t.playFromId) !== void 0)
           return (d = this.data) == null ? void 0 : d.keyframes.findIndex((c) => c.id === t.playFromId);
-        if (o != null && o.id) {
-          const c = (v = this.data) == null ? void 0 : v.keyframes.find((P) => P.id === o.id);
-          if (o != null && o.fiveState && (yield this.move(o.fiveState, {
+        if (a != null && a.id) {
+          const c = (v = this.data) == null ? void 0 : v.keyframes.find((P) => P.id === a.id);
+          if (a != null && a.fiveState && (yield this.move(a.fiveState, {
             moveEffect: i.moveToFirstPanoEffect,
             duration: i.moveToFirstPanoDuration
           })), c) {
             if (c.data.effect === "Move")
               return c.index;
             if (c.data.effect === "Rotate") {
-              const P = o.duration !== void 0 ? o.duration * (1 - o.playedProgress) : void 0;
-              return yield this.playKeyframe(c, { duration: P }), a = !0, c.index + 1;
+              const P = a.duration !== void 0 ? a.duration * (1 - a.playedProgress) : void 0;
+              return yield this.playKeyframe(c, { duration: P }), o = !0, c.index + 1;
             }
           }
         }
       }))();
       this.clearPauseData();
       for (const d of n) {
-        if (i.broke || !r.playing || !i.playing || m !== i.playId)
+        if (i.broke || !r.playing || !i.playing || p !== i.playId)
           return;
         if (!(f !== void 0 && d.index < f))
           try {
             s.emit("playIndexChange", d.index, d), yield this.playKeyframe(d, {
-              moveEffect: a === !1 ? i.moveToFirstPanoEffect : void 0,
-              duration: a === !1 && typeof i.moveToFirstPanoDuration == "number" ? i.moveToFirstPanoDuration : void 0
-            }), d.stay && (yield O(d.stay)), a === !1 && (a = !0);
+              moveEffect: o === !1 ? i.moveToFirstPanoEffect : void 0,
+              duration: o === !1 && typeof i.moveToFirstPanoDuration == "number" ? i.moveToFirstPanoDuration : void 0
+            }), d.stay && (yield O(d.stay)), o === !1 && (o = !0);
           } catch (v) {
             return console.error(v), Promise.resolve("broke");
           }
       }
-      r.playing && m === i.playId && (this.setState({ playing: !1 }, { userAction: !1 }), s.emit("end"), this.clearPauseData());
+      r.playing && p === i.playId && (this.setState({ playing: !1 }, { userAction: !1 }), s.emit("end"), this.clearPauseData());
     });
   }
   /**
@@ -411,12 +411,14 @@ class Sr extends G {
    * @description: Change play speed
    */
   changeSpeed(t, e = !0) {
-    const { state: r, privateState: i, hooks: s } = this, { currentPlayKeyframe: m } = i;
-    if (s.emit("speedChange", t, { userAction: e }), r.playing && m)
+    var n;
+    const { state: r, privateState: i, hooks: s } = this, { currentPlayKeyframe: p } = i;
+    if (s.emit("speedChange", t, { userAction: e }), r.playing && p)
       try {
-        const n = m.originDuration !== void 0 ? m.originDuration * (1 - this.getProgress()) : void 0, o = this.playKeyframe(m.keyframe, { duration: n });
-        i.currentPlayQueue.push(o);
-      } catch (n) {
+        const a = p.originDuration !== void 0 ? p.originDuration * (1 - this.getProgress()) : void 0, o = p.keyframe, { privateState: m } = this;
+        ((n = this.privateState.currentPlayKeyframe) == null ? void 0 : n.keyframe.id) !== o.id && (this.privateState.currentPlayKeyframe = { keyframe: o }), m.currentPlayQueue.push(this.getPlayPromise(o, { duration: a }));
+      } catch (a) {
+        console.error(a);
       }
   }
   /**
@@ -462,29 +464,29 @@ class Sr extends G {
       var s;
       const i = t.data;
       if (e.duration = (s = e.duration) != null ? s : t.start !== void 0 && t.end !== void 0 ? t.end - t.start : void 0, !!i)
-        return new Promise((m, n) => {
-          let o = !1;
+        return new Promise((p, n) => {
+          let a = !1;
           this.addInterruptListener(() => {
-            if (!o)
-              return this.hooks.emit("broke"), this.privateState.broke = !0, this.setState({ playing: !1 }), o = !0, n(new Error("play is interupted"));
+            if (!a)
+              return this.hooks.emit("broke"), this.privateState.broke = !0, this.setState({ playing: !1 }), a = !0, n(new Error("play is interupted"));
           });
           try {
-            if (o)
+            if (a)
               return;
-            const a = () => {
-              m(), o = !0;
+            const o = () => {
+              p(), a = !0;
             };
             switch (i.effect) {
               case "Move":
-                this.move(i, e).then(a);
+                this.move(i, e).then(o);
                 break;
               case "Rotate":
-                this.rotate(i, e).then(a);
+                this.rotate(i, e).then(o);
                 break;
               default:
-                this.rotate(i, e).then(a);
+                this.rotate(i, e).then(o);
             }
-          } catch (a) {
+          } catch (o) {
           }
         });
     });
@@ -539,26 +541,26 @@ class Sr extends G {
    */
   updateCamera(r) {
     return y(this, arguments, function* (t, e = {}) {
-      const { five: i, privateState: s, state: m } = this, n = (() => {
+      const { five: i, privateState: s, state: p } = this, n = (() => {
         var u, d;
-        const p = (u = m.config) == null ? void 0 : u.speedConfig, f = (d = t.rotateSpeed) != null ? d : p == null ? void 0 : p.rotateSpeed;
-        if ((p == null ? void 0 : p.rotateSpeedUnit) === void 0)
+        const m = (u = p.config) == null ? void 0 : u.speedConfig, f = (d = t.rotateSpeed) != null ? d : m == null ? void 0 : m.rotateSpeed;
+        if ((m == null ? void 0 : m.rotateSpeedUnit) === void 0)
           return f;
         if (f !== void 0)
-          return p.rotateSpeedUnit === "rad/ms" ? f : f / 1e3;
-      })(), o = (() => {
+          return m.rotateSpeedUnit === "rad/ms" ? f : f / 1e3;
+      })(), a = (() => {
         if (e.duration)
           return e.duration;
         if (n) {
-          const p = this.five.getCurrentState();
-          return L(p, t) / n;
+          const m = this.five.getCurrentState();
+          return L(m, t) / n;
         }
         return 800;
       })();
-      s.currentPlayKeyframe && (s.currentPlayKeyframe.originDuration = o);
-      const a = this.getSpeededDuration(o);
-      return new Promise((p) => {
-        T(() => i.updateCamera(t, a)), setTimeout(() => p(), a);
+      s.currentPlayKeyframe && (s.currentPlayKeyframe.originDuration = a);
+      const o = this.getSpeededDuration(a);
+      return new Promise((m) => {
+        T(() => i.updateCamera(t, o)), setTimeout(() => m(), o);
       });
     });
   }
@@ -570,36 +572,36 @@ class Sr extends G {
       const { five: r, privateState: i, state: s } = this;
       if (typeof t.panoIndex != "number" || t.panoIndex === r.panoIndex)
         return;
-      const m = r.getCurrentState().mode !== "Panorama";
-      m && (this.privateState.modeChanging = !0);
+      const p = r.getCurrentState().mode !== "Panorama";
+      p && (this.privateState.modeChanging = !0);
       const n = (() => {
         var f, u;
-        const a = (f = s.config) == null ? void 0 : f.speedConfig, p = (u = t.moveSpeed) != null ? u : a == null ? void 0 : a.moveSpeed;
-        if ((a == null ? void 0 : a.moveSpeedUnit) === void 0)
-          return p;
-        if (p !== void 0)
-          return a.moveSpeedUnit === "m/ms" ? p : p / 1e3;
-      })(), o = (() => {
+        const o = (f = s.config) == null ? void 0 : f.speedConfig, m = (u = t.moveSpeed) != null ? u : o == null ? void 0 : o.moveSpeed;
+        if ((o == null ? void 0 : o.moveSpeedUnit) === void 0)
+          return m;
+        if (m !== void 0)
+          return o.moveSpeedUnit === "m/ms" ? m : m / 1e3;
+      })(), a = (() => {
         if (e != null && e.duration)
           return e.duration;
         if (n && typeof r.panoIndex == "number" && typeof t.panoIndex == "number") {
-          const a = this.workUtil.getObserverPosition(r.panoIndex), p = this.workUtil.getObserverPosition(t.panoIndex);
-          return a && p ? a.distanceTo(p) / n : 800;
+          const o = this.workUtil.getObserverPosition(r.panoIndex), m = this.workUtil.getObserverPosition(t.panoIndex);
+          return o && m ? o.distanceTo(m) / n : 800;
         }
         return 800;
       })();
-      i.currentPlayKeyframe && (i.currentPlayKeyframe.originDuration = o), yield new Promise((a) => {
-        var p, f, u;
+      i.currentPlayKeyframe && (i.currentPlayKeyframe.originDuration = a), yield new Promise((o) => {
+        var m, f, u;
         this.fiveUtil.moveToPano(t.panoIndex, {
           latitude: t.latitude,
           longitude: t.longitude,
           fov: t.fov,
-          duration: this.getSpeededDuration(o),
-          effect: (u = (f = e == null ? void 0 : e.moveEffect) != null ? f : (p = this.state.config) == null ? void 0 : p.moveEffect) != null ? u : t.moveEffect,
-          moveCancelCallback: () => a(),
-          moveEndCallback: () => a()
-        }), m && r.once("panoArrived", () => a());
-      }), m && (this.privateState.modeChanging = !1);
+          duration: this.getSpeededDuration(a),
+          effect: (u = (f = e == null ? void 0 : e.moveEffect) != null ? f : (m = this.state.config) == null ? void 0 : m.moveEffect) != null ? u : t.moveEffect,
+          moveCancelCallback: () => o(),
+          moveEndCallback: () => o()
+        }), p && r.once("panoArrived", () => o());
+      }), p && (this.privateState.modeChanging = !1);
     });
   }
   /**

package/libs/base/BasePlugin.js

@@ -18,7 +18,7 @@ let P = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.50.7");
+    i(this, "VERSION", "3.50.8");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/logger.js

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

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.50.7",
+  "version": "3.50.8",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",