@realsee/vreo 2.4.1 → 2.4.3

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 = {}));

package/lib/fivePlugins/ModelTVVideoPlugin/index.js

@@ -10,7 +10,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var THREE = _interopRequireWildcard(require("three"));
-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); }
 var ModelTVVideoPlugin = exports.ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
   var videoElement = _ref.videoElement;
   var state = {
@@ -40,17 +40,17 @@ var ModelTVVideoPlugin = exports.ModelTVVideoPlugin = function ModelTVVideoPlugi
     });
     var play = function play() {
       if (!state.videoTexture) return;
-      var _timeupdate = function timeupdate() {
+      var timeupdate = function timeupdate() {
         var _state$videoTexture;
         if (!state.videoTexture) return;
-        (_state$videoTexture = state.videoTexture) === null || _state$videoTexture === void 0 || _state$videoTexture.image.removeEventListener('timeupdate', _timeupdate);
+        (_state$videoTexture = state.videoTexture) === null || _state$videoTexture === void 0 ? void 0 : _state$videoTexture.image.removeEventListener('timeupdate', timeupdate);
         state.videoTextureEnabled = true;
         state.videoMeshes.forEach(function (mesh) {
           if (mesh.material.map !== state.videoTexture) mesh.material.map = state.videoTexture;
         });
         five.needsRender = true;
       };
-      state.videoTexture.image.addEventListener('timeupdate', _timeupdate);
+      state.videoTexture.image.addEventListener('timeupdate', timeupdate);
       if (state.videoTexture && state.videoMeshes.length) {
         state.videoTexture.image.play();
       }
@@ -161,31 +161,33 @@ var ModelTVVideoPlugin = exports.ModelTVVideoPlugin = function ModelTVVideoPlugi
     var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(data, videoElement) {
       var video_src, video_poster_src, points;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            video_src = data.video_src, video_poster_src = data.video_poster_src, points = data.points;
-            state.videoSource = video_src;
-            state.rectPoints = points.map(function (items) {
-              return items.map(function (_ref3) {
-                var x = _ref3.x,
-                  y = _ref3.y,
-                  z = _ref3.z;
-                return new THREE.Vector3(x, y, z);
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              video_src = data.video_src, video_poster_src = data.video_poster_src, points = data.points;
+              state.videoSource = video_src;
+              state.rectPoints = points.map(function (items) {
+                return items.map(function (_ref3) {
+                  var x = _ref3.x,
+                    y = _ref3.y,
+                    z = _ref3.z;
+                  return new THREE.Vector3(x, y, z);
+                });
               });
-            });
-            state.imageTexture = getImageTexture(video_poster_src);
-            if (videoElement) {
-              state.videoElement = videoElement;
-            }
-            _context.next = 7;
-            return getVideoTexture(state.videoSource, state.videoElement);
-          case 7:
-            state.videoTexture = _context.sent;
-            state.enabled = !!data.enable;
-            if (state.enabled) enable();
-          case 10:
-          case "end":
-            return _context.stop();
+              state.imageTexture = getImageTexture(video_poster_src);
+              if (videoElement) {
+                state.videoElement = videoElement;
+              }
+              _context.next = 7;
+              return getVideoTexture(state.videoSource, state.videoElement);
+            case 7:
+              state.videoTexture = _context.sent;
+              state.enabled = !!data.enable;
+              if (state.enabled) enable();
+            case 10:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));

package/lib/react/index.d.ts

@@ -5,7 +5,7 @@ export interface VreoProviderProps {
     configs?: Partial<PlayerConfigs>;
     children?: React.ReactNode;
 }
-export declare const VreoProvider: (props: VreoProviderProps) => React.JSX.Element;
+export declare const VreoProvider: React.FC<VreoProviderProps>;
 /**
  * VreoPlayer 命令集合。
  */

package/lib/react/index.js

@@ -13,7 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("@realsee/five/react");
 var React = _interopRequireWildcard(require("react"));
 var _Player = require("../Player");
-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); }
 var VreoContext = /*#__PURE__*/React.createContext(null);
 var VreoProvider = exports.VreoProvider = function VreoProvider(props) {
   var five = (0, _react.unsafe__useFiveInstance)();
@@ -27,7 +27,7 @@ var VreoProvider = exports.VreoProvider = function VreoProvider(props) {
     setPlayer(playerRef.current);
     return function () {
       var _playerRef$current;
-      (_playerRef$current = playerRef.current) === null || _playerRef$current === void 0 || _playerRef$current.dispose();
+      (_playerRef$current = playerRef.current) === null || _playerRef$current === void 0 ? void 0 : _playerRef$current.dispose();
     };
   }, []);
   if (!player) return /*#__PURE__*/React.createElement(React.Fragment, null);

package/lib/shared-utils/Audio.d.ts

@@ -4,7 +4,15 @@ export declare function waitForBlankAudioGenerated(checkInterval?: number, timeo
 export declare function generateBlankAudio(length: number): void;
 declare class IAudio extends Audio {
     preload: "auto";
+    /**
+     * 获取音频源 URL
+     * @returns {string} 当前音频源 URL
+     */
     get src(): string;
+    /**
+     * 设置音频源 URL
+     * @param paramsSrc - 音频源 URL
+     */
     set src(paramsSrc: string);
     realSrc: string;
     inited: boolean;