@realsee/vreo 2.3.8 → 2.3.9-alpha.1

package/lib/fivePlugins/CSS3DRenderPlugin/index.js

@@ -1,19 +1,30 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.CSS3DRenderPlugin = void 0;
+
 var THREE = _interopRequireWildcard(require("three"));
+
 var _CSS3DRenderer = require("three/examples/jsm/renderers/CSS3DRenderer");
+
 var _evenNumber = _interopRequireDefault(require("./evenNumber"));
+
 var _centerPoint = _interopRequireDefault(require("./centerPoint"));
+
 var _transformPositionToVector = _interopRequireDefault(require("./transformPositionToVector3"));
+
 var _createResizeObserver = _interopRequireDefault(require("./createResizeObserver"));
+
 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; }
+
 /**
  * **CSS3DRenderPlugin** 提供矩形区域（三维空间四个坐标点），你可以在此矩形区域中渲染 DOM 内容。
  * 实现原理参考[CSS3DRenderer](https://threejs.org/docs/index.html?q=CSS3D#examples/en/renderers/CSS3DRenderer)。
@@ -24,11 +35,14 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
   var state = {
     disposeCallbacks: []
   };
+
   var create3DDomContainer = function create3DDomContainer() {
     var _five$model, _five$model2, _config$autoRender;
+
     for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
       params[_key] = arguments[_key];
     }
+
     var points = params[0].map(function (point) {
       return point instanceof THREE.Vector3 ? point : (0, _transformPositionToVector["default"])(point);
     });
@@ -45,40 +59,43 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
     var autoRender = (_config$autoRender = config === null || config === void 0 ? void 0 : config.autoRender) !== null && _config$autoRender !== void 0 ? _config$autoRender : true;
     var behindFiveContainer = (config === null || config === void 0 ? void 0 : config.behindFiveContainer) || fiveElement.parentElement || document.body;
     var container = (config === null || config === void 0 ? void 0 : config.container) || document.createElement('div');
-    container.classList.add('__Vreo-plugin--CSS3DRenderPlugin');
+    container.classList.add('__Vreo-plugin--CSS3DRenderPlugin'); // 获取css3DObject, 如果mode为behind的话，一起获取mesh
 
-    // 获取css3DObject, 如果mode为behind的话，一起获取mesh
     var _createObject = createObject(points, {
-        ratio: ratio,
-        dpr: dpr,
-        container: container,
-        mode: mode
-      }),
-      css3DObject = _createObject.css3DObject,
-      mesh = _createObject.mesh;
-
-    // ======= INIT START =======
+      ratio: ratio,
+      dpr: dpr,
+      container: container,
+      mode: mode
+    }),
+        css3DObject = _createObject.css3DObject,
+        mesh = _createObject.mesh; // ======= INIT START =======
+
+
     var resizeObserver;
     var frontModeUnInited = mode === 'front' && !state.frontMode;
     var behindModeUnInited = mode === 'behind' && !state.behindMode;
     var inited = !(frontModeUnInited || behindModeUnInited);
     var stopRenderFlag = false;
     var requestAnimationFrameId = null;
+
     if (behindModeUnInited) {
       state.behindMode = {
         scene: new THREE.Scene(),
         css3DRenderer: new _CSS3DRenderer.CSS3DRenderer()
       };
     }
+
     if (frontModeUnInited) {
       state.frontMode = {
         scene: new THREE.Scene(),
         css3DRenderer: new _CSS3DRenderer.CSS3DRenderer()
       };
     }
+
     var _ref = mode === 'behind' ? state.behindMode : state.frontMode,
-      scene = _ref.scene,
-      css3DRenderer = _ref.css3DRenderer;
+        scene = _ref.scene,
+        css3DRenderer = _ref.css3DRenderer;
+
     var render = function () {
       if (!inited) {
         var css3DRendererSetSize = function css3DRendererSetSize() {
@@ -92,22 +109,27 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
           });
           css3DRenderer.setSize(rendererWidth, rendererHeight);
         };
+
         css3DRendererSetSize();
         resizeObserver = (0, _createResizeObserver["default"])(css3DRendererSetSize, fiveElement);
         css3DRenderer.domElement.style.position = 'absolute';
         css3DRenderer.domElement.style.top = '0';
         css3DRenderer.domElement.style.userSelect = 'none';
         css3DRenderer.domElement.style.pointerEvents = 'none';
+
         var renderEveryFrame = function renderEveryFrame() {
           if (stopRenderFlag) return;
           requestAnimationFrameId = requestAnimationFrame(renderEveryFrame);
           css3DRenderer.render(scene, five.camera);
         };
+
         return function () {
           var _resizeObserver, _resizeObserver$obser;
+
           scene.add(css3DObject);
           (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 ? void 0 : (_resizeObserver$obser = _resizeObserver.observe) === null || _resizeObserver$obser === void 0 ? void 0 : _resizeObserver$obser.call(_resizeObserver);
           renderEveryFrame();
+
           if (mode === 'behind' && mesh) {
             five.scene.add(mesh);
             disposers.push(function () {
@@ -121,15 +143,18 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
         };
       }
     }();
+
     if (frontModeUnInited) {
       var wrapper = fiveElement.parentElement || document.body;
       wrapper.appendChild(css3DRenderer.domElement);
     }
+
     if (behindModeUnInited) {
       var _wrapper = behindFiveContainer;
+
       _wrapper.appendChild(css3DRenderer.domElement);
-    }
-    // ======= INIT END =======
+    } // ======= INIT END =======
+
 
     var dispose = function dispose() {
       stopRenderFlag = true;
@@ -138,25 +163,32 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
       });
       scene.remove(css3DObject);
       if (typeof requestAnimationFrameId === 'number') cancelAnimationFrame(requestAnimationFrameId);
+
       if (scene.children.length === 0) {
         css3DRenderer.domElement.remove();
         if (mode === 'front') state.frontMode = undefined;
         if (mode === 'behind') state.behindMode = undefined;
+
         if (!state.behindMode && !state.frontMode) {
           var _resizeObserver2, _resizeObserver2$unob;
+
           (_resizeObserver2 = resizeObserver) === null || _resizeObserver2 === void 0 ? void 0 : (_resizeObserver2$unob = _resizeObserver2.unobserve) === null || _resizeObserver2$unob === void 0 ? void 0 : _resizeObserver2$unob.call(_resizeObserver2);
         }
       }
+
       return true;
     };
+
     var idx = state.disposeCallbacks.findIndex(function (item) {
       return item === dispose;
     });
+
     if (idx !== -1) {
       state.disposeCallbacks.splice(idx, 1);
     } else {
       state.disposeCallbacks.push(dispose);
     }
+
     if (autoRender) render();
     return {
       container: container,
@@ -165,11 +197,12 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
       render: autoRender ? undefined : render
     };
   };
+
   var createObject = function createObject(points, config) {
     var ratio = config.ratio,
-      dpr = config.dpr,
-      element = config.container,
-      mode = config.mode;
+        dpr = config.dpr,
+        element = config.container,
+        mode = config.mode;
     var planeWidth = points[0].distanceTo(points[1]);
     var planeHeight = points[1].distanceTo(points[2]);
     var domWidthPx = (0, _evenNumber["default"])(planeWidth / ratio * dpr);
@@ -181,9 +214,10 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
     element.style.pointerEvents = 'none';
     var centerPosition = (0, _centerPoint["default"])(points[0], points[2]);
     var vector01 = points[1].clone().sub(points[0]); // 点0 -> 点1 的向量
-    var vector12 = points[2].clone().sub(points[1]); // 点1 -> 点2 的向量
 
+    var vector12 = points[2].clone().sub(points[1]); // 点1 -> 点2 的向量
     // 旋转
+
     var rotateXAngle = new THREE.Vector3(0, 1, 0).angleTo(new THREE.Vector3(0, vector12.y, vector12.z));
     var rotateYAngle = new THREE.Vector3(1, 0, 0).angleTo(new THREE.Vector3(vector01.x, 0, vector01.z));
     var rotateZAngle = vector01.angleTo(new THREE.Vector3(vector01.x, 0, vector01.z));
@@ -192,15 +226,19 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
      * [0,0,1] => [0,1,0]  为rolate Worldy正方向
      * [0,1,1] => [-1,0,0] 为rolate Worldz正方向
      */
+
     var rotateX = (vector12.z > 0 ? -1 : 1) * rotateXAngle;
     var rotateY = (vector01.z < 0 ? 1 : -1) * rotateYAngle;
     var rotateZ = (vector01.x > 0 && vector01.y < 0 || vector01.x < 0 && vector01.y > 0 ? -1 : 1) * rotateZAngle;
     css3DObject.rotateOnWorldAxis(new THREE.Vector3(1, 0, 0), rotateX); // x
+
     css3DObject.rotateOnWorldAxis(new THREE.Vector3(0, 1, 0), rotateY); // y
+
     css3DObject.rotateOnWorldAxis(new THREE.Vector3(0, 0, 1), rotateZ); // z
 
     css3DObject.position.set(centerPosition.x, centerPosition.y, centerPosition.z);
     var mesh;
+
     if (mode === 'behind') {
       var material = new THREE.MeshBasicMaterial({
         opacity: 0,
@@ -214,11 +252,13 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
       mesh.rotation.copy(css3DObject.rotation);
       mesh.scale.copy(css3DObject.scale);
     }
+
     return {
       css3DObject: css3DObject,
       mesh: mesh
     };
   };
+
   return {
     create3DDomContainer: create3DDomContainer,
     disposeAll: function disposeAll() {
@@ -229,6 +269,7 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
     }
   };
 };
+
 exports.CSS3DRenderPlugin = CSS3DRenderPlugin;
 var _default = CSS3DRenderPlugin;
 exports["default"] = _default;

package/lib/fivePlugins/CSS3DRenderPlugin/transformPositionToVector3.js

@@ -4,12 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+
 var _three = require("three");
+
 var transformPositionToVector3 = function transformPositionToVector3(_ref) {
   var x = _ref.x,
-    y = _ref.y,
-    z = _ref.z;
+      y = _ref.y,
+      z = _ref.z;
   return new _three.Vector3(x, y, z);
 };
+
 var _default = transformPositionToVector3;
 exports["default"] = _default;

package/lib/fivePlugins/CameraMovementPlugin/index.js

@@ -1,20 +1,29 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CameraMovementPlugin = void 0;
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _five = require("@realsee/five");
+
 var _typings = require("./typings");
+
 var PI = Math.PI;
 var PI_2 = PI * 2;
+var moving = false; // five 6 神秘bug， move 的时候不能 setState
+
 function progressNumber(from, to, pst) {
   if (from === to) return from;
   return from + (to - from) * pst;
 }
+
 function progressLongitude(fromLongitude, toLongitude, rotation, progress) {
   var clockwise = rotation === _typings.Rotation.Clockwise;
   var delta = clockwise ? fromLongitude - toLongitude : toLongitude - fromLongitude;
@@ -24,10 +33,11 @@ function progressLongitude(fromLongitude, toLongitude, rotation, progress) {
   var progressLongitude = fromLongitude + deltaMod3 * progress;
   return progressLongitude % PI_2;
 }
-
 /**
  * **运镜插件** 模拟类似于电影运镜效果。
  */
+
+
 var CameraMovementPlugin = function CameraMovementPlugin(five) {
   var move = function move(args, duration) {
     var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
@@ -36,58 +46,77 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
     return new Promise( /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
         var _opts$asyncEndCallbac;
+
         var panoIndex, start, movePanoOptions;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                moving = true;
+
                 if (opts.asyncStartCallback) {
                   opts.asyncStartCallback();
                 }
+
                 if (!(five.panoIndex === undefined)) {
-                  _context.next = 3;
+                  _context.next = 4;
                   break;
                 }
+
                 return _context.abrupt("return", reject(false));
-              case 3:
+
+              case 4:
                 if (!(args.mode && args.mode !== five.currentMode)) {
-                  _context.next = 7;
+                  _context.next = 8;
                   break;
                 }
-                _context.next = 6;
+
+                _context.next = 7;
                 return five.changeMode(args.mode, args, duration);
-              case 6:
-                return _context.abrupt("return", resolve(true));
+
               case 7:
+                return _context.abrupt("return", resolve(true));
+
+              case 8:
                 if (!(args.mode === _five.Five.Mode.Floorplan)) {
-                  _context.next = 9;
+                  _context.next = 10;
                   break;
                 }
+
                 return _context.abrupt("return", resolve(true));
-              case 9:
+
+              case 10:
                 if (!(opts.preload && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
-                  _context.next = 12;
+                  _context.next = 13;
                   break;
                 }
-                _context.next = 12;
+
+                _context.next = 13;
                 return five.preloadPano(args.panoIndex);
-              case 12:
+
+              case 13:
                 (_opts$asyncEndCallbac = opts.asyncEndCallback) === null || _opts$asyncEndCallbac === void 0 ? void 0 : _opts$asyncEndCallbac.call(opts);
+
                 if (!(args.panoIndex === undefined && args.fov === undefined && args.latitude === undefined && args.longitude === undefined)) {
-                  _context.next = 15;
+                  _context.next = 16;
                   break;
                 }
+
                 return _context.abrupt("return", resolve(true));
-              case 15:
+
+              case 16:
                 panoIndex = args.panoIndex !== undefined ? args.panoIndex : five.panoIndex;
+
                 if (!(panoIndex !== undefined)) {
-                  _context.next = 25;
+                  _context.next = 26;
                   break;
                 }
+
                 start = performance.now();
-                _context.next = 20;
+                _context.next = 21;
                 return five.ready();
-              case 20:
+
+              case 21:
                 movePanoOptions = Object.assign({}, args, {
                   duration: duration - (performance.now() - start),
                   // 移动耗时
@@ -101,65 +130,76 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
                   // 移动开始
                   effect: args.transEffect || 'fly'
                 });
-                _context.next = 23;
+                _context.next = 24;
                 return five.moveToPano(panoIndex, movePanoOptions);
-              case 23:
-                _context.next = 26;
+
+              case 24:
+                _context.next = 27;
                 break;
-              case 25:
-                reject(false);
+
               case 26:
+                reject(false);
+
+              case 27:
               case "end":
                 return _context.stop();
             }
           }
         }, _callee);
       }));
+
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
       };
     }());
   };
+
   var rotate = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(args, duration) {
       var _opts$asyncStartCallb, _opts$asyncEndCallbac2;
+
       var opts,
-        from,
-        to,
-        timeEnd,
-        start,
-        animeDuration,
-        onFiveRenderFrame,
-        _args2 = arguments;
+          from,
+          to,
+          timeEnd,
+          start,
+          animeDuration,
+          onFiveRenderFrame,
+          _args2 = arguments;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               opts = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {};
-              (_opts$asyncStartCallb = opts.asyncStartCallback) === null || _opts$asyncStartCallb === void 0 ? void 0 : _opts$asyncStartCallb.call(opts);
+              moving = false;
+              (_opts$asyncStartCallb = opts.asyncStartCallback) === null || _opts$asyncStartCallb === void 0 ? void 0 : _opts$asyncStartCallb.call(opts); // 先切换模型再出旋转效果
 
-              // 先切换模型再出旋转效果
               if (!(args.mode && five.currentMode !== args.mode)) {
-                _context2.next = 5;
+                _context2.next = 6;
                 break;
               }
-              _context2.next = 5;
+
+              _context2.next = 6;
               return five.changeMode(args.mode, args.mode === _five.Five.Mode.Panorama ? {
                 latitude: 0
               } : undefined);
-            case 5:
+
+            case 6:
               if (!(args.mode === _five.Five.Mode.Panorama && five.currentMode === _five.Five.Mode.Panorama && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex)) {
-                _context2.next = 11;
+                _context2.next = 12;
                 break;
               }
+
               if (!opts.preload) {
-                _context2.next = 9;
+                _context2.next = 10;
                 break;
               }
-              _context2.next = 9;
+
+              _context2.next = 10;
               return five.preloadPano(args.panoIndex);
-            case 9:
-              _context2.next = 11;
+
+            case 10:
+              _context2.next = 12;
               return new Promise(function (resolve, reject) {
                 five.moveToPano(args.panoIndex, {
                   moveEndCallback: function moveEndCallback() {
@@ -173,30 +213,38 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
                   effect: 'fade'
                 });
               });
-            case 11:
-              _context2.next = 13;
+
+            case 12:
+              _context2.next = 14;
               return five.ready();
-            case 13:
-              (_opts$asyncEndCallbac2 = opts.asyncEndCallback) === null || _opts$asyncEndCallbac2 === void 0 ? void 0 : _opts$asyncEndCallbac2.call(opts);
 
-              // 计算to
+            case 14:
+              (_opts$asyncEndCallbac2 = opts.asyncEndCallback) === null || _opts$asyncEndCallbac2 === void 0 ? void 0 : _opts$asyncEndCallbac2.call(opts); // 计算to
+
               from = five.getCurrentState();
+
               to = function () {
                 return args;
               }();
+
               timeEnd = false; // 开始时间
+
               start = performance.now();
               animeDuration = duration;
+
               if (args.rotation === _typings.Rotation.Loop) {
                 animeDuration = args.rotateSpeed ? Math.ceil(Math.abs(to.longitude - from.longitude) / args.rotateSpeed * 1000) : duration;
                 animeDuration = Math.min(duration, animeDuration);
               }
+
               onFiveRenderFrame = function onFiveRenderFrame() {
-                if (timeEnd) {
+                if (timeEnd || moving) {
                   five.off('renderFrame', onFiveRenderFrame);
                   return;
                 }
+
                 var targetState = {};
+
                 if (args.rotation !== _typings.Rotation.Loop) {
                   var progress = (performance.now() - start) / duration;
                   targetState = {
@@ -206,9 +254,13 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
                   };
                 } else {
                   var _progress = (performance.now() - start) / animeDuration; // 可能大于1
+
+
                   var times = Math.floor(_progress);
                   var progress2 = _progress - times; // 一定小于1
+
                   var isNegative = times % 2 === 1; // 是否为反向旋转, 0: 正, 1: 反, 2: 正, 3: 反 以此类推
+
                   var resultProgress = isNegative ? 1 - progress2 : progress2;
                   targetState = {
                     fov: progressNumber(from.fov, to.fov, resultProgress),
@@ -216,34 +268,41 @@ var CameraMovementPlugin = function CameraMovementPlugin(five) {
                     longitude: progressNumber(from.longitude, to.longitude, resultProgress)
                   };
                 }
+
                 five.setState(targetState, true);
               };
+
               five.on('renderFrame', onFiveRenderFrame);
-              _context2.next = 24;
+              _context2.next = 25;
               return new Promise(function (resolve) {
                 setTimeout(function () {
                   timeEnd = true;
-                  five.off('renderFrame', onFiveRenderFrame);
-                  // 总时间到了之后强制结束，同时也是 Loop 模式的结束方式
+                  five.off('renderFrame', onFiveRenderFrame); // 总时间到了之后强制结束，同时也是 Loop 模式的结束方式
+
                   resolve(true);
                 }, duration);
               });
-            case 24:
-              return _context2.abrupt("return", _context2.sent);
+
             case 25:
+              return _context2.abrupt("return", _context2.sent);
+
+            case 26:
             case "end":
               return _context2.stop();
           }
         }
       }, _callee2);
     }));
+
     return function rotate(_x3, _x4) {
       return _ref2.apply(this, arguments);
     };
   }();
+
   return {
     move: move,
     rotate: rotate
   };
 };
+
 exports.CameraMovementPlugin = CameraMovementPlugin;

package/lib/fivePlugins/CameraMovementPlugin/typings.js

@@ -4,16 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Rotation = exports.CameraMovementEffect = void 0;
+
 /* eslint-disable prettier/prettier */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 var CameraMovementEffect;
 exports.CameraMovementEffect = CameraMovementEffect;
+
 (function (CameraMovementEffect) {
   CameraMovementEffect["Move"] = "Move";
   CameraMovementEffect["Rotate"] = "Rotate";
 })(CameraMovementEffect || (exports.CameraMovementEffect = CameraMovementEffect = {}));
+
 var Rotation;
 exports.Rotation = Rotation;
+
 (function (Rotation) {
   Rotation["Clockwise"] = "Clockwise";
   Rotation["Anticlockwise"] = "Anticlockwise";