@colijnit/configuratorcore 262.1.6 → 300.1.1

package/fesm2022/colijnit-configuratorcore.mjs

@@ -1736,7 +1736,7 @@ class VariationHelper extends VariationCacheHelper {
                     const lastKnownVariations = [];
                     const variationPromise = [];
                     for (let j = 0; j < variations.length; j++) {
-                        variationPromise.push(this.loadCachedVariation(variations[j].materialUrl ? variations[j].materialCode : (variations[j].gameObjectName || parts[i].decoId)).then(async (variationSettings) => {
+                        variationPromise.push(this.loadCachedVariation(variations[j].materialUrl ? this.getFileNameFromUrl(variations[j].materialUrl) : (variations[j].gameObjectName || parts[i].decoId)).then(async (variationSettings) => {
                             const newVariation = this._createVariationFromNode(variations[j]);
                             newVariation.material = await AssetUtils.CreateMaterialFromAsset(variationSettings);
                             this.loadedAsset = variations[j].materialUrl ? variations[j].materialUrl : VariationUtils.GetUrl(assetPath, parts[i].schema, variations[j].gameObjectName || parts[i].decoId);
@@ -1757,6 +1757,12 @@ class VariationHelper extends VariationCacheHelper {
             }
         });
     }
+    getFileNameFromUrl(url) {
+        // Make sure that when we are referencing a material, we always use the URL values and not the code.
+        // materialCode can be different than the materialUrl file part and will cause issues.
+        const fileNameFromUrl = url ? url.substr(url.lastIndexOf('/') + 1, url.length) : null;
+        return fileNameFromUrl ? fileNameFromUrl.substr(0, fileNameFromUrl.lastIndexOf('.')) : null;
+    }
     async loadVariationFromLocalFile(id, file, obj) {
         try {
             const variationSettings = await VariationUtils.GetVariationSettingsFromFile(id, file);