@realsee/vreo 2.4.1 → 2.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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.d.ts +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.d.ts +1 -1
- package/lib/Player/modules/VideoAgent/VideoAgentMesh.js +145 -136
- 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
|
@@ -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);
|
package/lib/typings/VreoUnit.js
CHANGED
|
@@ -4,58 +4,24 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VreoKeyframeEnum = exports.PanoTagStyleEnum = exports.PanoTagEnum = exports.PanoEffectEnum = exports.InfoPanelTypeEnum = exports.InfoPanelStyleEnum = void 0;
|
|
7
|
-
var VreoKeyframeEnum
|
|
8
|
-
|
|
7
|
+
var VreoKeyframeEnum;
|
|
8
|
+
/**
|
|
9
|
+
* 支持自定义剧本关键帧配置项
|
|
10
|
+
*/
|
|
11
|
+
(function (VreoKeyframeEnum) {
|
|
9
12
|
VreoKeyframeEnum["CameraMovement"] = "CameraMovement";
|
|
10
|
-
/**
|
|
11
|
-
* 全景标签
|
|
12
|
-
*/
|
|
13
13
|
VreoKeyframeEnum["PanoTag"] = "PanoTag";
|
|
14
|
-
/**
|
|
15
|
-
* 全景文本标签
|
|
16
|
-
*/
|
|
17
14
|
VreoKeyframeEnum["PanoTextLabel"] = "PanoTextLabel";
|
|
18
|
-
/**
|
|
19
|
-
* 提词器
|
|
20
|
-
*/
|
|
21
15
|
VreoKeyframeEnum["Prompter"] = "Prompter";
|
|
22
|
-
/**
|
|
23
|
-
* 更新 VR 全景
|
|
24
|
-
*/
|
|
25
16
|
VreoKeyframeEnum["UpdateVRPanorama"] = "UpdateVRPanorama";
|
|
26
|
-
/**
|
|
27
|
-
* 视频广告
|
|
28
|
-
*/
|
|
29
17
|
VreoKeyframeEnum["ModelVideo"] = "ModelVideo";
|
|
30
|
-
/**
|
|
31
|
-
* 全景特效
|
|
32
|
-
*/
|
|
33
18
|
VreoKeyframeEnum["PanoEffect"] = "PanoEffect";
|
|
34
|
-
/**
|
|
35
|
-
* 信息面板
|
|
36
|
-
*/
|
|
37
19
|
VreoKeyframeEnum["InfoPanel"] = "InfoPanel";
|
|
38
|
-
/**
|
|
39
|
-
* 视频特效
|
|
40
|
-
*/
|
|
41
20
|
VreoKeyframeEnum["VideoEffect"] = "VideoEffect";
|
|
42
|
-
/**
|
|
43
|
-
* 背景音乐
|
|
44
|
-
*/
|
|
45
21
|
VreoKeyframeEnum["BgMusic"] = "BgMusic";
|
|
46
|
-
/**
|
|
47
|
-
* 结束
|
|
48
|
-
*/
|
|
49
22
|
VreoKeyframeEnum["Exit"] = "Exit";
|
|
50
|
-
/**
|
|
51
|
-
* 自定义剧本帧
|
|
52
|
-
*/
|
|
53
23
|
VreoKeyframeEnum["Custom"] = "Custom";
|
|
54
|
-
|
|
55
|
-
}({});
|
|
56
|
-
/**
|
|
57
|
-
* 支持自定义剧本关键帧配置项
|
|
58
|
-
*/
|
|
24
|
+
})(VreoKeyframeEnum || (exports.VreoKeyframeEnum = VreoKeyframeEnum = {}));
|
|
59
25
|
/**
|
|
60
26
|
* 剧本关键帧
|
|
61
27
|
*/
|
|
@@ -98,54 +64,45 @@ var VreoKeyframeEnum = exports.VreoKeyframeEnum = /*#__PURE__*/function (VreoKey
|
|
|
98
64
|
/**
|
|
99
65
|
* 全景标签枚举
|
|
100
66
|
*/
|
|
101
|
-
var PanoTagEnum
|
|
102
|
-
PanoTagEnum["Text"] = "Text";
|
|
103
|
-
PanoTagEnum["Image"] = "Image";
|
|
104
|
-
return PanoTagEnum;
|
|
105
|
-
}({});
|
|
67
|
+
var PanoTagEnum;
|
|
106
68
|
/**
|
|
107
69
|
* 标签样式种类
|
|
108
70
|
*/
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
71
|
+
(function (PanoTagEnum) {
|
|
72
|
+
PanoTagEnum["Text"] = "Text";
|
|
73
|
+
PanoTagEnum["Image"] = "Image";
|
|
74
|
+
})(PanoTagEnum || (exports.PanoTagEnum = PanoTagEnum = {}));
|
|
75
|
+
var PanoTagStyleEnum;
|
|
76
|
+
(function (PanoTagStyleEnum) {
|
|
113
77
|
PanoTagStyleEnum["Growth"] = "Growth";
|
|
114
|
-
/**
|
|
115
|
-
* 展开动画
|
|
116
|
-
*/
|
|
117
78
|
PanoTagStyleEnum["Expand"] = "Expand";
|
|
118
|
-
|
|
119
|
-
}({});
|
|
79
|
+
})(PanoTagStyleEnum || (exports.PanoTagStyleEnum = PanoTagStyleEnum = {}));
|
|
120
80
|
/**
|
|
121
81
|
* 全景特效枚举
|
|
122
82
|
*/
|
|
123
|
-
var PanoEffectEnum
|
|
124
|
-
/**
|
|
125
|
-
* 两点距离
|
|
126
|
-
*/
|
|
127
|
-
PanoEffectEnum["Distance"] = "Distance";
|
|
128
|
-
return PanoEffectEnum;
|
|
129
|
-
}({});
|
|
83
|
+
var PanoEffectEnum;
|
|
130
84
|
/**
|
|
131
85
|
* 全景特效
|
|
132
86
|
*/
|
|
87
|
+
(function (PanoEffectEnum) {
|
|
88
|
+
PanoEffectEnum["Distance"] = "Distance";
|
|
89
|
+
})(PanoEffectEnum || (exports.PanoEffectEnum = PanoEffectEnum = {}));
|
|
133
90
|
/**
|
|
134
91
|
* 信息面板类型枚举
|
|
135
92
|
*/
|
|
136
|
-
var InfoPanelTypeEnum
|
|
93
|
+
var InfoPanelTypeEnum;
|
|
94
|
+
(function (InfoPanelTypeEnum) {
|
|
137
95
|
InfoPanelTypeEnum["Image"] = "Image";
|
|
138
96
|
InfoPanelTypeEnum["Video"] = "Video";
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
var InfoPanelStyleEnum = exports.InfoPanelStyleEnum = /*#__PURE__*/function (InfoPanelStyleEnum) {
|
|
142
|
-
InfoPanelStyleEnum["Drawer"] = "Drawer";
|
|
143
|
-
InfoPanelStyleEnum["PopUp"] = "PopUp";
|
|
144
|
-
return InfoPanelStyleEnum;
|
|
145
|
-
}({});
|
|
97
|
+
})(InfoPanelTypeEnum || (exports.InfoPanelTypeEnum = InfoPanelTypeEnum = {}));
|
|
98
|
+
var InfoPanelStyleEnum;
|
|
146
99
|
/**
|
|
147
100
|
* 信息面板
|
|
148
101
|
*/
|
|
102
|
+
(function (InfoPanelStyleEnum) {
|
|
103
|
+
InfoPanelStyleEnum["Drawer"] = "Drawer";
|
|
104
|
+
InfoPanelStyleEnum["PopUp"] = "PopUp";
|
|
105
|
+
})(InfoPanelStyleEnum || (exports.InfoPanelStyleEnum = InfoPanelStyleEnum = {}));
|
|
149
106
|
/**
|
|
150
107
|
* 视频特效
|
|
151
108
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@realsee/vreo",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.3",
|
|
4
4
|
"description": "Vreo (VR Video 缩写) 是基于如视三维渲染引擎 Five 和 用户界面构建库 React 实现的如视 3D 空间剧本播放器。",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"realsee",
|
|
@@ -10,10 +10,6 @@
|
|
|
10
10
|
"author": "BEIKE REALSEE TECHNOLOGY (HK) LIMITED",
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"private": false,
|
|
13
|
-
"engines": {
|
|
14
|
-
"node": ">=22.0.0",
|
|
15
|
-
"npm": ">=10.0.0"
|
|
16
|
-
},
|
|
17
13
|
"files": [
|
|
18
14
|
"lib",
|
|
19
15
|
"stylesheets",
|
|
@@ -29,41 +25,41 @@
|
|
|
29
25
|
"postpublish": "cnpm sync @realsee/vreo"
|
|
30
26
|
},
|
|
31
27
|
"peerDependencies": {
|
|
32
|
-
"@realsee/
|
|
33
|
-
"@realsee/
|
|
34
|
-
"
|
|
35
|
-
"react
|
|
36
|
-
"
|
|
28
|
+
"@realsee/five": "^5.0.0",
|
|
29
|
+
"@realsee/dnalogel": "^2.3.3",
|
|
30
|
+
"three": ">=0.115.0 <=0.117.1",
|
|
31
|
+
"react": "^17.0.0",
|
|
32
|
+
"react-dom": "^17.0.0"
|
|
37
33
|
},
|
|
38
34
|
"devDependencies": {
|
|
39
35
|
"@babel/cli": "^7.16.0",
|
|
40
36
|
"@babel/core": "^7.16.0",
|
|
41
|
-
"@babel/plugin-transform-runtime": "7.24.3",
|
|
42
37
|
"@babel/preset-env": "^7.16.4",
|
|
43
38
|
"@babel/preset-react": "^7.16.0",
|
|
44
39
|
"@babel/preset-typescript": "^7.16.0",
|
|
45
|
-
"@
|
|
46
|
-
"@realsee/
|
|
47
|
-
"@
|
|
40
|
+
"@babel/plugin-transform-runtime": "7.24.3",
|
|
41
|
+
"@realsee/dnalogel": "^2.19.3",
|
|
42
|
+
"@realsee/five": "5.0.0-alpha.149",
|
|
43
|
+
"@tweenjs/tween.js": "18.6.4",
|
|
44
|
+
"@types/node": "^18.11.17",
|
|
48
45
|
"@types/offscreencanvas": "^2019.6.4",
|
|
49
|
-
"@types/react": "^
|
|
50
|
-
"@types/react-dom": "^
|
|
46
|
+
"@types/react": "^17.0.37",
|
|
47
|
+
"@types/react-dom": "^17.0.11",
|
|
51
48
|
"@types/react-transition-group": "^4.4.4",
|
|
52
49
|
"@vitejs/plugin-react": "^1.1.0",
|
|
53
50
|
"cnpm": "^9.2.0",
|
|
54
51
|
"del": "^6.0.0",
|
|
55
|
-
"react": "^
|
|
56
|
-
"react-dom": "^
|
|
57
|
-
"three": "0.117.1",
|
|
58
|
-
"typedoc": "^0.
|
|
59
|
-
"typescript": "
|
|
52
|
+
"react": "^16.0.0",
|
|
53
|
+
"react-dom": "^16.0.0",
|
|
54
|
+
"three": "^0.117.1",
|
|
55
|
+
"typedoc": "^0.22.10",
|
|
56
|
+
"typescript": "4.7.4",
|
|
60
57
|
"vite": "^2.6.14"
|
|
61
58
|
},
|
|
62
59
|
"dependencies": {
|
|
63
|
-
"@babel/runtime": "^7.16.0",
|
|
64
|
-
"@tweenjs/tween.js": "18.6.4",
|
|
65
60
|
"classnames": "^2.3.1",
|
|
66
61
|
"mobx": "^6.3.7",
|
|
67
62
|
"mobx-react": "^7.2.1"
|
|
68
|
-
}
|
|
63
|
+
},
|
|
64
|
+
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
|
69
65
|
}
|