@realsee/vreo 0.2.0-alpha.7 → 0.2.0-alpha.8

package/lib/PlayController/index.js

@@ -0,0 +1,300 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PlayController = void 0;
+
+var _five = require("@realsee/five");
+
+var _animationFrame = require("../shared-utils/animationFrame");
+
+var _createHTMLAudioElement = require("./createHTMLAudioElement");
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var closures = {};
+
+var PlayController = /*#__PURE__*/function (_Subscribe) {
+  _inherits(PlayController, _Subscribe);
+
+  var _super = _createSuper(PlayController);
+
+  function PlayController() {
+    var _this;
+
+    var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    _classCallCheck(this, PlayController);
+
+    _this = _super.call(this);
+
+    _defineProperty(_assertThisInitialized(_this), "config", {});
+
+    if (!config.audio) {
+      config.audio = (0, _createHTMLAudioElement.createHTMLAudioElement)();
+    }
+
+    _this.config = Object.assign(_this.config, config);
+
+    closures.onPlaying = function () {
+      return _this.emit('playing');
+    };
+
+    closures.onPaused = function () {
+      return _this.emit('paused');
+    };
+
+    closures.onEnded = function () {
+      return _this.emit('paused', true);
+    };
+
+    _this.audioInstance.addEventListener('play', closures.onPlaying);
+
+    _this.audioInstance.addEventListener('pause', closures.onPaused);
+
+    _this.audioInstance.addEventListener('ended', closures.onEnded);
+
+    _this.stopInterval = (0, _animationFrame.requestAnimationFrameInterval)(function () {
+      if (_this.audioInstance.paused) {
+        return;
+      }
+
+      if (!_this.vreoUnit) {
+        return;
+      }
+
+      var keyframes = _this.vreoUnit.keyframes;
+      var currentTime = _this.currentTime; // 没有被解析过且开始时间低于当前时间戳 100ms
+
+      var currentKeyframes = keyframes.filter(function (keyframe) {
+        if (keyframe.parsed) return false;
+        var dur = currentTime - keyframe.start;
+        return dur <= 60 && dur >= 0;
+      });
+      currentKeyframes.forEach(function (keyframe) {
+        if (keyframe.parsed) return;
+        keyframe.parsed = true;
+
+        _this.emit(keyframe.type, keyframe);
+      });
+    });
+    return _this;
+  }
+  /**
+   * 载入数据
+   */
+
+
+  _createClass(PlayController, [{
+    key: "paused",
+    get: function get() {
+      return this.audioInstance.paused;
+    }
+  }, {
+    key: "audioInstance",
+    get: function get() {
+      return this.config.audio;
+    }
+  }, {
+    key: "currentTime",
+    get: function get() {
+      return this.audioInstance.currentTime * 1000;
+    }
+  }, {
+    key: "currentKeyframes",
+    get: function get() {
+      var _this2 = this;
+
+      if (!this.vreoUnit) return [];
+      var keyframes = this.vreoUnit.keyframes; // 没有被解析过且开始时间低于当前时间戳 100ms
+
+      return keyframes.filter(function (keyframe) {
+        if (keyframe.parsed) return false;
+        var dur = _this2.currentTime - keyframe.start;
+        return dur <= 100 && dur >= 0;
+      });
+    }
+    /**
+     * 音频时长 不一定能获取得到，建议以 VreoUnit 配置的时长为准。
+     */
+
+  }, {
+    key: "duration",
+    get: function get() {
+      return this.audioInstance.duration * 1000;
+    }
+  }, {
+    key: "load",
+    value: function () {
+      var _load = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(vreoUnit) {
+        var _this3 = this;
+
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.vreoUnit = vreoUnit;
+                _context.next = 3;
+                return this.pause();
+
+              case 3:
+                _context.next = 5;
+                return new Promise(function (resolve, reject) {
+                  if (vreoUnit.video.url === _this3.audioInstance.src) {
+                    return resolve(true);
+                  }
+
+                  _this3.audioInstance.src = vreoUnit.video.url;
+
+                  var canplaythrough = function canplaythrough() {
+                    resolve(true);
+
+                    _this3.audioInstance.removeEventListener('canplaythrough', canplaythrough);
+                  };
+
+                  var error = function error(err) {
+                    reject(err);
+
+                    _this3.audioInstance.removeEventListener('error', error);
+                  };
+
+                  _this3.audioInstance.addEventListener('canplaythrough', canplaythrough);
+
+                  _this3.audioInstance.addEventListener('error', error);
+                });
+
+              case 5:
+                return _context.abrupt("return", _context.sent);
+
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function load(_x) {
+        return _load.apply(this, arguments);
+      }
+
+      return load;
+    }()
+    /**
+     * 播放
+     */
+
+  }, {
+    key: "play",
+    value: function () {
+      var _play = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                closures.playPromise = this.audioInstance.play();
+
+              case 1:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function play() {
+        return _play.apply(this, arguments);
+      }
+
+      return play;
+    }()
+    /**
+     * 暂停
+     */
+
+  }, {
+    key: "pause",
+    value: function () {
+      var _pause = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+        return regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                if (!closures.playPromise) {
+                  _context3.next = 3;
+                  break;
+                }
+
+                _context3.next = 3;
+                return closures.playPromise;
+
+              case 3:
+                this.audioInstance.pause();
+
+              case 4:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function pause() {
+        return _pause.apply(this, arguments);
+      }
+
+      return pause;
+    }()
+    /**
+     * 销毁资源
+     * @notice 一旦销毁，创建的实例将不可用：需重新创建实例。
+     * 
+     * @deprecated **慎重执行**
+     */
+
+  }, {
+    key: "dispose",
+    value: function dispose() {
+      // 清理事件监听
+      this.audioInstance.removeEventListener('play', closures.onPlaying);
+      this.audioInstance.removeEventListener('pasue', closures.onPaused);
+      this.audioInstance.removeEventListener('ended', closures.onEnded);
+
+      if (this.stopInterval) {
+        this.stopInterval();
+      }
+    }
+  }]);
+
+  return PlayController;
+}(_five.Subscribe);
+
+exports.PlayController = PlayController;
+console.log("\n\n\u250F\u2501\u2501\u2501\u2513\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u250F\u2513\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2503\u250F\u2501\u2513\u2503\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2503\u2503\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2503\u2517\u2501\u251B\u2503\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\u2501\u2503\u2503\u2501\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\n\u2503\u250F\u2513\u250F\u251B\u2503\u250F\u2513\u2503\u2517\u2501\u2513\u2503\u2501\u2503\u2503\u2501\u2503\u2501\u2501\u252B\u2503\u250F\u2513\u2503\u2503\u250F\u2513\u2503\n\u2503\u2503\u2503\u2517\u2513\u2503\u2503\u2501\u252B\u2503\u2517\u251B\u2517\u2513\u2503\u2517\u2513\u2523\u2501\u2501\u2503\u2503\u2503\u2501\u252B\u2503\u2503\u2501\u252B\n\u2517\u251B\u2517\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u2501\u251B\u2517\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u251B\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501 \n\n");

package/lib/Player/custom/SpatialScenePanel/index.js

@@ -201,7 +201,6 @@ function SpatialScenePanelBg() {
     var listener = function listener() {
       var _ref$current;
 
-      console.log('listener');
       (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setAttribute('class', 'SpatialScenePanel-bg');
       timeoutRef.current = setTimeout(function () {
         var _ref$current2;

package/lib/Player/index.d.ts

@@ -6,7 +6,7 @@ export declare class Player extends Subscribe<VreoKeyframeEvent> {
     private controller;
     configs: Readonly<PlayerConfigs>;
     constructor(five: Five, configs?: Partial<PlayerConfigs>);
-    load(vreoUnit: VreoUnit, currentTime?: number): Promise<boolean>;
+    load(vreoUnit: VreoUnit, currentTime?: number, preload?: boolean): Promise<boolean>;
     get paused(): boolean;
     play(): boolean;
     pause(): void;

package/lib/Player/index.js

@@ -17,6 +17,8 @@ var _App = require("./App");
 
 var _Controller = require("./Controller");
 
+var _VreoUnit = require("../typings/VreoUnit");
+
 var _mobx = require("mobx");
 
 var _Drawer = require("./modules/Drawer");
@@ -112,9 +114,14 @@ var Player = /*#__PURE__*/function (_Subscribe) {
     value: function () {
       var _load = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(vreoUnit) {
         var _this$controller$vide,
+            _this$configs$imageOp,
             _this2 = this;
 
         var currentTime,
+            preload,
+            panoIndexMap,
+            panoIndexs,
+            i,
             _this$controller$vide2,
             _this$controller$vide3,
             _args = arguments;
@@ -124,34 +131,86 @@ var Player = /*#__PURE__*/function (_Subscribe) {
             switch (_context.prev = _context.next) {
               case 0:
                 currentTime = _args.length > 1 && _args[1] !== undefined ? _args[1] : 0;
+                preload = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
 
                 if (this.controller.visible) {
-                  _context.next = 5;
+                  _context.next = 6;
                   break;
                 }
 
                 this.controller.setVisible(true); // 延迟 500ms 规避跟 DOM 动画冲突
 
-                _context.next = 5;
+                _context.next = 6;
                 return new Promise(function (resolve) {
                   setTimeout(function () {
                     return resolve(true);
                   }, 500);
                 });
 
-              case 5:
+              case 6:
                 if (this.controller.stopInterval) {
                   this.controller.stopInterval();
                   this.controller.stopInterval = undefined;
                 }
 
                 this.controller.vreoUnit = vreoUnit;
-                (_this$controller$vide = this.controller.videoInstance) === null || _this$controller$vide === void 0 ? void 0 : _this$controller$vide.pause(); // 新数据载入就绪
+                (_this$controller$vide = this.controller.videoInstance) === null || _this$controller$vide === void 0 ? void 0 : _this$controller$vide.pause(); // 预载逻辑
+                // 是否降低图片分辨率
+
+                if (this.$five.imageOptions.size && (_this$configs$imageOp = this.configs.imageOptions) !== null && _this$configs$imageOp !== void 0 && _this$configs$imageOp.size && this.$five.imageOptions.size > this.configs.imageOptions.size) {
+                  this.$five.imageOptions.size = this.configs.imageOptions.size;
+                } // 预载数据中的点位
+
+
+                if (!(preload || preload === undefined && this.configs.autoPreload)) {
+                  _context.next = 20;
+                  break;
+                }
+
+                panoIndexMap = vreoUnit.keyframes.filter(function (vreoKeyframe) {
+                  if (vreoKeyframe.type !== _VreoUnit.VreoKeyframeEnum.CameraMovement) {
+                    return false;
+                  }
+
+                  var data = vreoKeyframe.data;
+
+                  if (data.panoIndex === undefined) {
+                    return false;
+                  }
+
+                  return true;
+                }).reduce(function (accu, curr) {
+                  var panoIndex = curr.data.panoIndex;
 
+                  if (!accu[panoIndex]) {
+                    accu[panoIndex] = true;
+                  }
+
+                  return accu;
+                }, {});
+                panoIndexs = Object.keys(panoIndexMap);
+                i = 0;
+
+              case 14:
+                if (!(i < panoIndexs.length)) {
+                  _context.next = 20;
+                  break;
+                }
+
+                _context.next = 17;
+                return this.$five.preloadPano(Number(panoIndexs[i]));
+
+              case 17:
+                i++;
+                _context.next = 14;
+                break;
+
+              case 20:
+                // 新数据载入就绪
                 this.emit('loaded', vreoUnit);
 
                 if (!vreoUnit.video.url) {
-                  _context.next = 14;
+                  _context.next = 26;
                   break;
                 }
 
@@ -159,19 +218,19 @@ var Player = /*#__PURE__*/function (_Subscribe) {
                   this.controller.videoAgentScene.videoAgentMesh.videoInstance.currentTime = currentTime / 1000;
                 }
 
-                _context.next = 13;
+                _context.next = 25;
                 return (_this$controller$vide3 = this.controller.videoAgentScene) === null || _this$controller$vide3 === void 0 ? void 0 : _this$controller$vide3.videoAgentMesh.play(vreoUnit.video.url);
 
-              case 13:
+              case 25:
                 this.play();
 
-              case 14:
+              case 26:
                 this.controller.run(function (type, keyframe) {
                   return _this2.emit(type, keyframe);
                 });
                 return _context.abrupt("return", true);
 
-              case 16:
+              case 28:
               case "end":
                 return _context.stop();
             }

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

@@ -45,13 +45,49 @@ function CameraMovement() {
                 cameraMovementData = data;
                 effect = cameraMovementData.effect;
 
-                if (effect === _typings.CameraMovementEffect.Rotate) {
-                  ref.current.rotate(data, end - start);
-                } else {
-                  ref.current.move(data, end - start);
+                if (!(effect === _typings.CameraMovementEffect.Rotate)) {
+                  _context.next = 9;
+                  break;
                 }
 
-              case 5:
+                _context.next = 7;
+                return ref.current.rotate(data, end - start);
+
+              case 7:
+                _context.next = 21;
+                break;
+
+              case 9:
+                if (!(effect === _typings.CameraMovementEffect.Move)) {
+                  _context.next = 14;
+                  break;
+                }
+
+                _context.next = 12;
+                return ref.current.move(data, end - start);
+
+              case 12:
+                _context.next = 21;
+                break;
+
+              case 14:
+                if (!(cameraMovementData.panoIndex !== undefined && cameraMovementData.panoIndex !== five.panoIndex)) {
+                  _context.next = 19;
+                  break;
+                }
+
+                _context.next = 17;
+                return ref.current.move(data, end - start);
+
+              case 17:
+                _context.next = 21;
+                break;
+
+              case 19:
+                _context.next = 21;
+                return ref.current.rotate(data, end - start);
+
+              case 21:
               case "end":
                 return _context.stop();
             }

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

@@ -22,42 +22,45 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function UpdateVRPanorama() {
   var controller = (0, _hooks.useController)();
   var five = (0, _hooks.useFiveInstance)();
-  var rawRef = React.useRef(null);
-  var workRef = React.useRef(null);
+  var deafultWorkRef = React.useRef(null);
+  var updateWorkRef = React.useRef(null);
   var restoreCallback = React.useCallback(function () {
-    if (rawRef.current) {
-      var work = (0, _five.parseWork)(rawRef.current);
+    if (deafultWorkRef.current) {
+      var work = (0, _five.parseWork)(deafultWorkRef.current);
       five.load(work);
     }
 
-    workRef.current = null;
+    updateWorkRef.current = null;
   }, []);
   var pausedCallback = React.useCallback(function () {
-    if (rawRef.current) {
-      var work = (0, _five.parseWork)(rawRef.current);
+    if (deafultWorkRef.current) {
+      var work = (0, _five.parseWork)(deafultWorkRef.current);
+      Object.assign(window, {
+        $rawWork: work
+      });
       five.load(work);
     }
   }, []);
   var playingCallback = React.useCallback(function () {
-    if (!workRef.current) {
+    if (!updateWorkRef.current) {
       return;
     }
 
-    five.load(workRef.current);
+    five.load(updateWorkRef.current);
   }, []);
   React.useEffect(function () {
     var callback = function callback(keyframe) {
       var _five$work;
 
-      if (!rawRef.current) {
-        rawRef.current = five.work.raw.works;
+      if (!deafultWorkRef.current) {
+        deafultWorkRef.current = five.work.raw.works;
       }
 
       var data = keyframe.data; // 如果数据中有新 work 数据，则直接载入
 
       if (data.work) {
-        workRef.current = (0, _five.parseWork)(data.work);
-        five.load(workRef.current);
+        updateWorkRef.current = (0, _five.parseWork)(data.work);
+        five.load(updateWorkRef.current);
         return;
       }
 
@@ -72,8 +75,13 @@ function UpdateVRPanorama() {
         delete data.dynamic_scene;
       }
 
-      workRef.current = (0, _five.parseWork)([lastRawWork, data]);
-      five.load(workRef.current);
+      Object.assign(window, {
+        $work1: JSON.parse(lastRawWork),
+        $work2: data,
+        parseWork: _five.parseWork
+      });
+      updateWorkRef.current = (0, _five.parseWork)([lastRawWork, data]);
+      five.load(updateWorkRef.current);
     };
 
     controller.on(_VreoUnit.VreoKeyframeEnum.UpdateVRPanorama, callback); // 离开 将之前的内容清空

package/lib/Player/typings.d.ts

@@ -18,6 +18,10 @@ export interface PlayerConfigs {
      */
     customPanelChildren?: ReactNode;
     customKeyframes?: React.FC<CustomVreoKeyframeProps>[];
+    imageOptions?: {
+        size: number;
+    };
+    autoPreload?: boolean;
 }
 export declare type VreoSubscribe = Pick<Subscribe<VreoKeyframeEvent>, 'on' | 'once' | 'off'>;
 export interface CustomVreoKeyframeProps {