@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
|
@@ -23,15 +23,17 @@ function createHTMLAudioElement() {
|
|
|
23
23
|
// 触发一次播放
|
|
24
24
|
Promise.resolve(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
25
25
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
26
|
-
while (1)
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
26
|
+
while (1) {
|
|
27
|
+
switch (_context.prev = _context.next) {
|
|
28
|
+
case 0:
|
|
29
|
+
_context.next = 2;
|
|
30
|
+
return audio.play();
|
|
31
|
+
case 2:
|
|
32
|
+
return _context.abrupt("return", _context.sent);
|
|
33
|
+
case 3:
|
|
34
|
+
case "end":
|
|
35
|
+
return _context.stop();
|
|
36
|
+
}
|
|
35
37
|
}
|
|
36
38
|
}, _callee);
|
|
37
39
|
})));
|
|
@@ -9,23 +9,26 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
|
|
|
9
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
11
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
12
|
+
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
13
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
12
14
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
13
15
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
14
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
15
16
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
16
17
|
var _five = require("@realsee/five");
|
|
17
18
|
var _animationFrame = require("../shared-utils/animationFrame");
|
|
18
19
|
var _createHTMLAudioElement = require("./createHTMLAudioElement");
|
|
19
|
-
function
|
|
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); }; }
|
|
20
21
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
21
22
|
var closures = {};
|
|
22
23
|
var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
24
|
+
(0, _inherits2["default"])(PlayController, _Subscribe);
|
|
25
|
+
var _super = _createSuper(PlayController);
|
|
23
26
|
function PlayController() {
|
|
24
27
|
var _this;
|
|
25
28
|
var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
26
29
|
(0, _classCallCheck2["default"])(this, PlayController);
|
|
27
|
-
_this =
|
|
28
|
-
(0, _defineProperty2["default"])(_this, "config", {});
|
|
30
|
+
_this = _super.call(this);
|
|
31
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "config", {});
|
|
29
32
|
if (!config.audio) {
|
|
30
33
|
config.audio = (0, _createHTMLAudioElement.createHTMLAudioElement)();
|
|
31
34
|
}
|
|
@@ -69,8 +72,7 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
69
72
|
/**
|
|
70
73
|
* 载入数据
|
|
71
74
|
*/
|
|
72
|
-
(0,
|
|
73
|
-
return (0, _createClass2["default"])(PlayController, [{
|
|
75
|
+
(0, _createClass2["default"])(PlayController, [{
|
|
74
76
|
key: "paused",
|
|
75
77
|
get: function get() {
|
|
76
78
|
return this.audioInstance.paused;
|
|
@@ -113,34 +115,36 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
113
115
|
var _load = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(vreoUnit) {
|
|
114
116
|
var _this3 = this;
|
|
115
117
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
116
|
-
while (1)
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
118
|
+
while (1) {
|
|
119
|
+
switch (_context.prev = _context.next) {
|
|
120
|
+
case 0:
|
|
121
|
+
this.vreoUnit = vreoUnit;
|
|
122
|
+
_context.next = 3;
|
|
123
|
+
return this.pause();
|
|
124
|
+
case 3:
|
|
125
|
+
_context.next = 5;
|
|
126
|
+
return new Promise(function (resolve, reject) {
|
|
127
|
+
if (vreoUnit.video.url === _this3.audioInstance.src) {
|
|
128
|
+
return resolve(true);
|
|
129
|
+
}
|
|
130
|
+
_this3.audioInstance.src = vreoUnit.video.url;
|
|
131
|
+
var canplaythrough = function canplaythrough() {
|
|
132
|
+
resolve(true);
|
|
133
|
+
_this3.audioInstance.removeEventListener('canplaythrough', canplaythrough);
|
|
134
|
+
};
|
|
135
|
+
var error = function error(err) {
|
|
136
|
+
reject(err);
|
|
137
|
+
_this3.audioInstance.removeEventListener('error', error);
|
|
138
|
+
};
|
|
139
|
+
_this3.audioInstance.addEventListener('canplaythrough', canplaythrough);
|
|
140
|
+
_this3.audioInstance.addEventListener('error', error);
|
|
141
|
+
});
|
|
142
|
+
case 5:
|
|
143
|
+
return _context.abrupt("return", _context.sent);
|
|
144
|
+
case 6:
|
|
145
|
+
case "end":
|
|
146
|
+
return _context.stop();
|
|
147
|
+
}
|
|
144
148
|
}
|
|
145
149
|
}, _callee, this);
|
|
146
150
|
}));
|
|
@@ -158,12 +162,14 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
158
162
|
value: (function () {
|
|
159
163
|
var _play = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
160
164
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
161
|
-
while (1)
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
165
|
+
while (1) {
|
|
166
|
+
switch (_context2.prev = _context2.next) {
|
|
167
|
+
case 0:
|
|
168
|
+
closures.playPromise = this.audioInstance.play();
|
|
169
|
+
case 1:
|
|
170
|
+
case "end":
|
|
171
|
+
return _context2.stop();
|
|
172
|
+
}
|
|
167
173
|
}
|
|
168
174
|
}, _callee2, this);
|
|
169
175
|
}));
|
|
@@ -181,19 +187,21 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
181
187
|
value: (function () {
|
|
182
188
|
var _pause = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
|
|
183
189
|
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
|
184
|
-
while (1)
|
|
185
|
-
|
|
186
|
-
|
|
190
|
+
while (1) {
|
|
191
|
+
switch (_context3.prev = _context3.next) {
|
|
192
|
+
case 0:
|
|
193
|
+
if (!closures.playPromise) {
|
|
194
|
+
_context3.next = 3;
|
|
195
|
+
break;
|
|
196
|
+
}
|
|
187
197
|
_context3.next = 3;
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
case "end":
|
|
196
|
-
return _context3.stop();
|
|
198
|
+
return closures.playPromise;
|
|
199
|
+
case 3:
|
|
200
|
+
this.audioInstance.pause();
|
|
201
|
+
case 4:
|
|
202
|
+
case "end":
|
|
203
|
+
return _context3.stop();
|
|
204
|
+
}
|
|
197
205
|
}
|
|
198
206
|
}, _callee3, this);
|
|
199
207
|
}));
|
|
@@ -221,4 +229,5 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
221
229
|
}
|
|
222
230
|
}
|
|
223
231
|
}]);
|
|
232
|
+
return PlayController;
|
|
224
233
|
}(_five.Subscribe);
|
package/lib/Player/App.js
CHANGED
|
@@ -23,7 +23,7 @@ var _VideoEffect = require("./modules/keyframes/VideoEffect");
|
|
|
23
23
|
var _VideoAgent = require("./modules/VideoAgent");
|
|
24
24
|
var _BgMusic = require("./modules/keyframes/BgMusic");
|
|
25
25
|
var _Wave = require("./modules/Wave");
|
|
26
|
-
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); }
|
|
26
|
+
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); }
|
|
27
27
|
var AppView = (0, _mobxReact.observer)(function (_ref) {
|
|
28
28
|
var _controller$configs, _controller$waveAppea, _controller$configs3, _controller$configs4;
|
|
29
29
|
var controller = _ref.controller;
|
|
@@ -51,7 +51,7 @@ export declare class Controller extends Subscribe<VreoKeyframeEvent> {
|
|
|
51
51
|
get ready(): boolean;
|
|
52
52
|
get currentTime(): number;
|
|
53
53
|
get currentKeyframes(): VreoKeyframe[];
|
|
54
|
-
get mediaInstance(): HTMLVideoElement | HTMLAudioElement | import("../shared-utils/
|
|
54
|
+
get mediaInstance(): HTMLVideoElement | HTMLAudioElement | import("../shared-utils/AudioLike").AudioLike | undefined;
|
|
55
55
|
/**
|
|
56
56
|
* 逐帧任务
|
|
57
57
|
*/
|
package/lib/Player/Controller.js
CHANGED
|
@@ -9,9 +9,10 @@ exports.ControllerContext = exports.Controller = void 0;
|
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
11
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
12
|
+
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
13
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
12
14
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
13
15
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
14
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
15
16
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
16
17
|
var _five = require("@realsee/five");
|
|
17
18
|
var _mobx = require("mobx");
|
|
@@ -20,44 +21,45 @@ var _animationFrame = require("../shared-utils/animationFrame");
|
|
|
20
21
|
var _VreoUnit = require("../typings/VreoUnit");
|
|
21
22
|
var _setElementDataset = _interopRequireDefault(require("../shared-utils/setElementDataset"));
|
|
22
23
|
var _getMediaInfo = require("../shared-utils/getMediaInfo");
|
|
23
|
-
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
24
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
|
|
24
25
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
25
26
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
26
|
-
function
|
|
27
|
+
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); }; }
|
|
27
28
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
28
29
|
/**
|
|
29
30
|
* 逻辑控制器:内部状态。
|
|
30
31
|
*/
|
|
31
32
|
var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
33
|
+
(0, _inherits2["default"])(Controller, _Subscribe);
|
|
34
|
+
var _super = _createSuper(Controller);
|
|
32
35
|
function Controller(_ref) {
|
|
33
36
|
var _this;
|
|
34
37
|
var five = _ref.five,
|
|
35
38
|
container = _ref.container,
|
|
36
39
|
configs = _ref.configs;
|
|
37
40
|
(0, _classCallCheck2["default"])(this, Controller);
|
|
38
|
-
_this =
|
|
39
|
-
(0, _defineProperty2["default"])(_this, "playing", false);
|
|
40
|
-
(0, _defineProperty2["default"])(_this, "ended", false);
|
|
41
|
-
(0, _defineProperty2["default"])(_this, "loading", false);
|
|
42
|
-
|
|
43
|
-
(0, _defineProperty2["default"])(_this, "containerSize", {
|
|
41
|
+
_this = _super.call(this);
|
|
42
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "playing", false);
|
|
43
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "ended", false);
|
|
44
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "loading", false);
|
|
45
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "containerSize", {
|
|
44
46
|
width: 0,
|
|
45
47
|
height: 0
|
|
46
48
|
});
|
|
47
|
-
(0, _defineProperty2["default"])(_this, "waveAppearance", null);
|
|
48
|
-
(0, _defineProperty2["default"])(_this, "appearance", {
|
|
49
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "waveAppearance", null);
|
|
50
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "appearance", {
|
|
49
51
|
waveStyle: 'wave'
|
|
50
52
|
});
|
|
51
|
-
(0, _defineProperty2["default"])(_this, "avatar", {});
|
|
52
|
-
(0, _defineProperty2["default"])(_this, "visible", false);
|
|
53
|
-
(0, _defineProperty2["default"])(_this, "popUp", null);
|
|
54
|
-
(0, _defineProperty2["default"])(_this, "drawerConfig", null);
|
|
53
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "avatar", {});
|
|
54
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "visible", false);
|
|
55
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "popUp", null);
|
|
56
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "drawerConfig", null);
|
|
55
57
|
_this.configs = configs;
|
|
56
58
|
_this.container = container;
|
|
57
59
|
_this.five = five;
|
|
58
60
|
_this.appSize = configs.appSize;
|
|
59
61
|
_this.appearance = _objectSpread(_objectSpread({}, _this.appearance), configs.appearance);
|
|
60
|
-
(0, _mobx.makeObservable)(_this, {
|
|
62
|
+
(0, _mobx.makeObservable)((0, _assertThisInitialized2["default"])(_this), {
|
|
61
63
|
visible: _mobx.observable,
|
|
62
64
|
setVisible: _mobx.action,
|
|
63
65
|
playing: _mobx.observable,
|
|
@@ -161,10 +163,12 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
161
163
|
});
|
|
162
164
|
return _this;
|
|
163
165
|
}
|
|
164
|
-
(0,
|
|
165
|
-
return (0, _createClass2["default"])(Controller, [{
|
|
166
|
+
(0, _createClass2["default"])(Controller, [{
|
|
166
167
|
key: "agentType",
|
|
167
|
-
get:
|
|
168
|
+
get:
|
|
169
|
+
// null 表示加载失败
|
|
170
|
+
|
|
171
|
+
function get() {
|
|
168
172
|
var _this$videoAgentScene, _this$avatar;
|
|
169
173
|
var type = (0, _getMediaInfo.getMediaType)((_this$videoAgentScene = this.videoAgentScene) === null || _this$videoAgentScene === void 0 ? void 0 : _this$videoAgentScene.videoAgentMesh.videoUrl);
|
|
170
174
|
if ((_this$avatar = this.avatar) !== null && _this$avatar !== void 0 && _this$avatar.force) return 'avatar';
|
|
@@ -280,7 +284,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
280
284
|
if ((_this$mediaInstance = this.mediaInstance) !== null && _this$mediaInstance !== void 0 && _this$mediaInstance.ended && this.mediaInstance.currentTime !== 0) {
|
|
281
285
|
var _this$vreoUnit;
|
|
282
286
|
if (this.ended) return;
|
|
283
|
-
(_this$vreoUnit = this.vreoUnit) === null || _this$vreoUnit === void 0
|
|
287
|
+
(_this$vreoUnit = this.vreoUnit) === null || _this$vreoUnit === void 0 ? void 0 : _this$vreoUnit.keyframes.forEach(function (keyframe) {
|
|
284
288
|
return keyframe.parsed = false;
|
|
285
289
|
});
|
|
286
290
|
this.setEnded(true);
|
|
@@ -293,7 +297,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
293
297
|
var _this$mediaInstance2;
|
|
294
298
|
if (!((_this$mediaInstance2 = this.mediaInstance) !== null && _this$mediaInstance2 !== void 0 && _this$mediaInstance2.paused)) {
|
|
295
299
|
var _this$mediaInstance3;
|
|
296
|
-
(_this$mediaInstance3 = this.mediaInstance) === null || _this$mediaInstance3 === void 0
|
|
300
|
+
(_this$mediaInstance3 = this.mediaInstance) === null || _this$mediaInstance3 === void 0 ? void 0 : _this$mediaInstance3.pause();
|
|
297
301
|
}
|
|
298
302
|
return;
|
|
299
303
|
}
|
|
@@ -324,7 +328,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
324
328
|
value: function clear() {
|
|
325
329
|
var _this$vreoUnit2, _this$stopInterval;
|
|
326
330
|
this.setPlaying(false);
|
|
327
|
-
(_this$vreoUnit2 = this.vreoUnit) === null || _this$vreoUnit2 === void 0
|
|
331
|
+
(_this$vreoUnit2 = this.vreoUnit) === null || _this$vreoUnit2 === void 0 ? void 0 : _this$vreoUnit2.keyframes.forEach(function (keyframe) {
|
|
328
332
|
return keyframe.parsed = false;
|
|
329
333
|
});
|
|
330
334
|
|
|
@@ -336,7 +340,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
336
340
|
this.mediaInstance.pause();
|
|
337
341
|
this.mediaInstance.currentTime = 0;
|
|
338
342
|
}
|
|
339
|
-
(_this$stopInterval = this.stopInterval) === null || _this$stopInterval === void 0
|
|
343
|
+
(_this$stopInterval = this.stopInterval) === null || _this$stopInterval === void 0 ? void 0 : _this$stopInterval.call(this);
|
|
340
344
|
this.stopInterval = undefined;
|
|
341
345
|
}
|
|
342
346
|
}, {
|
|
@@ -345,5 +349,6 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
345
349
|
this.clear();
|
|
346
350
|
}
|
|
347
351
|
}]);
|
|
352
|
+
return Controller;
|
|
348
353
|
}(_five.Subscribe);
|
|
349
354
|
var ControllerContext = exports.ControllerContext = /*#__PURE__*/React.createContext(null);
|
|
@@ -13,7 +13,7 @@ var _three = require("three");
|
|
|
13
13
|
var _BetterTween = require("../../../shared-utils/animationFrame/BetterTween");
|
|
14
14
|
var _CSS3DRenderPlugin = require("../../../fivePlugins/CSS3DRenderPlugin");
|
|
15
15
|
var _VreoUnit = require("../../../typings/VreoUnit");
|
|
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
|
// __debug__
|
|
18
18
|
// const mockData: SpatialScenePanelData = {
|
|
19
19
|
// customType: 'SpatialScenePanel',
|
|
@@ -140,15 +140,15 @@ function SpatialScenePanel(props) {
|
|
|
140
140
|
var progress = _ref4.progress;
|
|
141
141
|
var needRotateY = Math.PI / 90 * 11 * progress;
|
|
142
142
|
var rotateY = needRotateY - lastRotateY;
|
|
143
|
-
css3DObject === null || css3DObject === void 0
|
|
143
|
+
css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.rotateY(rotateY);
|
|
144
144
|
// css3DObject?.rotateZ
|
|
145
145
|
lastRotateY = needRotateY;
|
|
146
146
|
}).onStart(function () {
|
|
147
|
-
css3DObject === null || css3DObject === void 0
|
|
147
|
+
css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.rotateY(startRotateY);
|
|
148
148
|
render();
|
|
149
149
|
}).onDispose(function () {
|
|
150
150
|
var _panelRef$current;
|
|
151
|
-
(_panelRef$current = panelRef.current) === null || _panelRef$current === void 0
|
|
151
|
+
(_panelRef$current = panelRef.current) === null || _panelRef$current === void 0 ? void 0 : _panelRef$current.classList.add('show');
|
|
152
152
|
}).play();
|
|
153
153
|
|
|
154
154
|
// Object.assign(window, { $dispose: () => {
|
|
@@ -160,9 +160,9 @@ function SpatialScenePanel(props) {
|
|
|
160
160
|
end = keyframe.end;
|
|
161
161
|
timeoutRef.current = setTimeout(function () {
|
|
162
162
|
var _panelRef$current2;
|
|
163
|
-
(_panelRef$current2 = panelRef.current) === null || _panelRef$current2 === void 0
|
|
163
|
+
(_panelRef$current2 = panelRef.current) === null || _panelRef$current2 === void 0 ? void 0 : _panelRef$current2.classList.add('hide');
|
|
164
164
|
timeoutRef.current = setTimeout(function () {
|
|
165
|
-
dispose === null || dispose === void 0
|
|
165
|
+
dispose === null || dispose === void 0 ? void 0 : dispose();
|
|
166
166
|
timeoutRef.current = null;
|
|
167
167
|
}, 1500);
|
|
168
168
|
}, end - start);
|
|
@@ -194,10 +194,10 @@ function SpatialScenePanelBg() {
|
|
|
194
194
|
if (!ref.current) return;
|
|
195
195
|
var listener = function listener() {
|
|
196
196
|
var _ref$current;
|
|
197
|
-
(_ref$current = ref.current) === null || _ref$current === void 0
|
|
197
|
+
(_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setAttribute('class', 'SpatialScenePanel-bg');
|
|
198
198
|
timeoutRef.current = setTimeout(function () {
|
|
199
199
|
var _ref$current2;
|
|
200
|
-
(_ref$current2 = ref.current) === null || _ref$current2 === void 0
|
|
200
|
+
(_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.setAttribute('class', 'SpatialScenePanel-bg SpatialScenePanel-bg--animation');
|
|
201
201
|
timeoutRef.current = null;
|
|
202
202
|
}, 3000);
|
|
203
203
|
};
|
|
@@ -213,7 +213,7 @@ function SpatialScenePanelBg() {
|
|
|
213
213
|
});
|
|
214
214
|
}
|
|
215
215
|
var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
|
|
216
|
-
var _props$data, _props$data2, _props$data3;
|
|
216
|
+
var _props$data, _props$data2, _props$data3, _props$data3$stateLis;
|
|
217
217
|
return /*#__PURE__*/React.createElement("div", {
|
|
218
218
|
className: "SpatialScenePanel",
|
|
219
219
|
ref: myRef
|
|
@@ -227,7 +227,7 @@ var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
|
|
|
227
227
|
className: "SpatialScenePanel-temperature"
|
|
228
228
|
}, (_props$data2 = props.data) === null || _props$data2 === void 0 ? void 0 : _props$data2.temperature, "\u2103")), /*#__PURE__*/React.createElement("div", {
|
|
229
229
|
className: "SpatialScenePanel-body"
|
|
230
|
-
}, (_props$data3 = props.data) === null || _props$data3 === void 0
|
|
230
|
+
}, (_props$data3 = props.data) === null || _props$data3 === void 0 ? void 0 : (_props$data3$stateLis = _props$data3.stateList) === null || _props$data3$stateLis === void 0 ? void 0 : _props$data3$stateLis.map(function (state, index) {
|
|
231
231
|
return /*#__PURE__*/React.createElement("div", {
|
|
232
232
|
key: "scene-".concat(state.text),
|
|
233
233
|
className: "SpatialScenePanel-item index_".concat(index)
|