@realsee/vreo 2.4.0 → 2.4.2

package/lib/shared-utils/animationFrame/index.js

@@ -7,39 +7,32 @@ exports["default"] = void 0;
 exports.getFrameTime = getFrameTime;
 exports.nextFrame = nextFrame;
 exports.requestAnimationFrameInterval = requestAnimationFrameInterval;
-
 var _requestAnimationFrame = window.requestAnimationFrame || function (fn) {
   return setTimeout(function () {
     return fn(performance.now());
   }, 16);
 };
-
 var _cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
-
-var _default = _requestAnimationFrame;
-exports["default"] = _default;
-
+var _default = exports["default"] = _requestAnimationFrame;
 function nextFrame(fn) {
   var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   if (delay <= 0) _requestAnimationFrame(fn);else _requestAnimationFrame(function () {
     return nextFrame(fn, delay - 1);
   });
 }
+
 /**
  * 在每个 AnimationFrame 中调用传入的函数
  * @param callback 每次 AnimationFrame 中调用的函数
  * @param frame 每秒运行多少次
  * @returns 返回一个函数，调用可以停止 AnimationFrameLoop
  */
-
-
 function requestAnimationFrameInterval(callback) {
   var frame = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
   var index = -1;
   var oldTime = 0;
   var startTime = -1;
   var minDeltaTime = 1000 / frame;
-
   function loop(time) {
     startTime === -1 && (startTime = time);
     index = _requestAnimationFrame(loop);
@@ -48,18 +41,16 @@ function requestAnimationFrameInterval(callback) {
     oldTime = time;
     callback && callback(time - startTime);
   }
-
   index = _requestAnimationFrame(loop);
   return function stop() {
     _cancelAnimationFrame(index);
   };
 }
+
 /**
  * 获取两个 AnimationFrame 间隔的时间
  * @returns 返回一个 Promise，resolve 的结果是两个 AnimationFrame 间隔的时间
  */
-
-
 function getFrameTime() {
   var start = Date.now();
   return new Promise(function (resolve) {

package/lib/shared-utils/animationFrame/tween.d.ts

@@ -1,5 +1,5 @@
 import { Tween, Easing } from '@tweenjs/tween.js';
-interface ITween<T> extends Tween<T> {
+interface ITween<T extends Record<string, any>> extends Tween<T> {
     onDestroy: (fn: () => void) => Tween<T>;
     destroy: () => void;
 }
@@ -13,7 +13,7 @@ interface ITween<T> extends Tween<T> {
  * @param duration 经历时间（s）
  * @param easing 过程动画，默认是 Easing.Linear.None
  */
-export default function tween<T>(from: T, to: T, duration: number, easing?: (amount: number) => number): ITween<T>;
+export default function tween<T extends Record<string, any>>(from: T, to: T, duration: number, easing?: (amount: number) => number): ITween<T>;
 export declare function tweenProgress(duration: number, easing: typeof Easing.Linear.None): ITween<{
     progress: number;
 }>;

package/lib/shared-utils/animationFrame/tween.js

@@ -5,11 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = tween;
 exports.tweenProgress = tweenProgress;
-
 var _tween = require("@tweenjs/tween.js");
-
 var _index = require("./index");
-
 /**
  * 对象变化的补间动画
  * 1. 应用 requestAnimationFrameInterval 做 update
@@ -22,8 +19,8 @@ var _index = require("./index");
  */
 function tween(from, to, duration) {
   var easing = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _tween.Easing.Linear.None;
-  var tween = new _tween.Tween(from).to(to, duration).easing(easing); // 这里注意一下，因为 requestAnimationFrameInterval 给的时间是从 0 开始的，tween 动画也从 0 开始
-
+  var tween = new _tween.Tween(from).to(to, duration).easing(easing);
+  // 这里注意一下，因为 requestAnimationFrameInterval 给的时间是从 0 开始的，tween 动画也从 0 开始
   (0, _index.nextFrame)(function () {
     return tween.start(0);
   });
@@ -31,12 +28,10 @@ function tween(from, to, duration) {
     if (tween.update(time) === false) cancelAnimationFrame();
   });
   var destroyMethods = [];
-
   tween.onDestroy = function (fn) {
     destroyMethods.push(fn);
     return tween;
   };
-
   tween.destroy = function () {
     this.stop();
     Object.assign(tween, {
@@ -46,17 +41,11 @@ function tween(from, to, duration) {
       _onStopCallbackL: null
     });
     var destroyMethod;
-
-    while (destroyMethod = destroyMethods.shift()) {
-      destroyMethod();
-    }
-
+    while (destroyMethod = destroyMethods.shift()) destroyMethod();
     cancelAnimationFrame();
   };
-
   return tween;
 }
-
 function tweenProgress(duration, easing) {
   return tween({
     progress: 0

package/lib/shared-utils/createTransMatrix.js

@@ -1,24 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createTransMatrix = createTransMatrix;
-
 var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var THREE = _interopRequireWildcard(require("three"));
-
-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); }
-
-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; }
-
+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); }
 function createTransMatrix(arr1) {
   var matrix4 = new THREE.Matrix4();
   matrix4.fromArray(arr1);

package/lib/shared-utils/getFileExpandedName.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = getFileExpandedName;
-
 function getFileExpandedName(filePath) {
   if (!filePath) return '';
   var index = filePath.lastIndexOf('.');

package/lib/shared-utils/getMediaInfo.d.ts

@@ -3,7 +3,7 @@ export default function getMediaInfo(fileUrl: string): Promise<{
     type?: 'video' | 'audio' | 'image' | 'unknown' | undefined;
     error?: string | undefined;
 }>;
-export declare function getMediaType(url?: string): "audio" | "video" | "image" | "unknown";
-export declare function getMediaTypeByExpandedName(fileExpandedName?: string | null): "audio" | "video" | "image" | "unknown";
-export declare function getMediaTypeByUrl(fileUrl?: string | null): "audio" | "video" | "image" | "unknown";
+export declare function getMediaType(url?: string): "video" | "audio" | "image" | "unknown";
+export declare function getMediaTypeByExpandedName(fileExpandedName?: string | null): "video" | "audio" | "image" | "unknown";
+export declare function getMediaTypeByUrl(fileUrl?: string | null): "video" | "audio" | "image" | "unknown" | undefined;
 export declare function getFileName(fileUrl?: string): string;

package/lib/shared-utils/getMediaInfo.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,20 +9,16 @@ exports.getFileName = getFileName;
 exports.getMediaType = getMediaType;
 exports.getMediaTypeByExpandedName = getMediaTypeByExpandedName;
 exports.getMediaTypeByUrl = getMediaTypeByUrl;
-
 var _getFileExpandedName = _interopRequireDefault(require("./getFileExpandedName"));
-
 function getMediaInfo(fileUrl) {
   var type = getMediaType(fileUrl);
   if (!type) return Promise.resolve({
     error: '未知的文件类型: ' + fileUrl
   });
-
   var mediaElement = function () {
     if (type === 'video') return document.createElement('video');
     if (type === 'audio') return document.createElement('audio');
   }();
-
   if (!mediaElement) return Promise.resolve({
     error: 'Unknown media element'
   });
@@ -34,7 +29,6 @@ function getMediaInfo(fileUrl) {
         error: 'onerror'
       });
     };
-
     mediaElement.onloadedmetadata = function () {
       resolve({
         duration: mediaElement.duration * 1000,
@@ -43,13 +37,11 @@ function getMediaInfo(fileUrl) {
     };
   });
 }
-
 function getMediaType(url) {
   var fileExpandedName = (0, _getFileExpandedName["default"])(url);
   var type = getMediaTypeByExpandedName(fileExpandedName);
   return type;
 }
-
 function getMediaTypeByExpandedName(fileExpandedName) {
   if (!fileExpandedName) return 'unknown';
   if (/jpg|jpeg|png$/.test(fileExpandedName)) return 'image';
@@ -57,13 +49,11 @@ function getMediaTypeByExpandedName(fileExpandedName) {
   if (/avi|wmv|mpeg|mp4|m4v|mov|asf|flv|f4v|rmvb|rm|3gp|vob$/.test(fileExpandedName)) return 'video';
   return 'unknown';
 }
-
 function getMediaTypeByUrl(fileUrl) {
   if (!fileUrl) return;
   var fileExpandedName = (0, _getFileExpandedName["default"])(fileUrl);
   return getMediaTypeByExpandedName(fileExpandedName);
 }
-
 function getFileName(fileUrl) {
   if (!fileUrl) return '';
   var index1 = fileUrl.lastIndexOf('/');

package/lib/shared-utils/setElementDataset.js

@@ -4,12 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = setElementDataset;
-
 function setElementDataset(element, dataset) {
   if (element) {
     Object.keys(dataset).forEach(function (key) {
       var value = dataset[key].toString();
-
       if (element instanceof Element) {
         element.setAttribute("data-".concat(key), value);
       } else if (element instanceof Document) {

package/lib/typings/VreoUnit.d.ts

@@ -51,7 +51,7 @@ export declare enum VreoKeyframeEnum {
 /**
  * 支持自定义剧本关键帧配置项
  */
-export declare type VreoKeyframeConfigMap = {
+export type VreoKeyframeConfigMap = {
     PanoTag?: false;
     PanoTextLabel?: false;
     Prompter?: false;
@@ -98,7 +98,7 @@ export interface VreoUnit {
 /**
  * 剧本事件
  */
-export declare type VreoKeyframeEvent = {
+export type VreoKeyframeEvent = {
     [key in VreoKeyframeEnum]: (keyframe: VreoKeyframe, currentTime: number) => void;
 } & {
     loaded: (vreoUnit: VreoUnit) => void;
@@ -110,7 +110,7 @@ export declare type VreoKeyframeEvent = {
 /**
  * 相机运动
  */
-export declare type CameraMovementData = {
+export type CameraMovementData = {
     effect?: CameraMovementEffect;
     transEffect?: "fly" | "fade" | "instant";
     mode: Mode;
@@ -122,13 +122,13 @@ export declare type CameraMovementData = {
 /**
  * 提词器
  */
-export declare type PrompterData = {
+export type PrompterData = {
     text: string;
 };
 /**
  * VR 全景切换
  */
-export declare type UpdateVRPanoramaData = {
+export type UpdateVRPanoramaData = {
     _signature: string;
     allow_hosts: string[];
     certificate: string;
@@ -157,15 +157,15 @@ export interface Vertex {
 /**
  * 矩形顶点
  */
-export declare type QuadrangleVertexs = [Vertex, Vertex, Vertex, Vertex];
+export type QuadrangleVertexs = [Vertex, Vertex, Vertex, Vertex];
 /**
  * 顶点数组
  */
-export declare type Vertexs = Vertex[];
+export type Vertexs = Vertex[];
 /**
  * 视频广告
  */
-export declare type ModelVideoData = {
+export type ModelVideoData = {
     /**
      * 视频素材
      */
@@ -183,7 +183,7 @@ export declare type ModelVideoData = {
 /**
  * 四元数
  */
-export declare type Quaternion = {
+export type Quaternion = {
     x: number;
     y: number;
     z: number;
@@ -192,7 +192,7 @@ export declare type Quaternion = {
 /**
  * 全景文本标签
  */
-export declare type PanoTextLabelData = {
+export type PanoTextLabelData = {
     text: string;
     vertex: Vertex;
     normal?: Vertex;
@@ -219,7 +219,7 @@ export declare enum PanoTagStyleEnum {
      */
     Expand = "Expand"
 }
-export declare type PanoTagData = {
+export type PanoTagData = {
     type: PanoTagEnum;
     style: PanoTagStyleEnum;
     text: string;
@@ -238,7 +238,7 @@ export declare enum PanoEffectEnum {
 /**
  * 全景特效
  */
-export declare type PanoEffectData = {
+export type PanoEffectData = {
     effect: PanoEffectEnum;
     twoVertexs: [Vertex, Vertex];
 };
@@ -256,7 +256,7 @@ export declare enum InfoPanelStyleEnum {
 /**
  * 信息面板
  */
-export declare type InfoPanelData = {
+export type InfoPanelData = {
     type: InfoPanelTypeEnum;
     style?: InfoPanelStyleEnum;
     url: string;
@@ -266,7 +266,7 @@ export declare type InfoPanelData = {
 /**
  * 视频特效
  */
-export declare type VideoEffectData = {
+export type VideoEffectData = {
     videoSrc: string;
     panoIndex: number;
     fov: number;
@@ -276,8 +276,8 @@ export declare type VideoEffectData = {
 /**
  * 背景音乐
  */
-export declare type BgMusicData = {
+export type BgMusicData = {
     url: string;
 };
 /** 自定义序列帧 */
-export declare type CustomData = Record<string, any>;
+export type CustomData = Record<string, any>;

package/lib/typings/VreoUnit.js

@@ -4,84 +4,152 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VreoKeyframeEnum = exports.PanoTagStyleEnum = exports.PanoTagEnum = exports.PanoEffectEnum = exports.InfoPanelTypeEnum = exports.InfoPanelStyleEnum = void 0;
-var VreoKeyframeEnum;
-/**
- * 支持自定义剧本关键帧配置项
- */
-
-exports.VreoKeyframeEnum = VreoKeyframeEnum;
-
-(function (VreoKeyframeEnum) {
+var VreoKeyframeEnum = exports.VreoKeyframeEnum = /*#__PURE__*/function (VreoKeyframeEnum) {
+  /** 运镜 */
   VreoKeyframeEnum["CameraMovement"] = "CameraMovement";
+  /**
+   * 全景标签
+   */
   VreoKeyframeEnum["PanoTag"] = "PanoTag";
+  /**
+   * 全景文本标签
+   */
   VreoKeyframeEnum["PanoTextLabel"] = "PanoTextLabel";
+  /**
+   * 提词器
+   */
   VreoKeyframeEnum["Prompter"] = "Prompter";
+  /**
+   * 更新 VR 全景
+   */
   VreoKeyframeEnum["UpdateVRPanorama"] = "UpdateVRPanorama";
+  /**
+   * 视频广告
+   */
   VreoKeyframeEnum["ModelVideo"] = "ModelVideo";
+  /**
+   * 全景特效
+   */
   VreoKeyframeEnum["PanoEffect"] = "PanoEffect";
+  /**
+   * 信息面板
+   */
   VreoKeyframeEnum["InfoPanel"] = "InfoPanel";
+  /**
+   * 视频特效
+   */
   VreoKeyframeEnum["VideoEffect"] = "VideoEffect";
+  /**
+   * 背景音乐
+   */
   VreoKeyframeEnum["BgMusic"] = "BgMusic";
+  /**
+   * 结束
+   */
   VreoKeyframeEnum["Exit"] = "Exit";
+  /**
+   * 自定义剧本帧
+   */
   VreoKeyframeEnum["Custom"] = "Custom";
-})(VreoKeyframeEnum || (exports.VreoKeyframeEnum = VreoKeyframeEnum = {}));
-
+  return VreoKeyframeEnum;
+}({});
 /**
- * 全景标签枚举
+ * 支持自定义剧本关键帧配置项
  */
-var PanoTagEnum;
 /**
- * 标签样式种类
+ * 剧本关键帧
  */
-
-exports.PanoTagEnum = PanoTagEnum;
-
-(function (PanoTagEnum) {
+/**
+ * 虚拟视频角色
+ */
+/**
+ * 剧本结构
+ */
+/**
+ * 剧本事件
+ */
+/**
+ * 相机运动
+ */
+/**
+ * 提词器
+ */
+/**
+ * VR 全景切换
+ */
+/**
+ * 顶点
+ */
+/**
+ * 矩形顶点
+ */
+/**
+ * 顶点数组
+ */
+/**
+ * 视频广告
+ */
+/**
+ * 四元数
+ */
+/**
+ * 全景文本标签
+ */
+/**
+ * 全景标签枚举
+ */
+var PanoTagEnum = exports.PanoTagEnum = /*#__PURE__*/function (PanoTagEnum) {
   PanoTagEnum["Text"] = "Text";
   PanoTagEnum["Image"] = "Image";
-})(PanoTagEnum || (exports.PanoTagEnum = PanoTagEnum = {}));
-
-var PanoTagStyleEnum;
-exports.PanoTagStyleEnum = PanoTagStyleEnum;
-
-(function (PanoTagStyleEnum) {
+  return PanoTagEnum;
+}({});
+/**
+ * 标签样式种类
+ */
+var PanoTagStyleEnum = exports.PanoTagStyleEnum = /*#__PURE__*/function (PanoTagStyleEnum) {
+  /**
+   * 生长动画：默认值
+   */
   PanoTagStyleEnum["Growth"] = "Growth";
+  /**
+   * 展开动画
+   */
   PanoTagStyleEnum["Expand"] = "Expand";
-})(PanoTagStyleEnum || (exports.PanoTagStyleEnum = PanoTagStyleEnum = {}));
-
+  return PanoTagStyleEnum;
+}({});
 /**
  * 全景特效枚举
  */
-var PanoEffectEnum;
+var PanoEffectEnum = exports.PanoEffectEnum = /*#__PURE__*/function (PanoEffectEnum) {
+  /**
+   * 两点距离
+   */
+  PanoEffectEnum["Distance"] = "Distance";
+  return PanoEffectEnum;
+}({});
 /**
  * 全景特效
  */
-
-exports.PanoEffectEnum = PanoEffectEnum;
-
-(function (PanoEffectEnum) {
-  PanoEffectEnum["Distance"] = "Distance";
-})(PanoEffectEnum || (exports.PanoEffectEnum = PanoEffectEnum = {}));
-
 /**
  * 信息面板类型枚举
  */
-var InfoPanelTypeEnum;
-exports.InfoPanelTypeEnum = InfoPanelTypeEnum;
-
-(function (InfoPanelTypeEnum) {
+var InfoPanelTypeEnum = exports.InfoPanelTypeEnum = /*#__PURE__*/function (InfoPanelTypeEnum) {
   InfoPanelTypeEnum["Image"] = "Image";
   InfoPanelTypeEnum["Video"] = "Video";
-})(InfoPanelTypeEnum || (exports.InfoPanelTypeEnum = InfoPanelTypeEnum = {}));
-
-var InfoPanelStyleEnum;
+  return InfoPanelTypeEnum;
+}({});
+var InfoPanelStyleEnum = exports.InfoPanelStyleEnum = /*#__PURE__*/function (InfoPanelStyleEnum) {
+  InfoPanelStyleEnum["Drawer"] = "Drawer";
+  InfoPanelStyleEnum["PopUp"] = "PopUp";
+  return InfoPanelStyleEnum;
+}({});
 /**
  * 信息面板
  */
-
-exports.InfoPanelStyleEnum = InfoPanelStyleEnum;
-
-(function (InfoPanelStyleEnum) {
-  InfoPanelStyleEnum["Drawer"] = "Drawer";
-  InfoPanelStyleEnum["PopUp"] = "PopUp";
-})(InfoPanelStyleEnum || (exports.InfoPanelStyleEnum = InfoPanelStyleEnum = {}));
+/**
+ * 视频特效
+ */
+/**
+ * 背景音乐
+ */
+/** 自定义序列帧 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/vreo",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Vreo (VR Video 缩写) 是基于如视三维渲染引擎 Five 和 用户界面构建库 React 实现的如视 3D 空间剧本播放器。",
   "keywords": [
     "realsee",
@@ -44,7 +44,6 @@
     "@babel/preset-typescript": "^7.16.0",
     "@realsee/dnalogel": "^3.67.1",
     "@realsee/five": "^6.4.0-alpha.36",
-    "@tweenjs/tween.js": "18.6.4",
     "@types/node": "^22.0.0",
     "@types/offscreencanvas": "^2019.6.4",
     "@types/react": "^18",
@@ -61,6 +60,8 @@
     "vite": "^2.6.14"
   },
   "dependencies": {
+    "@babel/runtime": "^7.16.0",
+    "@tweenjs/tween.js": "18.6.4",
     "classnames": "^2.3.1",
     "mobx": "^6.3.7",
     "mobx-react": "^7.2.1"