@realsee/vreo 0.2.0-alpha.3 → 0.2.0-alpha.4

package/lib/Player/custom/SpatialScenePanel/index.js

@@ -39,8 +39,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var searchV1 = function searchV1(_ref) {
   var five = _ref.five,
-      position = _ref.position,
-      rotation = _ref.rotation,
       dom = _ref.dom;
   var cameraDirection = new _three.Vector3();
   five.camera.getWorldDirection(cameraDirection);
@@ -98,19 +96,15 @@ function SpatialScenePanel(props) {
         return;
       }
 
-      var data = keyframe.data; // const data = mockData as SpatialScenePanelData
+      var data = keyframe.data;
 
       var _searchV = searchV1({
         five: props.five,
-        position: new _three.Vector3(data.position.x, data.position.y, data.position.z),
-        quaternion: data.quaternion,
         dom: ref.current
       }),
           points = _searchV.points,
           ratio = _searchV.ratio;
 
-      console.log(points, ratio);
-
       var _ref2 = rendererRef.current.create3DDomContainer(points, {
         ratio: ratio,
         autoRender: false
@@ -157,9 +151,6 @@ function SpatialScenePanel(props) {
       }, end - start);
     };
 
-    Object.assign(window, {
-      $SpatialScenePanelCallback: callback
-    });
     props.subscribe.on(_VreoUnit.VreoKeyframeEnum.Custom, callback);
     return function () {
       props.subscribe.off(_VreoUnit.VreoKeyframeEnum.Custom, callback);

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

@@ -63,12 +63,8 @@ function PanoTextLabel() {
       var res = project2d(new _three.Vector3(x, y, z));
       if (!res) return;
       var left = res.x,
-          top = res.y;
-      Object.assign(window, {
-        $PanoTextLabel: {
-          setState: setState
-        }
-      });
+          top = res.y; // Object.assign(window, { $PanoTextLabel: { setState } })
+
       setState({
         left: left,
         top: top,
@@ -80,12 +76,8 @@ function PanoTextLabel() {
       }, end - start);
     };
 
-    controller.on(_VreoUnit.VreoKeyframeEnum.PanoTextLabel, callback);
-    Object.assign(window, {
-      $panoTextLabel: {
-        setState: setState
-      }
-    });
+    controller.on(_VreoUnit.VreoKeyframeEnum.PanoTextLabel, callback); // Object.assign(window, { $panoTextLabel: { setState } })
+
     return function () {
       controller.off(_VreoUnit.VreoKeyframeEnum.PanoTextLabel, callback);
 

package/lib/fivePlugins/CameraMovementPlugin/index.js

@@ -241,8 +241,9 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
                   // 移动结束
                   moveCancelCallback: function moveCancelCallback() {
                     return reject(false);
-                  } // 移动开始
-
+                  },
+                  // 移动开始
+                  effect: 'fade'
                 });
               });
 

package/package.json

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

package/resources/Player/custom/SpatialScenePanel/index.tsx

@@ -22,13 +22,13 @@ export interface SpatialScenePanelData {
 
 interface SearchParams {
   five: Five
-  position: Vector3
-  rotation?: Vector3
-  quaternion: [number, number, number, number]
+  // position: Vector3
+  // rotation?: Vector3
+  // quaternion: [number, number, number, number]
   dom: HTMLDivElement 
 }
 
-const searchV1 = ({ five, position, rotation, dom }: SearchParams) => {
+const searchV1 = ({ five, dom }: SearchParams) => {
   const cameraDirection = new Vector3()
   five.camera.getWorldDirection(cameraDirection)
   const cameraPosition = five.camera.position
@@ -82,17 +82,12 @@ export function SpatialScenePanel(props: CustomVreoKeyframeProps) {
       }
 
       const data = keyframe.data as SpatialScenePanelData
-      // const data = mockData as SpatialScenePanelData
 
       const { points, ratio } = searchV1({
         five: props.five,
-        position: new Vector3(data.position.x, data.position.y, data.position.z),
-        quaternion: data.quaternion,
         dom: ref.current!
       })
 
-      console.log(points, ratio)
-
       const { container, dispose, css3DObject, render } =
         rendererRef.current.create3DDomContainer(points, { ratio, autoRender: false }) || {}
 
@@ -124,7 +119,6 @@ export function SpatialScenePanel(props: CustomVreoKeyframeProps) {
         }, end - start)
     }
 
-    Object.assign(window, {$SpatialScenePanelCallback: callback})
     props.subscribe.on(VreoKeyframeEnum.Custom, callback)
 
     return () => {

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

@@ -30,13 +30,13 @@ export function PanoTextLabel() {
       if (!res) return
       const { x: left, y: top } = res
 
-      Object.assign(window, { $PanoTextLabel: { setState } })
+      // Object.assign(window, { $PanoTextLabel: { setState } })
       setState({ left, top, text: data.text || '', fontSize: data.fontSize || 16 })
       timeoutRef.current = setTimeout(() => setState(null), end - start)
     }
     controller.on(VreoKeyframeEnum.PanoTextLabel, callback)
 
-    Object.assign(window, { $panoTextLabel: { setState } })
+    // Object.assign(window, { $panoTextLabel: { setState } })
     return () => {
       controller.off(VreoKeyframeEnum.PanoTextLabel, callback)
       if (timeoutRef.current) {

package/resources/fivePlugins/CameraMovementPlugin/index.ts

@@ -156,6 +156,7 @@ export const CameraMovementPlugin: FivePlugin<CameraMovementPluginParameterType,
         five.moveToPano(args.panoIndex, {
           moveEndCallback: () => resolve(true), // 移动结束
           moveCancelCallback: () => reject(false), // 移动开始
+          effect: 'fade',
         })
       })
     }