@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
|
@@ -10,16 +10,17 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
|
|
|
10
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
11
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
12
12
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
+
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
14
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
13
15
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
14
16
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
15
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
16
17
|
var THREE = _interopRequireWildcard(require("three"));
|
|
17
18
|
var _Preloader = require("../../../shared-utils/Preloader");
|
|
18
19
|
var _mobx = require("mobx");
|
|
19
|
-
var
|
|
20
|
+
var _AudioLike = _interopRequireDefault(require("../../../shared-utils/AudioLike"));
|
|
20
21
|
var _getMediaInfo = require("../../../shared-utils/getMediaInfo");
|
|
21
|
-
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); }
|
|
22
|
-
function
|
|
22
|
+
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); }
|
|
23
|
+
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); }; }
|
|
23
24
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
24
25
|
var vertexShader = "\nvarying vec2 vUv;\nvarying vec2 vColorUv;\nvarying vec2 vMaskUv;\nvoid main(){\n vUv = uv;\n vColorUv = vec2(uv.x / 2.0, uv.y);\n vMaskUv = vec2(0.5 + uv.x / 2.0, uv.y);\n gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n}\n";
|
|
25
26
|
var fragmentShaderTpl = function fragmentShaderTpl() {
|
|
@@ -30,6 +31,8 @@ var cacheInstance = {};
|
|
|
30
31
|
* 视频经纪人MESH
|
|
31
32
|
*/
|
|
32
33
|
var VideoAgentMesh = exports.VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh) {
|
|
34
|
+
(0, _inherits2["default"])(VideoAgentMesh, _THREE$Mesh);
|
|
35
|
+
var _super = _createSuper(VideoAgentMesh);
|
|
33
36
|
/**
|
|
34
37
|
*
|
|
35
38
|
* @param width
|
|
@@ -75,7 +78,7 @@ var VideoAgentMesh = exports.VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh
|
|
|
75
78
|
fragmentShader: fragmentShaderTpl(),
|
|
76
79
|
transparent: true
|
|
77
80
|
});
|
|
78
|
-
_this =
|
|
81
|
+
_this = _super.call(this, geometry, material);
|
|
79
82
|
_this.options = options;
|
|
80
83
|
_this.freeze = false;
|
|
81
84
|
_this.paused = true;
|
|
@@ -96,8 +99,8 @@ var VideoAgentMesh = exports.VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh
|
|
|
96
99
|
} else {
|
|
97
100
|
_this.audioInstance = options.audioInstance;
|
|
98
101
|
}
|
|
99
|
-
_this.audioLikeInstance = new
|
|
100
|
-
(0, _mobx.makeObservable)(_this, {
|
|
102
|
+
_this.audioLikeInstance = new _AudioLike["default"]();
|
|
103
|
+
(0, _mobx.makeObservable)((0, _assertThisInitialized2["default"])(_this), {
|
|
101
104
|
paused: _mobx.observable
|
|
102
105
|
});
|
|
103
106
|
var updatePaused = function updatePaused(paused) {
|
|
@@ -113,23 +116,22 @@ var VideoAgentMesh = exports.VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh
|
|
|
113
116
|
};
|
|
114
117
|
_this.audioInstance.addEventListener('pause', onPause);
|
|
115
118
|
_this.audioInstance.addEventListener('play', onPlay);
|
|
116
|
-
(_this$options$videoIn = _this.options.videoInstance) === null || _this$options$videoIn === void 0
|
|
117
|
-
(_this$options$videoIn2 = _this.options.videoInstance) === null || _this$options$videoIn2 === void 0
|
|
119
|
+
(_this$options$videoIn = _this.options.videoInstance) === null || _this$options$videoIn === void 0 ? void 0 : _this$options$videoIn.addEventListener('pause', onPause);
|
|
120
|
+
(_this$options$videoIn2 = _this.options.videoInstance) === null || _this$options$videoIn2 === void 0 ? void 0 : _this$options$videoIn2.addEventListener('play', onPlay);
|
|
118
121
|
_this.audioLikeInstance.addEventListener('pause', onPause);
|
|
119
122
|
_this.audioLikeInstance.addEventListener('play', onPlay);
|
|
120
123
|
_this.$removeEventListener = function () {
|
|
121
124
|
var _this$options$videoIn3, _this$options$videoIn4;
|
|
122
125
|
_this.audioInstance.removeEventListener('pause', onPause);
|
|
123
126
|
_this.audioInstance.removeEventListener('play', onPlay);
|
|
124
|
-
(_this$options$videoIn3 = _this.options.videoInstance) === null || _this$options$videoIn3 === void 0
|
|
125
|
-
(_this$options$videoIn4 = _this.options.videoInstance) === null || _this$options$videoIn4 === void 0
|
|
127
|
+
(_this$options$videoIn3 = _this.options.videoInstance) === null || _this$options$videoIn3 === void 0 ? void 0 : _this$options$videoIn3.removeEventListener('pause', onPause);
|
|
128
|
+
(_this$options$videoIn4 = _this.options.videoInstance) === null || _this$options$videoIn4 === void 0 ? void 0 : _this$options$videoIn4.removeEventListener('play', onPlay);
|
|
126
129
|
_this.audioLikeInstance.removeEventListener('pause', onPause);
|
|
127
130
|
_this.audioLikeInstance.removeEventListener('play', onPlay);
|
|
128
131
|
};
|
|
129
132
|
return _this;
|
|
130
133
|
}
|
|
131
|
-
(0,
|
|
132
|
-
return (0, _createClass2["default"])(VideoAgentMesh, [{
|
|
134
|
+
(0, _createClass2["default"])(VideoAgentMesh, [{
|
|
133
135
|
key: "mediaInstance",
|
|
134
136
|
get: function get() {
|
|
135
137
|
if (!this.videoUrl) {
|
|
@@ -147,62 +149,64 @@ var VideoAgentMesh = exports.VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh
|
|
|
147
149
|
value: function () {
|
|
148
150
|
var _update = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(videoUrl) {
|
|
149
151
|
var _this2 = this;
|
|
150
|
-
var uniforms,
|
|
152
|
+
var uniforms, onStart;
|
|
151
153
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
152
|
-
while (1)
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
154
|
+
while (1) {
|
|
155
|
+
switch (_context.prev = _context.next) {
|
|
156
|
+
case 0:
|
|
157
|
+
if (!(this.videoUrl === videoUrl)) {
|
|
158
|
+
_context.next = 2;
|
|
159
|
+
break;
|
|
160
|
+
}
|
|
161
|
+
return _context.abrupt("return");
|
|
162
|
+
case 2:
|
|
163
|
+
this.videoUrl = videoUrl;
|
|
161
164
|
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
165
|
+
// // 兼容非视频场景
|
|
166
|
+
// if (this.mediaInstance instanceof HTMLAudioElement) {
|
|
167
|
+
// this.mediaInstance.style.display = 'none'
|
|
168
|
+
// } else if (this.mediaInstance instanceof HTMLVideoElement) {
|
|
169
|
+
// this.mediaInstance.style.display = 'block'
|
|
170
|
+
// }
|
|
168
171
|
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
172
|
+
this.freeze = true;
|
|
173
|
+
_context.next = 6;
|
|
174
|
+
return this.mediaInstance.pause();
|
|
175
|
+
case 6:
|
|
176
|
+
uniforms = this.material.uniforms;
|
|
177
|
+
this.mediaInstance.muted = true;
|
|
178
|
+
if (!(this.options.preload || this.options.preload === undefined || (0, _getMediaInfo.getMediaType)(this.videoUrl) === 'video')) {
|
|
179
|
+
_context.next = 18;
|
|
180
|
+
break;
|
|
181
|
+
}
|
|
182
|
+
_context.t1 = URL;
|
|
183
|
+
_context.next = 12;
|
|
184
|
+
return _Preloader.Preloader.blob(this.videoUrl);
|
|
185
|
+
case 12:
|
|
186
|
+
_context.t2 = _context.sent;
|
|
187
|
+
_context.next = 15;
|
|
188
|
+
return _context.t1.createObjectURL.call(_context.t1, _context.t2);
|
|
189
|
+
case 15:
|
|
190
|
+
_context.t0 = _context.sent;
|
|
191
|
+
_context.next = 19;
|
|
177
192
|
break;
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
_onStart = function onStart() {
|
|
196
|
-
if (_this2.mediaInstance.currentTime === 0) return;
|
|
197
|
-
_this2.freeze = false;
|
|
198
|
-
_this2.mediaInstance.muted = false;
|
|
199
|
-
uniforms.enable.value = (0, _getMediaInfo.getMediaType)(_this2.videoUrl) ? 1 : 0;
|
|
200
|
-
_this2.mediaInstance.removeEventListener('timeupdate', _onStart, false);
|
|
201
|
-
};
|
|
202
|
-
this.mediaInstance.addEventListener('timeupdate', _onStart, false);
|
|
203
|
-
case 23:
|
|
204
|
-
case "end":
|
|
205
|
-
return _context.stop();
|
|
193
|
+
case 18:
|
|
194
|
+
_context.t0 = this.videoUrl;
|
|
195
|
+
case 19:
|
|
196
|
+
this.mediaInstance.src = _context.t0;
|
|
197
|
+
this.mediaInstance.setAttribute('data-src', this.videoUrl);
|
|
198
|
+
onStart = function onStart() {
|
|
199
|
+
if (_this2.mediaInstance.currentTime === 0) return;
|
|
200
|
+
_this2.freeze = false;
|
|
201
|
+
_this2.mediaInstance.muted = false;
|
|
202
|
+
uniforms.enable.value = (0, _getMediaInfo.getMediaType)(_this2.videoUrl) ? 1 : 0;
|
|
203
|
+
_this2.mediaInstance.removeEventListener('timeupdate', onStart, false);
|
|
204
|
+
};
|
|
205
|
+
this.mediaInstance.addEventListener('timeupdate', onStart, false);
|
|
206
|
+
case 23:
|
|
207
|
+
case "end":
|
|
208
|
+
return _context.stop();
|
|
209
|
+
}
|
|
206
210
|
}
|
|
207
211
|
}, _callee, this);
|
|
208
212
|
}));
|
|
@@ -221,79 +225,83 @@ var VideoAgentMesh = exports.VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh
|
|
|
221
225
|
duration,
|
|
222
226
|
_args3 = arguments;
|
|
223
227
|
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
|
224
|
-
while (1)
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
228
|
+
while (1) {
|
|
229
|
+
switch (_context3.prev = _context3.next) {
|
|
230
|
+
case 0:
|
|
231
|
+
videoUrl = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : '';
|
|
232
|
+
currentTime = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : 0;
|
|
233
|
+
duration = _args3.length > 2 ? _args3[2] : undefined;
|
|
234
|
+
videoUrl = videoUrl || '';
|
|
235
|
+
if (!(duration && !videoUrl)) {
|
|
236
|
+
_context3.next = 10;
|
|
237
|
+
break;
|
|
238
|
+
}
|
|
239
|
+
if (this.currentTime) {
|
|
240
|
+
this.mediaInstance.currentTime = currentTime;
|
|
241
|
+
}
|
|
242
|
+
this.mediaInstance.duration = duration;
|
|
243
|
+
this.videoUrl = '';
|
|
244
|
+
this.mediaInstance.play();
|
|
245
|
+
return _context3.abrupt("return", true);
|
|
246
|
+
case 10:
|
|
247
|
+
if (videoUrl) {
|
|
248
|
+
_context3.next = 18;
|
|
249
|
+
break;
|
|
250
|
+
}
|
|
251
|
+
if (!this.videoUrl) {
|
|
252
|
+
_context3.next = 16;
|
|
253
|
+
break;
|
|
254
|
+
}
|
|
255
|
+
_context3.next = 14;
|
|
256
|
+
return this.mediaInstance.play();
|
|
257
|
+
case 14:
|
|
258
|
+
_context3.next = 17;
|
|
232
259
|
break;
|
|
233
|
-
|
|
234
|
-
|
|
260
|
+
case 16:
|
|
261
|
+
console.warn('警告:视频资源未初始化。');
|
|
262
|
+
case 17:
|
|
263
|
+
return _context3.abrupt("return", true);
|
|
264
|
+
case 18:
|
|
265
|
+
if (!(videoUrl === this.videoUrl)) {
|
|
266
|
+
_context3.next = 23;
|
|
267
|
+
break;
|
|
268
|
+
}
|
|
235
269
|
this.mediaInstance.currentTime = currentTime;
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
return this.update(videoUrl);
|
|
272
|
-
case 25:
|
|
273
|
-
this.mediaInstance.pause();
|
|
274
|
-
_context3.next = 28;
|
|
275
|
-
return new Promise(function (resolve) {
|
|
276
|
-
return setTimeout(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
277
|
-
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
278
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
279
|
-
case 0:
|
|
280
|
-
_this3.mediaInstance.currentTime = currentTime;
|
|
281
|
-
_context2.next = 3;
|
|
282
|
-
return _this3.mediaInstance.play();
|
|
283
|
-
case 3:
|
|
284
|
-
resolve(true);
|
|
285
|
-
case 4:
|
|
286
|
-
case "end":
|
|
287
|
-
return _context2.stop();
|
|
288
|
-
}
|
|
289
|
-
}, _callee2);
|
|
290
|
-
})), 20);
|
|
291
|
-
});
|
|
292
|
-
case 28:
|
|
293
|
-
return _context3.abrupt("return", _context3.sent);
|
|
294
|
-
case 29:
|
|
295
|
-
case "end":
|
|
296
|
-
return _context3.stop();
|
|
270
|
+
_context3.next = 22;
|
|
271
|
+
return this.mediaInstance.play();
|
|
272
|
+
case 22:
|
|
273
|
+
return _context3.abrupt("return", true);
|
|
274
|
+
case 23:
|
|
275
|
+
_context3.next = 25;
|
|
276
|
+
return this.update(videoUrl);
|
|
277
|
+
case 25:
|
|
278
|
+
this.mediaInstance.pause();
|
|
279
|
+
_context3.next = 28;
|
|
280
|
+
return new Promise(function (resolve) {
|
|
281
|
+
return setTimeout(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
282
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
283
|
+
while (1) {
|
|
284
|
+
switch (_context2.prev = _context2.next) {
|
|
285
|
+
case 0:
|
|
286
|
+
_this3.mediaInstance.currentTime = currentTime;
|
|
287
|
+
_context2.next = 3;
|
|
288
|
+
return _this3.mediaInstance.play();
|
|
289
|
+
case 3:
|
|
290
|
+
resolve(true);
|
|
291
|
+
case 4:
|
|
292
|
+
case "end":
|
|
293
|
+
return _context2.stop();
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
}, _callee2);
|
|
297
|
+
})), 20);
|
|
298
|
+
});
|
|
299
|
+
case 28:
|
|
300
|
+
return _context3.abrupt("return", _context3.sent);
|
|
301
|
+
case 29:
|
|
302
|
+
case "end":
|
|
303
|
+
return _context3.stop();
|
|
304
|
+
}
|
|
297
305
|
}
|
|
298
306
|
}, _callee3, this);
|
|
299
307
|
}));
|
|
@@ -325,4 +333,5 @@ var VideoAgentMesh = exports.VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh
|
|
|
325
333
|
}
|
|
326
334
|
}
|
|
327
335
|
}]);
|
|
336
|
+
return VideoAgentMesh;
|
|
328
337
|
}(THREE.Mesh);
|
|
@@ -12,7 +12,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
12
12
|
var THREE = _interopRequireWildcard(require("three"));
|
|
13
13
|
var _addResizeListener = require("../../../shared-utils/addResizeListener");
|
|
14
14
|
var _VideoAgentMesh = require("./VideoAgentMesh");
|
|
15
|
-
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
15
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
|
|
16
16
|
var VideoAgentScene = exports.VideoAgentScene = /*#__PURE__*/(0, _createClass2["default"])(function VideoAgentScene(container, options) {
|
|
17
17
|
var _this = this;
|
|
18
18
|
(0, _classCallCheck2["default"])(this, VideoAgentScene);
|
|
@@ -31,7 +31,7 @@ var VideoAgentScene = exports.VideoAgentScene = /*#__PURE__*/(0, _createClass2["
|
|
|
31
31
|
});
|
|
32
32
|
(0, _defineProperty2["default"])(this, "dispose", function () {
|
|
33
33
|
var _this$videoAgentMesh;
|
|
34
|
-
(_this$videoAgentMesh = _this.videoAgentMesh) === null || _this$videoAgentMesh === void 0
|
|
34
|
+
(_this$videoAgentMesh = _this.videoAgentMesh) === null || _this$videoAgentMesh === void 0 ? void 0 : _this$videoAgentMesh.dispose();
|
|
35
35
|
_this.disposers.forEach(function (disposer) {
|
|
36
36
|
return disposer === null || disposer === void 0 ? void 0 : disposer();
|
|
37
37
|
});
|
|
@@ -10,7 +10,7 @@ var React = _interopRequireWildcard(require("react"));
|
|
|
10
10
|
var _hooks = require("../../hooks");
|
|
11
11
|
var _VideoAgentScene = require("./VideoAgentScene");
|
|
12
12
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
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
|
function VideoAgent(props) {
|
|
15
15
|
var _controller$avatar2;
|
|
16
16
|
var ref = React.useRef(null);
|
|
@@ -35,7 +35,7 @@ function VideoAgent(props) {
|
|
|
35
35
|
return function () {
|
|
36
36
|
var _controller$videoAgen2;
|
|
37
37
|
controller.dispose();
|
|
38
|
-
(_controller$videoAgen2 = controller.videoAgentScene) === null || _controller$videoAgen2 === void 0
|
|
38
|
+
(_controller$videoAgen2 = controller.videoAgentScene) === null || _controller$videoAgen2 === void 0 ? void 0 : _controller$videoAgen2.dispose();
|
|
39
39
|
};
|
|
40
40
|
}, []);
|
|
41
41
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
|
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.Wave = Wave;
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
|
-
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
11
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
|
|
12
12
|
var defaultPrefix = 'https://vr-public.realsee-cdn.cn/release/static/image/release/';
|
|
13
13
|
var WAVES = {
|
|
14
14
|
single: {
|
|
@@ -12,7 +12,7 @@ var React = _interopRequireWildcard(require("react"));
|
|
|
12
12
|
var _Audio = require("../../../../shared-utils/Audio");
|
|
13
13
|
var _VreoUnit = require("../../../../typings/VreoUnit");
|
|
14
14
|
var _hooks = require("../../../hooks");
|
|
15
|
-
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
15
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
|
|
16
16
|
function BgMusic() {
|
|
17
17
|
var controller = (0, _hooks.useController)();
|
|
18
18
|
React.useEffect(function () {
|
|
@@ -20,46 +20,48 @@ function BgMusic() {
|
|
|
20
20
|
var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe, currentTime) {
|
|
21
21
|
var start, end, _currentTime, audio, cleanAudio, play;
|
|
22
22
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
23
|
-
while (1)
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
23
|
+
while (1) {
|
|
24
|
+
switch (_context.prev = _context.next) {
|
|
25
|
+
case 0:
|
|
26
|
+
start = keyframe.start, end = keyframe.end;
|
|
27
|
+
_currentTime = (currentTime - start) / 1000;
|
|
28
|
+
if (!(_currentTime < 0 || _currentTime >= keyframe.end - keyframe.start)) {
|
|
29
|
+
_context.next = 4;
|
|
30
|
+
break;
|
|
31
|
+
}
|
|
32
|
+
return _context.abrupt("return");
|
|
33
|
+
case 4:
|
|
34
|
+
audio = (0, _Audio.getAudio)(keyframe.data.url);
|
|
35
|
+
audio.currentTime = Math.max(0, _currentTime);
|
|
36
|
+
// console.log('play', audio.src)
|
|
37
|
+
// const play = () => audio.play()
|
|
37
38
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
39
|
+
audio.play();
|
|
40
|
+
cleanAudio = function cleanAudio() {
|
|
41
|
+
// audio.removeEventListener('canplaythrough', play)
|
|
42
|
+
audio.removeEventListener('pause', play);
|
|
43
|
+
audio.pause();
|
|
44
|
+
audio.src = '';
|
|
45
|
+
// cleanTimeout()
|
|
46
|
+
}; // audio.addEventListener('canplaythrough', play)
|
|
46
47
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
48
|
+
audio.addEventListener('ended', function () {
|
|
49
|
+
cleanAudio();
|
|
50
|
+
});
|
|
51
|
+
play = function play() {
|
|
52
|
+
if (audio.realSrc === keyframe.data.url) {
|
|
53
|
+
// 有可能会被其他音轨打断
|
|
54
|
+
audio.play();
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
audio.addEventListener('pause', play);
|
|
58
|
+
controller.once('paused', function () {
|
|
59
|
+
cleanAudio();
|
|
60
|
+
});
|
|
61
|
+
case 12:
|
|
62
|
+
case "end":
|
|
63
|
+
return _context.stop();
|
|
64
|
+
}
|
|
63
65
|
}
|
|
64
66
|
}, _callee);
|
|
65
67
|
}));
|
|
@@ -13,7 +13,7 @@ var _CameraMovementPlugin = require("../../../../fivePlugins/CameraMovementPlugi
|
|
|
13
13
|
var _typings = require("../../../../fivePlugins/CameraMovementPlugin/typings");
|
|
14
14
|
var _VreoUnit = require("../../../../typings/VreoUnit");
|
|
15
15
|
var _hooks = require("../../../hooks");
|
|
16
|
-
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
16
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
|
|
17
17
|
function CameraMovement() {
|
|
18
18
|
var controller = (0, _hooks.useController)();
|
|
19
19
|
var five = (0, _hooks.useFiveInstance)();
|
|
@@ -23,49 +23,51 @@ function CameraMovement() {
|
|
|
23
23
|
var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(keyframe) {
|
|
24
24
|
var start, end, data, cameraMovementData, effect;
|
|
25
25
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
26
|
-
while (1)
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
ref.current
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
26
|
+
while (1) {
|
|
27
|
+
switch (_context.prev = _context.next) {
|
|
28
|
+
case 0:
|
|
29
|
+
if (!ref.current) {
|
|
30
|
+
ref.current = (0, _CameraMovementPlugin.CameraMovementPlugin)(five, {});
|
|
31
|
+
}
|
|
32
|
+
start = keyframe.start, end = keyframe.end, data = keyframe.data;
|
|
33
|
+
cameraMovementData = data;
|
|
34
|
+
effect = cameraMovementData.effect;
|
|
35
|
+
if (!(effect === _typings.CameraMovementEffect.Rotate)) {
|
|
36
|
+
_context.next = 9;
|
|
37
|
+
break;
|
|
38
|
+
}
|
|
39
|
+
_context.next = 7;
|
|
40
|
+
return ref.current.rotate(data, end - start);
|
|
41
|
+
case 7:
|
|
42
|
+
_context.next = 21;
|
|
36
43
|
break;
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
_context.next =
|
|
44
|
+
case 9:
|
|
45
|
+
if (!(effect === _typings.CameraMovementEffect.Move)) {
|
|
46
|
+
_context.next = 14;
|
|
47
|
+
break;
|
|
48
|
+
}
|
|
49
|
+
_context.next = 12;
|
|
50
|
+
return ref.current.move(data, end - start);
|
|
51
|
+
case 12:
|
|
52
|
+
_context.next = 21;
|
|
46
53
|
break;
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
_context.next =
|
|
54
|
+
case 14:
|
|
55
|
+
if (!(cameraMovementData.panoIndex !== undefined && cameraMovementData.panoIndex !== five.panoIndex)) {
|
|
56
|
+
_context.next = 19;
|
|
57
|
+
break;
|
|
58
|
+
}
|
|
59
|
+
_context.next = 17;
|
|
60
|
+
return ref.current.move(data, end - start);
|
|
61
|
+
case 17:
|
|
62
|
+
_context.next = 21;
|
|
56
63
|
break;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
_context.next = 21;
|
|
65
|
-
return ref.current.rotate(data, end - start);
|
|
66
|
-
case 21:
|
|
67
|
-
case "end":
|
|
68
|
-
return _context.stop();
|
|
64
|
+
case 19:
|
|
65
|
+
_context.next = 21;
|
|
66
|
+
return ref.current.rotate(data, end - start);
|
|
67
|
+
case 21:
|
|
68
|
+
case "end":
|
|
69
|
+
return _context.stop();
|
|
70
|
+
}
|
|
69
71
|
}
|
|
70
72
|
}, _callee);
|
|
71
73
|
}));
|