@realsee/dnalogel 2.28.5 → 2.28.6

package/libs/CruisePlugin/Controller.js

@@ -1,31 +1,31 @@
 var T = Object.defineProperty, K = Object.defineProperties;
-var O = Object.getOwnPropertyDescriptors;
+var A = Object.getOwnPropertyDescriptors;
 var F = Object.getOwnPropertySymbols;
-var U = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
-var L = (c, u, e) => u in c ? T(c, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[u] = e, g = (c, u) => {
-  for (var e in u || (u = {}))
-    U.call(u, e) && L(c, e, u[e]);
+var O = Object.prototype.hasOwnProperty, U = Object.prototype.propertyIsEnumerable;
+var L = (c, l, e) => l in c ? T(c, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[l] = e, g = (c, l) => {
+  for (var e in l || (l = {}))
+    O.call(l, e) && L(c, e, l[e]);
   if (F)
-    for (var e of F(u))
-      A.call(u, e) && L(c, e, u[e]);
+    for (var e of F(l))
+      U.call(l, e) && L(c, e, l[e]);
   return c;
-}, C = (c, u) => K(c, O(u));
-var I = (c, u, e) => (L(c, typeof u != "symbol" ? u + "" : u, e), e);
-var v = (c, u, e) => new Promise((t, i) => {
+}, C = (c, l) => K(c, A(l));
+var I = (c, l, e) => (L(c, typeof l != "symbol" ? l + "" : l, e), e);
+var v = (c, l, e) => new Promise((t, i) => {
   var r = (d) => {
     try {
       s(e.next(d));
-    } catch (o) {
-      i(o);
+    } catch (a) {
+      i(a);
     }
   }, n = (d) => {
     try {
       s(e.throw(d));
-    } catch (o) {
-      i(o);
+    } catch (a) {
+      i(a);
     }
   }, s = (d) => d.done ? t(d.value) : Promise.resolve(d.value).then(r, n);
-  s((e = e.apply(c, u)).next());
+  s((e = e.apply(c, l)).next());
 });
 import { Controller as V } from "../base/BasePluginWithData.js";
 import { GuideLinePlugin as $ } from "../GuideLinePlugin/index.js";
@@ -239,30 +239,30 @@ class z extends V {
    */
   load(e, t, i) {
     return v(this, null, function* () {
-      var a, m, f, l, h, P;
+      var o, m, p, u, h, P;
       if (this.state.disposed)
         return D();
-      this.privateState.fiveOriginGetProgress || (m = (a = this.five.controller) == null ? void 0 : a.cameraMotion) != null && m.getProgress || (yield this.waitFiveLoaded(), this.privateState.fiveOriginGetProgress = (l = (f = this.five.controller) == null ? void 0 : f.cameraMotion) == null ? void 0 : l.getProgress), this.clear();
+      this.privateState.fiveOriginGetProgress || (m = (o = this.five.controller) == null ? void 0 : o.cameraMotion) != null && m.getProgress || (yield this.waitFiveLoaded(), this.privateState.fiveOriginGetProgress = (u = (p = this.five.controller) == null ? void 0 : p.cameraMotion) == null ? void 0 : u.getProgress), this.clear();
       const r = this.data ? JSON.parse(JSON.stringify(this.data)) : void 0, n = yield this.formatData(e);
       this.data = n, this.hooks.emit("dataChange", n, r);
       let s = [], d;
-      const o = this.data.keyframes.filter((p) => p.data.panoIndex !== void 0);
-      o.filter((p, y) => {
+      const a = this.data.keyframes.filter((f) => f.data.panoIndex !== void 0);
+      a.filter((f, y) => {
         var S;
-        return p.data.panoIndex !== ((S = o[y - 1]) == null ? void 0 : S.data.panoIndex);
-      }).map((p) => p.data.panoIndex).forEach((p) => {
+        return f.data.panoIndex !== ((S = a[y - 1]) == null ? void 0 : S.data.panoIndex);
+      }).map((f) => f.data.panoIndex).forEach((f) => {
         var S, k;
-        const y = (S = this.five.work.observers[p]) == null ? void 0 : S.floorIndex;
+        const y = (S = this.five.work.observers[f]) == null ? void 0 : S.floorIndex;
         if (y !== void 0)
           if (d === y) {
             const b = s.length - 1;
-            s[b] = [...(k = s[b]) != null ? k : [], p];
+            s[b] = [...(k = s[b]) != null ? k : [], f];
           } else {
             d = y;
             const b = s.length;
-            s[b] = [p];
+            s[b] = [f];
           }
-      }), !this.GuideLine && ((h = this.config) == null ? void 0 : h.useGuideLine) !== !1 && n.useGuildLine !== !1 && (this.GuideLine = $(this.five, this.config)), (P = this.GuideLine) == null || P.load({ routes: s.map((p) => ({ panoIndexList: p })), config: n.guildPluginOptions }), this.setState({ playing: !1 }), this.handleVisible(this.state.visible), this.handleEnable(this.state.enabled), this.changePlayState(this.state.playing), this.changeSpeed(this.state.speed), t && this.setState(t, { userAction: i }), console.debug(`${x} loaded`, n), this.hooks.emit("dataLoaded", n);
+      }), !this.GuideLine && ((h = this.config) == null ? void 0 : h.useGuideLine) !== !1 && n.useGuildLine !== !1 && (this.GuideLine = $(this.five, this.config)), (P = this.GuideLine) == null || P.load({ routes: s.map((f) => ({ panoIndexList: f })), config: n.guildPluginOptions }), t ? this.setState(t, { userAction: i }) : (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(`${x} loaded`, n), this.hooks.emit("dataLoaded", n);
     });
   }
   /**
@@ -352,34 +352,34 @@ class z extends V {
         return {
           keyframesId: w(),
           keyframes: i.keyframes.map((r, n) => {
-            var o;
+            var a;
             const s = i.keyframes[n + 1], d = (() => !s || s.start === void 0 || r.end === void 0 ? 0 : s.start - r.end)();
-            return C(g({ id: (o = r.uuid) != null ? o : w(), moveIndex: n, stay: d, index: n }, r), { guildPluginOptions: i.guildPluginOptions });
+            return C(g({ id: (a = r.uuid) != null ? a : w(), moveIndex: n, stay: d, index: n }, r), { guildPluginOptions: i.guildPluginOptions });
           })
         };
       if (i.panoIndexList) {
         let r = [];
         const { moveEffect: n, moveToFirstPanoEffect: s, moveToFirstPanoDuration: d } = i;
-        return this.privateState.moveToFirstPanoEffect = s, this.privateState.moveToFirstPanoDuration = d, i.panoIndexList.forEach((o, a) => {
+        return this.privateState.moveToFirstPanoEffect = s, this.privateState.moveToFirstPanoDuration = d, i.panoIndexList.forEach((a, o) => {
           const m = (() => {
-            var p, y, S, k;
-            const f = i.panoIndexList.slice(a).find((b) => b !== o);
-            if (f === void 0)
+            var f, y, S, k;
+            const p = i.panoIndexList.slice(o).find((b) => b !== a);
+            if (p === void 0)
               return;
-            const l = (p = t[o]) == null ? void 0 : p.position, h = (y = t[f]) == null ? void 0 : y.position;
-            if (!h || !l || ((S = t[o]) == null ? void 0 : S.floorIndex) !== ((k = t[f]) == null ? void 0 : k.floorIndex))
+            const u = (f = t[a]) == null ? void 0 : f.position, h = (y = t[p]) == null ? void 0 : y.position;
+            if (!h || !u || ((S = t[a]) == null ? void 0 : S.floorIndex) !== ((k = t[p]) == null ? void 0 : k.floorIndex))
               return;
-            const P = new j.Vector3().subVectors(h, l);
+            const P = new j.Vector3().subVectors(h, u);
             return N(P.normalize());
           })();
           i.moveType === void 0 || i.moveType === "justMove" ? r.push({
-            moveIndex: a,
+            moveIndex: o,
             stay: i.stay,
-            data: g({ effect: "Move", panoIndex: o, moveEffect: n }, m != null ? m : {})
-          }) : i.moveType === "moveAndRotate" && (r.push({ moveIndex: a, stay: i.stay, data: { effect: "Move", panoIndex: o, moveEffect: n } }), m && r.push({ moveIndex: a, stay: i.stay, data: g({ effect: "Rotate", panoIndex: o }, m) }));
+            data: g({ effect: "Move", panoIndex: a, moveEffect: n }, m != null ? m : {})
+          }) : i.moveType === "moveAndRotate" && (r.push({ moveIndex: o, stay: i.stay, data: { effect: "Move", panoIndex: a, moveEffect: n } }), m && r.push({ moveIndex: o, stay: i.stay, data: g({ effect: "Rotate", panoIndex: a }, m) }));
         }), {
           keyframesId: w(),
-          keyframes: r.map((o, a) => g({ id: w(), index: a }, o)),
+          keyframes: r.map((a, o) => g({ id: w(), index: o }, a)),
           guildPluginOptions: i.guildPluginOptions,
           useGuildLine: i.useGuildLine
         };
@@ -411,32 +411,32 @@ class z extends V {
   // eslint-disable-next-line complexity
   handlePlay(e) {
     return v(this, null, function* () {
-      var l;
+      var u;
       const { data: t, state: i, privateState: r, hooks: n } = this;
       if (r.playing || !(t != null && t.keyframes) || (t == null ? void 0 : t.keyframes.length) === 0)
         return;
       const s = w();
       r.playId = s, r.playing = !0, r.broke = !1;
-      const d = t.keyframes, o = this.getPauseData();
-      (e == null ? void 0 : e.notEmitEvent) !== !0 && n.emit("play", { userAction: (l = e == null ? void 0 : e.userAction) != null ? l : !0 });
-      let a = !1;
-      const f = yield (() => v(this, null, function* () {
+      const d = t.keyframes, a = this.getPauseData();
+      (e == null ? void 0 : e.notEmitEvent) !== !0 && n.emit("play", { userAction: (u = e == null ? void 0 : e.userAction) != null ? u : !0 });
+      let o = !1;
+      const p = yield (() => v(this, null, function* () {
         var h, P;
         if ((e == null ? void 0 : e.playFromIndex) !== void 0)
           return e.playFromIndex;
         if ((e == null ? void 0 : e.playFromId) !== void 0)
-          return (h = this.data) == null ? void 0 : h.keyframes.findIndex((p) => p.id === e.playFromId);
-        if (o != null && o.keyframeId) {
-          const p = (P = this.data) == null ? void 0 : P.keyframes.find((y) => y.id === o.keyframeId);
-          if (o != null && o.fiveState && (yield this.move(o.fiveState, {
+          return (h = this.data) == null ? void 0 : h.keyframes.findIndex((f) => f.id === e.playFromId);
+        if (a != null && a.keyframeId) {
+          const f = (P = this.data) == null ? void 0 : P.keyframes.find((y) => y.id === a.keyframeId);
+          if (a != null && a.fiveState && (yield this.move(a.fiveState, {
             moveEffect: r.moveToFirstPanoEffect,
             duration: r.moveToFirstPanoDuration
-          })), p) {
-            if (p.data.effect === "Move")
-              return p.index;
-            if (p.data.effect === "Rotate") {
-              const y = o.duration !== void 0 ? o.duration * (1 - o.playedProgress) : void 0;
-              return yield this.playKeyframe(p, { duration: y }), a = !0, p.index + 1;
+          })), f) {
+            if (f.data.effect === "Move")
+              return f.index;
+            if (f.data.effect === "Rotate") {
+              const y = a.duration !== void 0 ? a.duration * (1 - a.playedProgress) : void 0;
+              return yield this.playKeyframe(f, { duration: y }), o = !0, f.index + 1;
             }
           }
         }
@@ -445,12 +445,12 @@ class z extends V {
       for (const h of d) {
         if (r.broke || !i.playing || !r.playing || s !== r.playId)
           return;
-        if (!(f !== void 0 && h.index < f))
+        if (!(p !== void 0 && h.index < p))
           try {
             n.emit("playIndexChange", h.index, h), yield this.playKeyframe(h, {
-              moveEffect: a === !1 ? r.moveToFirstPanoEffect : void 0,
-              duration: a === !1 && typeof r.moveToFirstPanoDuration == "number" ? r.moveToFirstPanoDuration : void 0
-            }), h.stay && (yield J(h.stay)), a === !1 && (a = !0);
+              moveEffect: o === !1 ? r.moveToFirstPanoEffect : void 0,
+              duration: o === !1 && typeof r.moveToFirstPanoDuration == "number" ? r.moveToFirstPanoDuration : void 0
+            }), h.stay && (yield J(h.stay)), o === !1 && (o = !0);
           } catch (P) {
             return Promise.resolve("broke");
           }
@@ -464,7 +464,7 @@ class z extends V {
   handlePause(e) {
     var n;
     const { state: t, privateState: i, hooks: r } = this;
-    t.playing = !1, i.playing !== !1 && (i.playing = !1, this.setPauseData(), i.broke || this.forceInteruptUpdateCamera(), (e == null ? void 0 : e.notEmitEvent) !== !0 && r.emit("pause", { userAction: (n = e == null ? void 0 : e.userAction) != null ? n : !0 }));
+    t.playing = !1, i.playing !== !1 && (i.playing = !1, (e == null ? void 0 : e.userAction) !== !1 && this.setPauseData(), i.broke || this.forceInteruptUpdateCamera(), (e == null ? void 0 : e.notEmitEvent) !== !0 && r.emit("pause", { userAction: (n = e == null ? void 0 : e.userAction) != null ? n : !0 }));
   }
   /**
    * @description Play single keyframe
@@ -496,28 +496,28 @@ class z extends V {
       const r = e.data;
       if (t.duration = (n = t.duration) != null ? n : e.start !== void 0 && e.end !== void 0 ? e.end - e.start : void 0, !!r)
         return new Promise((s, d) => {
-          let o = !1;
+          let a = !1;
           this.addInterruptListener(() => {
-            if (!o)
-              return this.hooks.emit("broke"), this.privateState.broke = !0, this.setState({ playing: !1 }), o = !0, d(new Error("play is interupted"));
+            if (!a)
+              return this.hooks.emit("broke"), this.privateState.broke = !0, this.setState({ playing: !1 }), a = !0, d(new Error("play is interupted"));
           });
           try {
-            if (o)
+            if (a)
               return;
-            const a = () => {
-              s(), o = !0;
+            const o = () => {
+              s(), a = !0;
             };
             switch (r.effect) {
               case "Move":
-                this.move(r, t).then(a);
+                this.move(r, t).then(o);
                 break;
               case "Rotate":
-                this.rotate(r, t).then(a);
+                this.rotate(r, t).then(o);
                 break;
               default:
-                this.rotate(r, t).then(a);
+                this.rotate(r, t).then(o);
             }
-          } catch (a) {
+          } catch (o) {
           }
         });
     });
@@ -573,13 +573,13 @@ class z extends V {
   updateCamera(i) {
     return v(this, arguments, function* (e, t = {}) {
       const { five: r, privateState: n, state: s } = this, d = (() => {
-        var l, h;
-        const m = (l = s.config) == null ? void 0 : l.speedConfig, f = (h = e.rotateSpeed) != null ? h : m == null ? void 0 : m.rotateSpeed;
+        var u, h;
+        const m = (u = s.config) == null ? void 0 : u.speedConfig, p = (h = e.rotateSpeed) != null ? h : m == null ? void 0 : m.rotateSpeed;
         if ((m == null ? void 0 : m.rotateSpeedUnit) === void 0)
-          return f;
-        if (f !== void 0)
-          return m.rotateSpeedUnit === "rad/ms" ? f : f / 1e3;
-      })(), o = (() => {
+          return p;
+        if (p !== void 0)
+          return m.rotateSpeedUnit === "rad/ms" ? p : p / 1e3;
+      })(), a = (() => {
         if (t.duration)
           return t.duration;
         if (d) {
@@ -588,10 +588,10 @@ class z extends V {
         }
         return 800;
       })();
-      n.currentPlayKeyframe && (n.currentPlayKeyframe.originDuration = o);
-      const a = this.getSpeededDuration(o);
+      n.currentPlayKeyframe && (n.currentPlayKeyframe.originDuration = a);
+      const o = this.getSpeededDuration(a);
       return new Promise((m) => {
-        _(() => r.updateCamera(e, a)), setTimeout(() => m(), a);
+        _(() => r.updateCamera(e, o)), setTimeout(() => m(), o);
       });
     });
   }
@@ -606,32 +606,32 @@ class z extends V {
       const s = i.getCurrentState().mode !== "Panorama";
       s && (this.privateState.modeChanging = !0);
       const d = (() => {
-        var f, l;
-        const a = (f = n.config) == null ? void 0 : f.speedConfig, m = (l = e.moveSpeed) != null ? l : a == null ? void 0 : a.moveSpeed;
-        if ((a == null ? void 0 : a.moveSpeedUnit) === void 0)
+        var p, u;
+        const o = (p = n.config) == null ? void 0 : p.speedConfig, m = (u = e.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 a.moveSpeedUnit === "m/ms" ? m : m / 1e3;
-      })(), o = (() => {
+          return o.moveSpeedUnit === "m/ms" ? m : m / 1e3;
+      })(), a = (() => {
         if (t != null && t.duration)
           return t.duration;
         if (d && typeof i.panoIndex == "number" && typeof e.panoIndex == "number") {
-          const a = i.work.observers[i.panoIndex].position, m = i.work.observers[e.panoIndex].position;
-          return a.distanceTo(m) / d;
+          const o = i.work.observers[i.panoIndex].position, m = i.work.observers[e.panoIndex].position;
+          return o.distanceTo(m) / d;
         }
         return 800;
       })();
-      r.currentPlayKeyframe && (r.currentPlayKeyframe.originDuration = o), yield new Promise((a) => {
-        var m, f, l;
+      r.currentPlayKeyframe && (r.currentPlayKeyframe.originDuration = a), yield new Promise((o) => {
+        var m, p, u;
         i.moveToPano(e.panoIndex, {
           latitude: e.latitude,
           longitude: e.longitude,
           fov: e.fov,
-          duration: this.getSpeededDuration(o),
-          effect: (l = (f = t == null ? void 0 : t.moveEffect) != null ? f : (m = this.state.config) == null ? void 0 : m.moveEffect) != null ? l : e.moveEffect,
-          moveCancelCallback: () => a(),
-          moveEndCallback: () => a()
-        }), s && i.once("panoArrived", () => a());
+          duration: this.getSpeededDuration(a),
+          effect: (u = (p = t == null ? void 0 : t.moveEffect) != null ? p : (m = this.state.config) == null ? void 0 : m.moveEffect) != null ? u : e.moveEffect,
+          moveCancelCallback: () => o(),
+          moveEndCallback: () => o()
+        }), s && i.once("panoArrived", () => o());
       }), s && (this.privateState.modeChanging = !1);
     });
   }
@@ -642,8 +642,8 @@ class z extends V {
     const { state: i, privateState: r, hooks: n } = this, { currentPlayKeyframe: s } = r;
     if (n.emit("speedChange", e, { userAction: t }), i.playing && s)
       try {
-        const d = s.originDuration !== void 0 ? s.originDuration * (1 - this.getProgress()) : void 0, o = this.playKeyframe(s.keyframe, { duration: d });
-        r.currentPlayQueue.push(o);
+        const d = s.originDuration !== void 0 ? s.originDuration * (1 - this.getProgress()) : void 0, a = this.playKeyframe(s.keyframe, { duration: d });
+        r.currentPlayQueue.push(a);
       } catch (d) {
       }
   }

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

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