@realsee/vreo 0.1.4 → 0.1.6-alpha.3

package/lib/Player/modules/keyframes/UpdateVRPanorama/index.js

@@ -28,7 +28,19 @@ function UpdateVRPanorama() {
 
       var _ref = keyframe.data,
           panoIndex = _ref.panoIndex,
-          images = _ref.images;
+          images = _ref.images,
+          work = _ref.work;
+
+      if (work) {
+        five.load(work);
+        return;
+      }
+
+      console.warn('not support.');
+      Object.keys(images).forEach(function (_key) {
+        var key = _key;
+        images[key] = images[key].replace(/https*:\/\//, '//');
+      });
       var newWorkJSON = JSON.parse(JSON.stringify((_five$work = five.work) === null || _five$work === void 0 ? void 0 : _five$work.raw.work)); // // 原Work数据不能被修改
 
       if (newWorkJSON.panorama && newWorkJSON.panorama.list && newWorkJSON.panorama.list[panoIndex]) {

package/lib/fivePlugins/CameraMovementPlugin/index.js

@@ -204,18 +204,19 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
 
               if (opts.asyncStartCallback) {
                 opts.asyncStartCallback();
-              }
+              } // 先切换模型再出旋转效果
+
 
-              if (!(five.currentMode !== _five.Five.Mode.Panorama)) {
+              if (!(args.mode && five.currentMode !== args.mode)) {
                 _context2.next = 5;
                 break;
               }
 
               _context2.next = 5;
-              return five.changeMode(_five.Five.Mode.Panorama);
+              return five.changeMode(args.mode);
 
             case 5:
-              if (!(args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
+              if (!(args.mode === _five.Five.Mode.Panorama && five.currentMode === _five.Five.Mode.Panorama && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
                 _context2.next = 11;
                 break;
               }

package/lib/fivePlugins/CameraMovementPlugin/typings.d.ts

@@ -38,6 +38,7 @@ export declare type MoveOpts = {
     preload?: boolean;
 } & CameraMovementOptsCallback;
 export declare type RotateArgs = {
+    mode?: Mode;
     panoIndex: number;
     loop: boolean;
     rotateSpeed: number;

package/lib/typings/VreoUnit.d.ts

@@ -1,4 +1,4 @@
-import { Mode, Pose, WorkCubeImage } from '@realsee/five';
+import { Mode, Pose, WorkCubeImage, Work } from '@realsee/five';
 import { CameraMovementEffect, Rotation } from '../fivePlugins/CameraMovementPlugin/typings';
 export declare enum VreoKeyframeEnum {
     /** 运镜 */
@@ -38,7 +38,11 @@ export declare enum VreoKeyframeEnum {
     /**
      * 结束
      */
-    Exit = "Exit"
+    Exit = "Exit",
+    /**
+     * 自定义剧本帧
+     */
+    Custom = "Custom"
 }
 /**
  * 支持自定义剧本关键帧配置项
@@ -111,6 +115,7 @@ export declare type PrompterData = {
 export declare type UpdateVRPanoramaData = {
     panoIndex: number;
     images: WorkCubeImage;
+    work?: Work;
 };
 /**
  * 顶点
@@ -202,3 +207,5 @@ export declare type VideoEffectData = {
     direction?: Vertex;
     vector?: Pick<Pose, 'longitude' | 'latitude'>;
 };
+/** 自定义序列帧 */
+export declare type CustomData = Record<string, any>;

package/lib/typings/VreoUnit.js

@@ -22,6 +22,7 @@ exports.VreoKeyframeEnum = VreoKeyframeEnum;
   VreoKeyframeEnum["InfoPanel"] = "InfoPanel";
   VreoKeyframeEnum["VideoEffect"] = "VideoEffect";
   VreoKeyframeEnum["Exit"] = "Exit";
+  VreoKeyframeEnum["Custom"] = "Custom";
 })(VreoKeyframeEnum || (exports.VreoKeyframeEnum = VreoKeyframeEnum = {}));
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/vreo",
-  "version": "0.1.4",
+  "version": "0.1.6-alpha.3",
   "description": "Vreo (VR Video 缩写) 是基于如视三维渲染引擎 Five 和 用户界面构建库 React 实现的如视 3D 空间剧本播放器。",
   "keywords": [
     "realsee",
@@ -35,7 +35,7 @@
     "@babel/preset-env": "^7.16.4",
     "@babel/preset-react": "^7.16.0",
     "@babel/preset-typescript": "^7.16.0",
-    "@realsee/five": "^5.0.0-alpha.80",
+    "@realsee/five": "^5.0.0-alpha.91",
     "@types/offscreencanvas": "^2019.6.4",
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",

package/resources/Player/modules/keyframes/ModelVideo/index.tsx

@@ -20,8 +20,8 @@ export function ModelVideo() {
       ref.current.disable()
       await ref.current.load(
         {
-          video_src: videoSrc.replace(/https*:/, ''),
-          video_poster_src: videoPosterSrc.replace(/https*:/, ''),
+          video_src: videoSrc,
+          video_poster_src: videoPosterSrc,
           points: [vertexs],
         },
         controller.configs?.videos?.modelTVVideo

package/resources/Player/modules/keyframes/UpdateVRPanorama/index.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { parseWork } from '@realsee/five'
+import { parseWork, WorkCubeImage } from '@realsee/five'
 import { useController, useFiveInstance } from '../../../hooks'
 import { UpdateVRPanoramaData, VreoKeyframe, VreoKeyframeEnum } from '../../../../typings/VreoUnit'
 
@@ -9,8 +9,18 @@ export function UpdateVRPanorama() {
 
   React.useEffect(() => {
     const callback = (keyframe: VreoKeyframe) => {
-      const { panoIndex, images } = keyframe.data as UpdateVRPanoramaData
+      const { panoIndex, images, work } = keyframe.data as UpdateVRPanoramaData
 
+      if (work) {
+        five.load(work)
+        return
+      }
+
+      console.warn('not support.')
+      Object.keys(images).forEach((_key) => {
+        const key = _key as keyof WorkCubeImage
+        images[key] = images[key].replace(/https*:\/\//, '//')
+      })
       const newWorkJSON = JSON.parse(JSON.stringify(five.work?.raw.work))
 
       // // 原Work数据不能被修改

package/resources/fivePlugins/CameraMovementPlugin/index.ts

@@ -139,11 +139,16 @@ export const CameraMovementPlugin: FivePlugin<CameraMovementPluginParameterType,
       opts.asyncStartCallback()
     }
 
-    if (five.currentMode !== Five.Mode.Panorama) {
-      await five.changeMode(Five.Mode.Panorama)
+    // 先切换模型再出旋转效果
+    if (args.mode && five.currentMode !== args.mode) {
+      await five.changeMode(args.mode)
     }
 
-    if (args.panoIndex !== undefined && args.panoIndex !== five.panoIndex) {
+    // 全景状态下，需要点位对齐
+    if (args.mode === Five.Mode.Panorama &&
+      five.currentMode === Five.Mode.Panorama &&
+      args.panoIndex !== undefined &&
+      args.panoIndex !== five.panoIndex) {
       if (opts.preload) await five.preloadPano(args.panoIndex)
       await new Promise((resolve, reject) => {
         five.moveToPano(args.panoIndex, {

package/resources/fivePlugins/CameraMovementPlugin/typings.ts

@@ -46,6 +46,7 @@ export type MoveOpts = {
 } & CameraMovementOptsCallback
 
 export type RotateArgs = {
+  mode?: Mode
   panoIndex: number
   loop: boolean
   rotateSpeed: number

package/resources/typings/VreoUnit.ts

@@ -1,4 +1,4 @@
-import { Mode, Pose, WorkCubeImage } from '@realsee/five'
+import { Mode, Pose, WorkCubeImage, Work } from '@realsee/five'
 import { CameraMovementEffect, Rotation } from '../fivePlugins/CameraMovementPlugin/typings'
 
 export enum VreoKeyframeEnum {
@@ -40,6 +40,10 @@ export enum VreoKeyframeEnum {
    * 结束
    */
   Exit = 'Exit',
+  /**
+   * 自定义剧本帧
+   */
+  Custom = 'Custom',
 }
 
 /**
@@ -121,6 +125,7 @@ export type PrompterData = {
 export type UpdateVRPanoramaData = {
   panoIndex: number
   images: WorkCubeImage
+  work?: Work
 }
 
 /**
@@ -223,3 +228,6 @@ export type VideoEffectData = {
   direction?: Vertex
   vector?: Pick<Pose, 'longitude' | 'latitude'>
 }
+
+/** 自定义序列帧 */
+export type CustomData = Record<string, any>