@realsee/vreo 0.2.0-alpha.9 → 1.0.0-alpha.10

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

@@ -1,42 +1,25 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SpatialScenePanel = SpatialScenePanel;
-
 var React = _interopRequireWildcard(require("react"));
-
 var _reactDom = _interopRequireDefault(require("react-dom"));
-
 var _three = require("three");
-
-var _BetterTween = require("@realsee/dnalogel/shared-utils/animationFrame/BetterTween");
-
-var _CSS3DRenderPlugin = require("@realsee/dnalogel/plugins/CSS3DRenderPlugin");
-
+var _BetterTween = require("../../../shared-utils/animationFrame/BetterTween");
+var _CSS3DRenderPlugin = require("../../../fivePlugins/CSS3DRenderPlugin");
 var _VreoUnit = require("../../../typings/VreoUnit");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 // const getSphere = (position: Vector3, color = 0xffff00) => {
 //   const geometry = new SphereGeometry(0.05, 32, 16)
 //   const material = new MeshBasicMaterial({ color })
@@ -44,28 +27,27 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 //   sphere.position.copy(position)
 //   return sphere
 // }
+
 var searchV1 = function searchV1(_ref) {
   var five = _ref.five,
-      dom = _ref.dom;
+    dom = _ref.dom;
   var cameraDirection = new _three.Vector3();
   five.camera.getWorldDirection(cameraDirection);
   var cameraPosition = five.camera.position;
-
   var _five$model$intersect = five.model.intersectRaycaster(new _three.Raycaster(cameraPosition, cameraDirection)),
-      _five$model$intersect2 = _slicedToArray(_five$model$intersect, 1),
-      intersect = _five$model$intersect2[0];
-
+    _five$model$intersect2 = _slicedToArray(_five$model$intersect, 1),
+    intersect = _five$model$intersect2[0];
   var point = five.project2d(intersect.point);
-  var widescreen = window.innerWidth > 560 ? true : false; // const width = dom!.clientWidth
-
+  var widescreen = window.innerWidth > 560 ? true : false;
+  // const width = dom!.clientWidth
   var height = dom.clientHeight;
   dom.style.left = point.x + 'px';
   dom.style.top = point.y - height / 2 + 'px';
   var rect = dom.getBoundingClientRect();
   var left = rect.left,
-      top = rect.top,
-      bottom = rect.bottom,
-      right = rect.right;
+    top = rect.top,
+    bottom = rect.bottom,
+    right = rect.right;
   var leftBottom = new _three.Vector3(left, bottom);
   var leftTop = new _three.Vector3(left, top);
   var rightTop = new _three.Vector3(right, top);
@@ -75,23 +57,24 @@ var searchV1 = function searchV1(_ref) {
     point.setY(-(point.y / window.innerHeight) * 2 + (widescreen ? 1.35 : 1.125));
     point.setZ(0.5);
     return point.unproject(five.camera).addScaledVector(cameraDirection, 0.2);
-  }); // __debug__
+  });
+
+  // __debug__
   // const colors = [0xdc143c, 0xffff00, 0x0000ff, 0x008000]
   // points.forEach((p, index) => five.scene.add(getSphere(p, colors[index])))
-  // 判断是手机 150
 
+  // 判断是手机 150
   var ratio = leftBottom.distanceTo(rightBottom) / (widescreen ? 150 : 120);
   return {
     points: points,
     ratio: ratio
   };
 };
+
 /**
  * 空间场景面板
  * @returns
  */
-
-
 function SpatialScenePanel(props) {
   var timeoutRef = React.useRef(null);
   var ref = React.useRef(null);
@@ -101,68 +84,63 @@ function SpatialScenePanel(props) {
     if (!ref.current) {
       return;
     }
-
     var callback = function callback(keyframe) {
       if (keyframe.data.customType !== 'SpatialScenePanel') {
         return;
       }
+      var data = keyframe.data;
 
-      var data = keyframe.data; // const data = mockData
-
+      // const data = mockData
       var _searchV = searchV1({
-        five: props.five,
-        dom: ref.current
-      }),
-          points = _searchV.points,
-          ratio = _searchV.ratio;
-
+          five: props.five,
+          dom: ref.current
+        }),
+        points = _searchV.points,
+        ratio = _searchV.ratio;
       var _ref2 = rendererRef.current.create3DDomContainer(points, {
-        ratio: ratio,
-        autoRender: false
-      }) || {},
-          container = _ref2.container,
-          dispose = _ref2.dispose,
-          css3DObject = _ref2.css3DObject,
-          render = _ref2.render;
-
+          ratio: ratio,
+          autoRender: false
+        }) || {},
+        container = _ref2.container,
+        dispose = _ref2.dispose,
+        css3DObject = _ref2.css3DObject,
+        render = _ref2.render;
       Object.assign(window, {
         $css3DObject: css3DObject
       });
       if (!container) return;
-
       _reactDom["default"].render( /*#__PURE__*/React.createElement(Panel, {
         ref: function ref(_ref3) {
           return panelRef.current = _ref3;
         },
         data: data
       }), container);
-
       var startRotateY = -(Math.PI * 2) / 9;
       var lastRotateY = 0;
       (0, _BetterTween.tweenProgress)(1000).onUpdate(function (_ref4) {
         var progress = _ref4.progress;
         var needRotateY = Math.PI / 90 * 11 * progress;
         var rotateY = needRotateY - lastRotateY;
-        css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.rotateY(rotateY); // css3DObject?.rotateZ
-
+        css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.rotateY(rotateY);
+        // css3DObject?.rotateZ
         lastRotateY = needRotateY;
       }).onStart(function () {
         css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.rotateY(startRotateY);
         render();
       }).onDispose(function () {
         var _panelRef$current;
-
         (_panelRef$current = panelRef.current) === null || _panelRef$current === void 0 ? void 0 : _panelRef$current.classList.add('show');
-      }).play(); // Object.assign(window, {  $dispose: () => {
+      }).play();
+
+      // Object.assign(window, {  $dispose: () => {
       //   panelRef.current?.classList.add('hide')
       //   setTimeout(() => dispose?.(), 1500)
       // } })
 
       var start = keyframe.start,
-          end = keyframe.end;
+        end = keyframe.end;
       timeoutRef.current = setTimeout(function () {
         var _panelRef$current2;
-
         (_panelRef$current2 = panelRef.current) === null || _panelRef$current2 === void 0 ? void 0 : _panelRef$current2.classList.add('hide');
         timeoutRef.current = setTimeout(function () {
           dispose === null || dispose === void 0 ? void 0 : dispose();
@@ -170,15 +148,14 @@ function SpatialScenePanel(props) {
         }, 1500);
       }, end - start);
     };
-
     Object.assign(window, {
       $callback: callback
-    }); // setTimeout(() => {callback()}, 8000)
+    });
 
+    // setTimeout(() => {callback()}, 8000)
     props.subscribe.on(_VreoUnit.VreoKeyframeEnum.Custom, callback);
     return function () {
       props.subscribe.off(_VreoUnit.VreoKeyframeEnum.Custom, callback);
-
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
@@ -189,27 +166,22 @@ function SpatialScenePanel(props) {
     ref: ref
   });
 }
-/** 背景动画：控制延迟 */
-
 
+/** 背景动画：控制延迟 */
 function SpatialScenePanelBg() {
   var ref = React.useRef(null);
   var timeoutRef = React.useRef(null);
   React.useEffect(function () {
     if (!ref.current) return;
-
     var listener = function listener() {
       var _ref$current;
-
       (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setAttribute('class', 'SpatialScenePanel-bg');
       timeoutRef.current = setTimeout(function () {
         var _ref$current2;
-
         (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.setAttribute('class', 'SpatialScenePanel-bg SpatialScenePanel-bg--animation');
         timeoutRef.current = null;
       }, 3000);
     };
-
     ref.current.addEventListener('animationend', listener);
     return function () {
       if (ref.current) ref.current.removeEventListener('animationend', listener);
@@ -221,10 +193,8 @@ function SpatialScenePanelBg() {
     className: "SpatialScenePanel-bg SpatialScenePanel-bg--animation"
   });
 }
-
 var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
   var _props$data, _props$data2, _props$data3, _props$data3$stateLis;
-
   return /*#__PURE__*/React.createElement("div", {
     className: "SpatialScenePanel",
     ref: myRef
@@ -244,7 +214,8 @@ var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
       className: "SpatialScenePanel-item index_".concat(index)
     }, /*#__PURE__*/React.createElement("img", {
       className: "SpatialScenePanel-icon",
-      src: state.icon
+      src: state.icon,
+      alt: "".concat(state.text)
     }), /*#__PURE__*/React.createElement("div", {
       className: "SpatialScenePanel-text"
     }, state.text), /*#__PURE__*/React.createElement("div", {
@@ -253,8 +224,11 @@ var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
   }))), /*#__PURE__*/React.createElement("div", {
     className: "SpatialScenePanel-disappear-area"
   }));
-}); // export function SpatialScenePanel() {
+});
+
+// export function SpatialScenePanel() {
 //   // const data = mockData
+
 //   return (
 //     <div className="SpatialScenePanel" >
 //     <div className="SpatialScenePanel-show-area">
@@ -273,6 +247,7 @@ var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
 //         ))}
 //       </div>
 //     </div>
+
 //     <div className="SpatialScenePanel-disappear-area"></div>
 //   </div>
 //   )

package/lib/Player/hooks.js

@@ -6,33 +6,23 @@ Object.defineProperty(exports, "__esModule", {
 exports.useController = useController;
 exports.useFiveInstance = useFiveInstance;
 exports.useFiveProject2d = useFiveProject2d;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _Controller = require("./Controller");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function useController() {
   var controller = _react["default"].useContext(_Controller.ControllerContext);
-
   if (!controller) {
     throw new Error('没有找到 "ControllerContext"');
   }
-
   return controller;
 }
-
 function useFiveInstance() {
   var controller = useController();
-
-  if (!controller.$five) {
+  if (!controller.five) {
     throw new Error('没有找到 "five" 实例');
   }
-
-  return controller.$five;
+  return controller.five;
 }
-
 function useFiveProject2d() {
   var five = useFiveInstance();
   return function (vector) {

package/lib/Player/index.d.ts

@@ -1,16 +1,18 @@
 import { Five, Subscribe } from '@realsee/five';
 import { VreoKeyframeEvent, VreoUnit } from '../typings/VreoUnit';
-import { PlayerConfigs } from './typings';
+import { Appearance, PlayerConfigs } from './typings';
 export declare class Player extends Subscribe<VreoKeyframeEvent> {
     $five: Five;
     private controller;
     configs: Readonly<PlayerConfigs>;
     constructor(five: Five, configs?: Partial<PlayerConfigs>);
-    load(vreoUnit: VreoUnit, currentTime?: number, preload?: boolean): Promise<boolean>;
+    load(vreoUnit: VreoUnit, currentTime?: number, preload?: boolean, force?: boolean): Promise<boolean>;
     get paused(): boolean;
-    play(): boolean;
+    play(currentTime?: number): boolean;
+    setAppearance(appearance: Appearance): void;
     pause(): void;
     show(): void;
     hide(): void;
+    getCurrentTime(): number;
     dispose(): void;
 }