@realsee/vreo 2.4.0 → 2.4.1

package/lib/fivePlugins/CameraMovementPlugin/index.js

@@ -1,20 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CameraMovementPlugin = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _five = require("@realsee/five");
-
 var _typings = require("./typings");
-
 var PI = Math.PI;
 var PI_2 = PI * 2;
 var moving = false; // five 6 神秘bug， move 的时候不能 setState
@@ -23,7 +17,6 @@ function progressNumber(from, to, pst) {
   if (from === to) return from;
   return from + (to - from) * pst;
 }
-
 function progressLongitude(fromLongitude, toLongitude, rotation, progress) {
   var clockwise = rotation === _typings.Rotation.Clockwise;
   var delta = clockwise ? fromLongitude - toLongitude : toLongitude - fromLongitude;
@@ -33,276 +26,223 @@ function progressLongitude(fromLongitude, toLongitude, rotation, progress) {
   var progressLongitude = fromLongitude + deltaMod3 * progress;
   return progressLongitude % PI_2;
 }
+
 /**
  * **运镜插件** 模拟类似于电影运镜效果。
  */
-
-
-var CameraMovementPlugin = function CameraMovementPlugin(five) {
+var CameraMovementPlugin = exports.CameraMovementPlugin = function CameraMovementPlugin(five) {
   var move = function move(args, duration) {
     var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
       preload: true
     };
-    return new Promise( /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
+    return new Promise(/*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
         var _opts$asyncEndCallbac;
-
         var panoIndex, start, movePanoOptions;
         return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                moving = true;
-
-                if (opts.asyncStartCallback) {
-                  opts.asyncStartCallback();
-                }
-
-                if (!(five.panoIndex === undefined)) {
-                  _context.next = 4;
-                  break;
-                }
-
-                return _context.abrupt("return", reject(false));
-
-              case 4:
-                if (!(args.mode && args.mode !== five.currentMode)) {
-                  _context.next = 8;
-                  break;
-                }
-
-                _context.next = 7;
-                return five.changeMode(args.mode, args, duration);
-
-              case 7:
-                return _context.abrupt("return", resolve(true));
-
-              case 8:
-                if (!(args.mode === _five.Five.Mode.Floorplan)) {
-                  _context.next = 10;
-                  break;
-                }
-
-                return _context.abrupt("return", resolve(true));
-
-              case 10:
-                if (!(opts.preload && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
-                  _context.next = 13;
-                  break;
-                }
-
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              moving = true;
+              if (opts.asyncStartCallback) {
+                opts.asyncStartCallback();
+              }
+              if (!(five.panoIndex === undefined)) {
+                _context.next = 4;
+                break;
+              }
+              return _context.abrupt("return", reject(false));
+            case 4:
+              if (!(args.mode && args.mode !== five.currentMode)) {
+                _context.next = 8;
+                break;
+              }
+              _context.next = 7;
+              return five.changeMode(args.mode, args, duration);
+            case 7:
+              return _context.abrupt("return", resolve(true));
+            case 8:
+              if (!(args.mode === _five.Five.Mode.Floorplan)) {
+                _context.next = 10;
+                break;
+              }
+              return _context.abrupt("return", resolve(true));
+            case 10:
+              if (!(opts.preload && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
                 _context.next = 13;
-                return five.preloadPano(args.panoIndex);
-
-              case 13:
-                (_opts$asyncEndCallbac = opts.asyncEndCallback) === null || _opts$asyncEndCallbac === void 0 ? void 0 : _opts$asyncEndCallbac.call(opts);
-
-                if (!(args.panoIndex === undefined && args.fov === undefined && args.latitude === undefined && args.longitude === undefined)) {
-                  _context.next = 16;
-                  break;
-                }
-
-                return _context.abrupt("return", resolve(true));
-
-              case 16:
-                panoIndex = args.panoIndex !== undefined ? args.panoIndex : five.panoIndex;
-
-                if (!(panoIndex !== undefined)) {
-                  _context.next = 26;
-                  break;
-                }
-
-                start = performance.now();
-                _context.next = 21;
-                return five.ready();
-
-              case 21:
-                movePanoOptions = Object.assign({}, args, {
-                  duration: duration - (performance.now() - start),
-                  // 移动耗时
-                  moveEndCallback: function moveEndCallback() {
-                    return resolve(true);
-                  },
-                  // 移动结束
-                  moveCancelCallback: function moveCancelCallback() {
-                    resolve(true);
-                  },
-                  // 移动开始
-                  effect: args.transEffect || 'fly'
-                });
-                _context.next = 24;
-                return five.moveToPano(panoIndex, movePanoOptions);
-
-              case 24:
-                _context.next = 27;
                 break;
-
-              case 26:
-                reject(false);
-
-              case 27:
-              case "end":
-                return _context.stop();
-            }
+              }
+              _context.next = 13;
+              return five.preloadPano(args.panoIndex);
+            case 13:
+              (_opts$asyncEndCallbac = opts.asyncEndCallback) === null || _opts$asyncEndCallbac === void 0 || _opts$asyncEndCallbac.call(opts);
+              if (!(args.panoIndex === undefined && args.fov === undefined && args.latitude === undefined && args.longitude === undefined)) {
+                _context.next = 16;
+                break;
+              }
+              return _context.abrupt("return", resolve(true));
+            case 16:
+              panoIndex = args.panoIndex !== undefined ? args.panoIndex : five.panoIndex;
+              if (!(panoIndex !== undefined)) {
+                _context.next = 26;
+                break;
+              }
+              start = performance.now();
+              _context.next = 21;
+              return five.ready();
+            case 21:
+              movePanoOptions = Object.assign({}, args, {
+                duration: duration - (performance.now() - start),
+                // 移动耗时
+                moveEndCallback: function moveEndCallback() {
+                  return resolve(true);
+                },
+                // 移动结束
+                moveCancelCallback: function moveCancelCallback() {
+                  resolve(true);
+                },
+                // 移动开始
+                effect: args.transEffect || 'fly'
+              });
+              _context.next = 24;
+              return five.moveToPano(panoIndex, movePanoOptions);
+            case 24:
+              _context.next = 27;
+              break;
+            case 26:
+              reject(false);
+            case 27:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
       }));
-
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
       };
     }());
   };
-
   var rotate = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(args, duration) {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(args, duration) {
       var _opts$asyncStartCallb, _opts$asyncEndCallbac2;
-
       var opts,
-          from,
-          to,
-          timeEnd,
-          start,
-          animeDuration,
-          onFiveRenderFrame,
-          _args2 = arguments;
+        from,
+        to,
+        timeEnd,
+        start,
+        animeDuration,
+        _onFiveRenderFrame,
+        _args2 = arguments;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              opts = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {};
-              moving = false;
-              (_opts$asyncStartCallb = opts.asyncStartCallback) === null || _opts$asyncStartCallb === void 0 ? void 0 : _opts$asyncStartCallb.call(opts); // 先切换模型再出旋转效果
-
-              if (!(args.mode && five.currentMode !== args.mode)) {
-                _context2.next = 6;
-                break;
-              }
-
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            opts = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {};
+            moving = false;
+            (_opts$asyncStartCallb = opts.asyncStartCallback) === null || _opts$asyncStartCallb === void 0 || _opts$asyncStartCallb.call(opts);
+
+            // 先切换模型再出旋转效果
+            if (!(args.mode && five.currentMode !== args.mode)) {
               _context2.next = 6;
-              return five.changeMode(args.mode, args.mode === _five.Five.Mode.Panorama ? {
-                latitude: 0
-              } : undefined);
-
-            case 6:
-              if (!(args.mode === _five.Five.Mode.Panorama && five.currentMode === _five.Five.Mode.Panorama && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
-                _context2.next = 12;
-                break;
-              }
-
-              if (!opts.preload) {
-                _context2.next = 10;
-                break;
-              }
-
-              _context2.next = 10;
-              return five.preloadPano(args.panoIndex);
-
-            case 10:
+              break;
+            }
+            _context2.next = 6;
+            return five.changeMode(args.mode, args.mode === _five.Five.Mode.Panorama ? {
+              latitude: 0
+            } : undefined);
+          case 6:
+            if (!(args.mode === _five.Five.Mode.Panorama && five.currentMode === _five.Five.Mode.Panorama && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
               _context2.next = 12;
-              return new Promise(function (resolve, reject) {
-                five.moveToPano(args.panoIndex, {
-                  moveEndCallback: function moveEndCallback() {
-                    return resolve(true);
-                  },
-                  // 移动结束
-                  moveCancelCallback: function moveCancelCallback() {
-                    return reject(false);
-                  },
-                  // 移动开始
-                  effect: 'fade'
-                });
+              break;
+            }
+            if (!opts.preload) {
+              _context2.next = 10;
+              break;
+            }
+            _context2.next = 10;
+            return five.preloadPano(args.panoIndex);
+          case 10:
+            _context2.next = 12;
+            return new Promise(function (resolve, reject) {
+              five.moveToPano(args.panoIndex, {
+                moveEndCallback: function moveEndCallback() {
+                  return resolve(true);
+                },
+                // 移动结束
+                moveCancelCallback: function moveCancelCallback() {
+                  return reject(false);
+                },
+                // 移动开始
+                effect: 'fade'
               });
-
-            case 12:
-              _context2.next = 14;
-              return five.ready();
-
-            case 14:
-              (_opts$asyncEndCallbac2 = opts.asyncEndCallback) === null || _opts$asyncEndCallbac2 === void 0 ? void 0 : _opts$asyncEndCallbac2.call(opts); // 计算to
-
-              from = five.getCurrentState();
-
-              to = function () {
-                return args;
-              }();
-
-              timeEnd = false; // 开始时间
-
-              start = performance.now();
-              animeDuration = duration;
-
-              if (args.rotation === _typings.Rotation.Loop) {
-                animeDuration = args.rotateSpeed ? Math.ceil(Math.abs(to.longitude - from.longitude) / args.rotateSpeed * 1000) : duration;
-                animeDuration = Math.min(duration, animeDuration);
+            });
+          case 12:
+            _context2.next = 14;
+            return five.ready();
+          case 14:
+            (_opts$asyncEndCallbac2 = opts.asyncEndCallback) === null || _opts$asyncEndCallbac2 === void 0 || _opts$asyncEndCallbac2.call(opts);
+
+            // 计算to
+            from = five.getCurrentState();
+            to = function () {
+              return args;
+            }();
+            timeEnd = false; // 开始时间
+            start = performance.now();
+            animeDuration = duration;
+            if (args.rotation === _typings.Rotation.Loop) {
+              animeDuration = args.rotateSpeed ? Math.ceil(Math.abs(to.longitude - from.longitude) / args.rotateSpeed * 1000) : duration;
+              animeDuration = Math.min(duration, animeDuration);
+            }
+            _onFiveRenderFrame = function onFiveRenderFrame() {
+              if (timeEnd || moving) {
+                five.off('renderFrame', _onFiveRenderFrame);
+                return;
               }
-
-              onFiveRenderFrame = function onFiveRenderFrame() {
-                if (timeEnd || moving) {
-                  five.off('renderFrame', onFiveRenderFrame);
-                  return;
-                }
-
-                var targetState = {};
-
-                if (args.rotation !== _typings.Rotation.Loop) {
-                  var progress = (performance.now() - start) / duration;
-                  targetState = {
-                    fov: progressNumber(from.fov, to.fov, progress),
-                    latitude: progressNumber(from.latitude, to.latitude, progress),
-                    longitude: progressLongitude(from.longitude, to.longitude, args.rotation, progress)
-                  };
-                } else {
-                  var _progress = (performance.now() - start) / animeDuration; // 可能大于1
-
-
-                  var times = Math.floor(_progress);
-                  var progress2 = _progress - times; // 一定小于1
-
-                  var isNegative = times % 2 === 1; // 是否为反向旋转, 0: 正, 1: 反, 2: 正, 3: 反 以此类推
-
-                  var resultProgress = isNegative ? 1 - progress2 : progress2;
-                  targetState = {
-                    fov: progressNumber(from.fov, to.fov, resultProgress),
-                    latitude: progressNumber(from.latitude, to.latitude, resultProgress),
-                    longitude: progressNumber(from.longitude, to.longitude, resultProgress)
-                  };
-                }
-
-                five.setState(targetState, true);
-              };
-
-              five.on('renderFrame', onFiveRenderFrame);
-              _context2.next = 25;
-              return new Promise(function (resolve) {
-                setTimeout(function () {
-                  timeEnd = true;
-                  five.off('renderFrame', onFiveRenderFrame); // 总时间到了之后强制结束，同时也是 Loop 模式的结束方式
-
-                  resolve(true);
-                }, duration);
-              });
-
-            case 25:
-              return _context2.abrupt("return", _context2.sent);
-
-            case 26:
-            case "end":
-              return _context2.stop();
-          }
+              var targetState = {};
+              if (args.rotation !== _typings.Rotation.Loop) {
+                var progress = (performance.now() - start) / duration;
+                targetState = {
+                  fov: progressNumber(from.fov, to.fov, progress),
+                  latitude: progressNumber(from.latitude, to.latitude, progress),
+                  longitude: progressLongitude(from.longitude, to.longitude, args.rotation, progress)
+                };
+              } else {
+                var _progress = (performance.now() - start) / animeDuration; // 可能大于1
+                var times = Math.floor(_progress);
+                var progress2 = _progress - times; // 一定小于1
+                var isNegative = times % 2 === 1; // 是否为反向旋转, 0: 正, 1: 反, 2: 正, 3: 反 以此类推
+                var resultProgress = isNegative ? 1 - progress2 : progress2;
+                targetState = {
+                  fov: progressNumber(from.fov, to.fov, resultProgress),
+                  latitude: progressNumber(from.latitude, to.latitude, resultProgress),
+                  longitude: progressNumber(from.longitude, to.longitude, resultProgress)
+                };
+              }
+              five.setState(targetState, true);
+            };
+            five.on('renderFrame', _onFiveRenderFrame);
+            _context2.next = 25;
+            return new Promise(function (resolve) {
+              setTimeout(function () {
+                timeEnd = true;
+                five.off('renderFrame', _onFiveRenderFrame);
+                // 总时间到了之后强制结束，同时也是 Loop 模式的结束方式
+                resolve(true);
+              }, duration);
+            });
+          case 25:
+            return _context2.abrupt("return", _context2.sent);
+          case 26:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));
-
     return function rotate(_x3, _x4) {
       return _ref2.apply(this, arguments);
     };
   }();
-
   return {
     move: move,
     rotate: rotate
   };
-};
-
-exports.CameraMovementPlugin = CameraMovementPlugin;
+};

package/lib/fivePlugins/CameraMovementPlugin/typings.d.ts

@@ -30,21 +30,21 @@ export interface CameraMovementOptsCallback {
     asyncStartCallback?: () => void;
     asyncEndCallback?: () => void;
 }
-export declare type MoveArgs = {
+export type MoveArgs = {
     mode: Mode;
     panoIndex: number;
     transEffect?: "fly" | "fade" | "instant";
 } & Pose;
-export declare type MoveOpts = {
+export type MoveOpts = {
     preload?: boolean;
 } & CameraMovementOptsCallback;
-export declare type RotateArgs = {
+export type RotateArgs = {
     mode?: Mode;
     panoIndex: number;
     loop: boolean;
     rotateSpeed: number;
     rotation: Rotation;
 } & Pose;
-export declare type RotateOpts = {
+export type RotateOpts = {
     preload?: boolean;
 } & CameraMovementOptsCallback;

package/lib/fivePlugins/CameraMovementPlugin/typings.js

@@ -4,22 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Rotation = exports.CameraMovementEffect = void 0;
-
 /* eslint-disable prettier/prettier */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-var CameraMovementEffect;
-exports.CameraMovementEffect = CameraMovementEffect;
-
-(function (CameraMovementEffect) {
+var CameraMovementEffect = exports.CameraMovementEffect = /*#__PURE__*/function (CameraMovementEffect) {
   CameraMovementEffect["Move"] = "Move";
   CameraMovementEffect["Rotate"] = "Rotate";
-})(CameraMovementEffect || (exports.CameraMovementEffect = CameraMovementEffect = {}));
-
-var Rotation;
-exports.Rotation = Rotation;
-
-(function (Rotation) {
+  return CameraMovementEffect;
+}({});
+var Rotation = exports.Rotation = /*#__PURE__*/function (Rotation) {
   Rotation["Clockwise"] = "Clockwise";
   Rotation["Anticlockwise"] = "Anticlockwise";
   Rotation["Loop"] = "Loop";
-})(Rotation || (exports.Rotation = Rotation = {}));
+  return Rotation;
+}({});