@colijnit/homedecorator 259.1.6 → 259.1.8

package/app/plugins/core3d/items/item.d.ts

@@ -12,6 +12,7 @@ import { ChildParams } from '../../../core/interface/child-params.interface';
  */
 export declare class Item extends BaseItem {
     rawMetadata: Metadata;
+    private _metadataSet;
     set allwaysConfigureMode(value: boolean);
     get allwaysConfigureMode(): boolean;
     set configuring(value: boolean);
@@ -74,6 +75,7 @@ export declare class Item extends BaseItem {
     endDrag(): void;
     initObject(itemType: any, id: string, identifier: string, modelUrl: any): void;
     getHalfSize(): Vector3;
+    protected handleRawMetadata(): void;
     /** on is a bool */
     protected updateHighlight(): void;
     /** */

package/app/plugins/core3d/items/wall-objects.d.ts

@@ -410,6 +410,7 @@ export declare abstract class WallItem extends Item {
     updateMaterialVisibility(side?: number): void;
     createTextureMaterial(options?: any): Promise<THREE.MeshPhongMaterial>;
     getTexture(): Texture;
+    setScaleXYZ(x: number, y: number, z: number, recalculateHalfSize?: boolean): void;
     protected createMaterial(side?: number, isSame?: boolean): Promise<void>;
     protected setYPositionBasedOnElevation(): void;
     protected addMaterialMap(material: THREE.MeshPhongMaterial, texture: Texture, flip: boolean): Promise<void>;

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) {
@@ -2439,6 +2441,7 @@
       function Item(rawMetadata, object, texture, handlers) {
           var _this = _super.call(this, rawMetadata, object, texture) || this;
           _this.rawMetadata = rawMetadata;
+          _this._metadataSet = false;
           _this.obsolete = false;
           _this.highLightDisabled = false;
           _this.originalLength = 0;
@@ -2487,46 +2490,9 @@
                   _this.addChild(child);
               });
           }
-          if (rawMetadata && rawMetadata.scale != null) {
-              if (_this.canScaleX || _this.canScaleY || _this.canScaleZ) {
-                  _this._shouldSetScale = true;
-              }
-              else {
-                  _this.scaleGeometry(rawMetadata.scale.x, rawMetadata.scale.y, rawMetadata.scale.z);
-              }
-          }
-          if (_this.scalePercentage !== 100) {
-              _this.scale.set(_this.scalePercentage / 100, _this.scalePercentage / 100, _this.scalePercentage / 100);
-          }
-          _this.calculateHalfSize();
           if (_this.usePivot) {
               _this.updatePivot(_this.updatePivotOnCreate);
           }
-          if (rawMetadata) {
-              _this.initObject(rawMetadata.itemType, rawMetadata.itemId, rawMetadata.itemIdentifier, rawMetadata.modelUrl);
-              if (rawMetadata.position) {
-                  _this.position.copy(rawMetadata.position);
-                  _this.positionSet = true;
-              }
-              else {
-                  _this.positionSet = false;
-              }
-              if (rawMetadata.elevation) {
-                  _this.elevation = rawMetadata.elevation;
-                  _this.setYPositionBasedOnElevation();
-              }
-              else {
-                  _this.elevation = 0;
-              }
-              if (rawMetadata.rotation) {
-                  if (rawMetadata.rotation instanceof THREE.Euler) {
-                      _this.rotation.set(rawMetadata.rotation.x, rawMetadata.rotation.y, rawMetadata.rotation.z);
-                  }
-                  else {
-                      _this.rotation.y = rawMetadata.rotation || 0;
-                  }
-              }
-          }
           // this.add(new AxesHelper(2));
           _this._setOriginals();
           return _this;
@@ -2597,6 +2563,7 @@
       };
       Item.prototype.buildFinished = function () {
           _super.prototype.buildFinished.call(this);
+          this.handleRawMetadata();
           // If it's possible to change materials then we need to store the original item
           // This way when we save the project we can do a diff on the materials and store
           // changes instead of the whole material
@@ -2606,9 +2573,6 @@
               }
               this.originalItem = ObjectUtils.DeepCloneObject3D(this);
           }
-          if (this._shouldSetScale) {
-              this.setScaleXYZ(this.rawMetadata.scale.x, this.rawMetadata.scale.y, this.rawMetadata.scale.z);
-          }
       };
       Item.prototype.connectorFromElement = function (selection) {
           var id = this._getIdentifierFromSelection(selection);
@@ -2741,6 +2705,48 @@
       Item.prototype.getHalfSize = function () {
           return this.halfSize.clone();
       };
+      Item.prototype.handleRawMetadata = function () {
+          var rawMetadata = this.rawMetadata;
+          if (rawMetadata && !this._metadataSet) {
+              this.initObject(rawMetadata.itemType, rawMetadata.itemId, rawMetadata.itemIdentifier, rawMetadata.modelUrl);
+              if (rawMetadata.rotation) {
+                  if (rawMetadata.rotation instanceof THREE.Euler) {
+                      this.rotation.set(rawMetadata.rotation.x, rawMetadata.rotation.y, rawMetadata.rotation.z);
+                  }
+                  else {
+                      this.rotation.y = rawMetadata.rotation || 0;
+                  }
+              }
+              if (rawMetadata.position) {
+                  this.position.copy(rawMetadata.position);
+                  this.positionSet = true;
+              }
+              else {
+                  this.positionSet = false;
+              }
+              if (rawMetadata.scale) {
+                  if (this.canScaleX || this.canScaleY || this.canScaleZ) {
+                      this.setScaleXYZ(this.rawMetadata.scale.x, this.rawMetadata.scale.y, this.rawMetadata.scale.z);
+                      // this._shouldSetScale = true;
+                  }
+                  else {
+                      this.scaleGeometry(rawMetadata.scale.x, rawMetadata.scale.y, rawMetadata.scale.z);
+                  }
+              }
+              if (this.scalePercentage !== 100) {
+                  this.scale.set(this.scalePercentage / 100, this.scalePercentage / 100, this.scalePercentage / 100);
+              }
+              if (rawMetadata.elevation) {
+                  this.elevation = rawMetadata.elevation;
+              }
+              else {
+                  this.elevation = 0;
+              }
+              this._metadataSet = true;
+          }
+          this.calculateHalfSize();
+          this.setYPositionBasedOnElevation();
+      };
       /** on is a bool */
       Item.prototype.updateHighlight = function () {
           if (this.highLightDisabled) {
@@ -13968,6 +13974,11 @@
       WallItem.prototype.getTexture = function () {
           return this.texture;
       };
+      WallItem.prototype.setScaleXYZ = function (x, y, z, recalculateHalfSize) {
+          if (recalculateHalfSize === void 0) { recalculateHalfSize = true; }
+          _super_1.prototype.setScaleXYZ.call(this, x, y, z, recalculateHalfSize);
+          this.reposition();
+      };
       WallItem.prototype.createMaterial = function (side, isSame) {
           if (side === void 0) { side = THREE__namespace.DoubleSide; }
           if (isSame === void 0) { isSame = true; }
@@ -14026,7 +14037,9 @@
           });
       };
       WallItem.prototype.setYPositionBasedOnElevation = function () {
-          this.position.y = this.elevation + this.halfSize.y;
+          if (this.boundToFloor) {
+              this.position.y = this.elevation + (this.halfSize ? this.halfSize.y : 0);
+          }
       };
       WallItem.prototype.addMaterialMap = function (material, texture, flip) {
           return __awaiter$1c(this, void 0, void 0, function () {
@@ -14145,6 +14158,9 @@
       /** takes the move vec3, and makes sure object stays bounded on plane */
       WallItem.prototype._boundMove = function (vec3) {
           var edge = this.currentWallEdge;
+          if (!edge) {
+              return;
+          }
           vec3.applyMatrix4(edge.interiorTransform);
           edge.wall.itemsChanged = true;
           if (vec3.x < this._sizeX / 2.0 + this._positionYTolerance) {
@@ -14475,6 +14491,7 @@
           var clone = this.createClass();
           this.cloneProperties(clone);
           clone.name = 'test clone';
+          clone.buildFinished();
           return clone;
       };
       InWallItem.prototype.createMaterial = function (side, isSame) {
@@ -14849,6 +14866,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;
@@ -14957,6 +14975,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;
@@ -15022,6 +15041,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;
@@ -15423,6 +15443,7 @@
               item.opening = Object.assign({}, metadata.opening);
           }
           item.userData.itemType = metadata.itemType;
+          item.buildFinished();
           this.addItem(item);
           return item;
       };
@@ -15460,6 +15481,7 @@
                           return [4 /*yield*/, new itemConstructor(metadata, modelData.object)];
                       case 1:
                           item = _a.sent();
+                          item.buildFinished();
                           this.addItem(item);
                           return [2 /*return*/, item];
                   }
@@ -20385,6 +20407,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*/];
                   }
               });
@@ -21945,6 +21970,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;
@@ -22004,6 +22030,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;
@@ -23025,7 +23052,7 @@
           var height = new BoxMeasurement();
           var heightString = MeasurementUtils.makeText(this._height, this.dimUnit, this.distanceStep);
           var text = this._dictionaryService.get('LABEL_HEIGHT');
-          height.textMesh = makeTextMesh(heightString, this._font, text);
+          height.textMesh = makeTextMesh(heightString, this._font, 0xFF00FF, 0.08, false, false, text);
           height.positions = this.calculateHeightPositions();
           return height;
       };
@@ -23042,7 +23069,7 @@
           var width = new BoxMeasurement();
           var widthString = MeasurementUtils.makeText(this._width, this.dimUnit, this.distanceStep);
           var text = this._dictionaryService.get('LABEL_WIDTH');
-          width.textMesh = makeTextMesh(widthString, this._font, text);
+          width.textMesh = makeTextMesh(widthString, this._font, 0xFF00FF, 0.08, false, false, text);
           width.positions = this.calculateWidthPositions();
           return width;
       };
@@ -23059,7 +23086,7 @@
           var openingDepth = new BoxMeasurement();
           var openingDepthString = MeasurementUtils.makeText(this._openingDepth, this.dimUnit, this.distanceStep);
           var text = this._dictionaryService.get('LABEL_DEPTH');
-          openingDepth.textMesh = makeTextMesh(openingDepthString, this._font, text);
+          openingDepth.textMesh = makeTextMesh(openingDepthString, this._font, 0xFF00FF, 0.08, false, false, text);
           openingDepth.positions = this.calculateOpeningDepthPositions();
           return openingDepth;
       };
@@ -23652,7 +23679,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 ||
@@ -33546,6 +33573,7 @@
           }
           item.allowRotate = true;
           item.highLightDisabled = !this._settingsService.settings.options.useStandaloneHighLight;
+          item.buildFinished();
           newCustomFloorObj.furniture = item;
           return newCustomFloorObj;
       };
@@ -43501,17 +43529,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);
@@ -43521,11 +43553,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;
@@ -43798,6 +43833,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;
@@ -43819,6 +43855,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();
@@ -45915,6 +45952,7 @@
                               itemSelected: this.itemSelected.bind(this),
                               itemUnselected: this.itemUnselected.bind(this)
                           });
+                          item.buildFinished();
                           this._itemService.addItem(item);
                           return [2 /*return*/, item];
                   }
@@ -46027,6 +46065,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);
                                   }
@@ -46072,6 +46111,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);
                           }
@@ -46111,6 +46151,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) {
@@ -46152,6 +46193,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);
                           }
@@ -46192,6 +46234,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) {