@realsee/vreo 0.1.5 → 0.1.6-alpha.1

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

@@ -29,6 +29,10 @@ function UpdateVRPanorama() {
       var _ref = keyframe.data,
           panoIndex = _ref.panoIndex,
           images = _ref.images;
+      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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/vreo",
-  "version": "0.1.5",
+  "version": "0.1.6-alpha.1",
   "description": "Vreo (VR Video 缩写) 是基于如视三维渲染引擎 Five 和 用户界面构建库 React 实现的如视 3D 空间剧本播放器。",
   "keywords": [
     "realsee",

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'
 
@@ -11,6 +11,10 @@ export function UpdateVRPanorama() {
     const callback = (keyframe: VreoKeyframe) => {
       const { panoIndex, images } = keyframe.data as UpdateVRPanoramaData
 
+      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