hart-estate-widget 0.0.17 → 0.0.20

package/build/components/ModelTab.js

@@ -33,6 +33,9 @@ const ModelTab = (0, _mobxReactLite.observer)(_ref => {
   } = _modelStore.default;
   (0, _react.useEffect)(() => {
     const container = document.querySelector('.widget-tab__model-scene');
+
+    _modelStore.default.setContainer(container);
+
     container.appendChild(_modelStore.default.renderer.domElement);
 
     _modelStore.default.setCurrentControlsType('orbit');

package/build/components/Widget.js

@@ -11,6 +11,8 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 
 var _store = _interopRequireDefault(require("../store"));
 
+var _modelStore = _interopRequireDefault(require("../store/modelStore"));
+
 var _Application = _interopRequireDefault(require("./Application"));
 
 var _defaultConfig = _interopRequireDefault(require("../config/defaultConfig"));
@@ -27,6 +29,8 @@ class Widget {
   constructor(container) {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
+    _defineProperty(this, "requiredParams", ['tabs', 'tabPanes', 'width', 'height', 'env']);
+
     const config = _objectSpread(_objectSpread({}, _defaultConfig.default), options);
 
     const widgetContainer = document.querySelector(container);
@@ -46,7 +50,16 @@ class Widget {
   }
 
   updateOptions(config) {
-    _store.default.setConfig(_objectSpread(_objectSpread({}, this.options), config));
+    const newConfig = _objectSpread({}, config);
+
+    this.requiredParams.forEach(param => {
+      if (config[param]) return;
+      newConfig[param] = this.options[param];
+    });
+
+    _modelStore.default.removeHouse();
+
+    _store.default.setConfig(newConfig);
   }
 
   on(event, callback) {

package/build/store/houseStore.js

@@ -95,6 +95,7 @@ class HouseStore {
 
     (0, _mobx.makeAutoObservable)(this);
     this.modelStore = modelStore;
+    this.houseGroup.name = 'House-Group';
     this.globalPlane = new THREE.Plane(new THREE.Vector3(0, -this.wallsHeight - 0.5, 0), 1);
     this.clippingPlanes = [this.globalPlane];
     this.setCenterPosition().loadTextures().then(() => {

package/build/store/modelStore.js

@@ -15,7 +15,7 @@ var THREE = _interopRequireWildcard(require("three"));
 
 var _cameraControls = _interopRequireDefault(require("camera-controls"));
 
-var _houseStore = _interopRequireDefault(require("./houseStore"));
+var _houseStore = _interopRequireDefault(require("../store/houseStore"));
 
 var _grass = _interopRequireDefault(require("../assets/img/grass.png"));
 
@@ -70,6 +70,12 @@ class ModelStore {
       this.scene.add(this.houseStore.houseGroup);
     });
 
+    _defineProperty(this, "removeHouse", () => {
+      const selectedObject = this.scene.getObjectByName('House-Group');
+      this.scene.remove(selectedObject);
+      this.initialized = false;
+    });
+
     _defineProperty(this, "setJoystickState", value => {
       this.isJoystickActive = value;
     });
@@ -78,6 +84,12 @@ class ModelStore {
       this.joystickDirections = directions;
     });
 
+    _defineProperty(this, "setContainer", container => {
+      this.container = container;
+      this.updateRendererSize();
+      this.updateCameraSize();
+    });
+
     _defineProperty(this, "createScene", () => {
       this.scene = new THREE.Scene();
       const light = new THREE.AmbientLight(0xffffff);
@@ -107,22 +119,30 @@ class ModelStore {
     _defineProperty(this, "createRenderer", () => {
       this.renderer = new THREE.WebGLRenderer();
       this.renderer.setPixelRatio(window.devicePixelRatio);
-      this.renderer.setSize(window.innerWidth, window.innerHeight);
+      this.updateRendererSize();
       this.renderer.localClippingEnabled = true;
       return this;
     });
 
+    _defineProperty(this, "updateRendererSize", () => {
+      this.renderer.setSize(this.width, this.height);
+    });
+
     _defineProperty(this, "createCamera", () => {
-      this.camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000);
+      this.camera = new THREE.PerspectiveCamera(75, this.width / this.height, 0.1, 1000);
       this.camera.position.set(0, 0, 0);
       window.addEventListener('resize', () => {
-        this.camera.aspect = window.innerWidth / window.innerHeight;
-        this.camera.updateProjectionMatrix();
-        this.renderer.setSize(window.innerWidth, window.innerHeight);
+        this.updateCameraSize();
+        this.updateRendererSize();
       });
       return this;
     });
 
+    _defineProperty(this, "updateCameraSize", () => {
+      this.camera.aspect = this.width / this.height;
+      this.camera.updateProjectionMatrix();
+    });
+
     _defineProperty(this, "createControls", () => {
       this.controls = new _cameraControls.default(this.camera, this.renderer.domElement);
       this.controls.minDistance = 0.5;
@@ -221,6 +241,18 @@ class ModelStore {
     this.createScene().createRenderer().createCamera().createControls().addKeyEvents();
   }
 
+  get width() {
+    var _this$container;
+
+    return ((_this$container = this.container) === null || _this$container === void 0 ? void 0 : _this$container.offsetWidth) || window.innerWidth;
+  }
+
+  get height() {
+    var _this$container2;
+
+    return ((_this$container2 = this.container) === null || _this$container2 === void 0 ? void 0 : _this$container2.offsetHeight) || window.innerHeight;
+  }
+
 }
 
 var _default = new ModelStore();

package/package.json

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