@realsee/vreo 2.4.2 → 2.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/PlayController/createHTMLAudioElement.js +11 -9
- package/lib/PlayController/index.js +61 -52
- package/lib/Player/App.js +1 -1
- package/lib/Player/Controller.js +28 -23
- package/lib/Player/custom/SpatialScenePanel/index.js +10 -10
- package/lib/Player/index.js +94 -90
- package/lib/Player/modules/Drawer/index.js +1 -1
- package/lib/Player/modules/PopUp/index.js +1 -1
- package/lib/Player/modules/VideoAgent/VideoAgentMesh.js +143 -134
- package/lib/Player/modules/VideoAgent/VideoAgentScene.js +2 -2
- package/lib/Player/modules/VideoAgent/index.js +2 -2
- package/lib/Player/modules/Wave/index.js +1 -1
- package/lib/Player/modules/keyframes/BgMusic/index.js +41 -39
- package/lib/Player/modules/keyframes/CameraMovement/index.js +43 -41
- package/lib/Player/modules/keyframes/InfoPanel/index.js +6 -6
- package/lib/Player/modules/keyframes/ModelVideo/index.js +53 -51
- package/lib/Player/modules/keyframes/PanoEffect/index.js +1 -1
- package/lib/Player/modules/keyframes/PanoEffect/lineAnime.js +1 -1
- package/lib/Player/modules/keyframes/PanoTag/index.js +2 -2
- package/lib/Player/modules/keyframes/PanoTextLabel/index.js +3 -3
- package/lib/Player/modules/keyframes/Prompter/index.js +1 -1
- package/lib/Player/modules/keyframes/UpdateVRPanorama/index.js +5 -5
- package/lib/Player/modules/keyframes/VideoEffect/index.js +44 -42
- package/lib/Player/typings.d.ts +1 -4
- package/lib/fivePlugins/CSS3DRenderPlugin/index.js +7 -7
- package/lib/fivePlugins/CameraMovementPlugin/index.js +171 -167
- package/lib/fivePlugins/CameraMovementPlugin/typings.js +6 -6
- package/lib/fivePlugins/ModelTVVideoPlugin/index.js +30 -28
- package/lib/react/index.d.ts +1 -1
- package/lib/react/index.js +2 -2
- package/lib/shared-utils/Audio.d.ts +8 -0
- package/lib/shared-utils/Audio.js +62 -46
- package/lib/shared-utils/AudioLike.js +13 -10
- package/lib/shared-utils/animationFrame/BetterTween.d.ts +4 -2
- package/lib/shared-utils/animationFrame/BetterTween.js +19 -15
- package/lib/shared-utils/animationFrame/tween.d.ts +4 -2
- package/lib/shared-utils/animationFrame/tween.js +12 -1
- package/lib/shared-utils/createTransMatrix.js +1 -1
- package/lib/typings/VreoUnit.js +26 -69
- package/package.json +20 -24
|
@@ -10,7 +10,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
|
|
|
10
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
12
|
var THREE = _interopRequireWildcard(require("three"));
|
|
13
|
-
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
13
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
|
|
14
14
|
var ModelTVVideoPlugin = exports.ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
|
|
15
15
|
var videoElement = _ref.videoElement;
|
|
16
16
|
var state = {
|
|
@@ -40,17 +40,17 @@ var ModelTVVideoPlugin = exports.ModelTVVideoPlugin = function ModelTVVideoPlugi
|
|
|
40
40
|
});
|
|
41
41
|
var play = function play() {
|
|
42
42
|
if (!state.videoTexture) return;
|
|
43
|
-
var
|
|
43
|
+
var timeupdate = function timeupdate() {
|
|
44
44
|
var _state$videoTexture;
|
|
45
45
|
if (!state.videoTexture) return;
|
|
46
|
-
(_state$videoTexture = state.videoTexture) === null || _state$videoTexture === void 0
|
|
46
|
+
(_state$videoTexture = state.videoTexture) === null || _state$videoTexture === void 0 ? void 0 : _state$videoTexture.image.removeEventListener('timeupdate', timeupdate);
|
|
47
47
|
state.videoTextureEnabled = true;
|
|
48
48
|
state.videoMeshes.forEach(function (mesh) {
|
|
49
49
|
if (mesh.material.map !== state.videoTexture) mesh.material.map = state.videoTexture;
|
|
50
50
|
});
|
|
51
51
|
five.needsRender = true;
|
|
52
52
|
};
|
|
53
|
-
state.videoTexture.image.addEventListener('timeupdate',
|
|
53
|
+
state.videoTexture.image.addEventListener('timeupdate', timeupdate);
|
|
54
54
|
if (state.videoTexture && state.videoMeshes.length) {
|
|
55
55
|
state.videoTexture.image.play();
|
|
56
56
|
}
|
|
@@ -161,31 +161,33 @@ var ModelTVVideoPlugin = exports.ModelTVVideoPlugin = function ModelTVVideoPlugi
|
|
|
161
161
|
var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(data, videoElement) {
|
|
162
162
|
var video_src, video_poster_src, points;
|
|
163
163
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
164
|
-
while (1)
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
164
|
+
while (1) {
|
|
165
|
+
switch (_context.prev = _context.next) {
|
|
166
|
+
case 0:
|
|
167
|
+
video_src = data.video_src, video_poster_src = data.video_poster_src, points = data.points;
|
|
168
|
+
state.videoSource = video_src;
|
|
169
|
+
state.rectPoints = points.map(function (items) {
|
|
170
|
+
return items.map(function (_ref3) {
|
|
171
|
+
var x = _ref3.x,
|
|
172
|
+
y = _ref3.y,
|
|
173
|
+
z = _ref3.z;
|
|
174
|
+
return new THREE.Vector3(x, y, z);
|
|
175
|
+
});
|
|
174
176
|
});
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
177
|
+
state.imageTexture = getImageTexture(video_poster_src);
|
|
178
|
+
if (videoElement) {
|
|
179
|
+
state.videoElement = videoElement;
|
|
180
|
+
}
|
|
181
|
+
_context.next = 7;
|
|
182
|
+
return getVideoTexture(state.videoSource, state.videoElement);
|
|
183
|
+
case 7:
|
|
184
|
+
state.videoTexture = _context.sent;
|
|
185
|
+
state.enabled = !!data.enable;
|
|
186
|
+
if (state.enabled) enable();
|
|
187
|
+
case 10:
|
|
188
|
+
case "end":
|
|
189
|
+
return _context.stop();
|
|
190
|
+
}
|
|
189
191
|
}
|
|
190
192
|
}, _callee);
|
|
191
193
|
}));
|
package/lib/react/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export interface VreoProviderProps {
|
|
|
5
5
|
configs?: Partial<PlayerConfigs>;
|
|
6
6
|
children?: React.ReactNode;
|
|
7
7
|
}
|
|
8
|
-
export declare const VreoProvider:
|
|
8
|
+
export declare const VreoProvider: React.FC<VreoProviderProps>;
|
|
9
9
|
/**
|
|
10
10
|
* VreoPlayer 命令集合。
|
|
11
11
|
*/
|
package/lib/react/index.js
CHANGED
|
@@ -13,7 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
13
13
|
var _react = require("@realsee/five/react");
|
|
14
14
|
var React = _interopRequireWildcard(require("react"));
|
|
15
15
|
var _Player = require("../Player");
|
|
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
|
var VreoContext = /*#__PURE__*/React.createContext(null);
|
|
18
18
|
var VreoProvider = exports.VreoProvider = function VreoProvider(props) {
|
|
19
19
|
var five = (0, _react.unsafe__useFiveInstance)();
|
|
@@ -27,7 +27,7 @@ var VreoProvider = exports.VreoProvider = function VreoProvider(props) {
|
|
|
27
27
|
setPlayer(playerRef.current);
|
|
28
28
|
return function () {
|
|
29
29
|
var _playerRef$current;
|
|
30
|
-
(_playerRef$current = playerRef.current) === null || _playerRef$current === void 0
|
|
30
|
+
(_playerRef$current = playerRef.current) === null || _playerRef$current === void 0 ? void 0 : _playerRef$current.dispose();
|
|
31
31
|
};
|
|
32
32
|
}, []);
|
|
33
33
|
if (!player) return /*#__PURE__*/React.createElement(React.Fragment, null);
|
|
@@ -4,7 +4,15 @@ export declare function waitForBlankAudioGenerated(checkInterval?: number, timeo
|
|
|
4
4
|
export declare function generateBlankAudio(length: number): void;
|
|
5
5
|
declare class IAudio extends Audio {
|
|
6
6
|
preload: "auto";
|
|
7
|
+
/**
|
|
8
|
+
* 获取音频源 URL
|
|
9
|
+
* @returns {string} 当前音频源 URL
|
|
10
|
+
*/
|
|
7
11
|
get src(): string;
|
|
12
|
+
/**
|
|
13
|
+
* 设置音频源 URL
|
|
14
|
+
* @param paramsSrc - 音频源 URL
|
|
15
|
+
*/
|
|
8
16
|
set src(paramsSrc: string);
|
|
9
17
|
realSrc: string;
|
|
10
18
|
inited: boolean;
|
|
@@ -11,13 +11,15 @@ exports.waitForBlankAudioGenerated = waitForBlankAudioGenerated;
|
|
|
11
11
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
12
12
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
13
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
14
|
+
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
15
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
14
16
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
17
|
+
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
15
18
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
16
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
17
19
|
var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
|
|
18
20
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
19
21
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
20
|
-
function
|
|
22
|
+
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2["default"])(t); if (r) { var s = (0, _getPrototypeOf2["default"])(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2["default"])(this, e); }; }
|
|
21
23
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
22
24
|
var blankAudioSrc = 'data:audio/mpeg;base64,//uQxAAAAAAAAAAAAAAAAAAAAAAASW5mbwAAAA8AAAADAAAGhgBVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVWqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqr///////////////////////////////////////////8AAAA5TEFNRTMuOThyAc0AAAAAAAAAABSAJAiqQgAAgAAABobxtI73AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//uQxAACFEII9ACZ/sJZwWEoEb8w/////N//////JcxjHjf+7/v/H2PzCCFAiDtGeyBCIx7bJJ1mmEEMy6g8mm2c8nrGABB4h2Mkmn//4z/73u773R5qHHu/j/w7Kxkzh5lWRWdsifCkNAnY9Zc1HvDAhjhSHdFkHFzLmabt/AQxSg2wwzLhHIJOBnAWwVY4zrhIYhhc2kvhYDfQ4hDi2Gmh5KyFn8EcGIrHAngNgIwVIEMf5bzbAiTRoAD///8z/KVhkkWEle6IX+d/z4fvH3BShK1e5kmjkCMoxVmXhd4ROlTKo3iipasvTilY21q19ta30/v/0/idPX1v8PNxJL6ramnOVsdvMv2akO0iSYIzdJFirtzWXCZicS9vHqvSKyqm5XJBdqBwPxyfJdykhWTZ0G0ZyTZGpLKxsNwwoRhsx3tZfhwmeOBVISm3impAC/IT/8hP/EKEM1KMdVdVKM2rHV4x7HVXZvbVVKN/qq8CiV9VL9jjH/6l6qf7MBCjZmOqsAibjcP+qqqv0oxqpa/NVW286hPo1nz2L/h8+jXt//uSxCmDU2IK/ECN98KKtE5IYzNoCfbw+u9i5r8PoadUMFPKqWL4LK3T/LCraMSHGkW4bpLXR/E6LlHOVQxmslKVJ8IULktMN06N0FKCpHCoYsjC4F+Z0NVqdNFoGSTjSiyjzLdnZ2fNqTi2eHKONONKLMPMKLONKLMPQRJGlFxZRoKcJFAYEeIFiRQkUWUeYfef//Ko04soswso40UJAgMw8wosososy0EalnZyjQUGBRQGIFggOWUacWUeYmuadrZziQKKEgQsQLAhQkUJAgMQDghltLO1onp0cpkNInSFMqlYeSEJ5AHsqFdOwy1DA2sRmRJKxdKRfLhfLw5BzUxBTUUzLjk4LjJVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVUxBTUUzLjk4LjJVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVf/7ksRRA8AAAaQAAAAgAAA0gAAABFVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVU=';
|
|
23
25
|
// 下面这段空音频居然在11pro和xr上播不出来
|
|
@@ -49,40 +51,42 @@ function _waitForBlankAudioGenerated() {
|
|
|
49
51
|
isTimedOut,
|
|
50
52
|
_args = arguments;
|
|
51
53
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
52
|
-
while (1)
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
54
|
+
while (1) {
|
|
55
|
+
switch (_context.prev = _context.next) {
|
|
56
|
+
case 0:
|
|
57
|
+
checkInterval = _args.length > 0 && _args[0] !== undefined ? _args[0] : 100;
|
|
58
|
+
timeout = _args.length > 1 && _args[1] !== undefined ? _args[1] : 2000;
|
|
59
|
+
console.log('waitForBlankAudioGenerated, needGenerate: ', audioList.some(function (audio) {
|
|
60
|
+
return !audio.ended && audio.src === blankAudioSrc;
|
|
61
|
+
}));
|
|
62
|
+
// while any audioList not ended
|
|
63
|
+
startTime = Date.now();
|
|
64
|
+
isTimedOut = false;
|
|
65
|
+
case 5:
|
|
66
|
+
if (!(audioList.some(function (audio) {
|
|
67
|
+
return !audio.ended && audio.src === blankAudioSrc;
|
|
68
|
+
}) && !isTimedOut)) {
|
|
69
|
+
_context.next = 13;
|
|
70
|
+
break;
|
|
71
|
+
}
|
|
72
|
+
if (!(Date.now() - startTime > timeout)) {
|
|
73
|
+
_context.next = 9;
|
|
74
|
+
break;
|
|
75
|
+
}
|
|
76
|
+
isTimedOut = true;
|
|
77
|
+
return _context.abrupt("return", Promise.resolve());
|
|
78
|
+
case 9:
|
|
79
|
+
_context.next = 11;
|
|
80
|
+
return new Promise(function (resolve) {
|
|
81
|
+
return setTimeout(resolve, checkInterval);
|
|
82
|
+
});
|
|
83
|
+
case 11:
|
|
84
|
+
_context.next = 5;
|
|
67
85
|
break;
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
_context.
|
|
71
|
-
|
|
72
|
-
}
|
|
73
|
-
isTimedOut = true;
|
|
74
|
-
return _context.abrupt("return", Promise.resolve());
|
|
75
|
-
case 9:
|
|
76
|
-
_context.next = 11;
|
|
77
|
-
return new Promise(function (resolve) {
|
|
78
|
-
return setTimeout(resolve, checkInterval);
|
|
79
|
-
});
|
|
80
|
-
case 11:
|
|
81
|
-
_context.next = 5;
|
|
82
|
-
break;
|
|
83
|
-
case 13:
|
|
84
|
-
case "end":
|
|
85
|
-
return _context.stop();
|
|
86
|
+
case 13:
|
|
87
|
+
case "end":
|
|
88
|
+
return _context.stop();
|
|
89
|
+
}
|
|
86
90
|
}
|
|
87
91
|
}, _callee);
|
|
88
92
|
}));
|
|
@@ -107,19 +111,21 @@ function initAudio(audio) {
|
|
|
107
111
|
}
|
|
108
112
|
}
|
|
109
113
|
var IAudio = /*#__PURE__*/function (_Audio) {
|
|
114
|
+
(0, _inherits2["default"])(IAudio, _Audio);
|
|
115
|
+
var _super = _createSuper(IAudio);
|
|
110
116
|
function IAudio(src) {
|
|
111
|
-
var _this;
|
|
117
|
+
var _thisSuper, _this;
|
|
112
118
|
(0, _classCallCheck2["default"])(this, IAudio);
|
|
113
|
-
_this =
|
|
114
|
-
(0, _defineProperty2["default"])(_this, "preload", 'auto');
|
|
115
|
-
(0, _defineProperty2["default"])(_this, "realSrc", '');
|
|
116
|
-
(0, _defineProperty2["default"])(_this, "inited", false);
|
|
119
|
+
_this = _super.call(this, src);
|
|
120
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "preload", 'auto');
|
|
121
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "realSrc", '');
|
|
122
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "inited", false);
|
|
117
123
|
_this.realSrc = src !== null && src !== void 0 ? src : '';
|
|
118
|
-
_this.addEventListener('ended', function () {
|
|
124
|
+
(0, _get2["default"])((_thisSuper = (0, _assertThisInitialized2["default"])(_this), (0, _getPrototypeOf2["default"])(IAudio.prototype)), "addEventListener", _thisSuper).call(_thisSuper, 'ended', function () {
|
|
119
125
|
_this.src = '';
|
|
120
126
|
});
|
|
121
127
|
var init = function init() {
|
|
122
|
-
return initAudio(_this);
|
|
128
|
+
return initAudio((0, _assertThisInitialized2["default"])(_this));
|
|
123
129
|
};
|
|
124
130
|
document.addEventListener('click', init);
|
|
125
131
|
document.addEventListener('touchend', init);
|
|
@@ -129,15 +135,25 @@ var IAudio = /*#__PURE__*/function (_Audio) {
|
|
|
129
135
|
};
|
|
130
136
|
return _this;
|
|
131
137
|
}
|
|
132
|
-
(0,
|
|
133
|
-
return (0, _createClass2["default"])(IAudio, [{
|
|
138
|
+
(0, _createClass2["default"])(IAudio, [{
|
|
134
139
|
key: "src",
|
|
135
|
-
get:
|
|
140
|
+
get:
|
|
141
|
+
/**
|
|
142
|
+
* 获取音频源 URL
|
|
143
|
+
* @returns {string} 当前音频源 URL
|
|
144
|
+
*/
|
|
145
|
+
function get() {
|
|
136
146
|
return this.getAttribute('src') || '';
|
|
137
|
-
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* 设置音频源 URL
|
|
151
|
+
* @param paramsSrc - 音频源 URL
|
|
152
|
+
*/,
|
|
138
153
|
set: function set(paramsSrc) {
|
|
139
154
|
this.setAttribute('src', paramsSrc);
|
|
140
155
|
this.realSrc = paramsSrc;
|
|
141
156
|
}
|
|
142
157
|
}]);
|
|
158
|
+
return IAudio;
|
|
143
159
|
}(/*#__PURE__*/(0, _wrapNativeSuper2["default"])(Audio));
|
|
@@ -7,13 +7,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports["default"] = exports.AudioLike = void 0;
|
|
8
8
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
9
9
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
10
|
+
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
11
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
10
12
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
11
13
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
12
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
13
14
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
15
|
var _five = require("@realsee/five");
|
|
15
16
|
var _animationFrame = require("./animationFrame");
|
|
16
|
-
function
|
|
17
|
+
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2["default"])(t); if (r) { var s = (0, _getPrototypeOf2["default"])(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2["default"])(this, e); }; }
|
|
17
18
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
18
19
|
/**
|
|
19
20
|
* 模拟 `<Audio>` 事件。
|
|
@@ -22,24 +23,25 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
22
23
|
* 模拟 `<Audio>` 功能:没有音频,但执行逻辑跟 `<Audio>` 相似。
|
|
23
24
|
*/
|
|
24
25
|
var AudioLike = exports.AudioLike = /*#__PURE__*/function (_Subscribe) {
|
|
26
|
+
(0, _inherits2["default"])(AudioLike, _Subscribe);
|
|
27
|
+
var _super = _createSuper(AudioLike);
|
|
25
28
|
function AudioLike() {
|
|
26
29
|
var _this;
|
|
27
30
|
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
28
31
|
duration = _ref.duration;
|
|
29
32
|
(0, _classCallCheck2["default"])(this, AudioLike);
|
|
30
|
-
_this =
|
|
31
|
-
(0, _defineProperty2["default"])(_this, "$timestamp", null);
|
|
32
|
-
(0, _defineProperty2["default"])(_this, "$currentTime", 0);
|
|
33
|
-
(0, _defineProperty2["default"])(_this, "$duration", 0);
|
|
34
|
-
(0, _defineProperty2["default"])(_this, "muted", false);
|
|
35
|
-
(0, _defineProperty2["default"])(_this, "src", '');
|
|
33
|
+
_this = _super.call(this);
|
|
34
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "$timestamp", null);
|
|
35
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "$currentTime", 0);
|
|
36
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "$duration", 0);
|
|
37
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "muted", false);
|
|
38
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "src", '');
|
|
36
39
|
if (duration) {
|
|
37
40
|
_this.$duration = duration;
|
|
38
41
|
}
|
|
39
42
|
return _this;
|
|
40
43
|
}
|
|
41
|
-
(0,
|
|
42
|
-
return (0, _createClass2["default"])(AudioLike, [{
|
|
44
|
+
(0, _createClass2["default"])(AudioLike, [{
|
|
43
45
|
key: "setAttribute",
|
|
44
46
|
value: function setAttribute(name, value) {
|
|
45
47
|
// nothing todo
|
|
@@ -122,5 +124,6 @@ var AudioLike = exports.AudioLike = /*#__PURE__*/function (_Subscribe) {
|
|
|
122
124
|
this.off(evtName, callback);
|
|
123
125
|
}
|
|
124
126
|
}]);
|
|
127
|
+
return AudioLike;
|
|
125
128
|
}(_five.Subscribe);
|
|
126
129
|
var _default = exports["default"] = AudioLike;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import TWEEN from '@tweenjs/tween.js';
|
|
2
|
-
|
|
1
|
+
import * as TWEEN from '@tweenjs/tween.js';
|
|
2
|
+
type UnknownProps = Record<string, any>;
|
|
3
|
+
export declare class BetterTween<G extends UnknownProps> extends TWEEN.Tween<G> {
|
|
3
4
|
private disposeMethods;
|
|
4
5
|
private animationFrameDisposer?;
|
|
5
6
|
onDispose: (callback: () => void) => this;
|
|
@@ -9,3 +10,4 @@ export declare class BetterTween<G extends Record<string, any>> extends TWEEN.Tw
|
|
|
9
10
|
export declare function tweenProgress(duration?: number, easing?: (amount: number) => number): BetterTween<{
|
|
10
11
|
progress: number;
|
|
11
12
|
}>;
|
|
13
|
+
export {};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
@@ -8,51 +9,54 @@ exports.BetterTween = void 0;
|
|
|
8
9
|
exports.tweenProgress = tweenProgress;
|
|
9
10
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
10
11
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
12
|
+
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
13
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
11
14
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
12
15
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
13
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
14
16
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
|
-
var
|
|
17
|
+
var TWEEN = _interopRequireWildcard(require("@tweenjs/tween.js"));
|
|
16
18
|
var _ = require(".");
|
|
17
|
-
function
|
|
19
|
+
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
|
+
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2["default"])(t); if (r) { var s = (0, _getPrototypeOf2["default"])(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2["default"])(this, e); }; }
|
|
18
21
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
19
22
|
var BetterTween = exports.BetterTween = /*#__PURE__*/function (_TWEEN$Tween) {
|
|
23
|
+
(0, _inherits2["default"])(BetterTween, _TWEEN$Tween);
|
|
24
|
+
var _super = _createSuper(BetterTween);
|
|
20
25
|
function BetterTween() {
|
|
21
26
|
var _this;
|
|
22
27
|
(0, _classCallCheck2["default"])(this, BetterTween);
|
|
23
28
|
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
24
29
|
args[_key] = arguments[_key];
|
|
25
30
|
}
|
|
26
|
-
_this =
|
|
27
|
-
(0, _defineProperty2["default"])(_this, "disposeMethods", []);
|
|
28
|
-
(0, _defineProperty2["default"])(_this, "onDispose", function (callback) {
|
|
31
|
+
_this = _super.call.apply(_super, [this].concat(args));
|
|
32
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "disposeMethods", []);
|
|
33
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDispose", function (callback) {
|
|
29
34
|
_this.disposeMethods.push(callback);
|
|
30
|
-
return _this;
|
|
35
|
+
return (0, _assertThisInitialized2["default"])(_this);
|
|
31
36
|
});
|
|
32
|
-
(0, _defineProperty2["default"])(_this, "play", function () {
|
|
37
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "play", function () {
|
|
33
38
|
_this.start();
|
|
34
39
|
_this.animationFrameDisposer = (0, _.requestAnimationFrameInterval)(function () {
|
|
35
40
|
return _this.update();
|
|
36
41
|
});
|
|
37
|
-
return _this;
|
|
42
|
+
return (0, _assertThisInitialized2["default"])(_this);
|
|
38
43
|
});
|
|
39
|
-
(0, _defineProperty2["default"])(_this, "dispose", function () {
|
|
44
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "dispose", function () {
|
|
40
45
|
var _this$animationFrameD, _this2;
|
|
41
46
|
_this.stop();
|
|
42
|
-
(_this$animationFrameD = (_this2 = _this).animationFrameDisposer) === null || _this$animationFrameD === void 0
|
|
47
|
+
(_this$animationFrameD = (_this2 = _this).animationFrameDisposer) === null || _this$animationFrameD === void 0 ? void 0 : _this$animationFrameD.call(_this2);
|
|
43
48
|
_this.disposeMethods.forEach(function (fn) {
|
|
44
49
|
return fn();
|
|
45
50
|
});
|
|
46
51
|
_this.disposeMethods = [];
|
|
47
|
-
|
|
52
|
+
TWEEN.remove((0, _assertThisInitialized2["default"])(_this));
|
|
48
53
|
});
|
|
49
54
|
return _this;
|
|
50
55
|
}
|
|
51
|
-
(0, _inherits2["default"])(BetterTween, _TWEEN$Tween);
|
|
52
56
|
return (0, _createClass2["default"])(BetterTween);
|
|
53
|
-
}(
|
|
57
|
+
}(TWEEN.Tween);
|
|
54
58
|
function tweenProgress(duration) {
|
|
55
|
-
var easing = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] :
|
|
59
|
+
var easing = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : TWEEN.Easing.Linear.None;
|
|
56
60
|
var tween = new BetterTween({
|
|
57
61
|
progress: 0
|
|
58
62
|
}).to({
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { Tween, Easing } from '@tweenjs/tween.js';
|
|
2
|
-
|
|
2
|
+
type UnknownProps = Record<string, any>;
|
|
3
|
+
interface ITween<T extends UnknownProps> extends Tween<T> {
|
|
3
4
|
onDestroy: (fn: () => void) => Tween<T>;
|
|
4
5
|
destroy: () => void;
|
|
5
6
|
}
|
|
7
|
+
export declare const clear: () => void;
|
|
6
8
|
/**
|
|
7
9
|
* 对象变化的补间动画
|
|
8
10
|
* 1. 应用 requestAnimationFrameInterval 做 update
|
|
@@ -13,7 +15,7 @@ interface ITween<T extends Record<string, any>> extends Tween<T> {
|
|
|
13
15
|
* @param duration 经历时间(s)
|
|
14
16
|
* @param easing 过程动画,默认是 Easing.Linear.None
|
|
15
17
|
*/
|
|
16
|
-
export default function tween<T extends
|
|
18
|
+
export default function tween<T extends UnknownProps>(from: T, to: T, duration: number, easing?: (amount: number) => number): ITween<T>;
|
|
17
19
|
export declare function tweenProgress(duration: number, easing: typeof Easing.Linear.None): ITween<{
|
|
18
20
|
progress: number;
|
|
19
21
|
}>;
|
|
@@ -3,10 +3,19 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.clear = void 0;
|
|
6
7
|
exports["default"] = tween;
|
|
7
8
|
exports.tweenProgress = tweenProgress;
|
|
8
9
|
var _tween = require("@tweenjs/tween.js");
|
|
9
10
|
var _index = require("./index");
|
|
11
|
+
var disposeMethods = [];
|
|
12
|
+
var clear = exports.clear = function clear() {
|
|
13
|
+
disposeMethods.forEach(function (dispose) {
|
|
14
|
+
return dispose();
|
|
15
|
+
});
|
|
16
|
+
disposeMethods = [];
|
|
17
|
+
};
|
|
18
|
+
|
|
10
19
|
/**
|
|
11
20
|
* 对象变化的补间动画
|
|
12
21
|
* 1. 应用 requestAnimationFrameInterval 做 update
|
|
@@ -41,7 +50,9 @@ function tween(from, to, duration) {
|
|
|
41
50
|
_onStopCallbackL: null
|
|
42
51
|
});
|
|
43
52
|
var destroyMethod;
|
|
44
|
-
while (destroyMethod = destroyMethods.shift())
|
|
53
|
+
while (destroyMethod = destroyMethods.shift()) {
|
|
54
|
+
destroyMethod();
|
|
55
|
+
}
|
|
45
56
|
cancelAnimationFrame();
|
|
46
57
|
};
|
|
47
58
|
return tween;
|
|
@@ -9,7 +9,7 @@ exports.createTransMatrix = createTransMatrix;
|
|
|
9
9
|
var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
|
|
10
10
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
11
11
|
var THREE = _interopRequireWildcard(require("three"));
|
|
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 createTransMatrix(arr1) {
|
|
14
14
|
var matrix4 = new THREE.Matrix4();
|
|
15
15
|
matrix4.fromArray(arr1);
|