@colijnit/configurator 12.0.7 → 12.0.8

package/fesm2015/colijnit-configurator.js

@@ -9,6 +9,7 @@ import axios from 'axios';
 import { DecoNodeKind } from '@colijnit/configuratorapi/build/enum/deco-node-kind.enum';
 import { Subject, BehaviorSubject } from 'rxjs';
 import JSZip from 'jszip';
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
 import { Article } from '@colijnit/configuratorapi/build/model/article';
 import { Configurator } from '@colijnit/configuratorapi/build/configurator';
 import { notNill } from '@colijnit/configuratorapi/build/utils/function/not-nill.function';
@@ -793,15 +794,21 @@ class VariationUtils {
             let index;
             variationSettings.id = id;
             if (zipContent) {
-                if (zipContent.files['index.json']) {
-                    const indexFile = yield zipContent.files['index.json'].async('string');
-                    index = JSON.parse(indexFile);
-                }
-                if (index) {
-                    yield VariationUtils.CreateSettingsBasedOnIndex(index, variationSettings, zipContent);
+                if (zipContent.files['material.glb']) {
+                    const material = yield zipContent.files['material.glb'].async('arraybuffer');
+                    variationSettings.material = yield VariationUtils.LoadMaterialFromGlb(material);
                 }
                 else {
-                    yield VariationUtils.CreateSettingsBasedOnFileName(variationSettings, zipContent);
+                    if (zipContent.files['index.json']) {
+                        const indexFile = yield zipContent.files['index.json'].async('string');
+                        index = JSON.parse(indexFile);
+                    }
+                    if (index) {
+                        yield VariationUtils.CreateSettingsBasedOnIndex(index, variationSettings, zipContent);
+                    }
+                    else {
+                        yield VariationUtils.CreateSettingsBasedOnFileName(variationSettings, zipContent);
+                    }
                 }
             }
             return variationSettings;
@@ -945,6 +952,25 @@ class VariationUtils {
             yield Promise.all(allLoaded);
         });
     }
+    static LoadMaterialFromJson(material) {
+        const loader = new THREE.MaterialLoader();
+        if (material.textures) {
+            const textures = {};
+            for (let i = 0; i < material.textures.length; i++) {
+                textures[material.textures[i].uuid] = material.textures[i];
+            }
+            loader.setTextures(textures);
+        }
+        return loader.parse(material);
+    }
+    static LoadMaterialFromGlb(material) {
+        return new Promise((resolve) => {
+            const loader = new GLTFLoader();
+            loader.parse(material, null, (object) => {
+                return resolve(object.scene.children[0].material);
+            });
+        });
+    }
     static LoadFileContentFromZip(zip, fileName, base64 = true) {
         return new Promise((resolve) => {
             if (zip && fileName) {
@@ -1088,7 +1114,7 @@ class VariationHelper {
                             newVariation.gameObjectName = variations[j].gameObjectName;
                             newVariation.supplierArticleNr = variations[j].supplierArticleNr;
                             newVariation.materialId = variations[j].materialId;
-                            newVariation.material = yield AssetUtils.CreateMaterialFromAsset(variationSettings);
+                            newVariation.material = variationSettings.material ? variationSettings.material : yield AssetUtils.CreateMaterialFromAsset(variationSettings);
                             lastKnownVariations.push(newVariation);
                         })));
                     }
@@ -1120,7 +1146,7 @@ class VariationHelper {
             this._variations.push(variations);
         }
     }
-    preloadVariations(schema, fileNames) {
+    preloadVariations(fileNames) {
         fileNames.forEach((fileName) => {
             if (fileName && !this.get(fileName)) {
                 const settings = new VariationSettings();
@@ -1210,13 +1236,23 @@ class VariationHelper {
                                 if (Array.isArray(mesh.material)) { // multimaterial support
                                     for (let m = 0, mlen = mesh.material.length; m < mlen; m++) {
                                         if (mesh.material[m].name.toLowerCase().indexOf(materialToSearch) !== -1) {
-                                            mesh.material[m] = this._setMeshMaterialFromVariation(mesh.material[m].name, variation, usePbr);
+                                            if (variation.material instanceof THREE.Material) {
+                                                mesh.material[m] = variation.material;
+                                            }
+                                            else {
+                                                mesh.material[m] = this._setMeshMaterialFromVariation(mesh.material[m].name, variation, usePbr);
+                                            }
                                         }
                                     }
                                 }
                                 else {
                                     if (mesh.material.name.toLowerCase().indexOf(materialToSearch) !== -1) {
-                                        mesh.material = this._setMeshMaterialFromVariation(mesh.material.name, variation, usePbr);
+                                        if (variation.material instanceof THREE.Material) {
+                                            mesh.material = variation.material;
+                                        }
+                                        else {
+                                            mesh.material = this._setMeshMaterialFromVariation(mesh.material.name, variation, usePbr);
+                                        }
                                     }
                                 }
                             }
@@ -1574,12 +1610,12 @@ class Builder {
                     promises.push(this._getSelections(this._instanceId));
                     promises.push(this._getDecos());
                     yield Promise.all(promises);
+                    this._preloadMaterials();
                     if (this._answers.length > 0) {
                         return;
                     }
                     this._linkSelectionsAndDecos();
                     const build = yield this._build();
-                    this._cleanUp();
                     return build;
                 }
                 else {
@@ -1603,7 +1639,7 @@ class Builder {
                     this._selections = selections;
                     this._decos = decos;
                     this._linkSelectionsAndDecos();
-                    this._preloadMaterials(schema);
+                    this._preloadMaterials();
                     const build = yield this._build();
                     this._cleanUp();
                     this._log('finish build');
@@ -1627,8 +1663,9 @@ class Builder {
     }
     selectSelection(selection) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._configuratorService.selectSelection(selection, false);
-            this.getQuestionAndAnswers();
+            const questionsAndAnswers = yield this._configuratorService.selectSelection(selection, false);
+            this._answers = questionsAndAnswers.answers;
+            this.answersReceived.next(questionsAndAnswers.answers);
         });
     }
     getQuestionAndAnswers(publicationCode) {
@@ -1640,8 +1677,12 @@ class Builder {
     }
     selectAnswer(answer) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._configuratorService.selectAnswer(answer, false);
-            this.modelLoaded.next(yield this.buildModel());
+            const questionsAndAnswers = yield this._configuratorService.selectAnswer(answer, false);
+            this._answers = questionsAndAnswers.answers;
+            this.answersReceived.next(questionsAndAnswers.answers);
+            if (questionsAndAnswers.answers.length === 0) {
+                this._build();
+            }
         });
     }
     getImageForSelectionOrAnswer(object) {
@@ -1691,8 +1732,8 @@ class Builder {
             return '';
         }
     }
-    _preloadMaterials(schema) {
-        this._variationHelper.preloadVariations(schema, this._decos.map(d => d.gameObjectName));
+    _preloadMaterials() {
+        this._variationHelper.preloadVariations([...new Set(this._decos.filter(d => d.gameObjectName !== undefined).map(d => d.gameObjectName))]);
     }
     _setInstanceId(sku, instanceId, goodId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1776,7 +1817,9 @@ class Builder {
                 this._log('remove from scene');
                 this._scene.remove(obj);
                 ObjectUtils.DisposeObject(this._source);
+                // this._cleanUp();
                 this._log('ready!');
+                this.modelLoaded.next(obj);
                 return obj;
             }
             else {