@realsee/vreo 2.3.7 → 2.3.9-alpha.0
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.
- package/lib/PlayController/createHTMLAudioElement.js +6 -4
- package/lib/PlayController/index.js +24 -32
- package/lib/Player/App.js +3 -3
- package/lib/Player/Controller.js +36 -64
- package/lib/Player/custom/SpatialScenePanel/index.js +6 -16
- package/lib/Player/hooks.js +2 -2
- package/lib/Player/index.js +23 -30
- package/lib/Player/modules/Drawer/index.js +3 -3
- package/lib/Player/modules/PopUp/index.js +3 -3
- package/lib/Player/modules/ResizeObserver/index.js +2 -2
- package/lib/Player/modules/VideoAgent/VideoAgentMesh.js +29 -35
- package/lib/Player/modules/VideoAgent/VideoAgentScene.js +17 -25
- package/lib/Player/modules/VideoAgent/index.js +3 -3
- package/lib/Player/modules/Wave/index.js +7 -15
- package/lib/Player/modules/keyframes/BgMusic/index.js +9 -7
- package/lib/Player/modules/keyframes/CameraMovement/index.js +9 -7
- package/lib/Player/modules/keyframes/InfoPanel/index.js +1 -1
- package/lib/Player/modules/keyframes/ModelVideo/index.js +9 -7
- package/lib/Player/modules/keyframes/PanoEffect/index.js +8 -18
- package/lib/Player/modules/keyframes/PanoEffect/lineAnime.js +1 -1
- package/lib/Player/modules/keyframes/PanoTag/index.js +1 -1
- package/lib/Player/modules/keyframes/PanoTextLabel/index.js +6 -16
- package/lib/Player/modules/keyframes/Prompter/index.js +10 -20
- package/lib/Player/modules/keyframes/UpdateVRPanorama/index.js +1 -1
- package/lib/Player/modules/keyframes/VideoEffect/index.js +14 -23
- package/lib/fivePlugins/CSS3DRenderPlugin/index.js +3 -3
- package/lib/fivePlugins/CameraMovementPlugin/index.js +34 -30
- package/lib/fivePlugins/ModelTVVideoPlugin/index.js +13 -21
- package/lib/react/index.js +7 -15
- package/lib/shared-utils/Audio.js +27 -47
- package/lib/shared-utils/AudioLike.js +19 -30
- package/lib/shared-utils/animationFrame/BetterTween.js +21 -32
- package/lib/shared-utils/createTransMatrix.js +8 -21
- package/lib/shared-utils/getMediaInfo.js +2 -2
- package/package.json +2 -1
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
6
|
|
|
5
7
|
Object.defineProperty(exports, "__esModule", {
|
|
6
8
|
value: true
|
|
7
9
|
});
|
|
8
10
|
exports.Prompter = Prompter;
|
|
9
11
|
|
|
12
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
|
+
|
|
14
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
15
|
+
|
|
10
16
|
var React = _interopRequireWildcard(require("react"));
|
|
11
17
|
|
|
12
18
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
@@ -15,34 +21,18 @@ var _hooks = require("../../../hooks");
|
|
|
15
21
|
|
|
16
22
|
var _VreoUnit = require("../../../../typings/VreoUnit");
|
|
17
23
|
|
|
18
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
19
|
-
|
|
20
24
|
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); }
|
|
21
25
|
|
|
22
26
|
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; }
|
|
23
27
|
|
|
24
|
-
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; }
|
|
25
|
-
|
|
26
|
-
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
27
|
-
|
|
28
|
-
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."); }
|
|
29
|
-
|
|
30
|
-
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); }
|
|
31
|
-
|
|
32
|
-
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; }
|
|
33
|
-
|
|
34
|
-
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; }
|
|
35
|
-
|
|
36
|
-
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
37
|
-
|
|
38
28
|
function Prompter() {
|
|
39
29
|
var _React$useState = React.useState(''),
|
|
40
|
-
_React$useState2 =
|
|
30
|
+
_React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
|
|
41
31
|
text = _React$useState2[0],
|
|
42
32
|
setText = _React$useState2[1];
|
|
43
33
|
|
|
44
34
|
var _React$useState3 = React.useState(true),
|
|
45
|
-
_React$useState4 =
|
|
35
|
+
_React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
|
|
46
36
|
hidden = _React$useState4[0],
|
|
47
37
|
setHidden = _React$useState4[1];
|
|
48
38
|
|
|
@@ -82,7 +72,7 @@ function Prompter() {
|
|
|
82
72
|
};
|
|
83
73
|
}, [controller]);
|
|
84
74
|
return /*#__PURE__*/React.createElement("div", {
|
|
85
|
-
className: (0, _classnames["default"])('vreo-prompter',
|
|
75
|
+
className: (0, _classnames["default"])('vreo-prompter', (0, _defineProperty2["default"])({
|
|
86
76
|
'vreo-prompter--hidden': hidden
|
|
87
77
|
}, "vreo-prompter-left--".concat(controller.agentType), true))
|
|
88
78
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
6
|
|
|
5
7
|
Object.defineProperty(exports, "__esModule", {
|
|
6
8
|
value: true
|
|
7
9
|
});
|
|
8
10
|
exports.VideoEffect = VideoEffect;
|
|
9
11
|
|
|
12
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
13
|
+
|
|
14
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
15
|
+
|
|
16
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
17
|
+
|
|
10
18
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
11
19
|
|
|
12
20
|
var React = _interopRequireWildcard(require("react"));
|
|
@@ -19,24 +27,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
19
27
|
|
|
20
28
|
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; }
|
|
21
29
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
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); } }
|
|
25
|
-
|
|
26
|
-
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); }); }; }
|
|
27
|
-
|
|
28
|
-
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
29
|
-
|
|
30
|
-
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."); }
|
|
31
|
-
|
|
32
|
-
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); }
|
|
33
|
-
|
|
34
|
-
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; }
|
|
35
|
-
|
|
36
|
-
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; }
|
|
37
|
-
|
|
38
|
-
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
39
|
-
|
|
30
|
+
// import { Preloader } from '../../../../shared-utils/Preloader'
|
|
40
31
|
var inlinePlay = function inlinePlay(videoInstance) {
|
|
41
32
|
if (!videoInstance) return;
|
|
42
33
|
|
|
@@ -63,7 +54,7 @@ function VideoEffect() {
|
|
|
63
54
|
var timeoutRef = React.useRef();
|
|
64
55
|
|
|
65
56
|
var _React$useState = React.useState(false),
|
|
66
|
-
_React$useState2 =
|
|
57
|
+
_React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
|
|
67
58
|
visible = _React$useState2[0],
|
|
68
59
|
setVisible = _React$useState2[1];
|
|
69
60
|
|
|
@@ -76,10 +67,10 @@ function VideoEffect() {
|
|
|
76
67
|
|
|
77
68
|
React.useEffect(function () {
|
|
78
69
|
var callback = /*#__PURE__*/function () {
|
|
79
|
-
var _ref =
|
|
70
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe) {
|
|
80
71
|
var start, end, _ref2, videoSrc, fov, direction, panoIndex, vector, _ref3, _ref4, longitude, latitude;
|
|
81
72
|
|
|
82
|
-
return
|
|
73
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
83
74
|
while (1) {
|
|
84
75
|
switch (_context.prev = _context.next) {
|
|
85
76
|
case 0:
|
|
@@ -98,7 +89,7 @@ function VideoEffect() {
|
|
|
98
89
|
longitude = (longitude % PI_2 + PI_2) % PI_2;
|
|
99
90
|
var latitude = -Math.asin(direction.y / 1);
|
|
100
91
|
return [longitude, latitude];
|
|
101
|
-
}(), _ref4 =
|
|
92
|
+
}(), _ref4 = (0, _slicedToArray2["default"])(_ref3, 2), longitude = _ref4[0], latitude = _ref4[1];
|
|
102
93
|
five.setState({
|
|
103
94
|
fov: fov,
|
|
104
95
|
panoIndex: panoIndex,
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
6
|
|
|
5
7
|
Object.defineProperty(exports, "__esModule", {
|
|
6
8
|
value: true
|
|
@@ -19,8 +21,6 @@ var _transformPositionToVector = _interopRequireDefault(require("./transformPosi
|
|
|
19
21
|
|
|
20
22
|
var _createResizeObserver = _interopRequireDefault(require("./createResizeObserver"));
|
|
21
23
|
|
|
22
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
23
|
-
|
|
24
24
|
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); }
|
|
25
25
|
|
|
26
26
|
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; }
|
|
@@ -1,20 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
3
5
|
Object.defineProperty(exports, "__esModule", {
|
|
4
6
|
value: true
|
|
5
7
|
});
|
|
6
8
|
exports.CameraMovementPlugin = void 0;
|
|
7
9
|
|
|
8
|
-
var
|
|
10
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
11
|
|
|
10
|
-
var
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
13
|
|
|
12
|
-
|
|
14
|
+
var _five = require("@realsee/five");
|
|
13
15
|
|
|
14
|
-
|
|
16
|
+
var _typings = require("./typings");
|
|
15
17
|
|
|
16
18
|
var PI = Math.PI;
|
|
17
19
|
var PI_2 = PI * 2;
|
|
20
|
+
var moving = false; // five 6 神秘bug, move 的时候不能 setState
|
|
18
21
|
|
|
19
22
|
function progressNumber(from, to, pst) {
|
|
20
23
|
if (from === to) return from;
|
|
@@ -41,11 +44,11 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
|
|
|
41
44
|
preload: true
|
|
42
45
|
};
|
|
43
46
|
return new Promise( /*#__PURE__*/function () {
|
|
44
|
-
var _ref =
|
|
47
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
|
|
45
48
|
var _opts$asyncEndCallbac;
|
|
46
49
|
|
|
47
50
|
var panoIndex, start, movePanoOptions;
|
|
48
|
-
return
|
|
51
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
49
52
|
while (1) {
|
|
50
53
|
switch (_context.prev = _context.next) {
|
|
51
54
|
case 0:
|
|
@@ -103,7 +106,7 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
|
|
|
103
106
|
panoIndex = args.panoIndex !== undefined ? args.panoIndex : five.panoIndex;
|
|
104
107
|
|
|
105
108
|
if (!(panoIndex !== undefined)) {
|
|
106
|
-
_context.next =
|
|
109
|
+
_context.next = 26;
|
|
107
110
|
break;
|
|
108
111
|
}
|
|
109
112
|
|
|
@@ -125,17 +128,18 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
|
|
|
125
128
|
// 移动开始
|
|
126
129
|
effect: args.transEffect || 'fly'
|
|
127
130
|
});
|
|
128
|
-
|
|
131
|
+
moving = true;
|
|
132
|
+
_context.next = 24;
|
|
129
133
|
return five.moveToPano(panoIndex, movePanoOptions);
|
|
130
134
|
|
|
131
|
-
case
|
|
132
|
-
_context.next =
|
|
135
|
+
case 24:
|
|
136
|
+
_context.next = 27;
|
|
133
137
|
break;
|
|
134
138
|
|
|
135
|
-
case
|
|
139
|
+
case 26:
|
|
136
140
|
reject(false);
|
|
137
141
|
|
|
138
|
-
case
|
|
142
|
+
case 27:
|
|
139
143
|
case "end":
|
|
140
144
|
return _context.stop();
|
|
141
145
|
}
|
|
@@ -150,7 +154,7 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
|
|
|
150
154
|
};
|
|
151
155
|
|
|
152
156
|
var rotate = /*#__PURE__*/function () {
|
|
153
|
-
var _ref2 =
|
|
157
|
+
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(args, duration) {
|
|
154
158
|
var _opts$asyncStartCallb, _opts$asyncEndCallbac2;
|
|
155
159
|
|
|
156
160
|
var opts,
|
|
@@ -161,39 +165,40 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
|
|
|
161
165
|
animeDuration,
|
|
162
166
|
onFiveRenderFrame,
|
|
163
167
|
_args2 = arguments;
|
|
164
|
-
return
|
|
168
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
165
169
|
while (1) {
|
|
166
170
|
switch (_context2.prev = _context2.next) {
|
|
167
171
|
case 0:
|
|
168
172
|
opts = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {};
|
|
173
|
+
moving = false;
|
|
169
174
|
(_opts$asyncStartCallb = opts.asyncStartCallback) === null || _opts$asyncStartCallb === void 0 ? void 0 : _opts$asyncStartCallb.call(opts); // 先切换模型再出旋转效果
|
|
170
175
|
|
|
171
176
|
if (!(args.mode && five.currentMode !== args.mode)) {
|
|
172
|
-
_context2.next =
|
|
177
|
+
_context2.next = 6;
|
|
173
178
|
break;
|
|
174
179
|
}
|
|
175
180
|
|
|
176
|
-
_context2.next =
|
|
181
|
+
_context2.next = 6;
|
|
177
182
|
return five.changeMode(args.mode, args.mode === _five.Five.Mode.Panorama ? {
|
|
178
183
|
latitude: 0
|
|
179
184
|
} : undefined);
|
|
180
185
|
|
|
181
|
-
case
|
|
186
|
+
case 6:
|
|
182
187
|
if (!(args.mode === _five.Five.Mode.Panorama && five.currentMode === _five.Five.Mode.Panorama && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
|
|
183
|
-
_context2.next =
|
|
188
|
+
_context2.next = 12;
|
|
184
189
|
break;
|
|
185
190
|
}
|
|
186
191
|
|
|
187
192
|
if (!opts.preload) {
|
|
188
|
-
_context2.next =
|
|
193
|
+
_context2.next = 10;
|
|
189
194
|
break;
|
|
190
195
|
}
|
|
191
196
|
|
|
192
|
-
_context2.next =
|
|
197
|
+
_context2.next = 10;
|
|
193
198
|
return five.preloadPano(args.panoIndex);
|
|
194
199
|
|
|
195
|
-
case
|
|
196
|
-
_context2.next =
|
|
200
|
+
case 10:
|
|
201
|
+
_context2.next = 12;
|
|
197
202
|
return new Promise(function (resolve, reject) {
|
|
198
203
|
five.moveToPano(args.panoIndex, {
|
|
199
204
|
moveEndCallback: function moveEndCallback() {
|
|
@@ -208,11 +213,11 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
|
|
|
208
213
|
});
|
|
209
214
|
});
|
|
210
215
|
|
|
211
|
-
case
|
|
212
|
-
_context2.next =
|
|
216
|
+
case 12:
|
|
217
|
+
_context2.next = 14;
|
|
213
218
|
return five.ready();
|
|
214
219
|
|
|
215
|
-
case
|
|
220
|
+
case 14:
|
|
216
221
|
(_opts$asyncEndCallbac2 = opts.asyncEndCallback) === null || _opts$asyncEndCallbac2 === void 0 ? void 0 : _opts$asyncEndCallbac2.call(opts); // 计算to
|
|
217
222
|
|
|
218
223
|
from = five.getCurrentState();
|
|
@@ -232,7 +237,7 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
|
|
|
232
237
|
}
|
|
233
238
|
|
|
234
239
|
onFiveRenderFrame = function onFiveRenderFrame() {
|
|
235
|
-
if (timeEnd) {
|
|
240
|
+
if (timeEnd || moving) {
|
|
236
241
|
five.off('renderFrame', onFiveRenderFrame);
|
|
237
242
|
return;
|
|
238
243
|
}
|
|
@@ -267,21 +272,20 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
|
|
|
267
272
|
};
|
|
268
273
|
|
|
269
274
|
five.on('renderFrame', onFiveRenderFrame);
|
|
270
|
-
_context2.next =
|
|
275
|
+
_context2.next = 25;
|
|
271
276
|
return new Promise(function (resolve) {
|
|
272
277
|
setTimeout(function () {
|
|
273
278
|
timeEnd = true;
|
|
274
279
|
five.off('renderFrame', onFiveRenderFrame); // 总时间到了之后强制结束,同时也是 Loop 模式的结束方式
|
|
275
280
|
|
|
276
|
-
// 总时间到了之后强制结束,同时也是 Loop 模式的结束方式
|
|
277
281
|
resolve(true);
|
|
278
282
|
}, duration);
|
|
279
283
|
});
|
|
280
284
|
|
|
281
|
-
case
|
|
285
|
+
case 25:
|
|
282
286
|
return _context2.abrupt("return", _context2.sent);
|
|
283
287
|
|
|
284
|
-
case
|
|
288
|
+
case 26:
|
|
285
289
|
case "end":
|
|
286
290
|
return _context2.stop();
|
|
287
291
|
}
|
|
@@ -1,33 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
6
|
|
|
5
7
|
Object.defineProperty(exports, "__esModule", {
|
|
6
8
|
value: true
|
|
7
9
|
});
|
|
8
10
|
exports.ModelTVVideoPlugin = void 0;
|
|
9
11
|
|
|
10
|
-
var
|
|
11
|
-
|
|
12
|
-
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); }
|
|
13
|
-
|
|
14
|
-
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; }
|
|
15
|
-
|
|
16
|
-
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
17
|
-
|
|
18
|
-
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."); }
|
|
19
|
-
|
|
20
|
-
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); }
|
|
12
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
21
13
|
|
|
22
|
-
|
|
14
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
23
15
|
|
|
24
|
-
|
|
16
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
25
17
|
|
|
26
|
-
|
|
18
|
+
var THREE = _interopRequireWildcard(require("three"));
|
|
27
19
|
|
|
28
|
-
function
|
|
20
|
+
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); }
|
|
29
21
|
|
|
30
|
-
function
|
|
22
|
+
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; }
|
|
31
23
|
|
|
32
24
|
var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
|
|
33
25
|
var videoElement = _ref.videoElement;
|
|
@@ -203,9 +195,9 @@ var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
|
|
|
203
195
|
};
|
|
204
196
|
|
|
205
197
|
var load = /*#__PURE__*/function () {
|
|
206
|
-
var _ref2 =
|
|
198
|
+
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data, videoElement) {
|
|
207
199
|
var video_src, video_poster_src, points;
|
|
208
|
-
return
|
|
200
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
209
201
|
while (1) {
|
|
210
202
|
switch (_context.prev = _context.next) {
|
|
211
203
|
case 0:
|
|
@@ -253,7 +245,7 @@ var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
|
|
|
253
245
|
if (!state.enabled) return;
|
|
254
246
|
|
|
255
247
|
var _raycaster$intersectO = raycaster.intersectObjects(five.scene.children, true),
|
|
256
|
-
_raycaster$intersectO2 =
|
|
248
|
+
_raycaster$intersectO2 = (0, _slicedToArray2["default"])(_raycaster$intersectO, 1),
|
|
257
249
|
intersect = _raycaster$intersectO2[0];
|
|
258
250
|
|
|
259
251
|
if (!!intersect && /^video/.test(intersect.object.name)) {
|
|
@@ -276,7 +268,7 @@ var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
|
|
|
276
268
|
var raycaster = new THREE.Raycaster(cameraPosition, vector);
|
|
277
269
|
|
|
278
270
|
var _raycaster$intersectO3 = raycaster.intersectObjects(five.scene.children, true),
|
|
279
|
-
_raycaster$intersectO4 =
|
|
271
|
+
_raycaster$intersectO4 = (0, _slicedToArray2["default"])(_raycaster$intersectO3, 1),
|
|
280
272
|
intersect = _raycaster$intersectO4[0];
|
|
281
273
|
|
|
282
274
|
return !!intersect && /^video/.test(intersect.object.name);
|
package/lib/react/index.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
6
|
|
|
5
7
|
Object.defineProperty(exports, "__esModule", {
|
|
6
8
|
value: true
|
|
@@ -10,6 +12,8 @@ exports.useVreoAction = useVreoAction;
|
|
|
10
12
|
exports.useVreoEventCallback = useVreoEventCallback;
|
|
11
13
|
exports.useVreoPausedState = useVreoPausedState;
|
|
12
14
|
|
|
15
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
16
|
+
|
|
13
17
|
var _react = require("@realsee/five/react");
|
|
14
18
|
|
|
15
19
|
var React = _interopRequireWildcard(require("react"));
|
|
@@ -20,25 +24,13 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
20
24
|
|
|
21
25
|
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; }
|
|
22
26
|
|
|
23
|
-
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
24
|
-
|
|
25
|
-
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."); }
|
|
26
|
-
|
|
27
|
-
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); }
|
|
28
|
-
|
|
29
|
-
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; }
|
|
30
|
-
|
|
31
|
-
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; }
|
|
32
|
-
|
|
33
|
-
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
34
|
-
|
|
35
27
|
var VreoContext = /*#__PURE__*/React.createContext(null);
|
|
36
28
|
|
|
37
29
|
var VreoProvider = function VreoProvider(props) {
|
|
38
30
|
var five = (0, _react.unsafe__useFiveInstance)();
|
|
39
31
|
|
|
40
32
|
var _React$useState = React.useState(null),
|
|
41
|
-
_React$useState2 =
|
|
33
|
+
_React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
|
|
42
34
|
player = _React$useState2[0],
|
|
43
35
|
setPlayer = _React$useState2[1];
|
|
44
36
|
|
|
@@ -126,7 +118,7 @@ function useVreoPausedState() {
|
|
|
126
118
|
var player = useVreoInstance();
|
|
127
119
|
|
|
128
120
|
var _React$useState3 = React.useState(player.paused),
|
|
129
|
-
_React$useState4 =
|
|
121
|
+
_React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
|
|
130
122
|
state = _React$useState4[0],
|
|
131
123
|
setState = _React$useState4[1];
|
|
132
124
|
|