@colijnit/configuratorcore 300.1.0 → 300.1.2

package/fesm2022/colijnit-configuratorcore.mjs

@@ -373,7 +373,6 @@ class ObjectUtils {
 }
 
 class ThreedUtils {
-    clips = [];
     _objectCache = new Map();
     clearCache() {
         const objs = Array.from(this._objectCache.values());
@@ -450,8 +449,8 @@ class ThreedUtils {
                 loader.dracoLoader.setDecoderPath(dracoPath);
                 loader.dracoLoader.setDecoderConfig({ type: 'js' });
                 loader.load(file, async (object) => {
-                    this.clips = object.animations || [];
                     const obj = this._cleanedUpObjects(object.scene, cleanUp);
+                    obj.animations = object.animations || [];
                     this._objectCache.set(file, obj);
                     resolve(obj);
                 }, xhr => this._handleUpdateProgressBar(xhr.loaded / xhr.total * 100), error => {
@@ -640,6 +639,8 @@ class ImageUtils {
                 return 'data:image/gif;base64,' + documentBody;
             case 'bmp':
                 return 'data:image/bmp;base64,' + documentBody;
+            case 'webp':
+                return 'data:image/webp;base64,' + documentBody;
             default:
                 return 'data:image/png;base64,' + documentBody;
         }
@@ -999,7 +1000,8 @@ class FileUtils {
     // Return the mimetype of the given filename.
     static MimeTypeFromFilename(fileName) {
         const regEx = /(?:\.([^.]+))?$/; // regex to find extension
-        const extension = regEx.exec(fileName)[1];
+        const match = regEx.exec(fileName)[1];
+        const extension = match ? match.toLowerCase() : '';
         switch (extension) {
             case 'jpg':
             case 'jpeg':
@@ -1008,6 +1010,8 @@ class FileUtils {
                 return 'image/png';
             case 'bmp':
                 return 'image/bmp';
+            case 'webp':
+                return 'image/webp';
         }
     }
     /**
@@ -1490,6 +1494,7 @@ class VariationUtils {
             case 'jpeg':
             case 'png':
             case 'bmp':
+            case 'webp':
                 return true;
             default:
                 return false;
@@ -1505,6 +1510,8 @@ class VariationUtils {
                 return 'png';
             case 'bmp':
                 return 'bmp';
+            case 'webp':
+                return 'webp';
             default:
                 return 'jpeg';
         }
@@ -1736,7 +1743,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 +1764,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);