hart-estate-widget 0.0.26 → 0.0.29

package/build/components/PanoramaTab.js

@@ -111,8 +111,8 @@ const setPanoramaLinks = (json, currentRoom, center, panorama, panoramas) => {
       return room_id === connectedRoom.ID;
     });
     if (!connectedPanorama) return;
-    const locationX = Location.X - center[0];
-    const locationY = -(Location.Y - center[1]);
+    const locationX = Location.Y - center[1];
+    const locationY = Location.X - center[0];
     const defaultScale = 20;
     const maxScale = 50;
     const defaultLength = 120;
@@ -222,6 +222,7 @@ const PanoramaTab = _ref3 => {
       });
       newViewer.add(panorama);
     });
+    newViewer.scene.rotation.y = Math.PI / 2;
     setViewer(newViewer);
     initPanorama();
   }, [panoramas]);

package/build/store/apiStore.js

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 require("core-js/modules/es.promise.js");
 
-require("core-js/modules/es.array.reduce.js");
-
 var _react = _interopRequireDefault(require("react"));
 
 var _mobx = require("mobx");
@@ -25,9 +23,8 @@ class ApiStore {
   constructor(API_URL) {
     _defineProperty(this, "API_URL", null);
 
-    _defineProperty(this, "loadFurnitureData", async furniture => {
-      const furnitureQuery = furniture.reduce((acc, item, i) => acc += "".concat(i === 0 ? '' : ',').concat(item.Model), '');
-      const path = "".concat(this.API_URL, "/api/furniture?only=").concat(furnitureQuery);
+    _defineProperty(this, "loadFurnitureData", async () => {
+      const path = "".concat(this.API_URL, "/api/furniture");
       const response = await fetch(path);
       return await response.json();
     });

package/build/store/houseStore.js

@@ -101,7 +101,7 @@ class HouseStore {
 
     _defineProperty(this, "clippingPlanes", []);
 
-    _defineProperty(this, "furnitureData", {});
+    _defineProperty(this, "furnitureData", []);
 
     _defineProperty(this, "loadedModels", {});
 
@@ -117,7 +117,7 @@ class HouseStore {
     this.setCenterPosition().loadTextures().then(() => {
       this.createFloors().createSpaceBetweenWalls().createWalls().createDoors();
     });
-    this.apiStore.loadFurnitureData(this.furniture).then(resp => {
+    this.apiStore.loadFurnitureData().then(resp => {
       this.furnitureData = resp;
       this.loadFurniture(0);
     });
@@ -618,7 +618,13 @@ class HouseStore {
   loadFurniture(index) {
     const furniture = this.furniture[index];
     if (!furniture) return;
-    const furnitureData = this.furnitureData[furniture.Model];
+    const furnitureData = this.furnitureData.find(_ref12 => {
+      let {
+        name,
+        type
+      } = _ref12;
+      return name === furniture.Model && type === furniture.Type;
+    });
 
     if (!furnitureData) {
       this.loadFurniture(index + 1);
@@ -632,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 {
@@ -648,31 +654,31 @@ class HouseStore {
     });
 
     const onTexturesLoaded = (result, model) => {
-      const materialsCount = result.reduce((acc, _ref12) => {
+      const materialsCount = result.reduce((acc, _ref13) => {
         let {
           image
-        } = _ref12;
+        } = _ref13;
         if (!image.currentSrc.includes('_D.') && !image.currentSrc.includes('_DA.')) return acc;
         return acc += 1;
       }, 0);
 
       const createMaterial = num => {
-        const map = result.find(_ref13 => {
+        const map = result.find(_ref14 => {
           let {
             image
-          } = _ref13;
+          } = _ref14;
           return image.currentSrc.includes("".concat(num, "_D.")) || image.currentSrc.includes("".concat(num, "_DA."));
         });
-        const envMap = result.find(_ref14 => {
+        const envMap = result.find(_ref15 => {
           let {
             image
-          } = _ref14;
+          } = _ref15;
           return image.currentSrc.includes("".concat(num, "_RMO."));
         });
-        const normalMap = result.find(_ref15 => {
+        const normalMap = result.find(_ref16 => {
           let {
             image
-          } = _ref15;
+          } = _ref16;
           return image.currentSrc.includes("".concat(num, "_N."));
         });
         const material = new THREE.MeshStandardMaterial({
@@ -721,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) {
@@ -766,11 +772,11 @@ class HouseStore {
 
   setCurrentWallsMaterialType(value) {
     this.wallsMaterialType = value;
-    this.wallsGroup.children.forEach(_ref16 => {
+    this.wallsGroup.children.forEach(_ref17 => {
       let {
         children,
         isExterior
-      } = _ref16;
+      } = _ref17;
       const wall = children[0];
 
       if (value === 'texture') {
@@ -796,11 +802,11 @@ class HouseStore {
   setCurrentWallColor(color) {
     this.wallsColor = color;
     this.wallsMaterial.color.set(color);
-    this.wallsGroup.children.forEach(_ref17 => {
+    this.wallsGroup.children.forEach(_ref18 => {
       let {
         children,
         isExterior
-      } = _ref17;
+      } = _ref18;
       if (isExterior) return;
       const wall = children[0];
       wall.material.color.set(color);
@@ -827,10 +833,10 @@ class HouseStore {
   setFullBuildingVisibility(value) {
     this.isFullBuildingVisible = value;
     this.globalPlane.constant = this.isFullBuildingVisible ? 1 : clippedBuildingConstant;
-    this.wallsGroup.children.forEach(_ref18 => {
+    this.wallsGroup.children.forEach(_ref19 => {
       let {
         children
-      } = _ref18;
+      } = _ref19;
       return children[2].visible = !value;
     });
   }

package/package.json

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