hart-estate-widget 0.0.21 → 0.0.22

package/build/components/ModelTab.js

@@ -109,6 +109,8 @@ const ModelTab = (0, _mobxReactLite.observer)(_ref => {
   }, "View from above"), /*#__PURE__*/_react.default.createElement("li", {
     onClick: () => _modelStore.default.setCurrentControlsType('orbit')
   }, "Free camera"), /*#__PURE__*/_react.default.createElement("li", {
+    onClick: () => houseStore.setShadowsVisibility(!houseStore.isShadowsVisible)
+  }, "Shadows: ", houseStore.isShadowsVisible ? 'On' : 'Off'), /*#__PURE__*/_react.default.createElement("li", {
     onClick: () => houseStore.setPlanMode()
   }, "Plan"), /*#__PURE__*/_react.default.createElement("li", {
     onClick: () => houseStore.setFullBuildingVisibility(!houseStore.isFullBuildingVisible)

package/build/store/houseStore.js

@@ -35,6 +35,8 @@ var _doorTexture = _interopRequireDefault(require("../assets/img/door-texture.jp
 
 var _exteriorWallTexture = _interopRequireDefault(require("../assets/img/exterior-wall-texture.jpeg"));
 
+var _exteriorWallTextureRoughness = _interopRequireDefault(require("../assets/img/exterior-wall-texture-roughness.jpg"));
+
 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; }
@@ -57,7 +59,10 @@ const doorMaterialOptions = {
 };
 const modelLoader = new _FBXLoader.FBXLoader();
 
-const createDefaultMaterial = options => new THREE.MeshPhongMaterial(options);
+const createDefaultMaterial = options => new THREE.MeshStandardMaterial(_objectSpread({
+  roughness: 1,
+  metalness: 0
+}, options));
 
 class HouseStore {
   constructor(modelStore) {
@@ -77,6 +82,11 @@ class HouseStore {
 
     _defineProperty(this, "wallsColor", '#FFFFFF');
 
+    _defineProperty(this, "exteriorWallsMaps", {
+      map: null,
+      roughnessMap: null
+    });
+
     _defineProperty(this, "exteriorWallsMaterial", null);
 
     _defineProperty(this, "wallsTextures", []);
@@ -97,6 +107,8 @@ class HouseStore {
 
     _defineProperty(this, "loadedTextures", {});
 
+    _defineProperty(this, "isShadowsVisible", true);
+
     (0, _mobx.makeAutoObservable)(this);
     this.modelStore = modelStore;
     this.houseGroup.name = 'House-Group';
@@ -268,15 +280,28 @@ class HouseStore {
         side: THREE.DoubleSide
       });
       const mesh = new THREE.Mesh(geometry, material);
+      mesh.receiveShadow = true;
+      mesh.castShadow = false;
       mesh.name = 'FloorMesh';
-      this.loadTexture(params.texture, [0.5, 0.5], texture => {
+
+      const callback = (texture, roughnessMap) => {
         const textureMaterial = createDefaultMaterial({
           color: params.color,
           side: THREE.DoubleSide,
           map: texture
         });
         mesh.material = textureMaterial;
+        if (roughnessMap) mesh.material.roughnessMap = roughnessMap;
         this.houseGroup.add(mesh);
+      };
+
+      this.loadTexture(params.texture, [0.5, 0.5], texture => {
+        if (!params.roughnessMap) {
+          callback(texture);
+          return;
+        }
+
+        this.loadTexture(params.roughnessMap, [0.5, 0.5], roughnessMap => callback(texture, roughnessMap));
       });
     });
     return this;
@@ -319,6 +344,8 @@ class HouseStore {
     const clippedMesh = new THREE.Mesh(clippedGeometry, clippedMaterial);
     const flatMesh = new THREE.Mesh(flatGeometry, material);
     const mesh = new THREE.Mesh(geometry, material);
+    flatMesh.receiveShadow = false;
+    flatMesh.castShadow = false;
     clippedMesh.position.z = -0.005;
     flatMesh.position.z = -0.005;
     mesh.position.z = -0.001;
@@ -328,6 +355,10 @@ class HouseStore {
     clippedMeshWithApertures.name = 'ClippedSpaceBetweenWalls';
     meshWithApertures.name = 'SpaceBetweenWalls';
     flatMesh.name = 'FlatSpaceBetweenWalls';
+    clippedMeshWithApertures.receiveShadow = false;
+    clippedMeshWithApertures.castShadow = false;
+    meshWithApertures.receiveShadow = false;
+    meshWithApertures.castShadow = false;
     this.houseGroup.add(flatMesh, clippedMeshWithApertures, meshWithApertures);
     return this;
   }
@@ -360,10 +391,18 @@ class HouseStore {
       const wallMesh = this.subtractApertures(new THREE.Mesh(wallGeometry, wallMaterial), apertures);
       const wallPadMesh = new THREE.Mesh(wallPadGeometry, wallPadMaterial);
       const wallClippedPadMesh = new THREE.Mesh(wallPadGeometry, wallClippedPadMaterial);
+      wallMesh.castShadow = true;
+      wallMesh.receiveShadow = !isExterior;
+      wallPadMesh.castShadow = false;
+      wallPadMesh.receiveShadow = false;
+      wallClippedPadMesh.castShadow = false;
+      wallClippedPadMesh.receiveShadow = false;
       wallPadMesh.position.z = this.wallsHeight;
       wallClippedPadMesh.position.z = (this.wallsHeight + 0.5) * clippedBuildingConstant + 0.001;
       const wallClippedPadMeshWithApertures = this.subtractApertures(wallClippedPadMesh, apertures);
       wallClippedPadMeshWithApertures.visible = false;
+      wallClippedPadMeshWithApertures.castShadow = false;
+      wallClippedPadMeshWithApertures.receiveShadow = false;
       const wallGroup = new THREE.Group();
       wallGroup.name = 'Wall';
       wallGroup.buildingId = wallId;
@@ -372,6 +411,11 @@ class HouseStore {
       this.wallsGroup.add(wallGroup);
     };
 
+    this.exteriorWallsMaterial = createDefaultMaterial(_objectSpread(_objectSpread({}, this.wallMaterialOptions), {}, {
+      map: this.exteriorWallsMaps.map,
+      roughnessMap: this.exteriorWallsMaps.roughnessMap,
+      color: '#FFFFFF'
+    }));
     this.rooms.forEach(_ref7 => {
       let {
         Walls
@@ -396,6 +440,8 @@ class HouseStore {
       mesh.position.y = Location.Y * this.sceneScale;
       mesh.position.z = this.doorsHeight / 2;
       mesh.rotation.z = THREE.Math.degToRad(Rotation.Yaw);
+      mesh.receiveShadow = true;
+      mesh.castShadow = true;
       this.doorsGroup.add(mesh);
     });
     this.houseGroup.add(this.doorsGroup);
@@ -444,7 +490,60 @@ class HouseStore {
       maxY,
       minY
     } = (0, _modelHelpers.getMinMaxCoordinates)(walls);
-    this.houseGroup.position.set(-(maxX + minX) / 2, -(maxY + minY) / 2);
+    const centerX = (maxX + minX) / 2;
+    const centerY = (maxY + minY) / 2;
+    const longerValue = centerX > centerY ? centerX : centerY;
+    this.houseGroup.position.set(-centerX, -centerY);
+    const lights = [{
+      x: centerX - longerValue,
+      y: centerY - longerValue,
+      z: this.wallsHeight * 3,
+      power: 0.4,
+      castShadow: true
+    }, {
+      x: centerX - longerValue,
+      y: centerY - longerValue,
+      z: this.wallsHeight * 2,
+      power: 1,
+      castShadow: false
+    }, {
+      x: centerX + longerValue,
+      y: centerY + longerValue,
+      z: this.wallsHeight * 2,
+      power: 1.1,
+      castShadow: false
+    }, {
+      x: centerX,
+      y: centerY,
+      z: this.wallsHeight * 5,
+      power: 0.1,
+      castShadow: false
+    }];
+    const targetObject = new THREE.Object3D();
+    targetObject.position.set(centerX, centerY, 0);
+    this.houseGroup.add(targetObject);
+    lights.forEach(_ref10 => {
+      let {
+        x,
+        y,
+        z,
+        power,
+        castShadow
+      } = _ref10;
+      const light = new THREE.DirectionalLight(0xffffff, power);
+      light.position.set(x, y, z);
+      light.shadowLight = castShadow;
+      light.castShadow = castShadow;
+      light.shadow.camera.left = -centerX * 2;
+      light.shadow.camera.right = centerX * 2;
+      light.shadow.camera.top = centerY * 2;
+      light.shadow.camera.bottom = -centerY * 2;
+      light.shadow.camera.zoom = 1;
+      light.shadow.mapSize = new THREE.Vector2(2048, 2048);
+      light.shadow.normalBias = 1;
+      light.target = targetObject;
+      this.houseGroup.add(light);
+    });
     return this;
   }
 
@@ -480,10 +579,17 @@ class HouseStore {
           image: _exteriorWallTexture.default,
           texture: texture
         });
-        this.exteriorWallsMaterial = createDefaultMaterial(_objectSpread(_objectSpread({}, this.wallMaterialOptions), {}, {
-          map: texture,
-          color: '#FFFFFF'
-        }));
+        this.exteriorWallsMaps.map = texture;
+      }
+    }, {
+      img: _exteriorWallTextureRoughness.default,
+      repeat: [1, 1],
+      callback: texture => {
+        this.wallsTextures.push({
+          image: _exteriorWallTextureRoughness.default,
+          texture: texture
+        });
+        this.exteriorWallsMaps.roughnessMap = texture;
       }
     }, {
       img: _doorTexture.default,
@@ -494,12 +600,12 @@ class HouseStore {
         }));
       }
     }];
-    return Promise.all(assets.map(_ref10 => {
+    return Promise.all(assets.map(_ref11 => {
       let {
         img,
         repeat,
         callback
-      } = _ref10;
+      } = _ref11;
       return new Promise(resolve => {
         this.loadTexture(img, repeat, texture => {
           callback(texture);
@@ -542,31 +648,31 @@ class HouseStore {
     });
 
     const onTexturesLoaded = (result, model) => {
-      const materialsCount = result.reduce((acc, _ref11) => {
+      const materialsCount = result.reduce((acc, _ref12) => {
         let {
           image
-        } = _ref11;
+        } = _ref12;
         if (!image.currentSrc.includes('_D.') && !image.currentSrc.includes('_DA.')) return acc;
         return acc += 1;
       }, 0);
 
       const createMaterial = num => {
-        const map = result.find(_ref12 => {
+        const map = result.find(_ref13 => {
           let {
             image
-          } = _ref12;
+          } = _ref13;
           return image.currentSrc.includes("".concat(num, "_D.")) || image.currentSrc.includes("".concat(num, "_DA."));
         });
-        const envMap = result.find(_ref13 => {
+        const envMap = result.find(_ref14 => {
           let {
             image
-          } = _ref13;
+          } = _ref14;
           return image.currentSrc.includes("".concat(num, "_RMO."));
         });
-        const normalMap = result.find(_ref14 => {
+        const normalMap = result.find(_ref15 => {
           let {
             image
-          } = _ref14;
+          } = _ref15;
           return image.currentSrc.includes("".concat(num, "_N."));
         });
         const material = new THREE.MeshStandardMaterial({
@@ -601,7 +707,11 @@ class HouseStore {
       }
 
       model.traverse(node => {
-        if (node.isMesh) node.material = materials;
+        if (node.isMesh) {
+          node.material = materials;
+          node.receiveShadow = true;
+          node.castShadow = true;
+        }
       });
       this.houseGroup.add(model);
       this.loadFurniture(index + 1);
@@ -639,6 +749,16 @@ class HouseStore {
   } // Actions
 
 
+  setShadowsVisibility(value) {
+    this.isShadowsVisible = value;
+    this.houseGroup.children.forEach(node => {
+      const isLight = node instanceof THREE.DirectionalLight;
+      if (!isLight) return;
+      if (!node.shadowLight) return;
+      node.castShadow = value;
+    });
+  }
+
   setDoorsVisibility(value) {
     this.isDoorsVisible = value;
     this.doorsGroup.children.forEach(door => door.visible = value);
@@ -646,11 +766,11 @@ class HouseStore {
 
   setCurrentWallsMaterialType(value) {
     this.wallsMaterialType = value;
-    this.wallsGroup.children.forEach(_ref15 => {
+    this.wallsGroup.children.forEach(_ref16 => {
       let {
         children,
         isExterior
-      } = _ref15;
+      } = _ref16;
       const wall = children[0];
 
       if (value === 'texture') {
@@ -676,11 +796,11 @@ class HouseStore {
   setCurrentWallColor(color) {
     this.wallsColor = color;
     this.wallsMaterial.color.set(color);
-    this.wallsGroup.children.forEach(_ref16 => {
+    this.wallsGroup.children.forEach(_ref17 => {
       let {
         children,
         isExterior
-      } = _ref16;
+      } = _ref17;
       if (isExterior) return;
       const wall = children[0];
       wall.material.color.set(color);
@@ -707,10 +827,10 @@ class HouseStore {
   setFullBuildingVisibility(value) {
     this.isFullBuildingVisible = value;
     this.globalPlane.constant = this.isFullBuildingVisible ? 1 : clippedBuildingConstant;
-    this.wallsGroup.children.forEach(_ref17 => {
+    this.wallsGroup.children.forEach(_ref18 => {
       let {
         children
-      } = _ref17;
+      } = _ref18;
       return children[2].visible = !value;
     });
   }

package/build/store/modelStore.js

@@ -92,11 +92,9 @@ class ModelStore {
 
     _defineProperty(this, "createScene", () => {
       this.scene = new THREE.Scene();
-      const light = new THREE.AmbientLight(0xffffff);
       this.scene.rotation.x = -Math.PI / 2;
       this.scene.scale.y = -1;
       this.scene.background = new THREE.Color('#FAFAFA');
-      this.scene.add(light);
       this.createGround();
       return this;
     });
@@ -104,13 +102,14 @@ class ModelStore {
     _defineProperty(this, "createGround", () => {
       this.textureLoader.load(_grass.default, texture => {
         texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
-        texture.repeat.set(70, 70);
-        let groundMaterial = new THREE.MeshBasicMaterial({
+        texture.repeat.set(50, 50);
+        let groundMaterial = new THREE.MeshStandardMaterial({
           map: texture,
-          color: 'rgb(255,255,255)'
+          color: 0xffffff
         });
-        let groundMesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(300, 300), groundMaterial);
+        let groundMesh = new THREE.Mesh(new THREE.CircleGeometry(100, 100), groundMaterial);
         groundMesh.position.z = -0.01;
+        groundMesh.receiveShadow = true;
         this.scene.add(groundMesh);
       });
       return this;
@@ -121,6 +120,8 @@ class ModelStore {
       this.renderer.setPixelRatio(window.devicePixelRatio);
       this.updateRendererSize();
       this.renderer.localClippingEnabled = true;
+      this.renderer.shadowMap.enabled = true;
+      this.renderer.shadowMap.type = THREE.PCFSoftShadowMap;
       return this;
     });
 

package/build/utils/modelHelpers.js

@@ -28,18 +28,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const FloorParams = {
   'default': {
     texture: _floorDark.default,
+    roughnessMap: null,
     color: '#FFFFFF'
   },
   'Kitchen': {
     texture: _floorWhite.default,
+    roughnessMap: null,
     color: '#FFFFFF'
   },
   'Balcony': {
     texture: _floor.default,
+    roughnessMap: null,
     color: '#DADADA'
   },
   'Bathroom': {
     texture: _floorBathroom.default,
+    roughnessMap: null,
     color: '#FFFFFF'
   }
 };

package/package.json

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