@colijnit/homedecorator 256.1.21 → 256.1.22

package/app/plugins/model-uploader/model-previewer/model-preview.component.d.ts

@@ -100,6 +100,7 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     private _createLightFromProperties;
     private _setObjectProperties;
     private _validateObjectStructure;
+    private _validateMaterial;
     static ɵfac: i0.ɵɵFactoryDeclaration<ModelPreviewComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ModelPreviewComponent, "rp-model-preview", never, {}, {}, never, never>;
 }

package/bundles/colijnit-homedecorator.umd.js

@@ -46306,10 +46306,12 @@
       ModelPreviewComponent.prototype.exportSceneAsGLB = function (returnType) {
           var _this = this;
           // add timestamp
+          this.showLoader = true;
           var timestamp = new Date().getTime();
           var exportFileName = this._setModelName(this.glbExportName.nativeElement.value) + '_' + timestamp;
           var gltfExporter = new GLTFExporter.GLTFExporter();
-          var scene = this.scenePreview.clone();
+          var scene;
+          scene = this.scenePreview.clone();
           var model = this.scenePreview.getObjectByName(this.modelName).clone();
           while (scene.children.length > 0) {
               scene.remove(scene.children[0]);
@@ -46429,6 +46431,7 @@
                   document.body.appendChild(element);
                   element.click();
                   document.body.removeChild(element);
+                  this.showLoader = false;
                   return [2 /*return*/];
               });
           });
@@ -46459,11 +46462,13 @@
                                       _this.data.thirdPartyModelService.parseModelToGLB(file, hash, modelUrl, configurationData, priceData, metaData).then(function (result) {
                                           _this._dialog.closeAll();
                                           _this._messageService.emit(MessageType.HideProductCatalog);
+                                          _this.showLoader = false;
                                       });
                                   });
                               }
                           }).catch(function (error) {
                               _this._messageService.emit(MessageType.RenderError, { title: 'Upload error', message: error });
+                              _this.showLoader = false;
                           });
                           return [2 /*return*/];
                       });
@@ -46678,6 +46683,7 @@
           }
       };
       ModelPreviewComponent.prototype._validateObjectStructure = function (inputObject) {
+          var _this = this;
           var modelGroup = inputObject;
           var validation = [];
           // Check for a group
@@ -46687,6 +46693,7 @@
           // Does it contain meshes
           var hasVisibleMeshes = false;
           modelGroup.traverse(function (object) {
+              var e_3, _a;
               if (object.isMesh) {
                   hasVisibleMeshes = true;
                   // basic geometry check
@@ -46697,6 +46704,26 @@
                   else if (!object.geometry.attributes.position || object.geometry.attributes.position.count === 0) {
                       validation.push('Mesh ' + object.name + ' geometry has no position data.');
                   }
+                  if (object.material) {
+                      if (object.material.length > 1) {
+                          try {
+                              for (var _b = __values(object.material), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                  var mat = _c.value;
+                                  _this._validateMaterial(mat);
+                              }
+                          }
+                          catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                          finally {
+                              try {
+                                  if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                              }
+                              finally { if (e_3) throw e_3.error; }
+                          }
+                      }
+                      else {
+                          _this._validateMaterial(object.material);
+                      }
+                  }
                   // basic mats check
                   if (!object.material) {
                       validation.push('Mesh ' + object.name + ' has no material');
@@ -46730,6 +46757,13 @@
           }
           return validation;
       };
+      ModelPreviewComponent.prototype._validateMaterial = function (material) {
+          if (material.map && material.map.source && material.map.source.data === null) {
+              material.map.dispose();
+              material.map = null;
+              material.needsUpdate = true;
+          }
+      };
       return ModelPreviewComponent;
   }());
   ModelPreviewComponent.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: ModelPreviewComponent, deps: [{ token: i1.MAT_DIALOG_DATA }, { token: HomedecoratorSettingsService }, { token: HomedecoratorIconCacheService }, { token: i1__namespace.MatDialogRef }, { token: MessageBusService }, { token: i1__namespace.MatDialog }, { token: HomedecoratorConnectorAdapterService }, { token: HomedecoratorDictionaryService }, { token: FontService }], target: i0__namespace.ɵɵFactoryTarget.Component });
@@ -47288,7 +47322,7 @@
           this.settingsService = settingsService;
           this._messageService = _messageService;
           this.file = null;
-          this.fileMaxSize = 80; // file size in mb
+          this.fileMaxSize = 30; // file size in mb
           this._maxFileSize = this.fileMaxSize * 1024 * 1024; // fileMaxSize to kb
           this._allowedFiles = ['glb', 'obj', 'fbx', '3ds', 'gltf', 'stl'];
       }