@colijnit/homedecorator 258.1.12 → 258.1.14

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

@@ -14032,6 +14032,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; }
@@ -14209,6 +14214,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) {
@@ -14913,6 +14921,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;
@@ -15021,6 +15030,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;
@@ -15086,6 +15096,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;
@@ -15487,6 +15498,7 @@
               item.opening = Object.assign({}, metadata.opening);
           }
           item.userData.itemType = metadata.itemType;
+          item.buildFinished();
           this.addItem(item);
           return item;
       };
@@ -15524,6 +15536,7 @@
                           return [4 /*yield*/, new itemConstructor(metadata, modelData.object)];
                       case 1:
                           item = _a.sent();
+                          item.buildFinished();
                           this.addItem(item);
                           return [2 /*return*/, item];
                   }
@@ -20376,6 +20389,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*/];
                   }
               });
@@ -21933,6 +21949,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;
@@ -21992,6 +22009,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;
@@ -23013,7 +23031,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;
       };
@@ -23030,7 +23048,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;
       };
@@ -23047,7 +23065,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;
       };
@@ -33106,6 +33124,7 @@
           }
           item.allowRotate = true;
           item.highLightDisabled = !this._settingsService.settings.options.useStandaloneHighLight;
+          item.buildFinished();
           newCustomFloorObj.furniture = item;
           return newCustomFloorObj;
       };
@@ -42851,17 +42870,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);
@@ -42871,11 +42894,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;
@@ -43148,6 +43174,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;
@@ -43169,6 +43196,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();
@@ -45266,6 +45294,7 @@
                               itemSelected: this.itemSelected.bind(this),
                               itemUnselected: this.itemUnselected.bind(this)
                           });
+                          item.buildFinished();
                           this._itemService.addItem(item);
                           return [2 /*return*/, item];
                   }
@@ -45378,6 +45407,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);
                                   }
@@ -45423,6 +45453,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);
                           }
@@ -45462,6 +45493,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) {
@@ -45503,6 +45535,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);
                           }
@@ -45543,6 +45576,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) {