@realsee/vreo 2.4.2 → 2.4.3

package/lib/Player/modules/keyframes/VideoEffect/index.js

@@ -13,18 +13,18 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var React = _interopRequireWildcard(require("react"));
 var _VreoUnit = require("../../../../typings/VreoUnit");
 var _hooks = require("../../../hooks");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
 // import { Preloader } from '../../../../shared-utils/Preloader'
 
 var inlinePlay = function inlinePlay(videoInstance) {
   if (!videoInstance) return;
-  var _canplaythrough = function canplaythrough() {
-    videoInstance.removeEventListener('canplaythrough', _canplaythrough);
+  var canplaythrough = function canplaythrough() {
+    videoInstance.removeEventListener('canplaythrough', canplaythrough);
     try {
       videoInstance.play();
     } catch (error) {}
   };
-  videoInstance.addEventListener('canplaythrough', _canplaythrough);
+  videoInstance.addEventListener('canplaythrough', canplaythrough);
   videoInstance.load();
 };
 
@@ -50,40 +50,42 @@ function VideoEffect() {
       var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe) {
         var start, end, _ref2, videoSrc, fov, direction, panoIndex, vector, _ref3, _ref4, longitude, latitude;
         return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              start = keyframe.start, end = keyframe.end;
-              _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, fov = _ref2.fov, direction = _ref2.direction, panoIndex = _ref2.panoIndex, vector = _ref2.vector;
-              _ref3 = function () {
-                if (vector) {
-                  return [vector.longitude, vector.latitude];
-                }
-                if (!direction) {
-                  return [0, 0];
-                }
-                var longitude = -Math.atan2(direction.x, -direction.z);
-                longitude = (longitude % PI_2 + PI_2) % PI_2;
-                var latitude = -Math.asin(direction.y / 1);
-                return [longitude, latitude];
-              }(), _ref4 = (0, _slicedToArray2["default"])(_ref3, 2), longitude = _ref4[0], latitude = _ref4[1];
-              five.setState({
-                fov: fov,
-                panoIndex: panoIndex,
-                longitude: longitude,
-                latitude: latitude
-              }, true);
-              setBlobSrc(videoSrc);
-              inlinePlay(videoRef.current);
-              setVisible(true);
-              timeoutRef.current = setTimeout(function () {
-                var _videoRef$current;
-                (_videoRef$current = videoRef.current) === null || _videoRef$current === void 0 || _videoRef$current.pause();
-                setVisible(false);
-                setBlobSrc('');
-              }, end - start);
-            case 8:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                start = keyframe.start, end = keyframe.end;
+                _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, fov = _ref2.fov, direction = _ref2.direction, panoIndex = _ref2.panoIndex, vector = _ref2.vector;
+                _ref3 = function () {
+                  if (vector) {
+                    return [vector.longitude, vector.latitude];
+                  }
+                  if (!direction) {
+                    return [0, 0];
+                  }
+                  var longitude = -Math.atan2(direction.x, -direction.z);
+                  longitude = (longitude % PI_2 + PI_2) % PI_2;
+                  var latitude = -Math.asin(direction.y / 1);
+                  return [longitude, latitude];
+                }(), _ref4 = (0, _slicedToArray2["default"])(_ref3, 2), longitude = _ref4[0], latitude = _ref4[1];
+                five.setState({
+                  fov: fov,
+                  panoIndex: panoIndex,
+                  longitude: longitude,
+                  latitude: latitude
+                }, true);
+                setBlobSrc(videoSrc);
+                inlinePlay(videoRef.current);
+                setVisible(true);
+                timeoutRef.current = setTimeout(function () {
+                  var _videoRef$current;
+                  (_videoRef$current = videoRef.current) === null || _videoRef$current === void 0 ? void 0 : _videoRef$current.pause();
+                  setVisible(false);
+                  setBlobSrc('');
+                }, end - start);
+              case 8:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee);
       }));
@@ -97,7 +99,7 @@ function VideoEffect() {
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
-      (_videoRef$current2 = videoRef.current) === null || _videoRef$current2 === void 0 || _videoRef$current2.pause();
+      (_videoRef$current2 = videoRef.current) === null || _videoRef$current2 === void 0 ? void 0 : _videoRef$current2.pause();
       setVisible(false);
       setBlobSrc('');
     };
@@ -115,9 +117,9 @@ function VideoEffect() {
     };
   }, [controller]);
   React.useEffect(function () {
-    var _controller$configs;
+    var _controller$configs, _controller$configs$v;
     if (!ref.current) return;
-    var video = ((_controller$configs = controller.configs) === null || _controller$configs === void 0 || (_controller$configs = _controller$configs.videos) === null || _controller$configs === void 0 ? void 0 : _controller$configs.videoEffect) || document.createElement('video');
+    var video = ((_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : (_controller$configs$v = _controller$configs.videos) === null || _controller$configs$v === void 0 ? void 0 : _controller$configs$v.videoEffect) || document.createElement('video');
     // <video playsInline key="VideoEffect-video" className="VideoEffect-video" src={blobSrc} />
     video.setAttribute('playsinline', 'true');
     video.setAttribute('webkit-playsinline', 'true');
@@ -128,7 +130,7 @@ function VideoEffect() {
     ref.current.append(videoRef.current);
     document.addEventListener('WeixinJSBridgeReady', function () {
       var _videoRef$current3;
-      (_videoRef$current3 = videoRef.current) === null || _videoRef$current3 === void 0 || _videoRef$current3.play();
+      (_videoRef$current3 = videoRef.current) === null || _videoRef$current3 === void 0 ? void 0 : _videoRef$current3.play();
     }, false);
     if (!ref.current) return;
     // const asyncfunc = async () => {

package/lib/Player/typings.d.ts

@@ -2,9 +2,6 @@ import React, { ReactNode } from 'react';
 import { Subscribe, Five } from '@realsee/five';
 import { VreoKeyframe, VreoKeyframeConfigMap, VreoKeyframeEvent } from '../typings/VreoUnit';
 import { VideoAgentMeshOptions } from './modules/VideoAgent/VideoAgentMesh';
-export type VreoFunctionComponent<P = {}> = (props: P) => ReactNode;
-/** @deprecated 请使用 VreoFunctionComponent<CustomVreoKeyframeProps> 替代 */
-export type LegacyCustomKeyframe = React.FC<CustomVreoKeyframeProps>;
 export interface PlayerConfigs {
     /**
      * @deprecated rename to container
@@ -27,7 +24,7 @@ export interface PlayerConfigs {
      * 如果需要在 底部面板添加自定义内容，可以传递个 React 组件。
      */
     customPanelChildren?: ReactNode;
-    customKeyframes?: (VreoFunctionComponent<CustomVreoKeyframeProps> | React.FC<CustomVreoKeyframeProps>)[];
+    customKeyframes?: React.FC<CustomVreoKeyframeProps>[];
     imageOptions?: {
         size: number;
     };

package/lib/fivePlugins/CSS3DRenderPlugin/index.js

@@ -13,7 +13,7 @@ var _evenNumber = _interopRequireDefault(require("./evenNumber"));
 var _centerPoint = _interopRequireDefault(require("./centerPoint"));
 var _transformPositionToVector = _interopRequireDefault(require("./transformPositionToVector3"));
 var _createResizeObserver = _interopRequireDefault(require("./createResizeObserver"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
 /**
  * 三维向量
  */
@@ -38,7 +38,7 @@ var CSS3DRenderPlugin = exports.CSS3DRenderPlugin = function CSS3DRenderPlugin(f
     });
     var config = params[1];
     if ((points === null || points === void 0 ? void 0 : points.length) < 4) return console.error('points must be equal or greater than than 4');
-    if (!(five !== null && five !== void 0 && (_five$model = five.model) !== null && _five$model !== void 0 && _five$model.loaded)) return console.error('five.model.loaded is: ', five === null || five === void 0 || (_five$model2 = five.model) === null || _five$model2 === void 0 ? void 0 : _five$model2.loaded);
+    if (!(five !== null && five !== void 0 && (_five$model = five.model) !== null && _five$model !== void 0 && _five$model.loaded)) return console.error('five.model.loaded is: ', five === null || five === void 0 ? void 0 : (_five$model2 = five.model) === null || _five$model2 === void 0 ? void 0 : _five$model2.loaded);
     var fiveElement = five.getElement();
     if (!fiveElement) return console.error('five.getElement() is ' + fiveElement);
     var disposers = [];
@@ -102,16 +102,16 @@ var CSS3DRenderPlugin = exports.CSS3DRenderPlugin = function CSS3DRenderPlugin(f
         css3DRenderer.domElement.style.top = '0';
         css3DRenderer.domElement.style.userSelect = 'none';
         css3DRenderer.domElement.style.pointerEvents = 'none';
-        var _renderEveryFrame = function renderEveryFrame() {
+        var renderEveryFrame = function renderEveryFrame() {
           if (stopRenderFlag) return;
-          requestAnimationFrameId = requestAnimationFrame(_renderEveryFrame);
+          requestAnimationFrameId = requestAnimationFrame(renderEveryFrame);
           css3DRenderer.render(scene, five.camera);
         };
         return function () {
           var _resizeObserver, _resizeObserver$obser;
           scene.add(css3DObject);
-          (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 || (_resizeObserver$obser = _resizeObserver.observe) === null || _resizeObserver$obser === void 0 || _resizeObserver$obser.call(_resizeObserver);
-          _renderEveryFrame();
+          (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 ? void 0 : (_resizeObserver$obser = _resizeObserver.observe) === null || _resizeObserver$obser === void 0 ? void 0 : _resizeObserver$obser.call(_resizeObserver);
+          renderEveryFrame();
           if (mode === 'behind' && mesh) {
             five.scene.add(mesh);
             disposers.push(function () {
@@ -148,7 +148,7 @@ var CSS3DRenderPlugin = exports.CSS3DRenderPlugin = function CSS3DRenderPlugin(f
         if (mode === 'behind') state.behindMode = undefined;
         if (!state.behindMode && !state.frontMode) {
           var _resizeObserver2, _resizeObserver2$unob;
-          (_resizeObserver2 = resizeObserver) === null || _resizeObserver2 === void 0 || (_resizeObserver2$unob = _resizeObserver2.unobserve) === null || _resizeObserver2$unob === void 0 || _resizeObserver2$unob.call(_resizeObserver2);
+          (_resizeObserver2 = resizeObserver) === null || _resizeObserver2 === void 0 ? void 0 : (_resizeObserver2$unob = _resizeObserver2.unobserve) === null || _resizeObserver2$unob === void 0 ? void 0 : _resizeObserver2$unob.call(_resizeObserver2);
         }
       }
       return true;

package/lib/fivePlugins/CameraMovementPlugin/index.js

@@ -40,79 +40,81 @@ var CameraMovementPlugin = exports.CameraMovementPlugin = function CameraMovemen
         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)) {
+          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;
+                }
                 _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;
-              }
-              _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();
+              case 26:
+                reject(false);
+              case 27:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee);
       }));
@@ -130,110 +132,112 @@ var CameraMovementPlugin = exports.CameraMovementPlugin = function CameraMovemen
         timeEnd,
         start,
         animeDuration,
-        _onFiveRenderFrame,
+        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 || _opts$asyncStartCallb.call(opts);
+        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)) {
+              // 先切换模型再出旋转效果
+              if (!(args.mode && five.currentMode !== args.mode)) {
+                _context2.next = 6;
+                break;
+              }
               _context2.next = 6;
-              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;
-              break;
-            }
-            if (!opts.preload) {
+              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;
-              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'
+              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 || _opts$asyncEndCallbac2.call(opts);
+            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);
-            }
-            _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)
-                };
+              // 计算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);
               }
-              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();
+              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();
+          }
         }
       }, _callee2);
     }));

package/lib/fivePlugins/CameraMovementPlugin/typings.js

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