@realsee/vreo 0.2.0-alpha.1 → 0.2.0-alpha.12

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

@@ -9,11 +9,15 @@ exports.ModelVideo = ModelVideo;
 
 var React = _interopRequireWildcard(require("react"));
 
+var THREE = _interopRequireWildcard(require("three"));
+
+var _hooks = require("../../../hooks");
+
 var _ModelTVVideoPlugin = require("../../../../fivePlugins/ModelTVVideoPlugin");
 
-var _VreoUnit = require("../../../../typings/VreoUnit");
+var _createTransMatrix = require("../../../../shared-utils/createTransMatrix");
 
-var _hooks = require("../../../hooks");
+var _VreoUnit = require("../../../../typings/VreoUnit");
 
 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); }
 
@@ -33,7 +37,7 @@ function ModelVideo() {
       var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(keyframe) {
         var _controller$configs, _controller$configs$v;
 
-        var start, end, _ref2, videoSrc, videoPosterSrc, vertexs;
+        var start, end, _ref2, videoSrc, videoPosterSrc, vertexs, matrixWorld, position, points;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -44,16 +48,49 @@ function ModelVideo() {
                 }
 
                 start = keyframe.start, end = keyframe.end;
-                _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, videoPosterSrc = _ref2.videoPosterSrc, vertexs = _ref2.vertexs;
+                _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, videoPosterSrc = _ref2.videoPosterSrc, vertexs = _ref2.vertexs, matrixWorld = _ref2.matrixWorld;
+
+                position = function () {
+                  if (vertexs.length < 4) {
+                    throw new Error('ModelVideo: 顶点数据集合不够，无法组成矩形 ....');
+                  }
+
+                  if (vertexs.length === 4) {
+                    return vertexs;
+                  }
+
+                  var box = new THREE.Box3();
+                  vertexs.forEach(function (v) {
+                    return box.expandByPoint(new THREE.Vector3(v.x, v.y, v.z));
+                  });
+                  return [new THREE.Vector3(box.min.x, box.max.y, box.max.z), new THREE.Vector3(box.min.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.max.y, box.max.z)];
+                }();
+
+                points = function () {
+                  if (matrixWorld) {
+                    var transMatrix = (0, _createTransMatrix.createTransMatrix)(matrixWorld);
+                    return [position.map(function (p) {
+                      var res = transMatrix([p.x, p.y, p.z]);
+                      return {
+                        x: res[0],
+                        y: res[1],
+                        z: res[2]
+                      };
+                    })];
+                  }
+
+                  return [position];
+                }();
+
                 ref.current.disable();
-                _context.next = 6;
+                _context.next = 8;
                 return ref.current.load({
                   video_src: videoSrc,
                   video_poster_src: videoPosterSrc,
-                  points: [vertexs]
+                  points: points
                 }, (_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : (_controller$configs$v = _controller$configs.videos) === null || _controller$configs$v === void 0 ? void 0 : _controller$configs$v.modelTVVideo);
 
-              case 6:
+              case 8:
                 ref.current.enable();
                 timeoutRef.current = setTimeout(function () {
                   var _ref$current;
@@ -61,7 +98,7 @@ function ModelVideo() {
                   return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.disable();
                 }, end - start);
 
-              case 8:
+              case 10:
               case "end":
                 return _context.stop();
             }

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

@@ -75,7 +75,8 @@ function PanoTag() {
         vertex: vertex,
         text: panoTagData.text || _VreoUnit.PanoTagEnum.Text,
         type: panoTagData.type,
-        imgUrl: panoTagData.imgUrl
+        imgUrl: panoTagData.imgUrl,
+        style: panoTagData.style || _VreoUnit.PanoTagStyleEnum.Growth
       });
       setPos({
         left: left,
@@ -139,6 +140,23 @@ function PanoTag() {
     return undefined;
   }();
 
+  if ((state === null || state === void 0 ? void 0 : state.style) === _VreoUnit.PanoTagStyleEnum.Expand) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: (0, _classnames["default"])('PanoTag', {
+        'PanoTag--expand': true,
+        'PanoTag--notHidden': state
+      }),
+      style: {
+        left: ((pos === null || pos === void 0 ? void 0 : pos.left) || 0) + 'px',
+        top: ((pos === null || pos === void 0 ? void 0 : pos.top) || 0) + 'px'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: 'PanoTag-box PanoTag-box--' + ((state === null || state === void 0 ? void 0 : state.type) || '')
+    }, boxContent), /*#__PURE__*/React.createElement("div", {
+      className: "PanoTag-guideline"
+    })));
+  }
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: (0, _classnames["default"])('PanoTag', {
       'PanoTag--notHidden': state
@@ -158,11 +176,6 @@ function PanoTag() {
   }), /*#__PURE__*/React.createElement("span", {
     className: "PanoTag-straightline"
   })), /*#__PURE__*/React.createElement("div", {
-    onClick: function onClick() {
-      if (state !== null && state !== void 0 && state.imgUrl) {// @TODO
-        // setDrawerVisible(true)
-      }
-    },
     className: 'PanoTag-box PanoTag-box--' + ((state === null || state === void 0 ? void 0 : state.type) || '')
   }, boxContent))));
 }

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/Player/modules/keyframes/Prompter/index.js

@@ -13,8 +13,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _hooks = require("../../../hooks");
 
-var _reactTransitionGroup = require("react-transition-group");
-
 var _VreoUnit = require("../../../../typings/VreoUnit");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -69,9 +67,8 @@ function Prompter() {
 
       ref.current = setTimeout(function () {
         setHidden(true);
-        setTimeout(function () {
-          return setText('');
-        }, 500);
+        setText(''); // setTimeout(() => setText(''), 500)
+
         if (ref.current) clearTimeout(ref.current);
         ref.current = null;
       }, end - start);
@@ -87,20 +84,9 @@ function Prompter() {
       'vreo-prompter--hidden': hidden,
       'vreo-prompter--audio': controller.isAudio
     })
-  }, text ?
-  /*#__PURE__*/
-
-  /* @warning "index.js:1 Warning: findDOMNode is deprecated in StrictMode." */
-  React.createElement(_reactTransitionGroup.TransitionGroup, {
+  }, /*#__PURE__*/React.createElement("div", {
     className: "vreo-prompter-text"
-  }, /*#__PURE__*/React.createElement(_reactTransitionGroup.CSSTransition, {
-    key: text,
-    classNames: "vreo-prompter-text-transition",
-    timeout: 500,
-    addEndListener: function addEndListener(node, done) {
-      return node.addEventListener('transitionend', done, false);
-    }
   }, /*#__PURE__*/React.createElement("div", {
     className: "vreo-prompter-innerText"
-  }, text))) : undefined);
+  }, text)));
 }

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

@@ -22,42 +22,49 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function UpdateVRPanorama() {
   var controller = (0, _hooks.useController)();
   var five = (0, _hooks.useFiveInstance)();
-  var rawRef = React.useRef(null);
-  var workRef = React.useRef(null);
+  var deafultWorkRef = React.useRef(null);
+  var updateWorkRef = React.useRef(null); // 恢复默认 VR
+
   var restoreCallback = React.useCallback(function () {
-    if (rawRef.current) {
-      var work = (0, _five.parseWork)(rawRef.current);
+    // 先清理掉 之前的 VR 数据备份
+    updateWorkRef.current = null;
+
+    if (deafultWorkRef.current) {
+      var work = (0, _five.parseWork)(deafultWorkRef.current);
       five.load(work);
     }
+  }, []); // 暂停时： 恢复默认 VR 
 
-    workRef.current = null;
-  }, []);
   var pausedCallback = React.useCallback(function () {
-    if (rawRef.current) {
-      var work = (0, _five.parseWork)(rawRef.current);
+    if (deafultWorkRef.current) {
+      var work = (0, _five.parseWork)(deafultWorkRef.current);
+      Object.assign(window, {
+        $rawWork: work
+      });
       five.load(work);
     }
-  }, []);
+  }, []); // 播放时：如果暂停前有更新 VR 需要还原
+
   var playingCallback = React.useCallback(function () {
-    if (!workRef.current) {
+    if (!updateWorkRef.current) {
       return;
     }
 
-    five.load(workRef.current);
+    five.load(updateWorkRef.current);
   }, []);
   React.useEffect(function () {
     var callback = function callback(keyframe) {
       var _five$work;
 
-      if (!rawRef.current) {
-        rawRef.current = five.work.raw.works;
+      if (!deafultWorkRef.current) {
+        deafultWorkRef.current = five.work.raw.works;
       }
 
       var data = keyframe.data; // 如果数据中有新 work 数据，则直接载入
 
       if (data.work) {
-        workRef.current = (0, _five.parseWork)(data.work);
-        five.load(workRef.current);
+        updateWorkRef.current = (0, _five.parseWork)(data.work);
+        five.load(updateWorkRef.current);
         return;
       }
 
@@ -72,8 +79,13 @@ function UpdateVRPanorama() {
         delete data.dynamic_scene;
       }
 
-      workRef.current = (0, _five.parseWork)([lastRawWork, data]);
-      five.load(workRef.current);
+      Object.assign(window, {
+        $work1: JSON.parse(lastRawWork),
+        $work2: data,
+        parseWork: _five.parseWork
+      });
+      updateWorkRef.current = (0, _five.parseWork)([lastRawWork, data]);
+      five.load(updateWorkRef.current);
     };
 
     controller.on(_VreoUnit.VreoKeyframeEnum.UpdateVRPanorama, callback); // 离开 将之前的内容清空
@@ -93,6 +105,6 @@ function UpdateVRPanorama() {
       controller.off('paused', pausedCallback);
       controller.off('playing', playingCallback);
     };
-  }, [controller]);
+  }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 }

package/lib/Player/typings.d.ts

@@ -1,5 +1,7 @@
-import { ReactNode } from 'react';
-import { VreoKeyframeConfigMap } from '../typings/VreoUnit';
+import React, { ReactNode } from 'react';
+import { Subscribe, Five } from '@realsee/five';
+import { VreoKeyframeConfigMap, VreoKeyframeEvent } from '../typings/VreoUnit';
+import { VideoAgentMeshOptions } from './modules/VideoAgent/VideoAgentMesh';
 export interface PlayerConfigs {
     containter?: ReactDOM.Container;
     keyframeMap: VreoKeyframeConfigMap;
@@ -12,8 +14,19 @@ export interface PlayerConfigs {
         videoEffect?: HTMLVideoElement;
         modelTVVideo?: HTMLVideoElement;
     };
+    videoAgentMeshOptions?: VideoAgentMeshOptions;
     /**
      * 如果需要在 底部面板添加自定义内容，可以传递个 React 组件。
      */
     customPanelChildren?: ReactNode;
+    customKeyframes?: React.FC<CustomVreoKeyframeProps>[];
+    imageOptions?: {
+        size: number;
+    };
+    autoPreload?: boolean;
+}
+export declare type VreoSubscribe = Pick<Subscribe<VreoKeyframeEvent>, 'on' | 'once' | 'off'>;
+export interface CustomVreoKeyframeProps {
+    subscribe: VreoSubscribe;
+    five: Five;
 }

package/lib/fivePlugins/CameraMovementPlugin/index.js

@@ -54,112 +54,125 @@ function progressNumber(from, to, pst) {
 
 
 var CameraMovementPlugin = function CameraMovementPlugin(five) {
-  var move = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(args, duration) {
-      var opts,
-          _args = arguments;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              opts = _args.length > 2 && _args[2] !== undefined ? _args[2] : {
-                preload: true
-              };
+  var move = function move(args, duration) {
+    var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+      preload: true
+    };
+    return new Promise( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(resolve, reject) {
+        var panoIndex, movePanoOptions;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (opts.asyncStartCallback) {
+                  opts.asyncStartCallback();
+                }
 
-              if (opts.asyncStartCallback) {
-                opts.asyncStartCallback();
-              }
+                if (!(five.panoIndex === undefined)) {
+                  _context.next = 3;
+                  break;
+                }
 
-              if (!(args.mode && args.mode !== five.currentMode)) {
-                _context.next = 5;
-                break;
-              }
+                return _context.abrupt("return", reject(false));
 
-              _context.next = 5;
-              return new Promise(function (resolve) {
-                if (!args.mode) return;
-                five.once('modeChange', function (mode) {
-                  five.once('initAnimationEnded', function () {
-                    if (mode === args.mode) {
-                      resolve(true);
-                    }
+              case 3:
+                if (!(args.mode && args.mode !== five.currentMode)) {
+                  _context.next = 6;
+                  break;
+                }
+
+                _context.next = 6;
+                return new Promise(function (resolve) {
+                  if (!args.mode) return;
+                  five.once('modeChange', function (mode) {
+                    five.once('initAnimationEnded', function () {
+                      if (mode === args.mode) {
+                        resolve(true);
+                      }
+                    });
+                  });
+                  five.changeMode(args.mode, {
+                    fov: args.fov || undefined,
+                    latitude: args.latitude || undefined,
+                    longitude: args.longitude || undefined,
+                    panoIndex: args.panoIndex || undefined
                   });
                 });
-                five.changeMode(args.mode, {
-                  fov: args.fov || undefined,
-                  latitude: args.latitude || undefined,
-                  longitude: args.longitude || undefined,
-                  panoIndex: args.panoIndex || undefined
-                });
-              });
 
-            case 5:
-              if (!(args.mode === _five.Five.Mode.Floorplan)) {
-                _context.next = 7;
-                break;
-              }
+              case 6:
+                if (!(args.mode === _five.Five.Mode.Floorplan)) {
+                  _context.next = 8;
+                  break;
+                }
 
-              return _context.abrupt("return", true);
+                return _context.abrupt("return", resolve(true));
 
-            case 7:
-              if (!(opts.preload && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
-                _context.next = 10;
-                break;
-              }
+              case 8:
+                if (!(opts.preload && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
+                  _context.next = 11;
+                  break;
+                }
 
-              _context.next = 10;
-              return five.preloadPano(args.panoIndex);
+                _context.next = 11;
+                return five.preloadPano(args.panoIndex);
 
-            case 10:
-              if (opts.asyncEndCallback) {
-                opts.asyncEndCallback();
-              }
+              case 11:
+                if (opts.asyncEndCallback) {
+                  opts.asyncEndCallback();
+                }
 
-              if (!(args.panoIndex === undefined && args.fov === undefined && args.latitude === undefined && args.longitude === undefined)) {
-                _context.next = 13;
-                break;
-              }
+                if (!(args.panoIndex === undefined && args.fov === undefined && args.latitude === undefined && args.longitude === undefined)) {
+                  _context.next = 14;
+                  break;
+                }
 
-              return _context.abrupt("return", true);
+                return _context.abrupt("return", resolve(true));
 
-            case 13:
-              _context.next = 15;
-              return new Promise(function (resolve, reject) {
-                var panoIndex = args.panoIndex !== undefined ? args.panoIndex : five.panoIndex;
-
-                if (panoIndex !== undefined) {
-                  five.moveToPano(panoIndex, Object.assign({
-                    duration: duration,
-                    // 移动耗时
-                    moveEndCallback: function moveEndCallback() {
-                      return resolve(true);
-                    },
-                    // 移动结束
-                    moveCancelCallback: function moveCancelCallback() {
-                      return reject(false);
-                    } // 移动开始
-
-                  }, args));
-                } else {
-                  reject(false);
+              case 14:
+                panoIndex = args.panoIndex !== undefined ? args.panoIndex : five.panoIndex;
+
+                if (!(panoIndex !== undefined)) {
+                  _context.next = 21;
+                  break;
                 }
-              });
 
-            case 15:
-              return _context.abrupt("return", _context.sent);
+                movePanoOptions = Object.assign(args, {
+                  duration: duration,
+                  // 移动耗时
+                  moveEndCallback: function moveEndCallback() {
+                    return resolve(true);
+                  },
+                  // 移动结束
+                  moveCancelCallback: function moveCancelCallback() {
+                    resolve(true);
+                  } // 移动开始
+                  // effect: args.transEffect || 'fade',
 
-            case 16:
-            case "end":
-              return _context.stop();
+                });
+                _context.next = 19;
+                return five.moveToPano(panoIndex, movePanoOptions);
+
+              case 19:
+                _context.next = 22;
+                break;
+
+              case 21:
+                reject(false);
+
+              case 22:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee);
-    }));
+        }, _callee);
+      }));
 
-    return function move(_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }();
+      return function (_x, _x2) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+  };
 
   var getAnimeParams = function getAnimeParams(args) {
     var currentFiveState = five.state; // latitude
@@ -239,8 +252,9 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
                   // 移动结束
                   moveCancelCallback: function moveCancelCallback() {
                     return reject(false);
-                  } // 移动开始
-
+                  },
+                  // 移动开始
+                  effect: 'fade'
                 });
               });
 

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

@@ -33,6 +33,7 @@ export interface CameraMovementOptsCallback {
 export declare type MoveArgs = {
     mode: Mode;
     panoIndex: number;
+    transEffect?: "fly" | "fade" | "instant";
 } & Pose;
 export declare type MoveOpts = {
     preload?: boolean;

package/lib/react/index.d.ts

@@ -1,18 +1,26 @@
 import * as React from 'react';
+import { PlayerConfigs } from '../Player/typings';
 import { VreoKeyframeEvent, VreoUnit } from '../typings/VreoUnit';
-export declare const VreoProvider: React.FC;
+export interface VreoProviderProps {
+    configs?: Partial<PlayerConfigs>;
+}
+export declare const VreoProvider: React.FC<VreoProviderProps>;
 /**
  * VreoPlayer 命令集合。
  */
 export interface VreoActionCallbacks {
     /**
      * 载入剧本数据。
+     * @param vreoUnit 剧本数据
+     * @param currentTime 开始时间戳
+     * @param preload 是否开启预载
+     * @param force 是否强制载入
      */
-    load: (vreoUnit: VreoUnit, currentTime?: number) => Promise<boolean>;
+    load: (vreoUnit: VreoUnit, currentTime?: number, preload?: boolean, force?: boolean) => Promise<boolean>;
     /**
      * 播放。
      */
-    play: () => void;
+    play: (currentTime?: number) => void;
     /**
      * 暂停。
      */
@@ -34,7 +42,7 @@ export declare function useVreoAction(): {
     load: (vreoUnit: VreoUnit, currentTime?: number | undefined) => Promise<boolean>;
     pause: () => void;
     show: () => void;
-    play: () => boolean;
+    play: (currentTime?: number | undefined) => boolean;
     hide: () => void;
     dispose: () => void;
 };

package/lib/react/index.js

@@ -44,7 +44,7 @@ var VreoProvider = function VreoProvider(props) {
 
   var playerRef = React.useRef(null);
   React.useEffect(function () {
-    playerRef.current = new _Player.Player(five);
+    playerRef.current = new _Player.Player(five, props.configs || {});
     setPlayer(playerRef.current);
     return function () {
       var _playerRef$current;
@@ -79,8 +79,8 @@ function useVreoAction() {
   var load = React.useCallback(function (vreoUnit, currentTime) {
     return player.load(vreoUnit, currentTime);
   }, [player]);
-  var play = React.useCallback(function () {
-    return player.play();
+  var play = React.useCallback(function (currentTime) {
+    return player.play(currentTime || 0);
   }, [player]);
   var pause = React.useCallback(function () {
     return player.pause();

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

@@ -0,0 +1 @@
+export declare function createTransMatrix(arr1: number[]): (arr2: number[]) => number[];