@colijnit/configurator 12.0.10 → 12.0.12

package/fesm2015/colijnit-configurator.js

@@ -5,7 +5,6 @@ import { DecoNode } from '@colijnit/configuratorapi/build/model/deco-node';
 import { BusinessObjectFactory } from '@colijnit/configuratorapi/build/service/business-object-factory';
 import { Selection } from '@colijnit/configuratorapi/build/model/selection';
 import { DecoNodeType } from '@colijnit/configuratorapi/build/enum/deco-node-type.enum';
-import axios from 'axios';
 import { DecoNodeKind } from '@colijnit/configuratorapi/build/enum/deco-node-kind.enum';
 import { Subject, BehaviorSubject } from 'rxjs';
 import JSZip from 'jszip';
@@ -67,146 +66,6 @@ class ObjectUtils$1 {
 }
 ObjectUtils$1.materialProps = ['map', 'lightMap', 'bumpMap', 'normalMap', 'specularMap', 'envMap', 'aoMap', 'roughnessMap', 'metalnessMap'];
 
-// Static utility functions holder related to files.
-// @dynamic
-class FileUtils {
-    // Returns the given dataUri string stripped of the mimetype part.
-    static StripMimeStringFromDataUri(dataUri) {
-        if (!dataUri) {
-            return '';
-        }
-        const mimeString = this.GetMimeStringFromDataUri(dataUri);
-        return dataUri.substr(mimeString.length + 1);
-    }
-    static GetMimeStringFromDataUri(dataUri) {
-        if (!dataUri) {
-            return '';
-        }
-        return dataUri.split(',')[0];
-    }
-    static FileExists(url, assetPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!assetPath.endsWith('/')) {
-                assetPath = assetPath + '/';
-            }
-            const result = yield axios({
-                method: 'get',
-                url: `${assetPath}getFiles.php?assetUrl=${url}`,
-                responseType: "json"
-            });
-            return !!result.data;
-        });
-    }
-    /**
-     * There is some discrepancy regarding locations of h3d objects
-     * Therefor we need to (temporarily?!) fix the content url
-     * Also we need to change some additionals
-     */
-    static FixUrl(assetUrl) {
-        if (!assetUrl) {
-            return '';
-        }
-        let fixedUrl = assetUrl;
-        if (!fixedUrl.endsWith('glb') && !fixedUrl.endsWith('obj') && !fixedUrl.endsWith('glb.gz') && !fixedUrl.endsWith('obj.gz')) {
-            fixedUrl = FileUtils.FixUnityUrl(fixedUrl);
-        }
-        fixedUrl = fixedUrl.replace('/content/', '/content43/');
-        return fixedUrl;
-    }
-    static FixGlbUrl(assetUrl) {
-        if (!assetUrl) {
-            return '';
-        }
-        let fixedUrl = assetUrl;
-        if (assetUrl.indexOf('_webplayer') === -1) {
-            fixedUrl = assetUrl.concat('_webplayer');
-        }
-        fixedUrl = fixedUrl.replace('/content/', '/content43/');
-        if (!fixedUrl.endsWith('.glb')) {
-            fixedUrl = fixedUrl.concat('.glb');
-        }
-        return fixedUrl;
-    }
-    // Return the mimetype of the given filename.
-    static MimeTypeFromFilename(fileName) {
-        const regEx = /(?:\.([^.]+))?$/; // regex to find extension
-        const extension = regEx.exec(fileName)[1];
-        switch (extension) {
-            case 'jpg':
-            case 'jpeg':
-                return 'image/jpeg';
-            case 'png':
-                return 'image/png';
-            case 'bmp':
-                return 'image/bmp';
-        }
-    }
-    /**
-     * Downloads the given file to the users default download location.
-     * @param fileName With or without extension
-     * @param content File content as a string
-     * @param [mimeType = 'text/plain']
-     */
-    static DownloadFile(fileName, content, mimeType = 'text/plain') {
-        const element = document.createElement('a');
-        element.setAttribute('href', 'data:' + mimeType + ';charset=utf-8,' + encodeURIComponent(content));
-        element.setAttribute('download', fileName);
-        element.style.display = 'none';
-        document.body.appendChild(element);
-        element.click();
-        document.body.removeChild(element);
-    }
-    // Returns the contents of given file as a text string.
-    static ReadAsText(file) {
-        return new Promise((resolve) => {
-            const reader = new FileReader();
-            reader.readAsText(file);
-            reader.onloadend = (event) => {
-                if (event.target.readyState === 2) {
-                    resolve(event.target.result);
-                }
-            };
-        });
-    }
-    static GetExtensionFromDataUri(dataUri) {
-        return dataUri.replace(/(data:image\/)(.*?)(;base64.*)/gi, '$2');
-    }
-    static CreateDownloadFileNameFromBase64(dataUri) {
-        const ext = this.GetExtensionFromDataUri(dataUri);
-        return 'preview.' + ext;
-    }
-    static DownloadFromDataUri(dataUri, fileName) {
-        const link = document.createElement('a');
-        link.download = fileName;
-        link.href = dataUri;
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
-    }
-    // todo remove once Connector deals with mimetypes and this method isn't used anymore
-    static DocumentBodyToDataUri(documentBody, mimeType) {
-        if (!!documentBody) {
-            return 'data:' + mimeType + ';base64,' + documentBody;
-        }
-        else {
-            return '';
-        }
-    }
-    static FixUnityUrl(url) {
-        if (url.indexOf('_webplayer') === -1) {
-            url = url.concat('_webplayer.ione3d');
-        }
-        else {
-            url = url.replace('_webplayer', '_webplayer.ione3d');
-        }
-        if (!url.endsWith('.gz')) {
-            url = url.concat('.gz');
-        }
-        return url.replace('.unity3d', '');
-    }
-}
-FileUtils._cachedTextureUploads = new Map();
-
 class ThreedUtils {
     constructor() {
         this._objectCache = new Map();
@@ -224,15 +83,14 @@ class ThreedUtils {
                 resolve(this._objectCache.get(lookupFileName));
                 return;
             }
-            if (yield FileUtils.FileExists(lookupFileName, assetPath)) {
-                this.loadGlbSource(lookupFileName).then((obj) => {
-                    this._objectCache.set(lookupFileName, obj);
-                    resolve(obj);
-                });
-            }
-            else {
+            this.loadGlbSource(lookupFileName)
+                .then((obj) => {
+                this._objectCache.set(lookupFileName, obj);
+                resolve(obj);
+            })
+                .catch(() => {
                 reject(`GLB source not found! (${lookupFileName})`);
-            }
+            });
         }));
     }
     readFileAsText(file) {
@@ -2084,7 +1942,7 @@ class Builder {
                 deco = new DecoNode();
             }
             const variation = this._getVariations().find(v => v.parentId === this._selections[i].artNodeIdDeco);
-            if (variation) {
+            if (variation && deco.type !== DecoNodeType.Variation) {
                 deco.variation = variation;
             }
             this._selections[i].decoNode = deco;