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

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

@@ -1,105 +1,132 @@
 "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
 });
 exports.PanoTextLabel = PanoTextLabel;
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var React = _interopRequireWildcard(require("react"));
-
-var _three = require("three");
-
-var _VreoUnit = require("../../../../typings/VreoUnit");
-
+var THREE = _interopRequireWildcard(require("three"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
 var _hooks = require("../../../hooks");
-
+var _CSS3DRenderPlugin = require("../../../../fivePlugins/CSS3DRenderPlugin");
+var _VreoUnit = require("../../../../typings/VreoUnit");
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 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; }
-
+/**
+ * 通过传入中心点确定矩形框架容器的四个点：
+ *  1. 已知矩形长宽和中心点
+ *  2. 借助planeGeometry生成垂直相机视角的平面上的四个点
+ *  3. 通过向量相加，平行四边形法则获取到移动position后的面上四个点
+ */
+var calcPoints = function calcPoints(centerPoint, normal, wrapperLength, wrapperWidth) {
+  // 375px 对应 1m
+  var length = wrapperLength / 375;
+  var width = wrapperWidth / 375;
+  var geometry = new THREE.PlaneGeometry(length, width);
+  if (normal) {
+    var lookPoint = new THREE.Vector3(normal.x + centerPoint.x, normal.y + centerPoint.y, normal.z + centerPoint.z);
+    geometry.lookAt(lookPoint);
+  }
+  // const pointgeometry = new THREE.Geometry()
+  // pointgeometry.vertices.push(cameraPosition)
+  // const pointmaterial = new THREE.PointsMaterial({
+  //   color: 0xffffff,
+  //   size: 0.4,
+  // })
+  // _point = new THREE.Points(pointgeometry, pointmaterial)
+
+  var material = new THREE.MeshBasicMaterial({
+    color: 0xffff00,
+    side: THREE.DoubleSide
+  });
+  var plane = new THREE.Mesh(geometry, material);
+  var v0 = centerPoint.clone();
+  plane.position.copy(v0);
+
+  // 计算传入的四个点的坐标
+  var _plane$geometry$verti = _slicedToArray(plane.geometry.vertices, 4),
+    v1 = _plane$geometry$verti[0],
+    v2 = _plane$geometry$verti[1],
+    v3 = _plane$geometry$verti[2],
+    v4 = _plane$geometry$verti[3];
+  var downLeft = v0.clone().add(v4);
+  var downRight = v0.clone().add(v3);
+  var upLeft = v0.clone().add(v2);
+  var upRight = v0.clone().add(v1);
+
+  // 插件使用要求：矩形四个点位数据，顺序为**必须**为左下、右下、右上、左上
+  return [downLeft, downRight, upRight, upLeft];
+};
+
+/**
+ * 空间文本标签。
+ */
 function PanoTextLabel() {
-  var _React$useState = React.useState(null),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      state = _React$useState2[0],
-      setState = _React$useState2[1];
-
   var timeoutRef = React.useRef();
   var controller = (0, _hooks.useController)();
-  var project2d = (0, _hooks.useFiveProject2d)();
+  var five = (0, _hooks.useFiveInstance)();
+  var ref = React.useRef();
   React.useEffect(function () {
     var _controller$configs;
-
     if (((_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : _controller$configs.keyframeMap.PanoTextLabel) === false) {
       return;
     }
-
     var callback = function callback(keyframe) {
+      var _panoTextLabelData$no, _panoTextLabelData$no2, _panoTextLabelData$no3;
       var start = keyframe.start,
-          end = keyframe.end,
-          data = keyframe.data;
+        end = keyframe.end,
+        data = keyframe.data;
       var panoTextLabelData = data;
+      // 增加无文本情况的判断
+      if (data.text === '') return;
       var _panoTextLabelData$ve = panoTextLabelData.vertex,
-          x = _panoTextLabelData$ve.x,
-          y = _panoTextLabelData$ve.y,
-          z = _panoTextLabelData$ve.z;
-      var res = project2d(new _three.Vector3(x, y, z));
-      if (!res) return;
-      var left = res.x,
-          top = res.y; // Object.assign(window, { $PanoTextLabel: { setState } })
-
-      setState({
-        left: left,
-        top: top,
-        text: data.text || '',
-        fontSize: data.fontSize || 16
-      });
+        x = _panoTextLabelData$ve.x,
+        y = _panoTextLabelData$ve.y,
+        z = _panoTextLabelData$ve.z;
+      var centerPoint = new THREE.Vector3(x, y, z);
+      var normal = new THREE.Vector3((_panoTextLabelData$no = panoTextLabelData.normal) === null || _panoTextLabelData$no === void 0 ? void 0 : _panoTextLabelData$no.x, (_panoTextLabelData$no2 = panoTextLabelData.normal) === null || _panoTextLabelData$no2 === void 0 ? void 0 : _panoTextLabelData$no2.y, (_panoTextLabelData$no3 = panoTextLabelData.normal) === null || _panoTextLabelData$no3 === void 0 ? void 0 : _panoTextLabelData$no3.z);
+      // 生成传入的四个点，将文本框最大宽度定在200px，最高高度在30px
+      var wrapperLength = 200;
+      var wrapperWidth = 30;
+      var points = calcPoints(centerPoint, panoTextLabelData.normal && normal, wrapperLength, wrapperWidth);
+      if (!ref.current) ref.current = (0, _CSS3DRenderPlugin.CSS3DRenderPlugin)(five);
+      var container = ref.current.create3DDomContainer(points);
+      var css3DObject = container === null || container === void 0 ? void 0 : container.css3DObject;
+      // 将获取的mesh进行旋转操作，根据欧拉角去进行mesh的变换
+      if (data.quaternion) {
+        var quaternion = new THREE.Quaternion(data.quaternion.x, data.quaternion.y, data.quaternion.z, data.quaternion.w);
+        css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.quaternion.copy(quaternion);
+      }
+      if (container !== null && container !== void 0 && container.container) _reactDom["default"].render( /*#__PURE__*/React.createElement("div", {
+        className: "PanoTextLabel PanoTextLabel--notHidden"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "PanoTextLabel-wrapper"
+      }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          fontSize: "".concat(data.fontSize || 16, "px")
+        },
+        className: "PanoText-innerText"
+      }, data.text || ''))), container === null || container === void 0 ? void 0 : container.container);
       timeoutRef.current = setTimeout(function () {
-        return setState(null);
+        var _ref$current;
+        (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.disposeAll();
       }, end - start);
     };
-
-    controller.on(_VreoUnit.VreoKeyframeEnum.PanoTextLabel, callback); // Object.assign(window, { $panoTextLabel: { setState } })
-
+    controller.on(_VreoUnit.VreoKeyframeEnum.PanoTextLabel, callback);
     return function () {
       controller.off(_VreoUnit.VreoKeyframeEnum.PanoTextLabel, callback);
-
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
     };
   }, [controller]);
-  return /*#__PURE__*/React.createElement("div", {
-    className: (0, _classnames["default"])('PanoTextLabel', {
-      'PanoTextLabel--notHidden': state
-    }),
-    style: {
-      left: ((state === null || state === void 0 ? void 0 : state.left) || 0) + 'px',
-      top: ((state === null || state === void 0 ? void 0 : state.top) || 0) + 'px'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "PanoTextLabel-wrapper"
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      fontSize: "".concat((state === null || state === void 0 ? void 0 : state.fontSize) || 16, "px")
-    },
-    className: "PanoText-innerText"
-  }, (state === null || state === void 0 ? void 0 : state.text) || '')));
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
 }

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

@@ -1,106 +1,71 @@
 "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
 });
 exports.Prompter = Prompter;
-
 var React = _interopRequireWildcard(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _hooks = require("../../../hooks");
-
-var _reactTransitionGroup = require("react-transition-group");
-
 var _VreoUnit = require("../../../../typings/VreoUnit");
-
 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 _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; }
 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 Prompter() {
   var _React$useState = React.useState(''),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      text = _React$useState2[0],
-      setText = _React$useState2[1];
-
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    text = _React$useState2[0],
+    setText = _React$useState2[1];
   var _React$useState3 = React.useState(true),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      hidden = _React$useState4[0],
-      setHidden = _React$useState4[1];
-
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    hidden = _React$useState4[0],
+    setHidden = _React$useState4[1];
   var ref = React.useRef(null);
   var controller = (0, _hooks.useController)();
   React.useEffect(function () {
     var _controller$configs;
-
     if (((_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : _controller$configs.keyframeMap.Prompter) === false) {
       return;
     }
-
     var callback = function callback(keyframe) {
       var start = keyframe.start,
-          end = keyframe.end,
-          data = keyframe.data;
+        end = keyframe.end,
+        data = keyframe.data;
       setText(data.text);
       setHidden(false);
-
       if (ref.current) {
         clearTimeout(ref.current);
         ref.current = null;
       }
-
       ref.current = setTimeout(function () {
         setHidden(true);
-        setTimeout(function () {
-          return setText('');
-        }, 500);
+        setText('');
+        // setTimeout(() => setText(''), 500)
+
         if (ref.current) clearTimeout(ref.current);
         ref.current = null;
       }, end - start);
     };
-
     controller.on(_VreoUnit.VreoKeyframeEnum.Prompter, callback);
     return function () {
       controller.off(_VreoUnit.VreoKeyframeEnum.Prompter, callback);
     };
   }, [controller]);
   return /*#__PURE__*/React.createElement("div", {
-    className: (0, _classnames["default"])('vreo-prompter', {
-      'vreo-prompter--hidden': hidden,
-      'vreo-prompter--audio': controller.isAudio
-    })
-  }, text ?
-  /*#__PURE__*/
-
-  /* @warning "index.js:1 Warning: findDOMNode is deprecated in StrictMode." */
-  React.createElement(_reactTransitionGroup.TransitionGroup, {
+    className: (0, _classnames["default"])('vreo-prompter', _defineProperty({
+      'vreo-prompter--hidden': hidden
+    }, "vreo-prompter-left--".concat(controller.agentType), true))
+  }, /*#__PURE__*/React.createElement("div", {
     className: "vreo-prompter-text"
-  }, /*#__PURE__*/React.createElement(_reactTransitionGroup.CSSTransition, {
-    key: text,
-    classNames: "vreo-prompter-text-transition",
-    timeout: 500,
-    addEndListener: function addEndListener(node, done) {
-      return node.addEventListener('transitionend', done, false);
-    }
   }, /*#__PURE__*/React.createElement("div", {
     className: "vreo-prompter-innerText"
-  }, text))) : undefined);
+  }, text)));
 }

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

@@ -1,37 +1,33 @@
 "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
 });
 exports.UpdateVRPanorama = UpdateVRPanorama;
-
 var React = _interopRequireWildcard(require("react"));
-
 var _five = require("@realsee/five");
-
 var _hooks = require("../../../hooks");
-
 var _VreoUnit = require("../../../../typings/VreoUnit");
-
 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 UpdateVRPanorama() {
   var controller = (0, _hooks.useController)();
   var five = (0, _hooks.useFiveInstance)();
   var deafultWorkRef = React.useRef(null);
   var updateWorkRef = React.useRef(null);
+
+  // 恢复默认 VR
   var restoreCallback = React.useCallback(function () {
+    // 先清理掉 之前的 VR 数据备份
+    updateWorkRef.current = null;
     if (deafultWorkRef.current) {
       var work = (0, _five.parseWork)(deafultWorkRef.current);
       five.load(work);
     }
-
-    updateWorkRef.current = null;
   }, []);
+
+  // 暂停时： 恢复默认 VR 
   var pausedCallback = React.useCallback(function () {
     if (deafultWorkRef.current) {
       var work = (0, _five.parseWork)(deafultWorkRef.current);
@@ -41,31 +37,31 @@ function UpdateVRPanorama() {
       five.load(work);
     }
   }, []);
+
+  // 播放时：如果暂停前有更新 VR 需要还原
   var playingCallback = React.useCallback(function () {
     if (!updateWorkRef.current) {
       return;
     }
-
     five.load(updateWorkRef.current);
   }, []);
   React.useEffect(function () {
     var callback = function callback(keyframe) {
       var _five$work;
-
       if (!deafultWorkRef.current) {
         deafultWorkRef.current = five.work.raw.works;
       }
+      var data = keyframe.data;
 
-      var data = keyframe.data; // 如果数据中有新 work 数据，则直接载入
-
+      // 如果数据中有新 work 数据，则直接载入
       if (data.work) {
         updateWorkRef.current = (0, _five.parseWork)(data.work);
         five.load(updateWorkRef.current);
         return;
       }
+      var lastRawWork = (_five$work = five.work) === null || _five$work === void 0 ? void 0 : _five$work.raw.works[0];
 
-      var lastRawWork = (_five$work = five.work) === null || _five$work === void 0 ? void 0 : _five$work.raw.works[0]; // 动态场景：不提供完成的签名数据，需重新整理
-
+      // 动态场景：不提供完成的签名数据，需重新整理
       if (data.dynamic_scene && !data.panorama) {
         var lastWork = JSON.parse(lastRawWork);
         var panorama = lastWork.panorama;
@@ -74,7 +70,6 @@ function UpdateVRPanorama() {
         data.panorama = panorama;
         delete data.dynamic_scene;
       }
-
       Object.assign(window, {
         $work1: JSON.parse(lastRawWork),
         $work2: data,
@@ -83,15 +78,17 @@ function UpdateVRPanorama() {
       updateWorkRef.current = (0, _five.parseWork)([lastRawWork, data]);
       five.load(updateWorkRef.current);
     };
+    controller.on(_VreoUnit.VreoKeyframeEnum.UpdateVRPanorama, callback);
 
-    controller.on(_VreoUnit.VreoKeyframeEnum.UpdateVRPanorama, callback); // 离开 将之前的内容清空
-
-    controller.on(_VreoUnit.VreoKeyframeEnum.Exit, restoreCallback); // 新载入数据 将之前的内容清空
+    // 离开 将之前的内容清空
+    controller.on(_VreoUnit.VreoKeyframeEnum.Exit, restoreCallback);
 
-    controller.on('loaded', restoreCallback); // 暂停 回到默认状态
-
-    controller.on('paused', pausedCallback); // 播放 回归暂停前状态
+    // 新载入数据 将之前的内容清空
+    controller.on('loaded', restoreCallback);
 
+    // 暂停 回到默认状态
+    controller.on('paused', pausedCallback);
+    // 播放 回归暂停前状态
     controller.on('playing', playingCallback);
     return function () {
       // 清理事件监听
@@ -101,6 +98,6 @@ function UpdateVRPanorama() {
       controller.off('paused', pausedCallback);
       controller.off('playing', playingCallback);
     };
-  }, [controller]);
+  }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 }

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

@@ -1,85 +1,60 @@
 "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
 });
 exports.VideoEffect = VideoEffect;
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var React = _interopRequireWildcard(require("react"));
-
 var _VreoUnit = require("../../../../typings/VreoUnit");
-
 var _hooks = require("../../../hooks");
-
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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 _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; }
-
 var inlinePlay = function inlinePlay(videoInstance) {
   if (!videoInstance) return;
-
   var canplaythrough = function canplaythrough() {
     videoInstance.removeEventListener('canplaythrough', canplaythrough);
-
     try {
       videoInstance.play();
     } catch (error) {}
   };
-
   videoInstance.addEventListener('canplaythrough', canplaythrough);
   videoInstance.load();
-}; // const emptyVideo = '//vrlab-static.ljcdn.com/release/web/leisure.69fd3522.mov'
-
+};
 
+// const emptyVideo = '//vrlab-static.ljcdn.com/release/web/leisure.69fd3522.mov'
 var PI = Math.PI;
 var PI_2 = PI * 2;
-
 function VideoEffect() {
   var ref = React.useRef(null);
   var videoRef = React.useRef();
   var controller = (0, _hooks.useController)();
   var timeoutRef = React.useRef();
-
   var _React$useState = React.useState(false),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      visible = _React$useState2[0],
-      setVisible = _React$useState2[1];
-
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    visible = _React$useState2[0],
+    setVisible = _React$useState2[1];
   var five = (0, _hooks.useFiveInstance)();
-
   var setBlobSrc = function setBlobSrc(blob) {
     if (!videoRef.current) return;
     videoRef.current.src = blob;
   };
-
   React.useEffect(function () {
     var callback = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(keyframe) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(keyframe) {
         var start, end, _ref2, videoSrc, fov, direction, panoIndex, vector, _ref3, _ref4, longitude, latitude;
-
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -89,11 +64,9 @@ function VideoEffect() {
                   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);
@@ -110,17 +83,13 @@ function VideoEffect() {
                 setVisible(true);
                 timeoutRef.current = setTimeout(function () {
                   var _videoRef$current;
-
                   if (!((_videoRef$current = videoRef.current) !== null && _videoRef$current !== void 0 && _videoRef$current.paused)) {
                     var _videoRef$current2;
-
                     (_videoRef$current2 = videoRef.current) === null || _videoRef$current2 === void 0 ? void 0 : _videoRef$current2.pause();
                   }
-
                   setVisible(false);
                   setBlobSrc('');
                 }, end - start);
-
               case 8:
               case "end":
                 return _context.stop();
@@ -128,16 +97,13 @@ function VideoEffect() {
           }
         }, _callee);
       }));
-
       return function callback(_x) {
         return _ref.apply(this, arguments);
       };
     }();
-
     controller.on(_VreoUnit.VreoKeyframeEnum.VideoEffect, callback);
     return function () {
       controller.off(_VreoUnit.VreoKeyframeEnum.VideoEffect, callback);
-
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
@@ -145,10 +111,9 @@ function VideoEffect() {
   }, [controller]);
   React.useEffect(function () {
     var _controller$configs, _controller$configs$v;
-
     if (!ref.current) return;
-    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} />
-
+    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');
     video.setAttribute('autoplay', 'true');
@@ -158,10 +123,10 @@ function VideoEffect() {
     ref.current.append(videoRef.current);
     document.addEventListener('WeixinJSBridgeReady', function () {
       var _videoRef$current3;
-
       (_videoRef$current3 = videoRef.current) === null || _videoRef$current3 === void 0 ? void 0 : _videoRef$current3.play();
     }, false);
-    if (!ref.current) return; // const asyncfunc = async () => {
+    if (!ref.current) return;
+    // const asyncfunc = async () => {
     //   setBlobSrc(await URL.createObjectURL(await Preloader.blob(emptyVideo)))
     //   inlinePlay(videoRef.current)
     // }