@realsee/vreo 2.4.2 → 2.4.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/lib/PlayController/createHTMLAudioElement.js +11 -9
  2. package/lib/PlayController/index.js +61 -52
  3. package/lib/Player/App.js +1 -1
  4. package/lib/Player/Controller.js +28 -23
  5. package/lib/Player/custom/SpatialScenePanel/index.js +10 -10
  6. package/lib/Player/index.js +94 -90
  7. package/lib/Player/modules/Drawer/index.js +1 -1
  8. package/lib/Player/modules/PopUp/index.js +1 -1
  9. package/lib/Player/modules/VideoAgent/VideoAgentMesh.js +143 -134
  10. package/lib/Player/modules/VideoAgent/VideoAgentScene.js +2 -2
  11. package/lib/Player/modules/VideoAgent/index.js +2 -2
  12. package/lib/Player/modules/Wave/index.js +1 -1
  13. package/lib/Player/modules/keyframes/BgMusic/index.js +41 -39
  14. package/lib/Player/modules/keyframes/CameraMovement/index.js +43 -41
  15. package/lib/Player/modules/keyframes/InfoPanel/index.js +6 -6
  16. package/lib/Player/modules/keyframes/ModelVideo/index.js +53 -51
  17. package/lib/Player/modules/keyframes/PanoEffect/index.js +1 -1
  18. package/lib/Player/modules/keyframes/PanoEffect/lineAnime.js +1 -1
  19. package/lib/Player/modules/keyframes/PanoTag/index.js +2 -2
  20. package/lib/Player/modules/keyframes/PanoTextLabel/index.js +3 -3
  21. package/lib/Player/modules/keyframes/Prompter/index.js +1 -1
  22. package/lib/Player/modules/keyframes/UpdateVRPanorama/index.js +5 -5
  23. package/lib/Player/modules/keyframes/VideoEffect/index.js +44 -42
  24. package/lib/Player/typings.d.ts +1 -4
  25. package/lib/fivePlugins/CSS3DRenderPlugin/index.js +7 -7
  26. package/lib/fivePlugins/CameraMovementPlugin/index.js +171 -167
  27. package/lib/fivePlugins/CameraMovementPlugin/typings.js +6 -6
  28. package/lib/fivePlugins/ModelTVVideoPlugin/index.js +30 -28
  29. package/lib/react/index.d.ts +1 -1
  30. package/lib/react/index.js +2 -2
  31. package/lib/shared-utils/Audio.d.ts +8 -0
  32. package/lib/shared-utils/Audio.js +62 -46
  33. package/lib/shared-utils/AudioLike.js +13 -10
  34. package/lib/shared-utils/animationFrame/BetterTween.d.ts +4 -2
  35. package/lib/shared-utils/animationFrame/BetterTween.js +19 -15
  36. package/lib/shared-utils/animationFrame/tween.d.ts +4 -2
  37. package/lib/shared-utils/animationFrame/tween.js +12 -1
  38. package/lib/shared-utils/createTransMatrix.js +1 -1
  39. package/lib/typings/VreoUnit.js +26 -69
  40. package/package.json +20 -24
@@ -12,7 +12,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
12
12
  var THREE = _interopRequireWildcard(require("three"));
13
13
  var _addResizeListener = require("../../../shared-utils/addResizeListener");
14
14
  var _VideoAgentMesh = require("./VideoAgentMesh");
15
- 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); }
15
+ 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); }
16
16
  var VideoAgentScene = exports.VideoAgentScene = /*#__PURE__*/(0, _createClass2["default"])(function VideoAgentScene(container, options) {
17
17
  var _this = this;
18
18
  (0, _classCallCheck2["default"])(this, VideoAgentScene);
@@ -31,7 +31,7 @@ var VideoAgentScene = exports.VideoAgentScene = /*#__PURE__*/(0, _createClass2["
31
31
  });
32
32
  (0, _defineProperty2["default"])(this, "dispose", function () {
33
33
  var _this$videoAgentMesh;
34
- (_this$videoAgentMesh = _this.videoAgentMesh) === null || _this$videoAgentMesh === void 0 || _this$videoAgentMesh.dispose();
34
+ (_this$videoAgentMesh = _this.videoAgentMesh) === null || _this$videoAgentMesh === void 0 ? void 0 : _this$videoAgentMesh.dispose();
35
35
  _this.disposers.forEach(function (disposer) {
36
36
  return disposer === null || disposer === void 0 ? void 0 : disposer();
37
37
  });
@@ -10,7 +10,7 @@ var React = _interopRequireWildcard(require("react"));
10
10
  var _hooks = require("../../hooks");
11
11
  var _VideoAgentScene = require("./VideoAgentScene");
12
12
  var _classnames = _interopRequireDefault(require("classnames"));
13
- 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); }
13
+ 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); }
14
14
  function VideoAgent(props) {
15
15
  var _controller$avatar2;
16
16
  var ref = React.useRef(null);
@@ -35,7 +35,7 @@ function VideoAgent(props) {
35
35
  return function () {
36
36
  var _controller$videoAgen2;
37
37
  controller.dispose();
38
- (_controller$videoAgen2 = controller.videoAgentScene) === null || _controller$videoAgen2 === void 0 || _controller$videoAgen2.dispose();
38
+ (_controller$videoAgen2 = controller.videoAgentScene) === null || _controller$videoAgen2 === void 0 ? void 0 : _controller$videoAgen2.dispose();
39
39
  };
40
40
  }, []);
41
41
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.Wave = Wave;
9
9
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
10
10
  var _react = _interopRequireWildcard(require("react"));
11
- 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); }
11
+ 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); }
12
12
  var defaultPrefix = 'https://vr-public.realsee-cdn.cn/release/static/image/release/';
13
13
  var WAVES = {
14
14
  single: {
@@ -12,7 +12,7 @@ var React = _interopRequireWildcard(require("react"));
12
12
  var _Audio = require("../../../../shared-utils/Audio");
13
13
  var _VreoUnit = require("../../../../typings/VreoUnit");
14
14
  var _hooks = require("../../../hooks");
15
- 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); }
15
+ 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); }
16
16
  function BgMusic() {
17
17
  var controller = (0, _hooks.useController)();
18
18
  React.useEffect(function () {
@@ -20,46 +20,48 @@ function BgMusic() {
20
20
  var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe, currentTime) {
21
21
  var start, end, _currentTime, audio, cleanAudio, play;
22
22
  return _regenerator["default"].wrap(function _callee$(_context) {
23
- while (1) switch (_context.prev = _context.next) {
24
- case 0:
25
- start = keyframe.start, end = keyframe.end;
26
- _currentTime = (currentTime - start) / 1000;
27
- if (!(_currentTime < 0 || _currentTime >= keyframe.end - keyframe.start)) {
28
- _context.next = 4;
29
- break;
30
- }
31
- return _context.abrupt("return");
32
- case 4:
33
- audio = (0, _Audio.getAudio)(keyframe.data.url);
34
- audio.currentTime = Math.max(0, _currentTime);
35
- // console.log('play', audio.src)
36
- // const play = () => audio.play()
23
+ while (1) {
24
+ switch (_context.prev = _context.next) {
25
+ case 0:
26
+ start = keyframe.start, end = keyframe.end;
27
+ _currentTime = (currentTime - start) / 1000;
28
+ if (!(_currentTime < 0 || _currentTime >= keyframe.end - keyframe.start)) {
29
+ _context.next = 4;
30
+ break;
31
+ }
32
+ return _context.abrupt("return");
33
+ case 4:
34
+ audio = (0, _Audio.getAudio)(keyframe.data.url);
35
+ audio.currentTime = Math.max(0, _currentTime);
36
+ // console.log('play', audio.src)
37
+ // const play = () => audio.play()
37
38
 
38
- audio.play();
39
- cleanAudio = function cleanAudio() {
40
- // audio.removeEventListener('canplaythrough', play)
41
- audio.removeEventListener('pause', play);
42
- audio.pause();
43
- audio.src = '';
44
- // cleanTimeout()
45
- }; // audio.addEventListener('canplaythrough', play)
39
+ audio.play();
40
+ cleanAudio = function cleanAudio() {
41
+ // audio.removeEventListener('canplaythrough', play)
42
+ audio.removeEventListener('pause', play);
43
+ audio.pause();
44
+ audio.src = '';
45
+ // cleanTimeout()
46
+ }; // audio.addEventListener('canplaythrough', play)
46
47
 
47
- audio.addEventListener('ended', function () {
48
- cleanAudio();
49
- });
50
- play = function play() {
51
- if (audio.realSrc === keyframe.data.url) {
52
- // 有可能会被其他音轨打断
53
- audio.play();
54
- }
55
- };
56
- audio.addEventListener('pause', play);
57
- controller.once('paused', function () {
58
- cleanAudio();
59
- });
60
- case 12:
61
- case "end":
62
- return _context.stop();
48
+ audio.addEventListener('ended', function () {
49
+ cleanAudio();
50
+ });
51
+ play = function play() {
52
+ if (audio.realSrc === keyframe.data.url) {
53
+ // 有可能会被其他音轨打断
54
+ audio.play();
55
+ }
56
+ };
57
+ audio.addEventListener('pause', play);
58
+ controller.once('paused', function () {
59
+ cleanAudio();
60
+ });
61
+ case 12:
62
+ case "end":
63
+ return _context.stop();
64
+ }
63
65
  }
64
66
  }, _callee);
65
67
  }));
@@ -13,7 +13,7 @@ var _CameraMovementPlugin = require("../../../../fivePlugins/CameraMovementPlugi
13
13
  var _typings = require("../../../../fivePlugins/CameraMovementPlugin/typings");
14
14
  var _VreoUnit = require("../../../../typings/VreoUnit");
15
15
  var _hooks = require("../../../hooks");
16
- 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); }
16
+ 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); }
17
17
  function CameraMovement() {
18
18
  var controller = (0, _hooks.useController)();
19
19
  var five = (0, _hooks.useFiveInstance)();
@@ -23,49 +23,51 @@ function CameraMovement() {
23
23
  var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe) {
24
24
  var start, end, data, cameraMovementData, effect;
25
25
  return _regenerator["default"].wrap(function _callee$(_context) {
26
- while (1) switch (_context.prev = _context.next) {
27
- case 0:
28
- if (!ref.current) {
29
- ref.current = (0, _CameraMovementPlugin.CameraMovementPlugin)(five, {});
30
- }
31
- start = keyframe.start, end = keyframe.end, data = keyframe.data;
32
- cameraMovementData = data;
33
- effect = cameraMovementData.effect;
34
- if (!(effect === _typings.CameraMovementEffect.Rotate)) {
35
- _context.next = 9;
26
+ while (1) {
27
+ switch (_context.prev = _context.next) {
28
+ case 0:
29
+ if (!ref.current) {
30
+ ref.current = (0, _CameraMovementPlugin.CameraMovementPlugin)(five, {});
31
+ }
32
+ start = keyframe.start, end = keyframe.end, data = keyframe.data;
33
+ cameraMovementData = data;
34
+ effect = cameraMovementData.effect;
35
+ if (!(effect === _typings.CameraMovementEffect.Rotate)) {
36
+ _context.next = 9;
37
+ break;
38
+ }
39
+ _context.next = 7;
40
+ return ref.current.rotate(data, end - start);
41
+ case 7:
42
+ _context.next = 21;
36
43
  break;
37
- }
38
- _context.next = 7;
39
- return ref.current.rotate(data, end - start);
40
- case 7:
41
- _context.next = 21;
42
- break;
43
- case 9:
44
- if (!(effect === _typings.CameraMovementEffect.Move)) {
45
- _context.next = 14;
44
+ case 9:
45
+ if (!(effect === _typings.CameraMovementEffect.Move)) {
46
+ _context.next = 14;
47
+ break;
48
+ }
49
+ _context.next = 12;
50
+ return ref.current.move(data, end - start);
51
+ case 12:
52
+ _context.next = 21;
46
53
  break;
47
- }
48
- _context.next = 12;
49
- return ref.current.move(data, end - start);
50
- case 12:
51
- _context.next = 21;
52
- break;
53
- case 14:
54
- if (!(cameraMovementData.panoIndex !== undefined && cameraMovementData.panoIndex !== five.panoIndex)) {
55
- _context.next = 19;
54
+ case 14:
55
+ if (!(cameraMovementData.panoIndex !== undefined && cameraMovementData.panoIndex !== five.panoIndex)) {
56
+ _context.next = 19;
57
+ break;
58
+ }
59
+ _context.next = 17;
60
+ return ref.current.move(data, end - start);
61
+ case 17:
62
+ _context.next = 21;
56
63
  break;
57
- }
58
- _context.next = 17;
59
- return ref.current.move(data, end - start);
60
- case 17:
61
- _context.next = 21;
62
- break;
63
- case 19:
64
- _context.next = 21;
65
- return ref.current.rotate(data, end - start);
66
- case 21:
67
- case "end":
68
- return _context.stop();
64
+ case 19:
65
+ _context.next = 21;
66
+ return ref.current.rotate(data, end - start);
67
+ case 21:
68
+ case "end":
69
+ return _context.stop();
70
+ }
69
71
  }
70
72
  }, _callee);
71
73
  }));
@@ -8,7 +8,7 @@ exports.InfoPanel = InfoPanel;
8
8
  var React = _interopRequireWildcard(require("react"));
9
9
  var _VreoUnit = require("../../../../typings/VreoUnit");
10
10
  var _hooks = require("../../../hooks");
11
- 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); }
11
+ 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); }
12
12
  var isWX = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1;
13
13
  var isIOS = navigator.userAgent.toLowerCase().indexOf('iphone') !== -1;
14
14
  var isIOSorWX = isIOS || isWX;
@@ -41,21 +41,21 @@ function InfoPanelVideo(_ref2) {
41
41
  var videoWrapperRef = React.useRef(null);
42
42
  var controller = (0, _hooks.useController)();
43
43
  React.useEffect(function () {
44
- var _controller$configs;
44
+ var _controller$configs, _controller$configs$v;
45
45
  // if (!isIOSorWX) return
46
- var video = ((_controller$configs = controller.configs) === null || _controller$configs === void 0 || (_controller$configs = _controller$configs.videos) === null || _controller$configs === void 0 ? void 0 : _controller$configs.videoPanel) || _videoElement;
46
+ 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.videoPanel) || _videoElement;
47
47
  if (!videoWrapperRef.current) return;
48
48
  video.src = url;
49
49
  if (!videoWrapperRef.current.contains(video)) {
50
50
  videoWrapperRef.current.appendChild(video);
51
51
  }
52
- var _canplaythrough = function canplaythrough() {
53
- video.removeEventListener('canplaythrough', _canplaythrough);
52
+ var canplaythrough = function canplaythrough() {
53
+ video.removeEventListener('canplaythrough', canplaythrough);
54
54
  try {
55
55
  video.play();
56
56
  } catch (error) {}
57
57
  };
58
- video.addEventListener('canplaythrough', _canplaythrough);
58
+ video.addEventListener('canplaythrough', canplaythrough);
59
59
  video.load();
60
60
  // video.play()
61
61
 
@@ -14,7 +14,7 @@ var _hooks = require("../../../hooks");
14
14
  var _ModelTVVideoPlugin = require("../../../../fivePlugins/ModelTVVideoPlugin");
15
15
  var _createTransMatrix = require("../../../../shared-utils/createTransMatrix");
16
16
  var _VreoUnit = require("../../../../typings/VreoUnit");
17
- 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); }
17
+ 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); }
18
18
  function ModelVideo() {
19
19
  var controller = (0, _hooks.useController)();
20
20
  var five = (0, _hooks.useFiveInstance)();
@@ -23,59 +23,61 @@ function ModelVideo() {
23
23
  React.useEffect(function () {
24
24
  var callback = /*#__PURE__*/function () {
25
25
  var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe) {
26
- var _controller$configs;
26
+ var _controller$configs, _controller$configs$v;
27
27
  var start, end, _ref2, videoSrc, videoPosterSrc, vertexs, matrixWorld, position, points;
28
28
  return _regenerator["default"].wrap(function _callee$(_context) {
29
- while (1) switch (_context.prev = _context.next) {
30
- case 0:
31
- if (!ref.current) {
32
- ref.current = (0, _ModelTVVideoPlugin.ModelTVVideoPlugin)(five, {});
33
- }
34
- start = keyframe.start, end = keyframe.end;
35
- _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, videoPosterSrc = _ref2.videoPosterSrc, vertexs = _ref2.vertexs, matrixWorld = _ref2.matrixWorld;
36
- position = function () {
37
- if (vertexs.length < 4) {
38
- throw new Error('ModelVideo: 顶点数据集合不够,无法组成矩形 ....');
29
+ while (1) {
30
+ switch (_context.prev = _context.next) {
31
+ case 0:
32
+ if (!ref.current) {
33
+ ref.current = (0, _ModelTVVideoPlugin.ModelTVVideoPlugin)(five, {});
39
34
  }
40
- if (vertexs.length === 4) {
41
- return vertexs;
42
- }
43
- var box = new THREE.Box3();
44
- vertexs.forEach(function (v) {
45
- return box.expandByPoint(new THREE.Vector3(v.x, v.y, v.z));
46
- });
47
- return [new THREE.Vector3(box.min.x, box.max.y, box.max.z), new THREE.Vector3(box.min.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.max.y, box.max.z)];
48
- }();
49
- points = function () {
50
- if (matrixWorld) {
51
- var transMatrix = (0, _createTransMatrix.createTransMatrix)(matrixWorld);
52
- return [position.map(function (p) {
53
- var res = transMatrix([p.x, p.y, p.z]);
54
- return {
55
- x: res[0],
56
- y: res[1],
57
- z: res[2]
58
- };
59
- })];
60
- }
61
- return [position];
62
- }();
63
- ref.current.disable();
64
- _context.next = 8;
65
- return ref.current.load({
66
- video_src: videoSrc,
67
- video_poster_src: videoPosterSrc,
68
- points: points
69
- }, (_controller$configs = controller.configs) === null || _controller$configs === void 0 || (_controller$configs = _controller$configs.videos) === null || _controller$configs === void 0 ? void 0 : _controller$configs.modelTVVideo);
70
- case 8:
71
- ref.current.enable();
72
- timeoutRef.current = setTimeout(function () {
73
- var _ref$current;
74
- return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.disable();
75
- }, end - start);
76
- case 10:
77
- case "end":
78
- return _context.stop();
35
+ start = keyframe.start, end = keyframe.end;
36
+ _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, videoPosterSrc = _ref2.videoPosterSrc, vertexs = _ref2.vertexs, matrixWorld = _ref2.matrixWorld;
37
+ position = function () {
38
+ if (vertexs.length < 4) {
39
+ throw new Error('ModelVideo: 顶点数据集合不够,无法组成矩形 ....');
40
+ }
41
+ if (vertexs.length === 4) {
42
+ return vertexs;
43
+ }
44
+ var box = new THREE.Box3();
45
+ vertexs.forEach(function (v) {
46
+ return box.expandByPoint(new THREE.Vector3(v.x, v.y, v.z));
47
+ });
48
+ return [new THREE.Vector3(box.min.x, box.max.y, box.max.z), new THREE.Vector3(box.min.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.max.y, box.max.z)];
49
+ }();
50
+ points = function () {
51
+ if (matrixWorld) {
52
+ var transMatrix = (0, _createTransMatrix.createTransMatrix)(matrixWorld);
53
+ return [position.map(function (p) {
54
+ var res = transMatrix([p.x, p.y, p.z]);
55
+ return {
56
+ x: res[0],
57
+ y: res[1],
58
+ z: res[2]
59
+ };
60
+ })];
61
+ }
62
+ return [position];
63
+ }();
64
+ ref.current.disable();
65
+ _context.next = 8;
66
+ return ref.current.load({
67
+ video_src: videoSrc,
68
+ video_poster_src: videoPosterSrc,
69
+ points: points
70
+ }, (_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.modelTVVideo);
71
+ case 8:
72
+ ref.current.enable();
73
+ timeoutRef.current = setTimeout(function () {
74
+ var _ref$current;
75
+ return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.disable();
76
+ }, end - start);
77
+ case 10:
78
+ case "end":
79
+ return _context.stop();
80
+ }
79
81
  }
80
82
  }, _callee);
81
83
  }));
@@ -13,7 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
13
13
  var _lineAnime = _interopRequireDefault(require("./lineAnime"));
14
14
  var _hooks = require("../../../hooks");
15
15
  var _VreoUnit = require("../../../../typings/VreoUnit");
16
- 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); }
16
+ 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); }
17
17
  function PanoEffect() {
18
18
  var _React$useState = React.useState(null),
19
19
  _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
@@ -8,7 +8,7 @@ exports["default"] = lineAnime;
8
8
  var THREE = _interopRequireWildcard(require("three"));
9
9
  var _line = require("@realsee/five/line");
10
10
  var _BetterTween = require("../../../../shared-utils/animationFrame/BetterTween");
11
- 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); }
11
+ 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); }
12
12
  function lineAnime(five, startPoint, endPoint) {
13
13
  var pointImage = 'data:image/png;base64,' + 'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAIVBMVEUAAAD////////////////////////////////////////PIev5AAAACnRSTlMAG/Py2baba05un7UgfgAAAHJJREFUKM9joBpgLHVSCRdA4metAoJlCJHmVWBgAeNzroKCCVCBLpjACqgJVjCBxRBT2FbBQQJYQAohsBAsUIUQWA4WiEIILAULeCEEloAFtBACizAEMLRgGIphLabDMJ2O6TlM72MGECIIMQIZIxqoBQCPvpJ/e9FaAAAAAABJRU5ErkJggg==';
14
14
  var pointTexture = new THREE.TextureLoader().load(pointImage);
@@ -9,7 +9,7 @@ var React = _interopRequireWildcard(require("react"));
9
9
  var _hooks = require("../../../hooks");
10
10
  var _VreoUnit = require("../../../../typings/VreoUnit");
11
11
  var _dnalogel = require("@realsee/dnalogel");
12
- 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); }
12
+ 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); }
13
13
  function PanoTag() {
14
14
  var timeoutRef = React.useRef();
15
15
  var controller = (0, _hooks.useController)();
@@ -94,7 +94,7 @@ function PanoTag() {
94
94
  tag.state.unfolded = false;
95
95
  panoTagPlugin.current.updateRenderAllTags();
96
96
  }
97
- (_tag$hooks = tag.hooks) === null || _tag$hooks === void 0 || _tag$hooks.on('folded', function () {
97
+ (_tag$hooks = tag.hooks) === null || _tag$hooks === void 0 ? void 0 : _tag$hooks.on('folded', function () {
98
98
  setTimeout(function () {
99
99
  if (tag.state) {
100
100
  tag.state.visible = false;
@@ -14,7 +14,7 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
14
14
  var _hooks = require("../../../hooks");
15
15
  var _CSS3DRenderPlugin = require("../../../../fivePlugins/CSS3DRenderPlugin");
16
16
  var _VreoUnit = require("../../../../typings/VreoUnit");
17
- 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); }
17
+ 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); }
18
18
  /**
19
19
  * 通过传入中心点确定矩形框架容器的四个点:
20
20
  * 1. 已知矩形长宽和中心点
@@ -99,7 +99,7 @@ function PanoTextLabel() {
99
99
  // 将获取的mesh进行旋转操作,根据欧拉角去进行mesh的变换
100
100
  if (data.quaternion) {
101
101
  var quaternion = new _three.Quaternion(data.quaternion.x, data.quaternion.y, data.quaternion.z, data.quaternion.w);
102
- css3DObject === null || css3DObject === void 0 || css3DObject.quaternion.copy(quaternion);
102
+ css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.quaternion.copy(quaternion);
103
103
  }
104
104
  if (container !== null && container !== void 0 && container.container) _reactDom["default"].render(/*#__PURE__*/React.createElement("div", {
105
105
  className: "PanoTextLabel PanoTextLabel--notHidden"
@@ -113,7 +113,7 @@ function PanoTextLabel() {
113
113
  }, data.text || ''))), container === null || container === void 0 ? void 0 : container.container);
114
114
  timeoutRef.current = setTimeout(function () {
115
115
  var _ref$current;
116
- (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.disposeAll();
116
+ (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.disposeAll();
117
117
  }, end - start);
118
118
  };
119
119
  controller.on(_VreoUnit.VreoKeyframeEnum.PanoTextLabel, callback);
@@ -12,7 +12,7 @@ var React = _interopRequireWildcard(require("react"));
12
12
  var _classnames = _interopRequireDefault(require("classnames"));
13
13
  var _hooks = require("../../../hooks");
14
14
  var _VreoUnit = require("../../../../typings/VreoUnit");
15
- 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); }
15
+ 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); }
16
16
  function Prompter() {
17
17
  var _React$useState = React.useState(''),
18
18
  _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
@@ -9,7 +9,7 @@ var React = _interopRequireWildcard(require("react"));
9
9
  var _five = require("@realsee/five");
10
10
  var _hooks = require("../../../hooks");
11
11
  var _VreoUnit = require("../../../../typings/VreoUnit");
12
- 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); }
12
+ 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); }
13
13
  function UpdateVRPanorama() {
14
14
  var controller = (0, _hooks.useController)();
15
15
  var five = (0, _hooks.useFiveInstance)();
@@ -46,8 +46,8 @@ function UpdateVRPanorama() {
46
46
  }, []);
47
47
  React.useEffect(function () {
48
48
  var callback = function callback(keyframe) {
49
- var _five$work, _five$work2;
50
- if (!deafultWorkRef.current && (_five$work = five.work) !== null && _five$work !== void 0 && _five$work.raw.works) {
49
+ var _five$work, _five$work$raw, _five$work2, _five$work2$raw, _five$work2$raw$works;
50
+ if (!deafultWorkRef.current && (_five$work = five.work) !== null && _five$work !== void 0 && (_five$work$raw = _five$work.raw) !== null && _five$work$raw !== void 0 && _five$work$raw.works) {
51
51
  deafultWorkRef.current = five.work.raw.works;
52
52
  }
53
53
  var data = keyframe.data;
@@ -58,9 +58,9 @@ function UpdateVRPanorama() {
58
58
  five.load(updateWorkRef.current);
59
59
  return;
60
60
  }
61
- var lastRawWork = (_five$work2 = five.work) === null || _five$work2 === void 0 || (_five$work2 = _five$work2.raw.works) === null || _five$work2 === void 0 ? void 0 : _five$work2[0];
61
+ var lastRawWork = (_five$work2 = five.work) === null || _five$work2 === void 0 ? void 0 : (_five$work2$raw = _five$work2.raw) === null || _five$work2$raw === void 0 ? void 0 : (_five$work2$raw$works = _five$work2$raw.works) === null || _five$work2$raw$works === void 0 ? void 0 : _five$work2$raw$works[0];
62
62
  if (!lastRawWork) {
63
- console.warn('No raw work data available');
63
+ console.warn('UpdateVRPanorama: 没有可用的 work 数据');
64
64
  return;
65
65
  }
66
66