@realsee/vreo 0.2.0-alpha.9 → 1.0.0-alpha.2

package/lib/Player/Controller.js

@@ -1,6 +1,6 @@
 "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); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -15,17 +15,39 @@ var React = _interopRequireWildcard(require("react"));
 
 var _animationFrame = require("../shared-utils/animationFrame");
 
+var _setElementDataset = _interopRequireDefault(require("../shared-utils/setElementDataset"));
+
+var _getMediaInfo = require("../shared-utils/getMediaInfo");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 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 _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); 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 _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 } }); Object.defineProperty(subClass, "prototype", { writable: false }); 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); }
 
@@ -49,46 +71,161 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
 
   var _super = _createSuper(Controller);
 
-  function Controller() {
+  function Controller(_ref) {
     var _this;
 
+    var five = _ref.five,
+        container = _ref.container,
+        configs = _ref.configs;
+
     _classCallCheck(this, Controller);
 
     _this = _super.call(this);
 
     _defineProperty(_assertThisInitialized(_this), "playing", false);
 
+    _defineProperty(_assertThisInitialized(_this), "ended", false);
+
+    _defineProperty(_assertThisInitialized(_this), "loading", false);
+
+    _defineProperty(_assertThisInitialized(_this), "waveAppearance", null);
+
+    _defineProperty(_assertThisInitialized(_this), "appearance", {
+      waveStyle: 'solid'
+    });
+
     _defineProperty(_assertThisInitialized(_this), "visible", false);
 
     _defineProperty(_assertThisInitialized(_this), "popUp", null);
 
     _defineProperty(_assertThisInitialized(_this), "drawerConfig", null);
 
+    _this.configs = configs;
+    _this.container = container;
+    _this.five = five;
+    _this.appSize = configs.appSize;
+    _this.appearance = _objectSpread(_objectSpread({}, _this.appearance), configs.appearance);
     (0, _mobx.makeObservable)(_assertThisInitialized(_this), {
       visible: _mobx.observable,
       setVisible: _mobx.action,
       playing: _mobx.observable,
       setPlaying: _mobx.action,
+      loading: _mobx.observable,
+      setLoading: _mobx.action,
       popUp: _mobx.observable.ref,
       openPopUp: _mobx.action,
       drawerConfig: _mobx.observable.ref,
-      openDrawer: _mobx.action
-    }); // 监听播放情况：抛出触发时机
+      openDrawer: _mobx.action,
+      ended: _mobx.observable,
+      waveAppearance: _mobx.observable,
+      avatar: _mobx.observable,
+      containerSize: _mobx.observable,
+      setContainerSize: _mobx.action,
+      appearance: _mobx.observable,
+      setAppearance: _mobx.action,
+      configs: _mobx.observable.ref,
+      setEnded: _mobx.action,
+      setAvatar: _mobx.action
+    });
+    (0, _mobx.reaction)(function () {
+      return [_this.appearance.waveStyle, _this.loading];
+    }, function (_ref2) {
+      var _ref3 = _slicedToArray(_ref2, 2),
+          waveStyle = _ref3[0],
+          loading = _ref3[1];
+
+      if (loading === null) {
+        _this.waveAppearance = null;
+        return;
+      }
+
+      if (waveStyle === 'wave') {
+        switch (loading) {
+          case true:
+            _this.waveAppearance = 'double';
+            break;
 
+          case false:
+            _this.waveAppearance = 'solid';
+            break;
+        }
+      } else if (waveStyle === 'solid') {
+        switch (loading) {
+          case true:
+            _this.waveAppearance = 'swap';
+            break;
+
+          case false:
+            _this.waveAppearance = 'expand';
+            break;
+        }
+      }
+    }, {
+      fireImmediately: true
+    });
+
+    if (!_this.appSize) {
+      (0, _mobx.reaction)(function () {
+        return _this.containerSize;
+      }, function (containerSize) {
+        if (!containerSize) return;
+        var width = containerSize.width;
+        var height = containerSize.height;
+
+        var size = function () {
+          if (width <= 500) return 'S';
+          if (width <= 1024) return 'M';
+          if (width <= 2048) return 'L';
+          return 'XL';
+        }();
+
+        var orientation = function () {
+          if (height > width) return 'portrait';
+          return 'landscape';
+        }();
+
+        (0, _setElementDataset["default"])(_this.container, {
+          size: size
+        });
+        (0, _setElementDataset["default"])(_this.container, {
+          orientation: orientation
+        });
+      }, {
+        fireImmediately: true
+      });
+    } else {
+      (0, _setElementDataset["default"])(_this.container, {
+        size: _this.appSize
+      });
+    } // 监听播放情况：抛出触发时机
+
+
+    (0, _mobx.reaction)(function () {
+      return _this.ended;
+    }, function (ended) {
+      if (ended) {
+        _this.emit('paused', true);
+      }
+    });
     (0, _mobx.reaction)(function () {
       return _this.playing;
     }, function (playing) {
-      _this.emit(playing ? 'playing' : 'paused');
+      if (!_this.ended) {
+        _this.emit(playing ? 'playing' : 'paused');
+      }
     });
     return _this;
   }
 
   _createClass(Controller, [{
-    key: "isAudio",
+    key: "agentType",
     get: function get() {
-      var _this$videoAgentScene, _this$videoAgentScene2;
+      var _this$videoAgentScene, _this$avatar;
 
-      return !((_this$videoAgentScene = this.videoAgentScene) !== null && _this$videoAgentScene !== void 0 && (_this$videoAgentScene2 = _this$videoAgentScene.videoAgentMesh.videoUrl) !== null && _this$videoAgentScene2 !== void 0 && _this$videoAgentScene2.endsWith('.mp4'));
+      var type = (0, _getMediaInfo.getMediaType)((_this$videoAgentScene = this.videoAgentScene) === null || _this$videoAgentScene === void 0 ? void 0 : _this$videoAgentScene.videoAgentMesh.videoUrl);
+      if ((_this$avatar = this.avatar) !== null && _this$avatar !== void 0 && _this$avatar.force) return 'avatar';
+      if (type === 'video') return 'video';
+      return 'none';
     }
   }, {
     key: "openPopUp",
@@ -100,6 +237,24 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
 
       this.popUp = popUp;
     }
+  }, {
+    key: "setLoading",
+    value: function setLoading(loading) {
+      this.loading = loading;
+    }
+  }, {
+    key: "setAvatar",
+    value: function setAvatar(avatar) {
+      this.avatar = avatar;
+    }
+  }, {
+    key: "setContainerSize",
+    value: function setContainerSize(width, height) {
+      this.containerSize = {
+        width: width,
+        height: height
+      };
+    }
   }, {
     key: "setVisible",
     value: function setVisible(v) {
@@ -110,6 +265,16 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
     value: function setPlaying(playing) {
       this.playing = playing;
     }
+  }, {
+    key: "setEnded",
+    value: function setEnded(ended) {
+      this.ended = ended;
+    }
+  }, {
+    key: "setAppearance",
+    value: function setAppearance(appearance) {
+      this.appearance = _objectSpread(_objectSpread({}, this.appearance), appearance);
+    }
   }, {
     key: "openDrawer",
     value: function openDrawer(drawerConfig) {
@@ -133,9 +298,9 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
   }, {
     key: "currentTime",
     get: function get() {
-      var _this$videoAgentScene3;
+      var _this$videoAgentScene2;
 
-      return ((_this$videoAgentScene3 = this.videoAgentScene) === null || _this$videoAgentScene3 === void 0 ? void 0 : _this$videoAgentScene3.videoAgentMesh.currentTime) || 0;
+      return ((_this$videoAgentScene2 = this.videoAgentScene) === null || _this$videoAgentScene2 === void 0 ? void 0 : _this$videoAgentScene2.videoAgentMesh.currentTime) || 0;
     }
   }, {
     key: "currentKeyframes",
@@ -152,11 +317,11 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
       });
     }
   }, {
-    key: "videoInstance",
+    key: "mediaInstance",
     get: function get() {
-      var _this$videoAgentScene4;
+      var _this$videoAgentScene3;
 
-      return (_this$videoAgentScene4 = this.videoAgentScene) === null || _this$videoAgentScene4 === void 0 ? void 0 : _this$videoAgentScene4.videoAgentMesh.videoInstance;
+      return (_this$videoAgentScene3 = this.videoAgentScene) === null || _this$videoAgentScene3 === void 0 ? void 0 : _this$videoAgentScene3.videoAgentMesh.mediaInstance;
     }
     /**
      * 逐帧任务
@@ -165,30 +330,31 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
   }, {
     key: "requestAnimationFrameLoop",
     value: function requestAnimationFrameLoop(callback) {
-      var _this$videoInstance,
-          _this$videoInstance4,
+      var _this$mediaInstance,
+          _this$mediaInstance4,
           _this3 = this;
 
-      if ((_this$videoInstance = this.videoInstance) !== null && _this$videoInstance !== void 0 && _this$videoInstance.ended) {
+      if ((_this$mediaInstance = this.mediaInstance) !== null && _this$mediaInstance !== void 0 && _this$mediaInstance.ended) {
+        this.setEnded(true);
         this.setPlaying(false);
-        this.videoInstance.pause();
+        this.mediaInstance.pause();
         return;
       }
 
       if (!this.playing) {
-        var _this$videoInstance2;
+        var _this$mediaInstance2;
 
-        if (!((_this$videoInstance2 = this.videoInstance) !== null && _this$videoInstance2 !== void 0 && _this$videoInstance2.paused)) {
-          var _this$videoInstance3;
+        if (!((_this$mediaInstance2 = this.mediaInstance) !== null && _this$mediaInstance2 !== void 0 && _this$mediaInstance2.paused)) {
+          var _this$mediaInstance3;
 
-          (_this$videoInstance3 = this.videoInstance) === null || _this$videoInstance3 === void 0 ? void 0 : _this$videoInstance3.pause();
+          (_this$mediaInstance3 = this.mediaInstance) === null || _this$mediaInstance3 === void 0 ? void 0 : _this$mediaInstance3.pause();
         }
 
         return;
       }
 
-      if ((_this$videoInstance4 = this.videoInstance) !== null && _this$videoInstance4 !== void 0 && _this$videoInstance4.paused && this.playing) {
-        this.videoInstance.play();
+      if ((_this$mediaInstance4 = this.mediaInstance) !== null && _this$mediaInstance4 !== void 0 && _this$mediaInstance4.paused && this.playing) {
+        this.mediaInstance.play();
       }
 
       var currentKeyframes = this.currentKeyframes;
@@ -230,8 +396,8 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
 
       this.vreoUnit = undefined;
 
-      if (this.videoInstance) {
-        this.videoInstance.currentTime = 0;
+      if (this.mediaInstance) {
+        this.mediaInstance.currentTime = 0;
       }
 
       if (this.stopInterval) {

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

@@ -1,6 +1,6 @@
 "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); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -13,9 +13,9 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 
 var _three = require("three");
 
-var _BetterTween = require("@realsee/dnalogel/shared-utils/animationFrame/BetterTween");
+var _BetterTween = require("../../../shared-utils/animationFrame/BetterTween");
 
-var _CSS3DRenderPlugin = require("@realsee/dnalogel/plugins/CSS3DRenderPlugin");
+var _CSS3DRenderPlugin = require("../../../fivePlugins/CSS3DRenderPlugin");
 
 var _VreoUnit = require("../../../typings/VreoUnit");
 
@@ -244,7 +244,8 @@ var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
       className: "SpatialScenePanel-item index_".concat(index)
     }, /*#__PURE__*/React.createElement("img", {
       className: "SpatialScenePanel-icon",
-      src: state.icon
+      src: state.icon,
+      alt: "".concat(state.text)
     }), /*#__PURE__*/React.createElement("div", {
       className: "SpatialScenePanel-text"
     }, state.text), /*#__PURE__*/React.createElement("div", {

package/lib/Player/hooks.js

@@ -26,11 +26,11 @@ function useController() {
 function useFiveInstance() {
   var controller = useController();
 
-  if (!controller.$five) {
+  if (!controller.five) {
     throw new Error('没有找到 "five" 实例');
   }
 
-  return controller.$five;
+  return controller.five;
 }
 
 function useFiveProject2d() {

package/lib/Player/index.d.ts

@@ -1,16 +1,18 @@
 import { Five, Subscribe } from '@realsee/five';
 import { VreoKeyframeEvent, VreoUnit } from '../typings/VreoUnit';
-import { PlayerConfigs } from './typings';
+import { Appearance, PlayerConfigs } from './typings';
 export declare class Player extends Subscribe<VreoKeyframeEvent> {
     $five: Five;
     private controller;
     configs: Readonly<PlayerConfigs>;
     constructor(five: Five, configs?: Partial<PlayerConfigs>);
-    load(vreoUnit: VreoUnit, currentTime?: number, preload?: boolean): Promise<boolean>;
+    load(vreoUnit: VreoUnit, currentTime?: number, preload?: boolean, force?: boolean): Promise<boolean>;
     get paused(): boolean;
-    play(): boolean;
+    play(currentTime?: number): boolean;
+    setAppearance(appearance: Appearance): void;
     pause(): void;
     show(): void;
     hide(): void;
+    getCurrentTime(): number;
     dispose(): void;
 }