@realsee/vreo 2.5.0 → 2.6.0
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 +5 -12
- package/lib/PlayController/index.js +27 -34
- package/lib/Player/App.js +25 -34
- package/lib/Player/Controller.js +66 -74
- package/lib/Player/custom/SpatialScenePanel/index.js +20 -31
- package/lib/Player/hooks.js +6 -15
- package/lib/Player/index.js +36 -44
- package/lib/Player/modules/Drawer/index.js +8 -17
- package/lib/Player/modules/PopUp/index.js +8 -17
- package/lib/Player/modules/ResizeObserver/index.js +10 -17
- package/lib/Player/modules/VideoAgent/VideoAgentMesh.js +33 -41
- package/lib/Player/modules/VideoAgent/VideoAgentScene.js +16 -25
- package/lib/Player/modules/VideoAgent/index.js +8 -17
- package/lib/Player/modules/Wave/index.js +24 -33
- package/lib/Player/modules/keyframes/BgMusic/index.js +13 -22
- package/lib/Player/modules/keyframes/CameraMovement/index.js +17 -26
- package/lib/Player/modules/keyframes/InfoPanel/index.js +13 -21
- package/lib/Player/modules/keyframes/ModelVideo/index.js +17 -26
- package/lib/Player/modules/keyframes/PanoEffect/index.js +21 -30
- package/lib/Player/modules/keyframes/PanoEffect/lineAnime.js +6 -14
- package/lib/Player/modules/keyframes/PanoTag/index.js +10 -18
- package/lib/Player/modules/keyframes/PanoTextLabel/index.js +19 -28
- package/lib/Player/modules/keyframes/Prompter/index.js +13 -22
- package/lib/Player/modules/keyframes/UpdateVRPanorama/index.js +16 -24
- package/lib/Player/modules/keyframes/VideoEffect/index.js +17 -27
- package/lib/Player/typings.js +1 -5
- package/lib/fivePlugins/CSS3DRenderPlugin/centerPoint.js +3 -9
- package/lib/fivePlugins/CSS3DRenderPlugin/createResizeObserver.js +1 -7
- package/lib/fivePlugins/CSS3DRenderPlugin/evenNumber.js +1 -7
- package/lib/fivePlugins/CSS3DRenderPlugin/index.js +27 -37
- package/lib/fivePlugins/CSS3DRenderPlugin/transformPositionToVector3.js +3 -9
- package/lib/fivePlugins/CameraMovementPlugin/index.js +15 -22
- package/lib/fivePlugins/CameraMovementPlugin/typings.js +6 -10
- package/lib/fivePlugins/ModelTVVideoPlugin/index.js +9 -18
- package/lib/index.js +1 -12
- package/lib/react/index.js +12 -24
- package/lib/shared-utils/Audio.js +27 -37
- package/lib/shared-utils/AudioLike.js +22 -29
- package/lib/shared-utils/Preloader.js +1 -7
- package/lib/shared-utils/addResizeListener.js +4 -11
- package/lib/shared-utils/animationFrame/BetterTween.js +23 -33
- package/lib/shared-utils/animationFrame/index.js +4 -13
- package/lib/shared-utils/animationFrame/tween.js +9 -17
- package/lib/shared-utils/createTransMatrix.js +5 -14
- package/lib/shared-utils/getFileExpandedName.js +1 -7
- package/lib/shared-utils/getMediaInfo.js +8 -19
- package/lib/shared-utils/setElementDataset.js +1 -7
- package/lib/typings/VreoUnit.js +15 -17
- package/package.json +58 -5
|
@@ -1,14 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.createHTMLAudioElement = createHTMLAudioElement;
|
|
8
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
1
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
2
|
+
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
10
3
|
var BLANK_AUDIO = '' + 'data:audio/mpeg;base64,' + '//uQxAAAAAAAAAAAAAAAAAAAAAAASW5mbwAAAA8AAAADAAAGhgBVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVWqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqr///////////' + '////////////////////////////////8AAAA5TEFNRTMuOThyAc0AAAAAAAAAABSAJAiqQgAAg' + 'AAABobxtI73AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//uQxAACFEII9ACZ/sJZwWEoEb8w/////N//////Jcxj' + 'Hjf+7/v/H2PzCCFAiDtGeyBCIx7bJJ1mmEEMy6g8mm2c8nrGABB4h2Mkmn//4z/73u773R5qHHu' + '/j/w7Kxkzh5lWRWdsifCkNAnY9Zc1HvDAhjhSHdFkHFzLmabt/AQxSg2wwzLhHIJOBnAWwVY4zr' + 'hIYhhc2kvhYDfQ4hDi2Gmh5KyFn8EcGIrHAngNgIwVIEMf5bzbAiTRoAD///8z/KVhkkWEle6IX' + '+d/z4fvH3BShK1e5kmjkCMoxVmXhd4ROlTKo3iipasvTilY21q19ta30/v/0/idPX1v8PNxJL6r' + 'amnOVsdvMv2akO0iSYIzdJFirtzWXCZicS9vHqvSKyqm5XJBdqBwPxyfJdykhWTZ0G0ZyTZGpLK' + 'xsNwwoRhsx3tZfhwmeOBVISm3impAC/IT/8hP/EKEM1KMdVdVKM2rHV4x7HVXZvbVVKN/qq8CiV' + '9VL9jjH/6l6qf7MBCjZmOqsAibjcP+qqqv0oxqpa/NVW286hPo1nz2L/h8+jXt//uSxCmDU2IK/' + 'ECN98KKtE5IYzNoCfbw+u9i5r8PoadUMFPKqWL4LK3T/LCraMSHGkW4bpLXR/E6LlHOVQxmslKV' + 'J8IULktMN06N0FKCpHCoYsjC4F+Z0NVqdNFoGSTjSiyjzLdnZ2fNqTi2eHKONONKLMPMKLONKLM' + 'PQRJGlFxZRoKcJFAYEeIFiRQkUWUeYfef//Ko04soswso40UJAgMw8wosososy0EalnZyjQUGBR' + 'QGIFggOWUacWUeYmuadrZziQKKEgQsQLAhQkUJAgMQDghltLO1onp0cpkNInSFMqlYeSEJ5AHsq' + 'FdOwy1DA2sRmRJKxdKRfLhfLw5BzUxBTUUzLjk4LjJVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVUxBTUUzLjk4LjJVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVf/7ksRRA8AAAaQAAAAgAAA0gAAABFVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVU=';
|
|
11
|
-
function createHTMLAudioElement() {
|
|
4
|
+
export function createHTMLAudioElement() {
|
|
12
5
|
var ndAudio = document.querySelector('#vreo-playController-audio');
|
|
13
6
|
if (ndAudio) {
|
|
14
7
|
return ndAudio;
|
|
@@ -21,8 +14,8 @@ function createHTMLAudioElement() {
|
|
|
21
14
|
audio.src = BLANK_AUDIO;
|
|
22
15
|
|
|
23
16
|
// 触发一次播放
|
|
24
|
-
Promise.resolve(/*#__PURE__*/(
|
|
25
|
-
return
|
|
17
|
+
Promise.resolve(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
|
18
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
26
19
|
while (1) {
|
|
27
20
|
switch (_context.prev = _context.next) {
|
|
28
21
|
case 0:
|
|
@@ -1,36 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
var
|
|
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"));
|
|
14
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
15
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
16
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
17
|
-
var _five = require("@realsee/five");
|
|
18
|
-
var _animationFrame = require("../shared-utils/animationFrame");
|
|
19
|
-
var _createHTMLAudioElement = require("./createHTMLAudioElement");
|
|
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); }; }
|
|
1
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
2
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
|
+
import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
|
|
5
|
+
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
6
|
+
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
7
|
+
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
8
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
9
|
+
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
10
|
+
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
|
|
21
11
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
12
|
+
import { Subscribe } from '@realsee/five';
|
|
13
|
+
import { requestAnimationFrameInterval } from "../shared-utils/animationFrame/index.js";
|
|
14
|
+
import { createHTMLAudioElement } from "./createHTMLAudioElement.js";
|
|
22
15
|
var closures = {};
|
|
23
|
-
var PlayController =
|
|
24
|
-
(
|
|
16
|
+
export var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
17
|
+
_inherits(PlayController, _Subscribe);
|
|
25
18
|
var _super = _createSuper(PlayController);
|
|
26
19
|
function PlayController() {
|
|
27
20
|
var _this;
|
|
28
21
|
var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
29
|
-
(
|
|
22
|
+
_classCallCheck(this, PlayController);
|
|
30
23
|
_this = _super.call(this);
|
|
31
|
-
(
|
|
24
|
+
_defineProperty(_assertThisInitialized(_this), "config", {});
|
|
32
25
|
if (!config.audio) {
|
|
33
|
-
config.audio =
|
|
26
|
+
config.audio = createHTMLAudioElement();
|
|
34
27
|
}
|
|
35
28
|
_this.config = Object.assign(_this.config, config);
|
|
36
29
|
closures.onPlaying = function () {
|
|
@@ -45,7 +38,7 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
45
38
|
_this.audioInstance.addEventListener('play', closures.onPlaying);
|
|
46
39
|
_this.audioInstance.addEventListener('pause', closures.onPaused);
|
|
47
40
|
_this.audioInstance.addEventListener('ended', closures.onEnded);
|
|
48
|
-
_this.stopInterval =
|
|
41
|
+
_this.stopInterval = requestAnimationFrameInterval(function () {
|
|
49
42
|
if (_this.audioInstance.paused) {
|
|
50
43
|
return;
|
|
51
44
|
}
|
|
@@ -72,7 +65,7 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
72
65
|
/**
|
|
73
66
|
* 载入数据
|
|
74
67
|
*/
|
|
75
|
-
(
|
|
68
|
+
_createClass(PlayController, [{
|
|
76
69
|
key: "paused",
|
|
77
70
|
get: function get() {
|
|
78
71
|
return this.audioInstance.paused;
|
|
@@ -112,9 +105,9 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
112
105
|
}, {
|
|
113
106
|
key: "load",
|
|
114
107
|
value: (function () {
|
|
115
|
-
var _load = (
|
|
108
|
+
var _load = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(vreoUnit) {
|
|
116
109
|
var _this3 = this;
|
|
117
|
-
return
|
|
110
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
118
111
|
while (1) {
|
|
119
112
|
switch (_context.prev = _context.next) {
|
|
120
113
|
case 0:
|
|
@@ -160,8 +153,8 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
160
153
|
}, {
|
|
161
154
|
key: "play",
|
|
162
155
|
value: (function () {
|
|
163
|
-
var _play = (
|
|
164
|
-
return
|
|
156
|
+
var _play = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
|
157
|
+
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
165
158
|
while (1) {
|
|
166
159
|
switch (_context2.prev = _context2.next) {
|
|
167
160
|
case 0:
|
|
@@ -185,8 +178,8 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
185
178
|
}, {
|
|
186
179
|
key: "pause",
|
|
187
180
|
value: (function () {
|
|
188
|
-
var _pause = (
|
|
189
|
-
return
|
|
181
|
+
var _pause = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
|
|
182
|
+
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
|
190
183
|
while (1) {
|
|
191
184
|
switch (_context3.prev = _context3.next) {
|
|
192
185
|
case 0:
|
|
@@ -230,4 +223,4 @@ var PlayController = exports.PlayController = /*#__PURE__*/function (_Subscribe)
|
|
|
230
223
|
}
|
|
231
224
|
}]);
|
|
232
225
|
return PlayController;
|
|
233
|
-
}(
|
|
226
|
+
}(Subscribe);
|
package/lib/Player/App.js
CHANGED
|
@@ -1,43 +1,34 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
var
|
|
19
|
-
var _PanoTextLabel = require("./modules/keyframes/PanoTextLabel");
|
|
20
|
-
var _Prompter = require("./modules/keyframes/Prompter");
|
|
21
|
-
var _UpdateVRPanorama = require("./modules/keyframes/UpdateVRPanorama");
|
|
22
|
-
var _VideoEffect = require("./modules/keyframes/VideoEffect");
|
|
23
|
-
var _VideoAgent = require("./modules/VideoAgent");
|
|
24
|
-
var _BgMusic = require("./modules/keyframes/BgMusic");
|
|
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); }
|
|
27
|
-
var AppView = (0, _mobxReact.observer)(function (_ref) {
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import classNames from 'classnames';
|
|
3
|
+
import { observer } from 'mobx-react';
|
|
4
|
+
import { useController } from "./hooks.js";
|
|
5
|
+
import { CameraMovement } from "./modules/keyframes/CameraMovement/index.js";
|
|
6
|
+
import { ResizeObserver } from "./modules/ResizeObserver/index.js";
|
|
7
|
+
import { InfoPanel } from "./modules/keyframes/InfoPanel/index.js";
|
|
8
|
+
import { ModelVideo } from "./modules/keyframes/ModelVideo/index.js";
|
|
9
|
+
import { PanoEffect } from "./modules/keyframes/PanoEffect/index.js";
|
|
10
|
+
import { PanoTag } from "./modules/keyframes/PanoTag/index.js";
|
|
11
|
+
import { PanoTextLabel } from "./modules/keyframes/PanoTextLabel/index.js";
|
|
12
|
+
import { Prompter } from "./modules/keyframes/Prompter/index.js";
|
|
13
|
+
import { UpdateVRPanorama } from "./modules/keyframes/UpdateVRPanorama/index.js";
|
|
14
|
+
import { VideoEffect } from "./modules/keyframes/VideoEffect/index.js";
|
|
15
|
+
import { VideoAgent } from "./modules/VideoAgent/index.js";
|
|
16
|
+
import { BgMusic } from "./modules/keyframes/BgMusic/index.js";
|
|
17
|
+
import { Wave } from "./modules/Wave/index.js";
|
|
18
|
+
var AppView = observer(function (_ref) {
|
|
28
19
|
var _controller$configs, _controller$waveAppea, _controller$configs3, _controller$configs4;
|
|
29
20
|
var controller = _ref.controller;
|
|
30
21
|
return /*#__PURE__*/React.createElement("div", {
|
|
31
|
-
className: (
|
|
22
|
+
className: classNames('vreo-panel', {
|
|
32
23
|
'vreo-panel--hidden': !controller.visible
|
|
33
24
|
})
|
|
34
25
|
}, /*#__PURE__*/React.createElement("div", {
|
|
35
26
|
className: "vreo-panel-inner"
|
|
36
|
-
}, /*#__PURE__*/React.createElement(
|
|
27
|
+
}, /*#__PURE__*/React.createElement(Wave, {
|
|
37
28
|
onClick: (_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : _controller$configs.onWaveClick,
|
|
38
29
|
appearance: (_controller$waveAppea = controller.waveAppearance) !== null && _controller$waveAppea !== void 0 ? _controller$waveAppea : 'single',
|
|
39
30
|
staticPrefix: controller.configs.waveStaticPrefix
|
|
40
|
-
}), /*#__PURE__*/React.createElement(
|
|
31
|
+
}), /*#__PURE__*/React.createElement(VideoAgent, {
|
|
41
32
|
onClick: function onClick() {
|
|
42
33
|
var _controller$configs2;
|
|
43
34
|
if ((_controller$configs2 = controller.configs) !== null && _controller$configs2 !== void 0 && _controller$configs2.onAvatarClick) {
|
|
@@ -51,11 +42,11 @@ var AppView = (0, _mobxReact.observer)(function (_ref) {
|
|
|
51
42
|
}
|
|
52
43
|
},
|
|
53
44
|
options: ((_controller$configs3 = controller.configs) === null || _controller$configs3 === void 0 ? void 0 : _controller$configs3.videoAgentMeshOptions) || {}
|
|
54
|
-
}), /*#__PURE__*/React.createElement(
|
|
45
|
+
}), /*#__PURE__*/React.createElement(Prompter, null), (_controller$configs4 = controller.configs) === null || _controller$configs4 === void 0 ? void 0 : _controller$configs4.customPanelChildren));
|
|
55
46
|
});
|
|
56
|
-
function App() {
|
|
57
|
-
var controller =
|
|
58
|
-
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(
|
|
47
|
+
export function App() {
|
|
48
|
+
var controller = useController();
|
|
49
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ResizeObserver, null), /*#__PURE__*/React.createElement(CameraMovement, null), /*#__PURE__*/React.createElement(ModelVideo, null), /*#__PURE__*/React.createElement(UpdateVRPanorama, null), /*#__PURE__*/React.createElement(VideoEffect, null), /*#__PURE__*/React.createElement(PanoTag, null), /*#__PURE__*/React.createElement(PanoTextLabel, null), /*#__PURE__*/React.createElement(InfoPanel, null), /*#__PURE__*/React.createElement(PanoEffect, null), /*#__PURE__*/React.createElement(BgMusic, null)), /*#__PURE__*/React.createElement(AppView, {
|
|
59
50
|
controller: controller
|
|
60
51
|
}));
|
|
61
52
|
}
|
package/lib/Player/Controller.js
CHANGED
|
@@ -1,31 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
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"));
|
|
14
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
15
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
16
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
17
|
-
var _five = require("@realsee/five");
|
|
18
|
-
var _mobx = require("mobx");
|
|
19
|
-
var React = _interopRequireWildcard(require("react"));
|
|
20
|
-
var _animationFrame = require("../shared-utils/animationFrame");
|
|
21
|
-
var _VreoUnit = require("../typings/VreoUnit");
|
|
22
|
-
var _setElementDataset = _interopRequireDefault(require("../shared-utils/setElementDataset"));
|
|
23
|
-
var _getMediaInfo = require("../shared-utils/getMediaInfo");
|
|
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); }
|
|
1
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
|
+
import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
|
|
5
|
+
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
6
|
+
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
7
|
+
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
8
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
25
9
|
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; }
|
|
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) { (
|
|
27
|
-
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (
|
|
10
|
+
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) { _defineProperty(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; }
|
|
11
|
+
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
|
|
28
12
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
13
|
+
import { Subscribe } from '@realsee/five';
|
|
14
|
+
import { action, makeObservable, observable, reaction } from 'mobx';
|
|
15
|
+
import * as React from 'react';
|
|
16
|
+
import { requestAnimationFrameInterval } from "../shared-utils/animationFrame/index.js";
|
|
17
|
+
import { VreoKeyframeEnum } from "../typings/VreoUnit.js";
|
|
18
|
+
import setElementDataset from "../shared-utils/setElementDataset.js";
|
|
19
|
+
import { getMediaType } from "../shared-utils/getMediaInfo.js";
|
|
29
20
|
/**
|
|
30
21
|
* Vreo 播放器逻辑控制器
|
|
31
22
|
*
|
|
@@ -50,8 +41,8 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
50
41
|
* controller.openDrawer({ content: '抽屉内容', height: 300 })
|
|
51
42
|
* ```
|
|
52
43
|
*/
|
|
53
|
-
var Controller =
|
|
54
|
-
(
|
|
44
|
+
export var Controller = /*#__PURE__*/function (_Subscribe) {
|
|
45
|
+
_inherits(Controller, _Subscribe);
|
|
55
46
|
var _super = _createSuper(Controller);
|
|
56
47
|
/**
|
|
57
48
|
* 创建 Controller 实例
|
|
@@ -65,55 +56,55 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
65
56
|
var five = _ref.five,
|
|
66
57
|
container = _ref.container,
|
|
67
58
|
configs = _ref.configs;
|
|
68
|
-
(
|
|
59
|
+
_classCallCheck(this, Controller);
|
|
69
60
|
_this = _super.call(this);
|
|
70
|
-
(
|
|
71
|
-
(
|
|
72
|
-
(
|
|
73
|
-
(
|
|
61
|
+
_defineProperty(_assertThisInitialized(_this), "playing", false);
|
|
62
|
+
_defineProperty(_assertThisInitialized(_this), "ended", false);
|
|
63
|
+
_defineProperty(_assertThisInitialized(_this), "loading", false);
|
|
64
|
+
_defineProperty(_assertThisInitialized(_this), "containerSize", {
|
|
74
65
|
width: 0,
|
|
75
66
|
height: 0
|
|
76
67
|
});
|
|
77
|
-
(
|
|
78
|
-
(
|
|
68
|
+
_defineProperty(_assertThisInitialized(_this), "waveAppearance", null);
|
|
69
|
+
_defineProperty(_assertThisInitialized(_this), "appearance", {
|
|
79
70
|
waveStyle: 'wave'
|
|
80
71
|
});
|
|
81
|
-
(
|
|
82
|
-
(
|
|
83
|
-
(
|
|
84
|
-
(
|
|
72
|
+
_defineProperty(_assertThisInitialized(_this), "avatar", {});
|
|
73
|
+
_defineProperty(_assertThisInitialized(_this), "visible", false);
|
|
74
|
+
_defineProperty(_assertThisInitialized(_this), "popUp", null);
|
|
75
|
+
_defineProperty(_assertThisInitialized(_this), "drawerConfig", null);
|
|
85
76
|
_this.configs = configs;
|
|
86
77
|
_this.container = container;
|
|
87
78
|
_this.five = five;
|
|
88
79
|
_this.appSize = configs.appSize;
|
|
89
80
|
_this.appearance = _objectSpread(_objectSpread({}, _this.appearance), configs.appearance);
|
|
90
|
-
|
|
91
|
-
visible:
|
|
92
|
-
setVisible:
|
|
93
|
-
playing:
|
|
94
|
-
setPlaying:
|
|
95
|
-
loading:
|
|
81
|
+
makeObservable(_assertThisInitialized(_this), {
|
|
82
|
+
visible: observable,
|
|
83
|
+
setVisible: action,
|
|
84
|
+
playing: observable,
|
|
85
|
+
setPlaying: action,
|
|
86
|
+
loading: observable,
|
|
96
87
|
// videoAgentScene: observable.ref,
|
|
97
|
-
setLoading:
|
|
98
|
-
popUp:
|
|
99
|
-
openPopUp:
|
|
100
|
-
drawerConfig:
|
|
101
|
-
openDrawer:
|
|
102
|
-
ended:
|
|
103
|
-
waveAppearance:
|
|
104
|
-
avatar:
|
|
105
|
-
containerSize:
|
|
106
|
-
setContainerSize:
|
|
107
|
-
appearance:
|
|
108
|
-
setAppearance:
|
|
109
|
-
configs:
|
|
110
|
-
setEnded:
|
|
111
|
-
setAvatar:
|
|
88
|
+
setLoading: action,
|
|
89
|
+
popUp: observable.ref,
|
|
90
|
+
openPopUp: action,
|
|
91
|
+
drawerConfig: observable.ref,
|
|
92
|
+
openDrawer: action,
|
|
93
|
+
ended: observable,
|
|
94
|
+
waveAppearance: observable,
|
|
95
|
+
avatar: observable,
|
|
96
|
+
containerSize: observable,
|
|
97
|
+
setContainerSize: action,
|
|
98
|
+
appearance: observable,
|
|
99
|
+
setAppearance: action,
|
|
100
|
+
configs: observable.ref,
|
|
101
|
+
setEnded: action,
|
|
102
|
+
setAvatar: action
|
|
112
103
|
});
|
|
113
|
-
|
|
104
|
+
reaction(function () {
|
|
114
105
|
return [_this.appearance.waveStyle, _this.loading];
|
|
115
106
|
}, function (_ref2) {
|
|
116
|
-
var _ref3 = (
|
|
107
|
+
var _ref3 = _slicedToArray(_ref2, 2),
|
|
117
108
|
waveStyle = _ref3[0],
|
|
118
109
|
loading = _ref3[1];
|
|
119
110
|
if (loading === null) {
|
|
@@ -143,7 +134,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
143
134
|
fireImmediately: true
|
|
144
135
|
});
|
|
145
136
|
if (!_this.appSize) {
|
|
146
|
-
|
|
137
|
+
reaction(function () {
|
|
147
138
|
return _this.containerSize;
|
|
148
139
|
}, function (containerSize) {
|
|
149
140
|
if (!(containerSize !== null && containerSize !== void 0 && containerSize.width)) return;
|
|
@@ -159,30 +150,30 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
159
150
|
if (height > width) return 'portrait';
|
|
160
151
|
return 'landscape';
|
|
161
152
|
}();
|
|
162
|
-
(
|
|
153
|
+
setElementDataset(_this.container, {
|
|
163
154
|
size: size
|
|
164
155
|
});
|
|
165
|
-
(
|
|
156
|
+
setElementDataset(_this.container, {
|
|
166
157
|
orientation: orientation
|
|
167
158
|
});
|
|
168
159
|
}, {
|
|
169
160
|
fireImmediately: true
|
|
170
161
|
});
|
|
171
162
|
} else {
|
|
172
|
-
(
|
|
163
|
+
setElementDataset(_this.container, {
|
|
173
164
|
size: _this.appSize
|
|
174
165
|
});
|
|
175
166
|
}
|
|
176
167
|
|
|
177
168
|
// 监听播放情况:抛出触发时机
|
|
178
|
-
|
|
169
|
+
reaction(function () {
|
|
179
170
|
return _this.ended;
|
|
180
171
|
}, function (ended) {
|
|
181
172
|
if (ended) {
|
|
182
173
|
_this.emit('paused', true);
|
|
183
174
|
}
|
|
184
175
|
});
|
|
185
|
-
|
|
176
|
+
reaction(function () {
|
|
186
177
|
return _this.playing;
|
|
187
178
|
}, function (playing) {
|
|
188
179
|
if (!_this.ended) {
|
|
@@ -196,7 +187,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
196
187
|
* 获取播放器是否准备就绪
|
|
197
188
|
* @returns 是否有可用的视频代理场景
|
|
198
189
|
*/
|
|
199
|
-
(
|
|
190
|
+
_createClass(Controller, [{
|
|
200
191
|
key: "agentType",
|
|
201
192
|
get:
|
|
202
193
|
// null 表示加载失败
|
|
@@ -207,7 +198,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
207
198
|
*/
|
|
208
199
|
function get() {
|
|
209
200
|
var _this$videoAgentScene, _this$avatar;
|
|
210
|
-
var type =
|
|
201
|
+
var type = getMediaType((_this$videoAgentScene = this.videoAgentScene) === null || _this$videoAgentScene === void 0 ? void 0 : _this$videoAgentScene.videoAgentMesh.videoUrl);
|
|
211
202
|
if ((_this$avatar = this.avatar) !== null && _this$avatar !== void 0 && _this$avatar.force) return 'avatar';
|
|
212
203
|
if (type === 'video') return 'video';
|
|
213
204
|
return 'none';
|
|
@@ -352,7 +343,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
352
343
|
if (keyframe.end < _this2.currentTime) return false;
|
|
353
344
|
// 检测开始时间
|
|
354
345
|
if (keyframe.start > _this2.currentTime) return false;
|
|
355
|
-
if (keyframe.type ===
|
|
346
|
+
if (keyframe.type === VreoKeyframeEnum.BgMusic) return true;
|
|
356
347
|
// 开始时间低于当前时间戳 100ms
|
|
357
348
|
var dur = _this2.currentTime - keyframe.start;
|
|
358
349
|
return dur <= 100 && dur >= 0;
|
|
@@ -427,7 +418,7 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
427
418
|
value: function run(callback) {
|
|
428
419
|
var _this4 = this;
|
|
429
420
|
if (this.stopInterval) return;
|
|
430
|
-
this.stopInterval =
|
|
421
|
+
this.stopInterval = requestAnimationFrameInterval(function () {
|
|
431
422
|
return _this4.requestAnimationFrameLoop(callback);
|
|
432
423
|
});
|
|
433
424
|
}
|
|
@@ -470,5 +461,6 @@ var Controller = exports.Controller = /*#__PURE__*/function (_Subscribe) {
|
|
|
470
461
|
}
|
|
471
462
|
}]);
|
|
472
463
|
return Controller;
|
|
473
|
-
}(
|
|
474
|
-
var ControllerContext =
|
|
464
|
+
}(Subscribe);
|
|
465
|
+
var ControllerContext = /*#__PURE__*/React.createContext(null);
|
|
466
|
+
export { ControllerContext };
|
|
@@ -1,20 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
exports.SpatialScenePanel = SpatialScenePanel;
|
|
9
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
|
-
var React = _interopRequireWildcard(require("react"));
|
|
11
|
-
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
12
|
-
var _three = require("three");
|
|
13
|
-
var _BetterTween = require("../../../shared-utils/animationFrame/BetterTween");
|
|
14
|
-
var _CSS3DRenderPlugin = require("../../../fivePlugins/CSS3DRenderPlugin");
|
|
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); }
|
|
17
|
-
// __debug__
|
|
1
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
import ReactDOM from 'react-dom';
|
|
4
|
+
import { Raycaster, Vector3 } from 'three';
|
|
5
|
+
import { tweenProgress } from "../../../shared-utils/animationFrame/BetterTween.js";
|
|
6
|
+
import { CSS3DRenderPlugin } from "../../../fivePlugins/CSS3DRenderPlugin/index.js";
|
|
7
|
+
import { VreoKeyframeEnum } from "../../../typings/VreoUnit.js"; // __debug__
|
|
18
8
|
// const mockData: SpatialScenePanelData = {
|
|
19
9
|
// customType: 'SpatialScenePanel',
|
|
20
10
|
// "stateList": [
|
|
@@ -38,7 +28,6 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
38
28
|
// "temperature": "27",
|
|
39
29
|
// "title": "沉浸式回家"
|
|
40
30
|
// }
|
|
41
|
-
|
|
42
31
|
// const getSphere = (position: Vector3, color = 0xffff00) => {
|
|
43
32
|
// const geometry = new SphereGeometry(0.05, 32, 16)
|
|
44
33
|
// const material = new MeshBasicMaterial({ color })
|
|
@@ -50,11 +39,11 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
50
39
|
var searchV1 = function searchV1(_ref) {
|
|
51
40
|
var five = _ref.five,
|
|
52
41
|
dom = _ref.dom;
|
|
53
|
-
var cameraDirection = new
|
|
42
|
+
var cameraDirection = new Vector3();
|
|
54
43
|
five.camera.getWorldDirection(cameraDirection);
|
|
55
44
|
var cameraPosition = five.camera.position;
|
|
56
|
-
var _five$model$intersect = five.model.intersectRaycaster(new
|
|
57
|
-
_five$model$intersect2 = (
|
|
45
|
+
var _five$model$intersect = five.model.intersectRaycaster(new Raycaster(cameraPosition, cameraDirection)),
|
|
46
|
+
_five$model$intersect2 = _slicedToArray(_five$model$intersect, 1),
|
|
58
47
|
intersect = _five$model$intersect2[0];
|
|
59
48
|
var point = five.project2d(intersect.point);
|
|
60
49
|
var widescreen = window.innerWidth > 560 ? true : false;
|
|
@@ -67,10 +56,10 @@ var searchV1 = function searchV1(_ref) {
|
|
|
67
56
|
top = rect.top,
|
|
68
57
|
bottom = rect.bottom,
|
|
69
58
|
right = rect.right;
|
|
70
|
-
var leftBottom = new
|
|
71
|
-
var leftTop = new
|
|
72
|
-
var rightTop = new
|
|
73
|
-
var rightBottom = new
|
|
59
|
+
var leftBottom = new Vector3(left, bottom);
|
|
60
|
+
var leftTop = new Vector3(left, top);
|
|
61
|
+
var rightTop = new Vector3(right, top);
|
|
62
|
+
var rightBottom = new Vector3(right, bottom);
|
|
74
63
|
var points = [leftBottom, rightBottom, rightTop, leftTop].map(function (point) {
|
|
75
64
|
point.setX(point.x / window.innerWidth * 2 - (widescreen ? 1.25 : 1.75));
|
|
76
65
|
point.setY(-(point.y / window.innerHeight) * 2 + (widescreen ? 1.35 : 1.125));
|
|
@@ -94,11 +83,11 @@ var searchV1 = function searchV1(_ref) {
|
|
|
94
83
|
* 空间场景面板
|
|
95
84
|
* @returns
|
|
96
85
|
*/
|
|
97
|
-
function SpatialScenePanel(props) {
|
|
86
|
+
export function SpatialScenePanel(props) {
|
|
98
87
|
var timeoutRef = React.useRef(null);
|
|
99
88
|
var ref = React.useRef(null);
|
|
100
89
|
var panelRef = React.useRef(null);
|
|
101
|
-
var rendererRef = React.useRef(
|
|
90
|
+
var rendererRef = React.useRef(CSS3DRenderPlugin(props.five));
|
|
102
91
|
React.useEffect(function () {
|
|
103
92
|
if (!ref.current) {
|
|
104
93
|
return;
|
|
@@ -128,7 +117,7 @@ function SpatialScenePanel(props) {
|
|
|
128
117
|
$css3DObject: css3DObject
|
|
129
118
|
});
|
|
130
119
|
if (!container) return;
|
|
131
|
-
|
|
120
|
+
ReactDOM.render(/*#__PURE__*/React.createElement(Panel, {
|
|
132
121
|
ref: function ref(_ref3) {
|
|
133
122
|
return panelRef.current = _ref3;
|
|
134
123
|
},
|
|
@@ -136,7 +125,7 @@ function SpatialScenePanel(props) {
|
|
|
136
125
|
}), container);
|
|
137
126
|
var startRotateY = -(Math.PI * 2) / 9;
|
|
138
127
|
var lastRotateY = 0;
|
|
139
|
-
|
|
128
|
+
tweenProgress(1000).onUpdate(function (_ref4) {
|
|
140
129
|
var progress = _ref4.progress;
|
|
141
130
|
var needRotateY = Math.PI / 90 * 11 * progress;
|
|
142
131
|
var rotateY = needRotateY - lastRotateY;
|
|
@@ -172,9 +161,9 @@ function SpatialScenePanel(props) {
|
|
|
172
161
|
});
|
|
173
162
|
|
|
174
163
|
// setTimeout(() => {callback()}, 8000)
|
|
175
|
-
props.subscribe.on(
|
|
164
|
+
props.subscribe.on(VreoKeyframeEnum.Custom, callback);
|
|
176
165
|
return function () {
|
|
177
|
-
props.subscribe.off(
|
|
166
|
+
props.subscribe.off(VreoKeyframeEnum.Custom, callback);
|
|
178
167
|
if (timeoutRef.current) {
|
|
179
168
|
clearTimeout(timeoutRef.current);
|
|
180
169
|
}
|
package/lib/Player/hooks.js
CHANGED
|
@@ -1,29 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.useController = useController;
|
|
8
|
-
exports.useFiveInstance = useFiveInstance;
|
|
9
|
-
exports.useFiveProject2d = useFiveProject2d;
|
|
10
|
-
var _react = _interopRequireDefault(require("react"));
|
|
11
|
-
var _Controller = require("./Controller");
|
|
12
|
-
function useController() {
|
|
13
|
-
var controller = _react["default"].useContext(_Controller.ControllerContext);
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { ControllerContext } from "./Controller.js";
|
|
3
|
+
export function useController() {
|
|
4
|
+
var controller = React.useContext(ControllerContext);
|
|
14
5
|
if (!controller) {
|
|
15
6
|
throw new Error('没有找到 "ControllerContext"');
|
|
16
7
|
}
|
|
17
8
|
return controller;
|
|
18
9
|
}
|
|
19
|
-
function useFiveInstance() {
|
|
10
|
+
export function useFiveInstance() {
|
|
20
11
|
var controller = useController();
|
|
21
12
|
if (!controller.five) {
|
|
22
13
|
throw new Error('没有找到 "five" 实例');
|
|
23
14
|
}
|
|
24
15
|
return controller.five;
|
|
25
16
|
}
|
|
26
|
-
function useFiveProject2d() {
|
|
17
|
+
export function useFiveProject2d() {
|
|
27
18
|
var five = useFiveInstance();
|
|
28
19
|
return function (vector) {
|
|
29
20
|
return five.project2d(vector, false);
|