@realsee/vreo 2.4.1 → 2.4.3

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 (42) 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.d.ts +1 -1
  5. package/lib/Player/Controller.js +28 -23
  6. package/lib/Player/custom/SpatialScenePanel/index.js +10 -10
  7. package/lib/Player/index.js +94 -90
  8. package/lib/Player/modules/Drawer/index.js +1 -1
  9. package/lib/Player/modules/PopUp/index.js +1 -1
  10. package/lib/Player/modules/VideoAgent/VideoAgentMesh.d.ts +1 -1
  11. package/lib/Player/modules/VideoAgent/VideoAgentMesh.js +145 -136
  12. package/lib/Player/modules/VideoAgent/VideoAgentScene.js +2 -2
  13. package/lib/Player/modules/VideoAgent/index.js +2 -2
  14. package/lib/Player/modules/Wave/index.js +1 -1
  15. package/lib/Player/modules/keyframes/BgMusic/index.js +41 -39
  16. package/lib/Player/modules/keyframes/CameraMovement/index.js +43 -41
  17. package/lib/Player/modules/keyframes/InfoPanel/index.js +6 -6
  18. package/lib/Player/modules/keyframes/ModelVideo/index.js +53 -51
  19. package/lib/Player/modules/keyframes/PanoEffect/index.js +1 -1
  20. package/lib/Player/modules/keyframes/PanoEffect/lineAnime.js +1 -1
  21. package/lib/Player/modules/keyframes/PanoTag/index.js +2 -2
  22. package/lib/Player/modules/keyframes/PanoTextLabel/index.js +3 -3
  23. package/lib/Player/modules/keyframes/Prompter/index.js +1 -1
  24. package/lib/Player/modules/keyframes/UpdateVRPanorama/index.js +5 -5
  25. package/lib/Player/modules/keyframes/VideoEffect/index.js +44 -42
  26. package/lib/Player/typings.d.ts +1 -4
  27. package/lib/fivePlugins/CSS3DRenderPlugin/index.js +7 -7
  28. package/lib/fivePlugins/CameraMovementPlugin/index.js +171 -167
  29. package/lib/fivePlugins/CameraMovementPlugin/typings.js +6 -6
  30. package/lib/fivePlugins/ModelTVVideoPlugin/index.js +30 -28
  31. package/lib/react/index.d.ts +1 -1
  32. package/lib/react/index.js +2 -2
  33. package/lib/shared-utils/Audio.d.ts +8 -0
  34. package/lib/shared-utils/Audio.js +62 -46
  35. package/lib/shared-utils/AudioLike.js +13 -10
  36. package/lib/shared-utils/animationFrame/BetterTween.d.ts +4 -2
  37. package/lib/shared-utils/animationFrame/BetterTween.js +19 -15
  38. package/lib/shared-utils/animationFrame/tween.d.ts +4 -2
  39. package/lib/shared-utils/animationFrame/tween.js +12 -1
  40. package/lib/shared-utils/createTransMatrix.js +1 -1
  41. package/lib/typings/VreoUnit.js +26 -69
  42. package/package.json +20 -24
@@ -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
 
@@ -13,18 +13,18 @@ var _classnames = _interopRequireDefault(require("classnames"));
13
13
  var React = _interopRequireWildcard(require("react"));
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
  // import { Preloader } from '../../../../shared-utils/Preloader'
18
18
 
19
19
  var inlinePlay = function inlinePlay(videoInstance) {
20
20
  if (!videoInstance) return;
21
- var _canplaythrough = function canplaythrough() {
22
- videoInstance.removeEventListener('canplaythrough', _canplaythrough);
21
+ var canplaythrough = function canplaythrough() {
22
+ videoInstance.removeEventListener('canplaythrough', canplaythrough);
23
23
  try {
24
24
  videoInstance.play();
25
25
  } catch (error) {}
26
26
  };
27
- videoInstance.addEventListener('canplaythrough', _canplaythrough);
27
+ videoInstance.addEventListener('canplaythrough', canplaythrough);
28
28
  videoInstance.load();
29
29
  };
30
30
 
@@ -50,40 +50,42 @@ function VideoEffect() {
50
50
  var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe) {
51
51
  var start, end, _ref2, videoSrc, fov, direction, panoIndex, vector, _ref3, _ref4, longitude, latitude;
52
52
  return _regenerator["default"].wrap(function _callee$(_context) {
53
- while (1) switch (_context.prev = _context.next) {
54
- case 0:
55
- start = keyframe.start, end = keyframe.end;
56
- _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, fov = _ref2.fov, direction = _ref2.direction, panoIndex = _ref2.panoIndex, vector = _ref2.vector;
57
- _ref3 = function () {
58
- if (vector) {
59
- return [vector.longitude, vector.latitude];
60
- }
61
- if (!direction) {
62
- return [0, 0];
63
- }
64
- var longitude = -Math.atan2(direction.x, -direction.z);
65
- longitude = (longitude % PI_2 + PI_2) % PI_2;
66
- var latitude = -Math.asin(direction.y / 1);
67
- return [longitude, latitude];
68
- }(), _ref4 = (0, _slicedToArray2["default"])(_ref3, 2), longitude = _ref4[0], latitude = _ref4[1];
69
- five.setState({
70
- fov: fov,
71
- panoIndex: panoIndex,
72
- longitude: longitude,
73
- latitude: latitude
74
- }, true);
75
- setBlobSrc(videoSrc);
76
- inlinePlay(videoRef.current);
77
- setVisible(true);
78
- timeoutRef.current = setTimeout(function () {
79
- var _videoRef$current;
80
- (_videoRef$current = videoRef.current) === null || _videoRef$current === void 0 || _videoRef$current.pause();
81
- setVisible(false);
82
- setBlobSrc('');
83
- }, end - start);
84
- case 8:
85
- case "end":
86
- return _context.stop();
53
+ while (1) {
54
+ switch (_context.prev = _context.next) {
55
+ case 0:
56
+ start = keyframe.start, end = keyframe.end;
57
+ _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, fov = _ref2.fov, direction = _ref2.direction, panoIndex = _ref2.panoIndex, vector = _ref2.vector;
58
+ _ref3 = function () {
59
+ if (vector) {
60
+ return [vector.longitude, vector.latitude];
61
+ }
62
+ if (!direction) {
63
+ return [0, 0];
64
+ }
65
+ var longitude = -Math.atan2(direction.x, -direction.z);
66
+ longitude = (longitude % PI_2 + PI_2) % PI_2;
67
+ var latitude = -Math.asin(direction.y / 1);
68
+ return [longitude, latitude];
69
+ }(), _ref4 = (0, _slicedToArray2["default"])(_ref3, 2), longitude = _ref4[0], latitude = _ref4[1];
70
+ five.setState({
71
+ fov: fov,
72
+ panoIndex: panoIndex,
73
+ longitude: longitude,
74
+ latitude: latitude
75
+ }, true);
76
+ setBlobSrc(videoSrc);
77
+ inlinePlay(videoRef.current);
78
+ setVisible(true);
79
+ timeoutRef.current = setTimeout(function () {
80
+ var _videoRef$current;
81
+ (_videoRef$current = videoRef.current) === null || _videoRef$current === void 0 ? void 0 : _videoRef$current.pause();
82
+ setVisible(false);
83
+ setBlobSrc('');
84
+ }, end - start);
85
+ case 8:
86
+ case "end":
87
+ return _context.stop();
88
+ }
87
89
  }
88
90
  }, _callee);
89
91
  }));
@@ -97,7 +99,7 @@ function VideoEffect() {
97
99
  if (timeoutRef.current) {
98
100
  clearTimeout(timeoutRef.current);
99
101
  }
100
- (_videoRef$current2 = videoRef.current) === null || _videoRef$current2 === void 0 || _videoRef$current2.pause();
102
+ (_videoRef$current2 = videoRef.current) === null || _videoRef$current2 === void 0 ? void 0 : _videoRef$current2.pause();
101
103
  setVisible(false);
102
104
  setBlobSrc('');
103
105
  };
@@ -115,9 +117,9 @@ function VideoEffect() {
115
117
  };
116
118
  }, [controller]);
117
119
  React.useEffect(function () {
118
- var _controller$configs;
120
+ var _controller$configs, _controller$configs$v;
119
121
  if (!ref.current) return;
120
- 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.videoEffect) || document.createElement('video');
122
+ 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');
121
123
  // <video playsInline key="VideoEffect-video" className="VideoEffect-video" src={blobSrc} />
122
124
  video.setAttribute('playsinline', 'true');
123
125
  video.setAttribute('webkit-playsinline', 'true');
@@ -128,7 +130,7 @@ function VideoEffect() {
128
130
  ref.current.append(videoRef.current);
129
131
  document.addEventListener('WeixinJSBridgeReady', function () {
130
132
  var _videoRef$current3;
131
- (_videoRef$current3 = videoRef.current) === null || _videoRef$current3 === void 0 || _videoRef$current3.play();
133
+ (_videoRef$current3 = videoRef.current) === null || _videoRef$current3 === void 0 ? void 0 : _videoRef$current3.play();
132
134
  }, false);
133
135
  if (!ref.current) return;
134
136
  // const asyncfunc = async () => {
@@ -2,9 +2,6 @@ import React, { ReactNode } from 'react';
2
2
  import { Subscribe, Five } from '@realsee/five';
3
3
  import { VreoKeyframe, VreoKeyframeConfigMap, VreoKeyframeEvent } from '../typings/VreoUnit';
4
4
  import { VideoAgentMeshOptions } from './modules/VideoAgent/VideoAgentMesh';
5
- export type VreoFunctionComponent<P = {}> = (props: P) => ReactNode;
6
- /** @deprecated 请使用 VreoFunctionComponent<CustomVreoKeyframeProps> 替代 */
7
- export type LegacyCustomKeyframe = React.FC<CustomVreoKeyframeProps>;
8
5
  export interface PlayerConfigs {
9
6
  /**
10
7
  * @deprecated rename to container
@@ -27,7 +24,7 @@ export interface PlayerConfigs {
27
24
  * 如果需要在 底部面板添加自定义内容,可以传递个 React 组件。
28
25
  */
29
26
  customPanelChildren?: ReactNode;
30
- customKeyframes?: (VreoFunctionComponent<CustomVreoKeyframeProps> | React.FC<CustomVreoKeyframeProps>)[];
27
+ customKeyframes?: React.FC<CustomVreoKeyframeProps>[];
31
28
  imageOptions?: {
32
29
  size: number;
33
30
  };
@@ -13,7 +13,7 @@ var _evenNumber = _interopRequireDefault(require("./evenNumber"));
13
13
  var _centerPoint = _interopRequireDefault(require("./centerPoint"));
14
14
  var _transformPositionToVector = _interopRequireDefault(require("./transformPositionToVector3"));
15
15
  var _createResizeObserver = _interopRequireDefault(require("./createResizeObserver"));
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
  /**
18
18
  * 三维向量
19
19
  */
@@ -38,7 +38,7 @@ var CSS3DRenderPlugin = exports.CSS3DRenderPlugin = function CSS3DRenderPlugin(f
38
38
  });
39
39
  var config = params[1];
40
40
  if ((points === null || points === void 0 ? void 0 : points.length) < 4) return console.error('points must be equal or greater than than 4');
41
- if (!(five !== null && five !== void 0 && (_five$model = five.model) !== null && _five$model !== void 0 && _five$model.loaded)) return console.error('five.model.loaded is: ', five === null || five === void 0 || (_five$model2 = five.model) === null || _five$model2 === void 0 ? void 0 : _five$model2.loaded);
41
+ if (!(five !== null && five !== void 0 && (_five$model = five.model) !== null && _five$model !== void 0 && _five$model.loaded)) return console.error('five.model.loaded is: ', five === null || five === void 0 ? void 0 : (_five$model2 = five.model) === null || _five$model2 === void 0 ? void 0 : _five$model2.loaded);
42
42
  var fiveElement = five.getElement();
43
43
  if (!fiveElement) return console.error('five.getElement() is ' + fiveElement);
44
44
  var disposers = [];
@@ -102,16 +102,16 @@ var CSS3DRenderPlugin = exports.CSS3DRenderPlugin = function CSS3DRenderPlugin(f
102
102
  css3DRenderer.domElement.style.top = '0';
103
103
  css3DRenderer.domElement.style.userSelect = 'none';
104
104
  css3DRenderer.domElement.style.pointerEvents = 'none';
105
- var _renderEveryFrame = function renderEveryFrame() {
105
+ var renderEveryFrame = function renderEveryFrame() {
106
106
  if (stopRenderFlag) return;
107
- requestAnimationFrameId = requestAnimationFrame(_renderEveryFrame);
107
+ requestAnimationFrameId = requestAnimationFrame(renderEveryFrame);
108
108
  css3DRenderer.render(scene, five.camera);
109
109
  };
110
110
  return function () {
111
111
  var _resizeObserver, _resizeObserver$obser;
112
112
  scene.add(css3DObject);
113
- (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 || (_resizeObserver$obser = _resizeObserver.observe) === null || _resizeObserver$obser === void 0 || _resizeObserver$obser.call(_resizeObserver);
114
- _renderEveryFrame();
113
+ (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 ? void 0 : (_resizeObserver$obser = _resizeObserver.observe) === null || _resizeObserver$obser === void 0 ? void 0 : _resizeObserver$obser.call(_resizeObserver);
114
+ renderEveryFrame();
115
115
  if (mode === 'behind' && mesh) {
116
116
  five.scene.add(mesh);
117
117
  disposers.push(function () {
@@ -148,7 +148,7 @@ var CSS3DRenderPlugin = exports.CSS3DRenderPlugin = function CSS3DRenderPlugin(f
148
148
  if (mode === 'behind') state.behindMode = undefined;
149
149
  if (!state.behindMode && !state.frontMode) {
150
150
  var _resizeObserver2, _resizeObserver2$unob;
151
- (_resizeObserver2 = resizeObserver) === null || _resizeObserver2 === void 0 || (_resizeObserver2$unob = _resizeObserver2.unobserve) === null || _resizeObserver2$unob === void 0 || _resizeObserver2$unob.call(_resizeObserver2);
151
+ (_resizeObserver2 = resizeObserver) === null || _resizeObserver2 === void 0 ? void 0 : (_resizeObserver2$unob = _resizeObserver2.unobserve) === null || _resizeObserver2$unob === void 0 ? void 0 : _resizeObserver2$unob.call(_resizeObserver2);
152
152
  }
153
153
  }
154
154
  return true;