@realsee/vreo 2.4.0 → 2.4.1
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 +12 -22
- package/lib/PlayController/index.js +70 -137
- package/lib/Player/App.d.ts +2 -2
- package/lib/Player/App.js +1 -28
- package/lib/Player/Controller.d.ts +3 -3
- package/lib/Player/Controller.js +46 -110
- package/lib/Player/custom/SpatialScenePanel/index.d.ts +2 -2
- package/lib/Player/custom/SpatialScenePanel/index.js +75 -72
- package/lib/Player/hooks.d.ts +3 -3
- package/lib/Player/hooks.js +0 -10
- package/lib/Player/index.js +109 -175
- package/lib/Player/modules/Drawer/index.d.ts +2 -2
- package/lib/Player/modules/Drawer/index.js +2 -21
- package/lib/Player/modules/PopUp/index.d.ts +2 -2
- package/lib/Player/modules/PopUp/index.js +1 -12
- package/lib/Player/modules/ResizeObserver/index.d.ts +2 -2
- package/lib/Player/modules/ResizeObserver/index.js +0 -8
- package/lib/Player/modules/VideoAgent/VideoAgentMesh.d.ts +1 -1
- package/lib/Player/modules/VideoAgent/VideoAgentMesh.js +148 -247
- package/lib/Player/modules/VideoAgent/VideoAgentScene.js +7 -23
- package/lib/Player/modules/VideoAgent/index.d.ts +2 -2
- package/lib/Player/modules/VideoAgent/index.js +2 -20
- package/lib/Player/modules/Wave/index.d.ts +2 -2
- package/lib/Player/modules/Wave/index.js +12 -34
- package/lib/Player/modules/keyframes/BgMusic/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/BgMusic/index.js +41 -64
- package/lib/Player/modules/keyframes/CameraMovement/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/CameraMovement/index.js +42 -71
- package/lib/Player/modules/keyframes/InfoPanel/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/InfoPanel/index.js +16 -47
- package/lib/Player/modules/keyframes/ModelVideo/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/ModelVideo/index.js +52 -83
- package/lib/Player/modules/keyframes/PanoEffect/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/PanoEffect/index.js +16 -40
- package/lib/Player/modules/keyframes/PanoEffect/lineAnime.js +1 -9
- package/lib/Player/modules/keyframes/PanoTag/index.d.ts +1 -1
- package/lib/Player/modules/keyframes/PanoTag/index.js +6 -25
- package/lib/Player/modules/keyframes/PanoTextLabel/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/PanoTextLabel/index.js +31 -50
- package/lib/Player/modules/keyframes/Prompter/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/Prompter/index.js +11 -29
- package/lib/Player/modules/keyframes/UpdateVRPanorama/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/UpdateVRPanorama/index.js +25 -29
- package/lib/Player/modules/keyframes/VideoEffect/index.d.ts +2 -2
- package/lib/Player/modules/keyframes/VideoEffect/index.js +52 -87
- package/lib/Player/typings.d.ts +7 -4
- package/lib/fivePlugins/CSS3DRenderPlugin/centerPoint.js +0 -2
- package/lib/fivePlugins/CSS3DRenderPlugin/createResizeObserver.js +0 -1
- package/lib/fivePlugins/CSS3DRenderPlugin/evenNumber.js +0 -1
- package/lib/fivePlugins/CSS3DRenderPlugin/index.d.ts +1 -1
- package/lib/fivePlugins/CSS3DRenderPlugin/index.js +42 -81
- package/lib/fivePlugins/CSS3DRenderPlugin/transformPositionToVector3.js +3 -7
- package/lib/fivePlugins/CameraMovementPlugin/index.js +181 -241
- package/lib/fivePlugins/CameraMovementPlugin/typings.d.ts +4 -4
- package/lib/fivePlugins/CameraMovementPlugin/typings.js +6 -12
- package/lib/fivePlugins/ModelTVVideoPlugin/index.js +37 -87
- package/lib/index.js +0 -1
- package/lib/react/index.d.ts +2 -1
- package/lib/react/index.js +10 -35
- package/lib/shared-utils/Audio.js +57 -106
- package/lib/shared-utils/AudioLike.d.ts +1 -1
- package/lib/shared-utils/AudioLike.js +19 -46
- package/lib/shared-utils/Preloader.js +2 -10
- package/lib/shared-utils/addResizeListener.d.ts +1 -1
- package/lib/shared-utils/addResizeListener.js +0 -5
- package/lib/shared-utils/animationFrame/BetterTween.d.ts +1 -1
- package/lib/shared-utils/animationFrame/BetterTween.js +14 -45
- package/lib/shared-utils/animationFrame/index.d.ts +1 -2
- package/lib/shared-utils/animationFrame/index.js +3 -12
- package/lib/shared-utils/animationFrame/tween.d.ts +2 -2
- package/lib/shared-utils/animationFrame/tween.js +3 -14
- package/lib/shared-utils/createTransMatrix.js +1 -10
- package/lib/shared-utils/getFileExpandedName.js +0 -1
- package/lib/shared-utils/getMediaInfo.d.ts +3 -3
- package/lib/shared-utils/getMediaInfo.js +0 -10
- package/lib/shared-utils/setElementDataset.js +0 -2
- package/lib/typings/VreoUnit.d.ts +16 -16
- package/lib/typings/VreoUnit.js +115 -47
- package/package.json +3 -2
|
@@ -1,57 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
8
|
exports.VideoAgent = VideoAgent;
|
|
11
|
-
|
|
12
9
|
var React = _interopRequireWildcard(require("react"));
|
|
13
|
-
|
|
14
10
|
var _hooks = require("../../hooks");
|
|
15
|
-
|
|
16
11
|
var _VideoAgentScene = require("./VideoAgentScene");
|
|
17
|
-
|
|
18
12
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
19
|
-
|
|
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); }
|
|
21
|
-
|
|
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; }
|
|
23
|
-
|
|
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); }
|
|
24
14
|
function VideoAgent(props) {
|
|
25
15
|
var _controller$avatar2;
|
|
26
|
-
|
|
27
16
|
var ref = React.useRef(null);
|
|
28
17
|
var controller = (0, _hooks.useController)();
|
|
29
18
|
var showAvatar = React.useMemo(function () {
|
|
30
19
|
var _controller$avatar;
|
|
31
|
-
|
|
32
20
|
return ((_controller$avatar = controller.avatar) === null || _controller$avatar === void 0 ? void 0 : _controller$avatar.url) && controller.avatar.force === true;
|
|
33
21
|
}, [controller.avatar]);
|
|
34
22
|
var showVideoAgent = React.useMemo(function () {
|
|
35
23
|
var _controller$videoAgen;
|
|
36
|
-
|
|
37
24
|
if (showAvatar) return false;
|
|
38
25
|
return ((_controller$videoAgen = controller.videoAgentScene) === null || _controller$videoAgen === void 0 ? void 0 : _controller$videoAgen.videoAgentMesh.mediaInstance) instanceof HTMLVideoElement;
|
|
39
26
|
}, [controller.videoAgentScene, showAvatar]);
|
|
40
27
|
React.useEffect(function () {
|
|
41
28
|
if (!ref.current) throw new Error('React 渲染异常,请稍后重试 ...');
|
|
42
|
-
|
|
43
29
|
if (controller.videoAgentScene) {
|
|
44
30
|
console.warn('VideoAgentScene" 重复初始化,已被过滤');
|
|
45
31
|
return;
|
|
46
32
|
}
|
|
47
|
-
|
|
48
33
|
var videoAgentScene = new _VideoAgentScene.VideoAgentScene(ref.current, props.options);
|
|
49
34
|
controller.videoAgentScene = videoAgentScene;
|
|
50
35
|
return function () {
|
|
51
36
|
var _controller$videoAgen2;
|
|
52
|
-
|
|
53
37
|
controller.dispose();
|
|
54
|
-
(_controller$videoAgen2 = controller.videoAgentScene) === null || _controller$videoAgen2 === void 0
|
|
38
|
+
(_controller$videoAgen2 = controller.videoAgentScene) === null || _controller$videoAgen2 === void 0 || _controller$videoAgen2.dispose();
|
|
55
39
|
};
|
|
56
40
|
}, []);
|
|
57
41
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
|
|
@@ -66,7 +50,6 @@ function VideoAgent(props) {
|
|
|
66
50
|
src: (_controller$avatar2 = controller.avatar) === null || _controller$avatar2 === void 0 ? void 0 : _controller$avatar2.url,
|
|
67
51
|
onClick: function onClick() {
|
|
68
52
|
var _props$onClick;
|
|
69
|
-
|
|
70
53
|
return (_props$onClick = props.onClick) === null || _props$onClick === void 0 ? void 0 : _props$onClick.call(props);
|
|
71
54
|
}
|
|
72
55
|
}))), /*#__PURE__*/React.createElement("div", {
|
|
@@ -84,7 +67,6 @@ function VideoAgent(props) {
|
|
|
84
67
|
className: "VideoAgent-play",
|
|
85
68
|
onClick: function onClick() {
|
|
86
69
|
var _props$onClick2;
|
|
87
|
-
|
|
88
70
|
return (_props$onClick2 = props.onClick) === null || _props$onClick2 === void 0 ? void 0 : _props$onClick2.call(props);
|
|
89
71
|
}
|
|
90
72
|
}))))));
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
2
1
|
import { WaveAppearance } from '../../typings';
|
|
2
|
+
import React from 'react';
|
|
3
3
|
export declare function Wave(props?: {
|
|
4
4
|
appearance?: WaveAppearance;
|
|
5
5
|
onClick?: () => void;
|
|
6
6
|
staticPrefix?: string;
|
|
7
|
-
}): JSX.Element;
|
|
7
|
+
}): React.JSX.Element;
|
|
@@ -1,22 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
8
|
exports.Wave = Wave;
|
|
11
|
-
|
|
12
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
13
|
-
|
|
14
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
15
|
-
|
|
16
|
-
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); }
|
|
17
|
-
|
|
18
|
-
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; }
|
|
19
|
-
|
|
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); }
|
|
20
12
|
var defaultPrefix = 'https://vr-public.realsee-cdn.cn/release/static/image/release/';
|
|
21
13
|
var WAVES = {
|
|
22
14
|
single: {
|
|
@@ -66,21 +58,16 @@ var isSafari = /safari/i.test(userAgent) && !/chrome/i.test(userAgent) && /versi
|
|
|
66
58
|
var isMicroMessenger = /microMessenger/i.test(userAgent);
|
|
67
59
|
var canPlayHevc = isAppleDevice || isSafari;
|
|
68
60
|
var canPlayVp9 = typeof MediaSource !== 'undefined' && MediaSource.isTypeSupported("video/webm; codecs=vp9");
|
|
69
|
-
|
|
70
61
|
function Wave(props) {
|
|
71
62
|
var wave = _react["default"].useMemo(function () {
|
|
72
63
|
var _props$appearance;
|
|
73
|
-
|
|
74
64
|
var appearance = (_props$appearance = props === null || props === void 0 ? void 0 : props.appearance) !== null && _props$appearance !== void 0 ? _props$appearance : 'solid';
|
|
75
65
|
return WAVES[appearance];
|
|
76
66
|
}, [props === null || props === void 0 ? void 0 : props.appearance]);
|
|
77
|
-
|
|
78
67
|
var heightWidthRatio = _react["default"].useMemo(function () {
|
|
79
68
|
return wave.height / wave.width;
|
|
80
69
|
}, [wave]);
|
|
81
|
-
|
|
82
70
|
var content = null;
|
|
83
|
-
|
|
84
71
|
if (isMicroMessenger) {
|
|
85
72
|
content = /*#__PURE__*/_react["default"].createElement(KeyframeWaveContent, {
|
|
86
73
|
wave: wave,
|
|
@@ -104,7 +91,6 @@ function Wave(props) {
|
|
|
104
91
|
prefix: props === null || props === void 0 ? void 0 : props.staticPrefix
|
|
105
92
|
});
|
|
106
93
|
}
|
|
107
|
-
|
|
108
94
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
109
95
|
className: "vreo-wave",
|
|
110
96
|
onClick: props === null || props === void 0 ? void 0 : props.onClick
|
|
@@ -124,24 +110,20 @@ function Wave(props) {
|
|
|
124
110
|
}
|
|
125
111
|
}, content)));
|
|
126
112
|
}
|
|
127
|
-
|
|
128
113
|
var VideoWaveContent = function VideoWaveContent(_ref) {
|
|
129
114
|
var wave = _ref.wave,
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
115
|
+
format = _ref.format,
|
|
116
|
+
_ref$prefix = _ref.prefix,
|
|
117
|
+
prefix = _ref$prefix === void 0 ? defaultPrefix : _ref$prefix;
|
|
133
118
|
var videoRef = (0, _react.useRef)(null);
|
|
134
|
-
|
|
135
119
|
var _useState = (0, _react.useState)(false),
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
120
|
+
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
121
|
+
canPlay = _useState2[0],
|
|
122
|
+
setCanPlay = _useState2[1];
|
|
140
123
|
var _useState3 = (0, _react.useState)(false),
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
124
|
+
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
|
|
125
|
+
errored = _useState4[0],
|
|
126
|
+
setErrored = _useState4[1];
|
|
145
127
|
var source = prefix + wave[format];
|
|
146
128
|
(0, _react.useEffect)(function () {
|
|
147
129
|
setCanPlay(false);
|
|
@@ -150,20 +132,17 @@ var VideoWaveContent = function VideoWaveContent(_ref) {
|
|
|
150
132
|
if (videoRef.current) {
|
|
151
133
|
videoRef.current.play();
|
|
152
134
|
}
|
|
153
|
-
|
|
154
135
|
setCanPlay(true);
|
|
155
136
|
}, []);
|
|
156
137
|
var errorHandler = (0, _react.useCallback)(function () {
|
|
157
138
|
setErrored(true);
|
|
158
139
|
}, []);
|
|
159
|
-
|
|
160
140
|
if (errored) {
|
|
161
141
|
return /*#__PURE__*/_react["default"].createElement(KeyframeWaveContent, {
|
|
162
142
|
wave: wave,
|
|
163
143
|
prefix: prefix
|
|
164
144
|
});
|
|
165
145
|
}
|
|
166
|
-
|
|
167
146
|
return /*#__PURE__*/_react["default"].createElement("video", {
|
|
168
147
|
style: {
|
|
169
148
|
opacity: canPlay ? 1 : 0
|
|
@@ -181,11 +160,10 @@ var VideoWaveContent = function VideoWaveContent(_ref) {
|
|
|
181
160
|
src: source
|
|
182
161
|
});
|
|
183
162
|
};
|
|
184
|
-
|
|
185
163
|
var KeyframeWaveContent = function KeyframeWaveContent(_ref2) {
|
|
186
164
|
var wave = _ref2.wave,
|
|
187
|
-
|
|
188
|
-
|
|
165
|
+
_ref2$prefix = _ref2.prefix,
|
|
166
|
+
prefix = _ref2$prefix === void 0 ? defaultPrefix : _ref2$prefix;
|
|
189
167
|
var source = prefix + wave.png;
|
|
190
168
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
191
169
|
style: {
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export declare function BgMusic(): JSX.Element;
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
export declare function BgMusic(): React.JSX.Element;
|
|
@@ -1,95 +1,72 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
8
|
exports.BgMusic = BgMusic;
|
|
11
|
-
|
|
12
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
13
|
-
|
|
14
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
15
|
-
|
|
16
11
|
var React = _interopRequireWildcard(require("react"));
|
|
17
|
-
|
|
18
12
|
var _Audio = require("../../../../shared-utils/Audio");
|
|
19
|
-
|
|
20
13
|
var _VreoUnit = require("../../../../typings/VreoUnit");
|
|
21
|
-
|
|
22
14
|
var _hooks = require("../../../hooks");
|
|
23
|
-
|
|
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
|
-
|
|
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; }
|
|
27
|
-
|
|
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); }
|
|
28
16
|
function BgMusic() {
|
|
29
17
|
var controller = (0, _hooks.useController)();
|
|
30
18
|
React.useEffect(function () {
|
|
31
19
|
var callback = /*#__PURE__*/function () {
|
|
32
|
-
var _ref = (0, _asyncToGenerator2["default"])(
|
|
20
|
+
var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe, currentTime) {
|
|
33
21
|
var start, end, _currentTime, audio, cleanAudio, play;
|
|
34
|
-
|
|
35
22
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
36
|
-
while (1) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
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()
|
|
37
|
+
|
|
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)
|
|
46
|
+
|
|
47
|
+
audio.addEventListener('ended', function () {
|
|
48
|
+
cleanAudio();
|
|
49
|
+
});
|
|
50
|
+
play = function play() {
|
|
51
|
+
if (audio.realSrc === keyframe.data.url) {
|
|
52
|
+
// 有可能会被其他音轨打断
|
|
53
|
+
audio.play();
|
|
45
54
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
audio.play();
|
|
55
|
-
|
|
56
|
-
cleanAudio = function cleanAudio() {
|
|
57
|
-
// audio.removeEventListener('canplaythrough', play)
|
|
58
|
-
audio.removeEventListener('pause', play);
|
|
59
|
-
audio.pause();
|
|
60
|
-
audio.src = ''; // cleanTimeout()
|
|
61
|
-
}; // audio.addEventListener('canplaythrough', play)
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
audio.addEventListener('ended', function () {
|
|
65
|
-
cleanAudio();
|
|
66
|
-
});
|
|
67
|
-
|
|
68
|
-
play = function play() {
|
|
69
|
-
if (audio.realSrc === keyframe.data.url) {
|
|
70
|
-
// 有可能会被其他音轨打断
|
|
71
|
-
audio.play();
|
|
72
|
-
}
|
|
73
|
-
};
|
|
74
|
-
|
|
75
|
-
audio.addEventListener('pause', play);
|
|
76
|
-
controller.once('paused', function () {
|
|
77
|
-
cleanAudio();
|
|
78
|
-
});
|
|
79
|
-
|
|
80
|
-
case 12:
|
|
81
|
-
case "end":
|
|
82
|
-
return _context.stop();
|
|
83
|
-
}
|
|
55
|
+
};
|
|
56
|
+
audio.addEventListener('pause', play);
|
|
57
|
+
controller.once('paused', function () {
|
|
58
|
+
cleanAudio();
|
|
59
|
+
});
|
|
60
|
+
case 12:
|
|
61
|
+
case "end":
|
|
62
|
+
return _context.stop();
|
|
84
63
|
}
|
|
85
64
|
}, _callee);
|
|
86
65
|
}));
|
|
87
|
-
|
|
88
66
|
return function callback(_x, _x2) {
|
|
89
67
|
return _ref.apply(this, arguments);
|
|
90
68
|
};
|
|
91
69
|
}();
|
|
92
|
-
|
|
93
70
|
controller.on(_VreoUnit.VreoKeyframeEnum.BgMusic, callback);
|
|
94
71
|
return function () {
|
|
95
72
|
controller.off(_VreoUnit.VreoKeyframeEnum.BgMusic, callback);
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export declare function CameraMovement(): JSX.Element;
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
export declare function CameraMovement(): React.JSX.Element;
|
|
@@ -1,107 +1,78 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
8
|
exports.CameraMovement = CameraMovement;
|
|
11
|
-
|
|
12
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
13
|
-
|
|
14
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
15
|
-
|
|
16
11
|
var React = _interopRequireWildcard(require("react"));
|
|
17
|
-
|
|
18
12
|
var _CameraMovementPlugin = require("../../../../fivePlugins/CameraMovementPlugin");
|
|
19
|
-
|
|
20
13
|
var _typings = require("../../../../fivePlugins/CameraMovementPlugin/typings");
|
|
21
|
-
|
|
22
14
|
var _VreoUnit = require("../../../../typings/VreoUnit");
|
|
23
|
-
|
|
24
15
|
var _hooks = require("../../../hooks");
|
|
25
|
-
|
|
26
|
-
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); }
|
|
27
|
-
|
|
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; }
|
|
29
|
-
|
|
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); }
|
|
30
17
|
function CameraMovement() {
|
|
31
18
|
var controller = (0, _hooks.useController)();
|
|
32
19
|
var five = (0, _hooks.useFiveInstance)();
|
|
33
20
|
var ref = React.useRef();
|
|
34
21
|
React.useEffect(function () {
|
|
35
22
|
var callback = /*#__PURE__*/function () {
|
|
36
|
-
var _ref = (0, _asyncToGenerator2["default"])(
|
|
23
|
+
var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe) {
|
|
37
24
|
var start, end, data, cameraMovementData, effect;
|
|
38
25
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
39
|
-
while (1) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if (!(effect === _typings.CameraMovementEffect.Rotate)) {
|
|
51
|
-
_context.next = 9;
|
|
52
|
-
break;
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
_context.next = 7;
|
|
56
|
-
return ref.current.rotate(data, end - start);
|
|
57
|
-
|
|
58
|
-
case 7:
|
|
59
|
-
_context.next = 21;
|
|
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;
|
|
60
36
|
break;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
case 12:
|
|
72
|
-
_context.next = 21;
|
|
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;
|
|
73
46
|
break;
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
case 17:
|
|
85
|
-
_context.next = 21;
|
|
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;
|
|
86
56
|
break;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
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();
|
|
96
69
|
}
|
|
97
70
|
}, _callee);
|
|
98
71
|
}));
|
|
99
|
-
|
|
100
72
|
return function callback(_x) {
|
|
101
73
|
return _ref.apply(this, arguments);
|
|
102
74
|
};
|
|
103
75
|
}();
|
|
104
|
-
|
|
105
76
|
controller.on(_VreoUnit.VreoKeyframeEnum.CameraMovement, callback);
|
|
106
77
|
return function () {
|
|
107
78
|
controller.off(_VreoUnit.VreoKeyframeEnum.CameraMovement, callback);
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export declare function InfoPanel(): JSX.Element;
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
export declare function InfoPanel(): React.JSX.Element;
|