@colijnit/homedecorator 258.1.13 → 258.1.15

package/app/plugins/room-planner/components/custome-shape-creator/custom-shape-creator.component.d.ts

@@ -31,6 +31,10 @@ export declare class CustomShapeCreatorComponent implements OnInit {
     selectedFace: Face;
     textureOptions: typeof TextureEditorOptions;
     skin: BoxSkin;
+    private _oldFloorPosition;
+    private _oldFloorElevation;
+    private _oldWallPosition;
+    private _oldWallElevation;
     constructor(_hudService: HudService, _sceneService: SceneService, _roomService: RoomService, _itemService: ItemService, _sceneEventService: SceneEventService, _messageBusService: MessageBusService);
     ngOnInit(): void;
     setName(name: string): void;

package/bundles/colijnit-homedecorator.umd.js

@@ -2409,7 +2409,9 @@
           }
       };
       BaseItem.prototype.setYPositionBasedOnElevation = function () {
-          this.position.y = this.elevation;
+          if (this.elevation) {
+              this.position.y = this.elevation;
+          }
       };
       BaseItem.prototype.getHalfSizeWithoutScale = function () {
           if (this.children.length < 1) {
@@ -2735,13 +2737,13 @@
               }
               if (rawMetadata.elevation) {
                   this.elevation = rawMetadata.elevation;
-                  this.setYPositionBasedOnElevation();
               }
               else {
                   this.elevation = 0;
               }
           }
           this.calculateHalfSize();
+          this.setYPositionBasedOnElevation();
       };
       /** on is a bool */
       Item.prototype.updateHighlight = function () {
@@ -14095,7 +14097,7 @@
           });
       };
       WallItem.prototype.setYPositionBasedOnElevation = function () {
-          this.position.y = this.elevation + this.halfSize.y;
+          this.position.y = this.elevation + (this.halfSize ? this.halfSize.y : 0);
       };
       WallItem.prototype.addMaterialMap = function (material, texture, flip) {
           return __awaiter$17(this, void 0, void 0, function () {
@@ -14547,6 +14549,7 @@
           var clone = this.createClass();
           this.cloneProperties(clone);
           clone.name = 'test clone';
+          clone.buildFinished();
           return clone;
       };
       InWallItem.prototype.createMaterial = function (side, isSame) {
@@ -14921,6 +14924,7 @@
       }
       InWallFloorItem.prototype.createClass = function () {
           var clazz = new InWallFloorItem(this.metadata, new THREE.Mesh(new THREE.BoxGeometry(this.halfSize.x * 2, this.halfSize.y * 2, this.halfSize.z * 2)));
+          clazz.buildFinished();
           return clazz;
       };
       return InWallFloorItem;
@@ -15029,6 +15033,7 @@
           var metadata = Object.assign({}, this.metadata);
           metadata.skin = Object.assign({}, this.skin);
           var copy = new CustomShapeFloorItem(metadata, new THREE.Mesh(this.customMesh.geometry.clone().scale(origScale.x, origScale.y, origScale.z), materialsCloned));
+          copy.buildFinished();
           copy.scaleGeometry(this.scale.x, this.scale.y, this.scale.z);
           copy.calculateHalfSize();
           return copy;
@@ -15094,6 +15099,7 @@
           var metadata = Object.assign({}, this.metadata);
           metadata.skin = Object.assign({}, this.skin);
           var copy = new CustomCylinderFloorItem(metadata, new THREE.Mesh(this.customMesh.geometry.clone().scale(origScale.x, origScale.y, origScale.z), materialsCloned));
+          copy.buildFinished();
           copy.scaleGeometry(this.scale.x, this.scale.y, this.scale.z);
           copy.calculateHalfSize();
           return copy;
@@ -20386,6 +20392,9 @@
                       case 1:
                           _a.sent();
                           this.walls.forEach(function (wall) { return wall.updateWallItems(); });
+                          if (this.walls && this.walls.length > 0 && this._viewModeService.is3dViewActive()) {
+                              this._updateEdgeVisibility(this._cameraService.camera.position);
+                          }
                           return [2 /*return*/];
                   }
               });
@@ -21943,6 +21952,7 @@
           var metadata = Object.assign({}, this.metadata);
           metadata.skin = Object.assign({}, this.skin);
           var copy = new CustomShapeWallItem(metadata, new THREE.Mesh(this.customMesh.geometry.clone().scale(origScale.x, origScale.y, origScale.z), materialsCloned));
+          copy.buildFinished();
           copy.scaleGeometry(this.scale.x, this.scale.y, this.scale.z);
           copy.calculateHalfSize();
           return copy;
@@ -22002,6 +22012,7 @@
           var metadata = Object.assign({}, this.metadata);
           metadata.skin = Object.assign({}, this.skin);
           var copy = new CustomCylinderWallItem(metadata, new THREE.Mesh(this.customMesh.geometry.clone().scale(origScale.x, origScale.y, origScale.z), materialsCloned));
+          copy.buildFinished();
           copy.scaleGeometry(this.scale.x, this.scale.y, this.scale.z);
           copy.calculateHalfSize();
           return copy;
@@ -23650,7 +23661,7 @@
           }
       };
       OnWallMeasurements.prototype.getZPos = function () {
-          return Math.max(this.item.getHalfSize().z, this.wallThickness / 2);
+          return Math.max(this.item.getHalfSize().z, this.wallThickness / 2) + 0.05;
       };
       OnWallMeasurements.prototype.hasChanged = function () {
           return this.rotationY !== this.item.rotation.y ||
@@ -42862,17 +42873,21 @@
               this.isFloorType = !this.isFloorType;
               var origScale = new THREE.Vector3(1, 1, 1).divide(this.shape.metadata.scale || new THREE.Vector3(1, 1, 1));
               if (this.isFloorType) {
+                  this._oldWallPosition = this.shape.position.clone();
+                  this._oldWallElevation = this.shape.elevation;
                   var metadata = Object.assign(Object.assign({}, this.shape.metadata), { itemType: ItemType.CustomShape });
-                  metadata.position = undefined;
+                  metadata.position = this._oldFloorPosition ? this._oldFloorPosition.clone() : undefined;
+                  metadata.elevation = this._oldFloorElevation ? this._oldFloorElevation : 0;
                   metadata.centerPivot = true;
                   var geometry = this.shape.customMesh.geometry.clone().scale(origScale.x, origScale.y, origScale.z);
                   var shapeFloor = new CustomShapeFloorItem(metadata, new THREE.Mesh(geometry, this.shape.customMesh.material));
+                  shapeFloor.buildFinished();
                   shapeFloor.scaleGeometry(this.shape.scale.x, this.shape.scale.y, this.shape.scale.z);
                   shapeFloor.calculateHalfSize();
                   shapeFloor.skin = this.shape.skin;
                   var roomCenter = this._roomService.getRoomCenter();
                   if (roomCenter) {
-                      shapeFloor.position.copy(roomCenter);
+                      shapeFloor.position.copy(this._oldFloorPosition ? this._oldFloorPosition.clone() : roomCenter);
                   }
                   shapeFloor.position.y = shapeFloor.getFloorY();
                   this._itemService.addItem(shapeFloor);
@@ -42882,11 +42897,14 @@
                   this._hudService.updateSelectedItemHud();
               }
               else {
+                  this._oldFloorPosition = this.shape.position.clone();
+                  this._oldFloorElevation = this.shape.elevation;
                   var metadata = Object.assign(Object.assign({}, this.shape.metadata), { itemType: ItemType.CustomShapeWall });
-                  metadata.position = undefined;
+                  metadata.position = this._oldWallPosition ? this._oldWallPosition.clone() : undefined;
                   metadata.centerPivot = false;
                   var geometry = this.shape.customMesh.geometry.clone().scale(origScale.x, origScale.y, origScale.z);
                   var shapeWall = new CustomShapeWallItem(metadata, new THREE.Mesh(geometry, this.shape.customMesh.material));
+                  shapeWall.buildFinished();
                   shapeWall.scaleGeometry(this.shape.scale.x, this.shape.scale.y, this.shape.scale.z);
                   shapeWall.calculateHalfSize();
                   shapeWall.skin = this.shape.skin;
@@ -43159,6 +43177,7 @@
                   var geometry = this.shape.customMesh.geometry.clone().scale(origScale.x, origScale.y, origScale.z);
                   geometry.rotateX(-Math.PI / 2);
                   var shapeFloor = new CustomCylinderFloorItem(metadata, new THREE.Mesh(geometry, this.shape.customMesh.material));
+                  shapeFloor.buildFinished();
                   shapeFloor.scaleGeometry(this.shape.scale.x, this.shape.scale.y, this.shape.scale.z);
                   shapeFloor.calculateHalfSize();
                   shapeFloor.skin = this.shape.skin;
@@ -43180,6 +43199,7 @@
                   var position = this.shape.position.clone();
                   var geometry = this.shape.customMesh.geometry.clone().scale(origScale.x, origScale.y, origScale.z);
                   var shapeWall = new CustomCylinderWallItem(metadata, new THREE.Mesh(geometry, this.shape.customMesh.material));
+                  shapeWall.buildFinished();
                   shapeWall.scaleGeometry(this.shape.scale.x, this.shape.scale.y, this.shape.scale.z);
                   shapeWall.customMesh.geometry.rotateX(Math.PI / 2);
                   shapeWall.calculateHalfSize();
@@ -45277,6 +45297,7 @@
                               itemSelected: this.itemSelected.bind(this),
                               itemUnselected: this.itemUnselected.bind(this)
                           });
+                          item.buildFinished();
                           this._itemService.addItem(item);
                           return [2 /*return*/, item];
                   }
@@ -45389,6 +45410,7 @@
                                   };
                                   metadata.scale = model.scale;
                                   item = new FloorItem(metadata, model.object, null, handlers);
+                                  item.buildFinished();
                                   if (object.itemGroup) {
                                       this._groupService.reattachToItemGroup(item, object.itemGroup, position);
                                   }
@@ -45434,6 +45456,7 @@
                           return [7 /*endfinally*/];
                       case 12:
                           item = new CustomShapeFloorItem(metadata, new THREE.Mesh(geometry, materials), object.texture);
+                          item.buildFinished();
                           if (object.itemGroup) {
                               this._groupService.reattachToItemGroup(item, object.itemGroup, position);
                           }
@@ -45473,6 +45496,7 @@
                           return [7 /*endfinally*/];
                       case 21:
                           item = new CustomShapeWallItem(metadata, new THREE.Mesh(geometry, materials), object.texture);
+                          item.buildFinished();
                           closestWallEdge = this._roomService.getClosestWallEdge(position.x, position.z);
                           item.placeOnEdge(closestWallEdge);
                           if (object.itemGroup) {
@@ -45514,6 +45538,7 @@
                           return [7 /*endfinally*/];
                       case 30:
                           item = new CustomCylinderFloorItem(metadata, new THREE.Mesh(geometry, materials), object.texture);
+                          item.buildFinished();
                           if (object.itemGroup) {
                               this._groupService.reattachToItemGroup(item, object.itemGroup, position);
                           }
@@ -45554,6 +45579,7 @@
                           return [7 /*endfinally*/];
                       case 39:
                           item = new CustomCylinderWallItem(metadata, new THREE.Mesh(geometry, materials), object.texture);
+                          item.buildFinished();
                           closestWallEdge = this._roomService.getClosestWallEdge(position.x, position.z);
                           item.placeOnEdge(closestWallEdge);
                           if (object.itemGroup) {