@colijnit/configurator 260.1.1 → 260.1.2

package/bundles/colijnit-configurator.umd.js

@@ -2273,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;
@@ -2291,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;
@@ -3193,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;
               }
@@ -3226,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;
@@ -3237,33 +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) {
-                                  lastAdded.variations.push(decoNode_1);
+                              if (decoNode.materialId) {
+                                  lastAdded.variations.push(decoNode);
                               }
                               else {
-                                  lastAdded.variations = [decoNode_1];
+                                  lastAdded.variations = [decoNode];
                               }
                           }
                           else {
-                              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;
@@ -3276,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;
                           }
@@ -3288,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;
                           }
@@ -3297,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});
@@ -3508,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 () {