hart-estate-widget 0.0.28 → 0.0.31

package/build/components/Application.js

@@ -81,8 +81,8 @@ const Application = (0, _mobxReactLite.observer)(_ref => {
     })),
     'panorama': /*#__PURE__*/_react.default.createElement(_TabWrapper.default, {
       isActive: !isTabPanesVisible,
-      disabled: !config.panoramaImages[0],
-      image: config.panoramaImages[0],
+      disabled: !_store.default.hallRoomImage,
+      image: _store.default.hallRoomImage,
       title: "Panoramic tour",
       text: ['Use mouse to rotate', 'To move through the rooms, click on the layout thumbnail'],
       onStart: hideTabPanes

package/build/components/PanoramaTab.js

@@ -13,6 +13,8 @@ require("core-js/modules/web.dom-collections.iterator.js");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _store = _interopRequireDefault(require("../store"));
+
 var THREE = _interopRequireWildcard(require("three"));
 
 var PANOLENS = _interopRequireWildcard(require("panolens"));
@@ -58,7 +60,13 @@ const getPanoramas = (json, images, setLoadingState) => {
     if (!image) return acc;
     const panorama = createPanorama(image, index, setLoadingState);
     panorama['room_id'] = jsonRoom.ID;
-    acc.push(panorama);
+
+    if (panorama['room_id'] === _store.default.hallRoomId) {
+      acc.unshift(panorama);
+    } else {
+      acc.push(panorama);
+    }
+
     return acc;
   }, []);
 };
@@ -206,12 +214,30 @@ const PanoramaTab = _ref3 => {
   };
 
   (0, _react.useEffect)(() => {
+    const container = document.querySelector('.widget-tab__panorama-overlay');
     const newViewer = new PANOLENS.Viewer({
-      container: document.querySelector('.widget-tab__panorama-overlay'),
+      container,
       autoHideInfospot: false,
       controlButtons: [],
       cameraFov: 90
     });
+    container.addEventListener('mousewheel', e => {
+      e.preventDefault();
+      e.stopPropagation();
+      const scope = newViewer.getControl();
+      const fovStep = 2;
+
+      if (e.deltaY > 0) {
+        const newFov = scope.object.fov + fovStep;
+        scope.object.fov = newFov < scope.maxFov ? newFov : scope.maxFov;
+        scope.object.updateProjectionMatrix();
+        return;
+      }
+
+      const newFov = scope.object.fov - fovStep;
+      scope.object.fov = newFov > scope.minFov ? newFov : scope.minFov;
+      scope.object.updateProjectionMatrix();
+    });
     panoramas.forEach(panorama => {
       if (!panorama.panorama_id) return;
       panorama.addEventListener('enter', _ref4 => {

package/build/components/TabPanes.js

@@ -28,7 +28,6 @@ const TabPanes = (0, _mobxReactLite.observer)(_ref => {
     planImage,
     topView,
     topDownView,
-    panoramaImages,
     rotationImages,
     tabs
   } = _store.default.config;
@@ -46,7 +45,7 @@ const TabPanes = (0, _mobxReactLite.observer)(_ref => {
       icon: null
     },
     'panorama': {
-      img: panoramaImages[0],
+      img: _store.default.hallRoomImage,
       icon: null
     },
     'rotation': {

package/build/store/houseStore.js

@@ -638,7 +638,7 @@ class HouseStore {
     const modelPath = "".concat(this.apiStore.API_URL, "/storage/furniture/").concat(mesh);
     const {
       Location,
-      WEB_Rotation,
+      Rotation,
       Model: ModelName
     } = furniture;
     const {
@@ -727,7 +727,7 @@ class HouseStore {
       const model = originalModel.clone();
       model.scale.set(this.sceneScale, this.sceneScale, this.sceneScale);
       model.position.set(X * this.sceneScale, Y * this.sceneScale, Z * this.sceneScale);
-      model.rotation.set(Math.PI / 2, THREE.Math.degToRad(WEB_Rotation.Yaw), 0);
+      model.rotation.set(Math.PI / 2, THREE.Math.degToRad(Rotation.Yaw), 0);
       const loadedTextures = this.loadedTextures[ModelName];
 
       if (loadedTextures) {

package/build/store/index.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("core-js/modules/es.string.includes.js");
+
 var _react = _interopRequireDefault(require("react"));
 
 var _mobx = require("mobx");
@@ -29,6 +31,37 @@ class Store {
     (0, _mobx.makeAutoObservable)(this);
   }
 
+  get hallRoomId() {
+    const {
+      json
+    } = this.config;
+    if (!json) return 0;
+    const exteriorWallWithDoor = json.Floors[0].ExteriorWalls.find(wallId => {
+      return json.Floors[0].Doors.some(door => door.Walls.some(doorWallId => doorWallId === wallId));
+    });
+    const exteriorDoor = json.Floors[0].Doors.find(door => {
+      return door.Walls.some(doorWallId => json.Floors[0].ExteriorWalls.some(exteriorWallId => exteriorWallId === doorWallId));
+    });
+    const wallWithExteriorDoor = exteriorDoor.Walls.find(wallId => wallId !== exteriorWallWithDoor);
+    const room = json.Floors[0].Units[0].Rooms.find(_ref => {
+      let {
+        Walls
+      } = _ref;
+      return Walls.some(wallId => wallId === wallWithExteriorDoor);
+    });
+    return room.ID;
+  }
+
+  get hallRoomImage() {
+    const {
+      json,
+      panoramaImages
+    } = this.config;
+    const roomIndex = json.Floors[0].Units[0].Rooms.findIndex(room => room.ID === this.hallRoomId);
+    const image = panoramaImages.find(url => url.includes("".concat(roomIndex, ".png")));
+    return image || panoramaImages[0];
+  }
+
   setConfig(config) {
     this.config = config;
   }

package/package.json

@@ -3,7 +3,7 @@
   "description": "HART Estate widget",
   "author": "HART",
   "keywords": [],
-  "version": "0.0.28",
+  "version": "0.0.31",
   "private": false,
   "main": "build/index.js",
   "module": "build/index.js",