@realsee/vreo 1.0.0-alpha.31 → 1.0.0-alpha.33

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.
@@ -57,6 +57,7 @@ export declare class Controller extends Subscribe<VreoKeyframeEvent> {
57
57
  */
58
58
  requestAnimationFrameLoop(callback: (type: VreoKeyframeEnum, keyframe: VreoKeyframe, currentTime: number) => void): void;
59
59
  run(callback: (type: VreoKeyframeEnum, keyframe: VreoKeyframe) => void): void;
60
+ clear(): void;
60
61
  dispose(): void;
61
62
  }
62
63
  declare const ControllerContext: React.Context<Controller | null>;
@@ -332,8 +332,8 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
332
332
  });
333
333
  }
334
334
  }, {
335
- key: "dispose",
336
- value: function dispose() {
335
+ key: "clear",
336
+ value: function clear() {
337
337
  var _this$vreoUnit2, _this$stopInterval;
338
338
  this.setPlaying(false);
339
339
  (_this$vreoUnit2 = this.vreoUnit) === null || _this$vreoUnit2 === void 0 ? void 0 : _this$vreoUnit2.keyframes.forEach(function (keyframe) {
@@ -351,6 +351,11 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
351
351
  (_this$stopInterval = this.stopInterval) === null || _this$stopInterval === void 0 ? void 0 : _this$stopInterval.call(this);
352
352
  this.stopInterval = undefined;
353
353
  }
354
+ }, {
355
+ key: "dispose",
356
+ value: function dispose() {
357
+ this.clear();
358
+ }
354
359
  }]);
355
360
  return Controller;
356
361
  }(_five.Subscribe);
@@ -124,23 +124,24 @@ var Player = /*#__PURE__*/function (_Subscribe) {
124
124
  currentTime = _args.length > 1 && _args[1] !== undefined ? _args[1] : 0;
125
125
  preload = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
126
126
  force = _args.length > 3 && _args[3] !== undefined ? _args[3] : false;
127
+ this.controller.clear();
127
128
  this.controller.setLoading(true);
128
129
  if (force) {
129
130
  vreoUnit = JSON.parse(JSON.stringify(vreoUnit));
130
131
  }
131
132
  if (this.controller.visible) {
132
- _context.next = 9;
133
+ _context.next = 10;
133
134
  break;
134
135
  }
135
136
  this.controller.setVisible(true);
136
137
  // 延迟 500ms 规避跟 DOM 动画冲突
137
- _context.next = 9;
138
+ _context.next = 10;
138
139
  return new Promise(function (resolve) {
139
140
  setTimeout(function () {
140
141
  return resolve(true);
141
142
  }, 500);
142
143
  });
143
- case 9:
144
+ case 10:
144
145
  if (this.controller.stopInterval) {
145
146
  this.controller.stopInterval();
146
147
  this.controller.stopInterval = undefined;
@@ -156,7 +157,7 @@ var Player = /*#__PURE__*/function (_Subscribe) {
156
157
 
157
158
  // 预载数据中的点位
158
159
  if (!(preload || preload === undefined && this.configs.autoPreload)) {
159
- _context.next = 23;
160
+ _context.next = 24;
160
161
  break;
161
162
  }
162
163
  panoIndexMap = vreoUnit.keyframes.filter(function (vreoKeyframe) {
@@ -177,18 +178,18 @@ var Player = /*#__PURE__*/function (_Subscribe) {
177
178
  }, {});
178
179
  panoIndexes = Object.keys(panoIndexMap);
179
180
  i = 0;
180
- case 17:
181
+ case 18:
181
182
  if (!(i < panoIndexes.length)) {
182
- _context.next = 23;
183
+ _context.next = 24;
183
184
  break;
184
185
  }
185
- _context.next = 20;
186
+ _context.next = 21;
186
187
  return this.$five.preloadPano(Number(panoIndexes[i]));
187
- case 20:
188
+ case 21:
188
189
  i++;
189
- _context.next = 17;
190
+ _context.next = 18;
190
191
  break;
191
- case 23:
192
+ case 24:
192
193
  // 新数据载入就绪
193
194
  this.emit('loaded', vreoUnit);
194
195
  this.controller.emit('loaded', vreoUnit);
@@ -196,12 +197,12 @@ var Player = /*#__PURE__*/function (_Subscribe) {
196
197
  this.controller.videoAgentScene.videoAgentMesh.mediaInstance.currentTime = currentTime / 1000;
197
198
  }
198
199
  this.controller.setAvatar(vreoUnit.video.avatar);
199
- _context.next = 29;
200
+ _context.next = 30;
200
201
  return (0, _Audio.waitForBlankAudioGenerated)();
201
- case 29:
202
- _context.next = 31;
202
+ case 30:
203
+ _context.next = 32;
203
204
  return (_this$controller$vide2 = this.controller.videoAgentScene) === null || _this$controller$vide2 === void 0 ? void 0 : _this$controller$vide2.videoAgentMesh.play(vreoUnit.video.url, currentTime / 1000, vreoUnit.video.duration);
204
- case 31:
205
+ case 32:
205
206
  this.controller.setEnded(false);
206
207
  this.play();
207
208
  this.controller.run(function (type, keyframe) {
@@ -209,7 +210,7 @@ var Player = /*#__PURE__*/function (_Subscribe) {
209
210
  });
210
211
  this.controller.setLoading(false);
211
212
  return _context.abrupt("return", true);
212
- case 36:
213
+ case 37:
213
214
  case "end":
214
215
  return _context.stop();
215
216
  }
@@ -274,7 +275,6 @@ var Player = /*#__PURE__*/function (_Subscribe) {
274
275
  }, {
275
276
  key: "dispose",
276
277
  value: function dispose() {
277
- this.pause();
278
278
  this.controller.dispose();
279
279
  if (this.configs.container) {
280
280
  ReactDOM.unmountComponentAtNode(this.configs.container);
@@ -46,7 +46,7 @@ var VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh) {
46
46
  * @param options
47
47
  */
48
48
  function VideoAgentMesh(width, height, widthSegments, heightSegments) {
49
- var _this$options$videoIn, _this$options$videoIn2, _this$options$videoIn3;
49
+ var _this$options$videoIn, _this$options$videoIn2;
50
50
  var _this;
51
51
  var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
52
52
  preload: true
@@ -118,25 +118,20 @@ var VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh) {
118
118
  var onPlay = function onPlay() {
119
119
  return updatePaused(false);
120
120
  };
121
- var onEnded = function onEnded() {
122
- return console.log('vreo: video 播放结束');
123
- };
124
121
  _this.audioInstance.addEventListener('pause', onPause);
125
122
  _this.audioInstance.addEventListener('play', onPlay);
126
123
  (_this$options$videoIn = _this.options.videoInstance) === null || _this$options$videoIn === void 0 ? void 0 : _this$options$videoIn.addEventListener('pause', onPause);
127
124
  (_this$options$videoIn2 = _this.options.videoInstance) === null || _this$options$videoIn2 === void 0 ? void 0 : _this$options$videoIn2.addEventListener('play', onPlay);
128
125
  _this.audioLikeInstance.addEventListener('pause', onPause);
129
126
  _this.audioLikeInstance.addEventListener('play', onPlay);
130
- (_this$options$videoIn3 = _this.options.videoInstance) === null || _this$options$videoIn3 === void 0 ? void 0 : _this$options$videoIn3.addEventListener('ended', onEnded);
131
127
  _this.$removeEventListener = function () {
132
- var _this$options$videoIn4, _this$options$videoIn5, _this$options$videoIn6;
128
+ var _this$options$videoIn3, _this$options$videoIn4;
133
129
  _this.audioInstance.removeEventListener('pause', onPause);
134
130
  _this.audioInstance.removeEventListener('play', onPlay);
135
- (_this$options$videoIn4 = _this.options.videoInstance) === null || _this$options$videoIn4 === void 0 ? void 0 : _this$options$videoIn4.removeEventListener('pause', onPause);
136
- (_this$options$videoIn5 = _this.options.videoInstance) === null || _this$options$videoIn5 === void 0 ? void 0 : _this$options$videoIn5.removeEventListener('play', onPlay);
131
+ (_this$options$videoIn3 = _this.options.videoInstance) === null || _this$options$videoIn3 === void 0 ? void 0 : _this$options$videoIn3.removeEventListener('pause', onPause);
132
+ (_this$options$videoIn4 = _this.options.videoInstance) === null || _this$options$videoIn4 === void 0 ? void 0 : _this$options$videoIn4.removeEventListener('play', onPlay);
137
133
  _this.audioLikeInstance.removeEventListener('pause', onPause);
138
134
  _this.audioLikeInstance.removeEventListener('play', onPlay);
139
- (_this$options$videoIn6 = _this.options.videoInstance) === null || _this$options$videoIn6 === void 0 ? void 0 : _this$options$videoIn6.removeEventListener('ended', onEnded);
140
135
  };
141
136
  return _this;
142
137
  }
@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.CameraMovementPlugin = void 0;
8
8
  var _five = require("@realsee/five");
9
+ var _tween = require("@tweenjs/tween.js");
9
10
  var _typings = require("./typings");
10
- var _tween = require("../../shared-utils/animationFrame/tween");
11
+ var _tween2 = require("../../shared-utils/animationFrame/tween");
11
12
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
12
13
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
13
14
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -245,7 +246,7 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
245
246
  if (args.rotation === _typings.Rotation.Loop) {
246
247
  animeDuration = args.rotateSpeed ? Math.ceil(Math.abs(to.longitude - from.longitude) / args.rotateSpeed * 1000) : duration;
247
248
  }
248
- var tween = (0, _tween.tweenProgress)(animeDuration, _tween.Easing.Linear.None).onUpdate(onUpdate).onComplete(onComplete).onDestroy(onDestroy);
249
+ var tween = (0, _tween2.tweenProgress)(animeDuration, _tween.Easing.Linear.None).onUpdate(onUpdate).onComplete(onComplete).onDestroy(onDestroy);
249
250
  if (args.rotation === _typings.Rotation.Loop) {
250
251
  tween.repeat(Infinity).yoyo(true);
251
252
  }
@@ -66,7 +66,7 @@ function _waitForBlankAudioGenerated() {
66
66
  case 0:
67
67
  checkInterval = _args.length > 0 && _args[0] !== undefined ? _args[0] : 100;
68
68
  timeout = _args.length > 1 && _args[1] !== undefined ? _args[1] : 2000;
69
- console.log('waitForBlankAudioGenerated', audioList.some(function (audio) {
69
+ console.log('waitForBlankAudioGenerated, needGenerate: ', audioList.some(function (audio) {
70
70
  return !audio.ended && audio.src === blankAudioSrc;
71
71
  }));
72
72
  // while any audioList not ended
@@ -1,61 +1,6 @@
1
- import * as TWEEN from '@tweenjs/tween.js';
2
- export declare const Easing: {
3
- Linear: {
4
- None: (amount: number) => number;
5
- };
6
- Quadratic: {
7
- In: (amount: number) => number;
8
- Out: (amount: number) => number;
9
- InOut: (amount: number) => number;
10
- };
11
- Cubic: {
12
- In: (amount: number) => number;
13
- Out: (amount: number) => number;
14
- InOut: (amount: number) => number;
15
- };
16
- Quartic: {
17
- In: (amount: number) => number;
18
- Out: (amount: number) => number;
19
- InOut: (amount: number) => number;
20
- };
21
- Quintic: {
22
- In: (amount: number) => number;
23
- Out: (amount: number) => number;
24
- InOut: (amount: number) => number;
25
- };
26
- Sinusoidal: {
27
- In: (amount: number) => number;
28
- Out: (amount: number) => number;
29
- InOut: (amount: number) => number;
30
- };
31
- Exponential: {
32
- In: (amount: number) => number;
33
- Out: (amount: number) => number;
34
- InOut: (amount: number) => number;
35
- };
36
- Circular: {
37
- In: (amount: number) => number;
38
- Out: (amount: number) => number;
39
- InOut: (amount: number) => number;
40
- };
41
- Elastic: {
42
- In: (amount: number) => number;
43
- Out: (amount: number) => number;
44
- InOut: (amount: number) => number;
45
- };
46
- Back: {
47
- In: (amount: number) => number;
48
- Out: (amount: number) => number;
49
- InOut: (amount: number) => number;
50
- };
51
- Bounce: {
52
- In: (amount: number) => number;
53
- Out: (amount: number) => number;
54
- InOut: (amount: number) => number;
55
- };
56
- };
57
- interface ITween<T> extends TWEEN.Tween<T> {
58
- onDestroy: (fn: () => void) => TWEEN.Tween<T>;
1
+ import { Tween, Easing } from '@tweenjs/tween.js';
2
+ interface ITween<T> extends Tween<T> {
3
+ onDestroy: (fn: () => void) => Tween<T>;
59
4
  destroy: () => void;
60
5
  }
61
6
  /**
@@ -1,18 +1,12 @@
1
1
  "use strict";
2
2
 
3
- function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
- exports.Easing = void 0;
8
6
  exports["default"] = tween;
9
7
  exports.tweenProgress = tweenProgress;
10
- var TWEEN = _interopRequireWildcard(require("@tweenjs/tween.js"));
8
+ var _tween = require("@tweenjs/tween.js");
11
9
  var _index = require("./index");
12
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
13
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
14
- var Easing = TWEEN.Easing;
15
- exports.Easing = Easing;
16
10
  /**
17
11
  * 对象变化的补间动画
18
12
  * 1. 应用 requestAnimationFrameInterval 做 update
@@ -24,8 +18,8 @@ exports.Easing = Easing;
24
18
  * @param easing 过程动画,默认是 Easing.Linear.None
25
19
  */
26
20
  function tween(from, to, duration) {
27
- var easing = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : Easing.Linear.None;
28
- var tween = new TWEEN.Tween(from).to(to, duration).easing(easing);
21
+ var easing = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _tween.Easing.Linear.None;
22
+ var tween = new _tween.Tween(from).to(to, duration).easing(easing);
29
23
  // 这里注意一下,因为 requestAnimationFrameInterval 给的时间是从 0 开始的,tween 动画也从 0 开始
30
24
  (0, _index.nextFrame)(function () {
31
25
  return tween.start(0);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@realsee/vreo",
3
- "version": "1.0.0-alpha.31",
3
+ "version": "1.0.0-alpha.33",
4
4
  "description": "Vreo (VR Video 缩写) 是基于如视三维渲染引擎 Five 和 用户界面构建库 React 实现的如视 3D 空间剧本播放器。",
5
5
  "keywords": [
6
6
  "realsee",
@@ -26,6 +26,8 @@
26
26
  "peerDependencies": {
27
27
  "@realsee/five": "^5.0.0",
28
28
  "@realsee/dnalogel": "^2.3.3",
29
+ "@tweenjs/tween.js": "18.6.4",
30
+ "three": ">=0.115.0 <=0.117.1",
29
31
  "react": "^17.0.0",
30
32
  "react-dom": "^17.0.0"
31
33
  },
@@ -37,6 +39,7 @@
37
39
  "@babel/preset-typescript": "^7.16.0",
38
40
  "@realsee/dnalogel": "^2.3.3",
39
41
  "@realsee/five": "5.0.0-alpha.149",
42
+ "@tweenjs/tween.js": "18.6.4",
40
43
  "@types/node": "^18.11.17",
41
44
  "@types/offscreencanvas": "^2019.6.4",
42
45
  "@types/react": "^17.0.37",
@@ -52,7 +55,6 @@
52
55
  "vite": "^2.6.14"
53
56
  },
54
57
  "dependencies": {
55
- "@tweenjs/tween.js": "18.6.4",
56
58
  "classnames": "^2.3.1",
57
59
  "mobx": "^6.3.7",
58
60
  "mobx-react": "^7.2.1"