hart-estate-widget 0.0.22 → 0.0.25

package/build/components/PanoramaTab.js

@@ -23,6 +23,8 @@ var _Loader = _interopRequireDefault(require("./Loader"));
 
 var _panoramaHelpers = require("../utils/panoramaHelpers");
 
+var _geometric = require("geometric");
+
 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); }
@@ -63,21 +65,22 @@ const getPanoramas = (json, images, setLoadingState) => {
 
 const getPanoramaRooms = (json, panoramas) => {
   return panoramas.map((panorama, index) => {
-    let currentRoom = {
-      Type: "Room - ".concat(panorama['panorama_id'])
+    panorama['panorama_index'] = index;
+    const type = "Room - ".concat(panorama['panorama_id']);
+    if (!json) return {
+      type,
+      id: index,
+      panorama,
+      left: 0,
+      top: 0
     };
+    const currentRoom = json.Floors[0].Units[0].Rooms.find(room => room.ID === panorama['room_id']);
+    const [left, top] = (0, _geometric.polygonMean)((0, _panoramaHelpers.getRoomCoordinates)(currentRoom, json.Floors[0].Walls, json.Vertices));
 
-    if (json) {
-      currentRoom = json.Floors[0].Units[0].Rooms.find(room => room.ID === panorama['room_id']);
+    if (!panorama.linkedSpots.length) {
+      setPanoramaLinks(json, currentRoom, [left, top], panorama, panoramas);
     }
 
-    const {
-      left,
-      top
-    } = json ? (0, _panoramaHelpers.findRoomCenter)(currentRoom, json.Floors[0].Walls, json.Vertices) : {
-      left: 0,
-      top: 0
-    };
     return {
       type: currentRoom.Type,
       id: index,
@@ -88,6 +91,39 @@ const getPanoramaRooms = (json, panoramas) => {
   }, []);
 };
 
+const setPanoramaLinks = (json, currentRoom, center, panorama, panoramas) => {
+  json.Floors[0].Doors.forEach(_ref => {
+    let {
+      Location,
+      Walls
+    } = _ref;
+    if (!Walls.some(doorWallId => currentRoom.Walls.some(roomWallId => roomWallId === doorWallId))) return;
+    const connectedRoom = json.Floors[0].Units[0].Rooms.find(room => {
+      const roomHasSameWall = room.Walls.some(roomWallId => Walls.some(doorWallId => roomWallId === doorWallId));
+      const isSameRoom = room.ID === currentRoom.ID;
+      return roomHasSameWall && !isSameRoom;
+    });
+    if (!connectedRoom) return;
+    const connectedPanorama = panoramas.find(_ref2 => {
+      let {
+        room_id
+      } = _ref2;
+      return room_id === connectedRoom.ID;
+    });
+    if (!connectedPanorama) return;
+    const locationX = Location.X - center[0];
+    const locationY = -(Location.Y - center[1]);
+    const defaultScale = 20;
+    const maxScale = 50;
+    const defaultLength = 120;
+    const length = (0, _geometric.lineLength)([[0, 0], [locationX, locationY]]);
+    const scale = length / defaultLength * defaultScale;
+    const finalScale = scale > maxScale ? maxScale : scale;
+    const position = new THREE.Vector3(locationX, -10, locationY);
+    panorama.link(connectedPanorama, position, finalScale);
+  });
+};
+
 const initPanorama = () => {
   let camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 1, 1100);
   let controls = new _threeDeviceOrientation.default(camera);
@@ -113,12 +149,12 @@ const initPanorama = () => {
   };
 };
 
-const PanoramaTab = _ref => {
+const PanoramaTab = _ref3 => {
   let {
     json,
     planImage,
     images
-  } = _ref;
+  } = _ref3;
   const [menuState, setMenuState] = (0, _react.useState)(false);
   const [loadingState, setLoadingState] = (0, _react.useState)(true);
   const [isMapActive, setMapState] = (0, _react.useState)(false);
@@ -178,6 +214,12 @@ const PanoramaTab = _ref => {
     });
     panoramas.forEach(panorama => {
       if (!panorama.panorama_id) return;
+      panorama.addEventListener('enter', _ref4 => {
+        let {
+          target
+        } = _ref4;
+        return setCurrentRoomIndex(target['panorama_index']);
+      });
       newViewer.add(panorama);
     });
     setViewer(newViewer);

package/build/store/houseStore.js

@@ -492,23 +492,23 @@ class HouseStore {
     } = (0, _modelHelpers.getMinMaxCoordinates)(walls);
     const centerX = (maxX + minX) / 2;
     const centerY = (maxY + minY) / 2;
-    const longerValue = centerX > centerY ? centerX : centerY;
+    const lightsOffset = 25;
     this.houseGroup.position.set(-centerX, -centerY);
     const lights = [{
-      x: centerX - longerValue,
-      y: centerY - longerValue,
+      x: centerX - lightsOffset,
+      y: centerY - lightsOffset,
       z: this.wallsHeight * 3,
       power: 0.4,
       castShadow: true
     }, {
-      x: centerX - longerValue,
-      y: centerY - longerValue,
+      x: centerX - lightsOffset,
+      y: centerY - lightsOffset,
       z: this.wallsHeight * 2,
       power: 1,
       castShadow: false
     }, {
-      x: centerX + longerValue,
-      y: centerY + longerValue,
+      x: centerX + lightsOffset,
+      y: centerY + lightsOffset,
       z: this.wallsHeight * 2,
       power: 1.1,
       castShadow: false

package/build/store/modelStore.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("core-js/modules/es.promise.js");
+
 require("core-js/modules/web.dom-collections.iterator.js");
 
 var _react = _interopRequireDefault(require("react"));
@@ -94,20 +96,26 @@ class ModelStore {
       this.scene = new THREE.Scene();
       this.scene.rotation.x = -Math.PI / 2;
       this.scene.scale.y = -1;
-      this.scene.background = new THREE.Color('#FAFAFA');
+      this.scene.background = new THREE.Color('#E7E7E7');
+      this.scene.fog = new THREE.Fog('#E7E7E7', 5, 200);
       this.createGround();
       return this;
     });
 
     _defineProperty(this, "createGround", () => {
-      this.textureLoader.load(_grass.default, texture => {
-        texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
-        texture.repeat.set(50, 50);
+      const textures = {};
+      const assets = [new Promise(resolve => this.loadTexture(_grass.default, [75, 75], texture => {
+        textures.map = texture;
+        resolve();
+      }))];
+      Promise.all(assets).then(() => {
         let groundMaterial = new THREE.MeshStandardMaterial({
-          map: texture,
-          color: 0xffffff
+          map: textures.map,
+          normalMap: textures.normalMap,
+          envMap: textures.envMap,
+          color: 0xe7e7e7
         });
-        let groundMesh = new THREE.Mesh(new THREE.CircleGeometry(100, 100), groundMaterial);
+        let groundMesh = new THREE.Mesh(new THREE.CircleGeometry(250, 100), groundMaterial);
         groundMesh.position.z = -0.01;
         groundMesh.receiveShadow = true;
         this.scene.add(groundMesh);
@@ -254,6 +262,17 @@ class ModelStore {
     return ((_this$container2 = this.container) === null || _this$container2 === void 0 ? void 0 : _this$container2.offsetHeight) || window.innerHeight;
   }
 
+  loadTexture(img) {
+    let repeat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [1, 1];
+    let callback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : () => {};
+    this.textureLoader.load(img, texture => {
+      texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
+      texture.repeat.set(repeat[0], repeat[1]);
+      texture.flipY = false;
+      callback(texture);
+    });
+  }
+
 }
 
 var _default = new ModelStore();

package/build/utils/panoramaHelpers.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getVerticesLocations = exports.getScale = exports.findWallVertices = exports.findRoomCenter = exports.findMinMaxCoordinates = void 0;
+exports.getScale = exports.getRoomCoordinates = exports.findWallVertices = void 0;
 
-require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/es.array.reduce.js");
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -13,59 +13,24 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const findWallVertices = (walls, wall, vertices) => {
   const currentWall = walls.find(el => el.ID === wall);
-  return currentWall.Vertices.map(vertex => vertices.find(el => el.ID === vertex));
-};
-
-exports.findWallVertices = findWallVertices;
-
-const getVerticesLocations = vertices => vertices.map(vertex => vertex.Location);
-
-exports.getVerticesLocations = getVerticesLocations;
-
-const findMinMaxCoordinates = (room, walls, vertices) => {
-  let maxX = 0;
-  let minX = Infinity;
-  let maxY = 0;
-  let minY = Infinity;
-  room.Walls.forEach(wall => {
-    const [coord1, coord2] = getVerticesLocations(findWallVertices(walls, wall, vertices)); // CALCULATE MAX COORDS
-
-    if (coord1.X > maxX) maxX = coord1.X;
-    if (coord1.X > maxX) maxX = coord1.X;
-    if (coord2.Y > maxY) maxY = coord2.Y;
-    if (coord2.Y > maxY) maxY = coord2.Y; // CALCULATE MIN COORDS
-
-    if (coord1.X < minX) minX = coord1.X;
-    if (coord1.X < minX) minX = coord1.X;
-    if (coord2.Y < minY) minY = coord2.Y;
-    if (coord2.Y < minY) minY = coord2.Y;
+  return currentWall.Vertices.map(vertexId => {
+    const vertex = vertices.find(el => el.ID === vertexId);
+    return [vertex.Location.X, vertex.Location.Y];
   });
-  return {
-    maxX,
-    minX,
-    maxY,
-    minY
-  };
 };
 
-exports.findMinMaxCoordinates = findMinMaxCoordinates;
+exports.findWallVertices = findWallVertices;
 
-const findRoomCenter = (room, walls, vertices) => {
-  const {
-    maxX,
-    minX,
-    maxY,
-    minY
-  } = findMinMaxCoordinates(room, walls, vertices);
-  const left = (maxX + minX) / 2;
-  const top = (maxY + minY) / 2;
-  return {
-    left,
-    top
-  };
+const getRoomCoordinates = (room, walls, vertices) => {
+  const points = room.Walls.reduce((acc, wallId) => {
+    const wall = walls.find(wallObject => wallObject.ID === wallId);
+    findWallVertices(walls, wall.ID, vertices).forEach(vertex => acc.push(vertex));
+    return acc;
+  }, []);
+  return points;
 };
 
-exports.findRoomCenter = findRoomCenter;
+exports.getRoomCoordinates = getRoomCoordinates;
 
 const getScale = (image, json) => {
   if (!json) return {

package/package.json

@@ -3,7 +3,7 @@
   "description": "HART Estate widget",
   "author": "HART",
   "keywords": [],
-  "version": "0.0.22",
+  "version": "0.0.25",
   "private": false,
   "main": "build/index.js",
   "module": "build/index.js",
@@ -20,6 +20,7 @@
   "dependencies": {
     "camera-controls": "^1.34.1",
     "core-js": "^3.21.0",
+    "geometric": "^2.2.10",
     "hold-event": "^0.1.0",
     "mobx": "^6.3.13",
     "mobx-react-lite": "^3.2.3",