@colijnit/homedecorator 258.1.11 → 258.1.13

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

@@ -74,6 +74,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/bundles/colijnit-homedecorator.umd.js

@@ -2487,46 +2487,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 +2560,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 +2570,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 +2702,47 @@
       Item.prototype.getHalfSize = function () {
           return this.halfSize.clone();
       };
+      Item.prototype.handleRawMetadata = function () {
+          var rawMetadata = this.rawMetadata;
+          if (rawMetadata) {
+              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;
+                  this.setYPositionBasedOnElevation();
+              }
+              else {
+                  this.elevation = 0;
+              }
+          }
+          this.calculateHalfSize();
+      };
       /** on is a bool */
       Item.prototype.updateHighlight = function () {
           if (this.highLightDisabled) {
@@ -14030,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; }
@@ -14207,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) {
@@ -15485,6 +15495,7 @@
               item.opening = Object.assign({}, metadata.opening);
           }
           item.userData.itemType = metadata.itemType;
+          item.buildFinished();
           this.addItem(item);
           return item;
       };
@@ -15522,6 +15533,7 @@
                           return [4 /*yield*/, new itemConstructor(metadata, modelData.object)];
                       case 1:
                           item = _a.sent();
+                          item.buildFinished();
                           this.addItem(item);
                           return [2 /*return*/, item];
                   }
@@ -23011,7 +23023,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;
       };
@@ -23028,7 +23040,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;
       };
@@ -23045,7 +23057,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;
       };
@@ -33104,6 +33116,7 @@
           }
           item.allowRotate = true;
           item.highLightDisabled = !this._settingsService.settings.options.useStandaloneHighLight;
+          item.buildFinished();
           newCustomFloorObj.furniture = item;
           return newCustomFloorObj;
       };