@colijnit/configurator 260.1.0 → 260.1.2

package/README.md

@@ -1,28 +1,28 @@
-# Catalog
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.1.2.
-
-## Development server
-
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.
-
-## Build
-
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-Before running the tests make sure you are serving the app via `ng serve`.
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+# Catalog
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.1.2.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Before running the tests make sure you are serving the app via `ng serve`.
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

package/bundles/colijnit-configurator.umd.js

@@ -1454,6 +1454,45 @@
               });
           });
       };
+      VariationUtils.LoadVariationByUrl = function (materialCode, url) {
+          return __awaiter(this, void 0, void 0, function () {
+              var file, settings, err_2;
+              return __generator(this, function (_a) {
+                  switch (_a.label) {
+                      case 0:
+                          if (!url) {
+                              return [2 /*return*/, null];
+                          }
+                          if (!url.includes('ione3d')) {
+                              url = url.concat('.ione3d');
+                          }
+                          if (!window.hasOwnProperty('downloadVariation')) {
+                              console.error('downloadVariation not defined in window global');
+                              throw new Error('downloadVariation not defined in window global');
+                          }
+                          if (this.MaterialCache.has(materialCode)) {
+                              return [2 /*return*/, this.MaterialCache.get(materialCode)];
+                          }
+                          _a.label = 1;
+                      case 1:
+                          _a.trys.push([1, 4, , 5]);
+                          return [4 /*yield*/, window.downloadVariation(url)];
+                      case 2:
+                          file = _a.sent();
+                          return [4 /*yield*/, VariationUtils.GetVariationSettingsFromFile(materialCode, file)];
+                      case 3:
+                          settings = _a.sent();
+                          this.MaterialCache.set(materialCode, settings);
+                          return [2 /*return*/, settings];
+                      case 4:
+                          err_2 = _a.sent();
+                          console.error('Error loading variation:', err_2);
+                          throw err_2;
+                      case 5: return [2 /*return*/];
+                  }
+              });
+          });
+      };
       // public static GetMaterialFromName(variationFolder: string, material: any): Promise<MeshStandardMaterial> {
       //   return new Promise((resolve: Function) => {
       //     if (!material) {
@@ -1943,37 +1982,45 @@
               return __generator(this, function (_b) {
                   switch (_b.label) {
                       case 0:
-                          _b.trys.push([0, 6, , 7]);
+                          _b.trys.push([0, 9, , 10]);
                           len = parts.length;
                           i = 0;
                           _b.label = 1;
                       case 1:
-                          if (!(i < len)) return [3 /*break*/, 5];
-                          if (!(parts[i].decoNode && parts[i].decoNode.gameObjectName && parts[i].decoNode.type === decoNodeType_enum.DecoNodeType.Part)) return [3 /*break*/, 4];
-                          return [4 /*yield*/, VariationUtils.LoadVariation(this.assetPath, parts[i].decoNode.gameObjectName || parts[i].decoId)];
+                          if (!(i < len)) return [3 /*break*/, 8];
+                          partSettings = void 0;
+                          if (!(parts[i].decoNode && parts[i].decoNode.materialUrl && parts[i].decoNode.type === decoNodeType_enum.DecoNodeType.Part)) return [3 /*break*/, 3];
+                          return [4 /*yield*/, VariationUtils.LoadVariationByUrl(parts[i].decoNode.materialCode, parts[i].decoNode.materialUrl)];
                       case 2:
                           partSettings = _b.sent();
-                          if (!partSettings) return [3 /*break*/, 4];
+                          _b.label = 3;
+                      case 3:
+                          if (!(parts[i].decoNode && parts[i].decoNode.gameObjectName && parts[i].decoNode.type === decoNodeType_enum.DecoNodeType.Part)) return [3 /*break*/, 5];
+                          return [4 /*yield*/, VariationUtils.LoadVariation(this.assetPath, parts[i].decoNode.gameObjectName || parts[i].decoId)];
+                      case 4:
+                          partSettings = _b.sent();
+                          _b.label = 5;
+                      case 5:
+                          if (!partSettings) return [3 /*break*/, 7];
                           partVariation = new Variation();
                           partVariation.decoId = parseFloat(parts[i].decoNode.id);
                           partVariation.brandId = parts[i].decoNode.brandId;
                           partVariation.gameObjectName = parts[i].decoNode.gameObjectName;
                           _a = partVariation;
                           return [4 /*yield*/, AssetUtils.CreateMaterialFromAsset(partSettings)];
-                      case 3:
+                      case 6:
                           _a.material = _b.sent();
-                          // parts[i].variation = partVariation;
                           this._applyMaterialPart(obj, partVariation, parts[i].node, usePbr);
-                          _b.label = 4;
-                      case 4:
+                          _b.label = 7;
+                      case 7:
                           i++;
                           return [3 /*break*/, 1];
-                      case 5: return [3 /*break*/, 7];
-                      case 6:
+                      case 8: return [3 /*break*/, 10];
+                      case 9:
                           e_1 = _b.sent();
                           console.error(e_1);
-                          return [3 /*break*/, 7];
-                      case 7: return [2 /*return*/];
+                          return [3 /*break*/, 10];
+                      case 10: return [2 /*return*/];
                   }
               });
           });
@@ -2006,8 +2053,14 @@
                                           lastKnownVariations = [];
                                           variationPromise = [];
                                           _loop_2 = function (j) {
-                                              variationPromise.push(this_1.loadTheVariation(variations[j].gameObjectName || parts[i].decoId)
-                                                  .then(function (variationSettings) {
+                                              var variationsName = '';
+                                              if (variations[j].materialCode && variations[j].materialUrl) {
+                                                  variationsName = variations[j].materialCode;
+                                              }
+                                              else {
+                                                  variationsName = variations[j].gameObjectName || parts[i].decoId;
+                                              }
+                                              variationPromise.push(this_1.loadTheVariation(variationsName).then(function (variationSettings) {
                                                   var newVariation = new Variation();
                                                   newVariation.decoId = variations[j].constructor.name === 'Variation' ? variations[j].decoId : parseFloat(variations[j].id);
                                                   newVariation.node = variations[j].constructor.name === 'Variation' ? variations[j].node : variations[j].nodeId;
@@ -2073,33 +2126,47 @@
           }
       };
       VariationHelper.prototype.preloadVariations = function (fileNames) {
-          var _loop_3 = function (i) {
-              var fileName = fileNames[i];
-              if (fileName && !this_2.get(fileName)) {
-                  var settings_1 = new VariationSettings();
-                  settings_1.id = fileName;
-                  settings_1.loading = true;
-                  this_2._variations.push(settings_1);
-                  VariationUtils.LoadVariation(this_2.assetPath, fileName)
-                      .then(function (variationSettings) {
-                      settings_1.loading = false;
-                      if (variationSettings) {
-                          // this.set(variationSettings);
-                          settings_1.copyFrom(variationSettings);
-                      }
-                      settings_1.loaded.next(settings_1);
-                  })
-                      .catch(function (err) {
-                      console.error("Error loading variation " + fileName + ":", err);
-                      settings_1.loading = false;
-                      settings_1.loaded.next(null);
-                  });
+          var _this = this;
+          fileNames.forEach(function (node) {
+              if (node.materialUrl) {
+                  if (node.materialCode && !_this.get(node.materialCode)) {
+                      var settings_1 = new VariationSettings();
+                      settings_1.id = node.materialCode;
+                      settings_1.loading = true;
+                      _this._variations.push(settings_1);
+                      VariationUtils.LoadVariationByUrl(node.materialCode, node.materialUrl).then(function (variationSettings) {
+                          settings_1.loading = false;
+                          if (variationSettings) {
+                              settings_1.copyFrom(variationSettings);
+                          }
+                          settings_1.loaded.next(settings_1);
+                      }).catch(function (err) {
+                          console.error("Error loading variation " + node.materialCode + ":", err);
+                          settings_1.loading = false;
+                          settings_1.loaded.next(null);
+                      });
+                  }
               }
-          };
-          var this_2 = this;
-          for (var i = 0; i < fileNames.length; i++) {
-              _loop_3(i);
-          }
+              else if (node.gameObjectName) {
+                  if (!_this.get(node.gameObjectName)) {
+                      var settings_2 = new VariationSettings();
+                      settings_2.id = node.gameObjectName;
+                      settings_2.loading = true;
+                      _this._variations.push(settings_2);
+                      VariationUtils.LoadVariation(_this.assetPath, node.gameObjectName).then(function (variationSettings) {
+                          settings_2.loading = false;
+                          if (variationSettings) {
+                              settings_2.copyFrom(variationSettings);
+                          }
+                          settings_2.loaded.next(settings_2);
+                      }).catch(function (err) {
+                          console.error("Error loading variation " + node.gameObjectName + ":", err);
+                          settings_2.loading = false;
+                          settings_2.loaded.next(null);
+                      });
+                  }
+              }
+          });
       };
       VariationHelper.prototype.loadTheVariation = function (fileName) {
           return __awaiter(this, void 0, void 0, function () {
@@ -2206,7 +2273,9 @@
                                   var materialToSearch = !!variation.materialId ? variation.materialId.toLowerCase() : 'default';
                                   if (Array.isArray(mesh.material)) { // multimaterial support
                                       for (var m = 0, mlen = mesh.material.length; m < mlen; m++) {
-                                          if (mesh.material[m].name.toLowerCase().indexOf(materialToSearch) !== -1) {
+                                          // if (mesh.material[m].name.toLowerCase().indexOf(materialToSearch) !== -1) {
+                                          if ((variation.materialId && mesh.material[m].name.toLowerCase() === materialToSearch) ||
+                                              (!variation.materialId && mesh.material[m].name.toLowerCase().indexOf(materialToSearch) !== -1)) {
                                               if ((variation.material instanceof Material || variation.material.constructor.name === 'Material') && variation.material.isMaterial) {
                                                   // it's a THREE.Material
                                                   mesh.material[m] = variation.material;
@@ -2224,7 +2293,9 @@
                                       }
                                   }
                                   else {
-                                      if (mesh.material.name && mesh.material.name.toLowerCase().indexOf(materialToSearch) !== -1) {
+                                      // if (mesh.material.name && mesh.material.name.toLowerCase().indexOf(materialToSearch) !== -1) {
+                                      if ((variation.materialId && mesh.material.name.toLowerCase() === materialToSearch) ||
+                                          (!variation.materialId && mesh.material.name.toLowerCase().indexOf(materialToSearch) !== -1)) {
                                           if ((variation.material instanceof Material || variation.material.constructor.name === 'Material') && variation.material.isMaterial) {
                                               // it's a THREE.Material
                                               mesh.material = variation.material;
@@ -2966,8 +3037,8 @@
       Builder.prototype._preloadMaterials = function () {
           if (this._decos && this._decos.length) {
               var materials = __spreadArray([], __read(new Set(this._decos
-                  .filter(function (d) { return d.gameObjectName && d.type === decoNodeType_enum.DecoNodeType.Variation; })
-                  .map(function (d) { return d.gameObjectName; }))));
+                  .filter(function (d) { return (d.gameObjectName || d.materialUrl) && d.type === decoNodeType_enum.DecoNodeType.Variation; })
+                  .map(function (d) { return d; }))));
               this._variationHelper.preloadVariations(materials);
           }
       };
@@ -3126,11 +3197,11 @@
               selectionOfArticle.gameObject &&
               selectionOfArticle.gameObject.length > 0;
           // get generic variations
-          var globalVariations = this._selections
-              .filter(function (s) { return (s.generic || adjustableSelections.length === 1) && s.decoNode.variation && !s.decoNode.type; })
+          var globalVariations = selections
+              .filter(function (s) { return (s.generic || adjustableSelections.length === 1) && s.decoNode.variation; } /*&& !s.decoNode.type*/)
               .map(function (value, index, array) {
               // find selection of variation
-              var sel = _this._selections.find(function (s) { return s.artNodeIdDeco === value.decoNode.variation.parentId; });
+              var sel = selections.find(function (s) { return s.artNodeIdDeco === value.decoNode.variation.parentId; });
               if (sel) {
                   value.decoNode.variation.supplierArticleNr = sel.supplierArticleNr;
               }
@@ -3159,7 +3230,7 @@
           var previousPresLevel = -1;
           var positioning;
           var optionText;
-          var _loop_1 = function (i) {
+          for (var i = 0; i < len; i++) {
               var selection = selections[i];
               if (selection.presentationLevel === 1) {
                   positioning = selection.hdecoPositioning;
@@ -3170,37 +3241,33 @@
               }
               if (selection.decoNode) {
                   if (selection.decoNode.type === decoNodeType_enum.DecoNodeType.Variation) {
-                      var decoNode_1 = selection.decoNode;
-                      decoNode_1.optionText = optionText;
+                      var decoNode = selection.decoNode;
+                      decoNode.optionText = optionText;
                       // find selection of variation and set materialId in case of multimaterial
-                      decoNode_1.materialId = this_1._getMaterialIdFromParent(decoNode_1.nodeId);
+                      decoNode.materialId = this._getMaterialIdFromParent(decoNode.nodeId);
                       if (lastAdded) {
                           if (newPart) {
-                              if (decoNode_1.materialId) {
-                                  if (!lastAdded.variations.find(function (v) { return v.id === decoNode_1.id; })) {
-                                      lastAdded.variations.push(decoNode_1);
-                                  }
+                              if (decoNode.materialId) {
+                                  lastAdded.variations.push(decoNode);
                               }
                               else {
-                                  lastAdded.variations = [decoNode_1];
+                                  lastAdded.variations = [decoNode];
                               }
                           }
                           else {
-                              if (!lastAdded.variations.find(function (v) { return v.id === decoNode_1.id; })) {
-                                  lastAdded.variations.push(decoNode_1);
-                              }
+                              lastAdded.variations.push(decoNode);
                           }
                           newPart = false;
                       }
-                      else {
-                          if (globalVariationsRewrite) {
-                              globalVariations.length = 0;
-                              globalVariationsRewrite = false;
-                          }
-                          if (!globalVariations.find(function (v) { return v.id === decoNode_1.id; })) {
-                              globalVariations.push(decoNode_1);
-                          }
-                      }
+                      // else {
+                      //     if (globalVariationsRewrite) {
+                      //         globalVariations.length = 0;
+                      //         globalVariationsRewrite = false;
+                      //     }
+                      //     if (!globalVariations.find(v => v.id === decoNode.id)) {
+                      //         globalVariations.push(decoNode);
+                      //     }
+                      // }
                       // const variation: FurniturePartVariation = new FurniturePartVariation();
                       // variation.BrandId = selection.decoNode.brandId;
                       // variation.Description = selection.decoNode.gameObjectName;
@@ -3213,7 +3280,7 @@
                       selection.decoNode.gameObjectName.length) || (isArticleWithMaterial)) {
                       if (selection.decoNode.kind === decoNodeKind_enum.DecoNodeKind.Adjustable || (isArticleWithMaterial)) {
                           selection.variations = globalVariations;
-                          this_1._adjustables.push(selection);
+                          this._adjustables.push(selection);
                           if (!lastAdded || (lastAdded.nodeId !== selection.nodeId || lastAdded.node !== selection.node)) {
                               newPart = true;
                           }
@@ -3225,7 +3292,7 @@
                           if (lastAdjustable) {
                               lastAdjustable.addables.push(selection);
                           }
-                          this_1._addables.push(selection);
+                          this._addables.push(selection);
                           if (!lastAdded || (lastAdded.nodeId !== selection.nodeId || lastAdded.node !== selection.node)) {
                               newPart = true;
                           }
@@ -3234,10 +3301,6 @@
                   }
               }
               previousPresLevel = selection.presentationLevel;
-          };
-          var this_1 = this;
-          for (var i = 0; i < len; i++) {
-              _loop_1(i);
           }
           // this._upsertFurniture(this.activeInstance,
           //   {Variations: usedVariations});
@@ -3445,23 +3508,23 @@
               return;
           }
           var len = this._selections.length;
-          var _loop_2 = function (i) {
+          var _loop_1 = function (i) {
               // const id: string = this.selections[i].artNodeIdDeco;
-              var deco = this_2._decos.find(function (d) { return d.nodeId === _this._selections[i].node; });
+              var deco = this_1._decos.find(function (d) { return d.nodeId === _this._selections[i].node; });
               if (!deco) {
                   deco = new decoNode.DecoNode();
               }
               if (deco.type !== decoNodeType_enum.DecoNodeType.Variation) {
-                  var variation = this_2._getVariations().find(function (v) { return v.parentId === _this._selections[i].artNodeIdDeco; });
+                  var variation = this_1._getVariations().find(function (v) { return v.parentId === _this._selections[i].artNodeIdDeco; });
                   if (variation) {
                       deco.variation = variation;
                   }
               }
-              this_2._selections[i].decoNode = deco;
+              this_1._selections[i].decoNode = deco;
           };
-          var this_2 = this;
+          var this_1 = this;
           for (var i = 0; i < len; i++) {
-              _loop_2(i);
+              _loop_1(i);
           }
       };
       Builder.prototype._getVariations = function () {