@colijnit/configurator 12.0.7 → 12.0.8

package/bundles/colijnit-configurator.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('three'), require('@colijnit/configuratorapi/build/model/deco-node'), require('@colijnit/configuratorapi/build/service/business-object-factory'), require('@colijnit/configuratorapi/build/model/selection'), require('@colijnit/configuratorapi/build/enum/deco-node-type.enum'), require('axios'), require('@colijnit/configuratorapi/build/enum/deco-node-kind.enum'), require('rxjs'), require('jszip'), require('@colijnit/configuratorapi/build/model/article'), require('@colijnit/configuratorapi/build/configurator'), require('@colijnit/configuratorapi/build/utils/function/not-nill.function'), require('@colijnit/configuratorapi/build/enum/node-type.enum'), require('@colijnit/configuratorapi/build/utils/function/is-nill.function'), require('@angular/core'), require('@angular/common'), require('@angular/animations')) :
-    typeof define === 'function' && define.amd ? define('@colijnit/configurator', ['exports', 'three', '@colijnit/configuratorapi/build/model/deco-node', '@colijnit/configuratorapi/build/service/business-object-factory', '@colijnit/configuratorapi/build/model/selection', '@colijnit/configuratorapi/build/enum/deco-node-type.enum', 'axios', '@colijnit/configuratorapi/build/enum/deco-node-kind.enum', 'rxjs', 'jszip', '@colijnit/configuratorapi/build/model/article', '@colijnit/configuratorapi/build/configurator', '@colijnit/configuratorapi/build/utils/function/not-nill.function', '@colijnit/configuratorapi/build/enum/node-type.enum', '@colijnit/configuratorapi/build/utils/function/is-nill.function', '@angular/core', '@angular/common', '@angular/animations'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.colijnit = global.colijnit || {}, global.colijnit.configurator = {}), global.THREE, global.decoNode, global.businessObjectFactory, global.selection, global.decoNodeType_enum, global.axios, global.decoNodeKind_enum, global.rxjs, global.JSZip, global.article, global.configurator, global.notNill_function, global.nodeType_enum, global.isNill_function, global.ng.core, global.ng.common, global.ng.animations));
-})(this, (function (exports, THREE, decoNode, businessObjectFactory, selection, decoNodeType_enum, axios, decoNodeKind_enum, rxjs, JSZip, article, configurator, notNill_function, nodeType_enum, isNill_function, i0, common, animations) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('three'), require('@colijnit/configuratorapi/build/model/deco-node'), require('@colijnit/configuratorapi/build/service/business-object-factory'), require('@colijnit/configuratorapi/build/model/selection'), require('@colijnit/configuratorapi/build/enum/deco-node-type.enum'), require('axios'), require('@colijnit/configuratorapi/build/enum/deco-node-kind.enum'), require('rxjs'), require('jszip'), require('three/examples/jsm/loaders/GLTFLoader'), require('@colijnit/configuratorapi/build/model/article'), require('@colijnit/configuratorapi/build/configurator'), require('@colijnit/configuratorapi/build/utils/function/not-nill.function'), require('@colijnit/configuratorapi/build/enum/node-type.enum'), require('@colijnit/configuratorapi/build/utils/function/is-nill.function'), require('@angular/core'), require('@angular/common'), require('@angular/animations')) :
+    typeof define === 'function' && define.amd ? define('@colijnit/configurator', ['exports', 'three', '@colijnit/configuratorapi/build/model/deco-node', '@colijnit/configuratorapi/build/service/business-object-factory', '@colijnit/configuratorapi/build/model/selection', '@colijnit/configuratorapi/build/enum/deco-node-type.enum', 'axios', '@colijnit/configuratorapi/build/enum/deco-node-kind.enum', 'rxjs', 'jszip', 'three/examples/jsm/loaders/GLTFLoader', '@colijnit/configuratorapi/build/model/article', '@colijnit/configuratorapi/build/configurator', '@colijnit/configuratorapi/build/utils/function/not-nill.function', '@colijnit/configuratorapi/build/enum/node-type.enum', '@colijnit/configuratorapi/build/utils/function/is-nill.function', '@angular/core', '@angular/common', '@angular/animations'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.colijnit = global.colijnit || {}, global.colijnit.configurator = {}), global.THREE, global.decoNode, global.businessObjectFactory, global.selection, global.decoNodeType_enum, global.axios, global.decoNodeKind_enum, global.rxjs, global.JSZip, global.GLTFLoader, global.article, global.configurator, global.notNill_function, global.nodeType_enum, global.isNill_function, global.ng.core, global.ng.common, global.ng.animations));
+})(this, (function (exports, THREE, decoNode, businessObjectFactory, selection, decoNodeType_enum, axios, decoNodeKind_enum, rxjs, JSZip, GLTFLoader, article, configurator, notNill_function, nodeType_enum, isNill_function, i0, common, animations) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -1269,36 +1269,46 @@
         // }
         VariationUtils.GetVariationSettingsFromFile = function (id, compressedFile) {
             return __awaiter(this, void 0, void 0, function () {
-                var zipContent, variationSettings, index, indexFile;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var zipContent, variationSettings, index, material, _a, indexFile;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (!compressedFile) {
                                 return [2 /*return*/, null];
                             }
                             return [4 /*yield*/, VariationUtils.GetZipContent(compressedFile)];
                         case 1:
-                            zipContent = _a.sent();
+                            zipContent = _b.sent();
                             variationSettings = new VariationSettings();
                             variationSettings.id = id;
-                            if (!zipContent) return [3 /*break*/, 7];
-                            if (!zipContent.files['index.json']) return [3 /*break*/, 3];
-                            return [4 /*yield*/, zipContent.files['index.json'].async('string')];
+                            if (!zipContent) return [3 /*break*/, 10];
+                            if (!zipContent.files['material.glb']) return [3 /*break*/, 4];
+                            return [4 /*yield*/, zipContent.files['material.glb'].async('arraybuffer')];
                         case 2:
-                            indexFile = _a.sent();
-                            index = JSON.parse(indexFile);
-                            _a.label = 3;
+                            material = _b.sent();
+                            _a = variationSettings;
+                            return [4 /*yield*/, VariationUtils.LoadMaterialFromGlb(material)];
                         case 3:
-                            if (!index) return [3 /*break*/, 5];
-                            return [4 /*yield*/, VariationUtils.CreateSettingsBasedOnIndex(index, variationSettings, zipContent)];
+                            _a.material = _b.sent();
+                            return [3 /*break*/, 10];
                         case 4:
-                            _a.sent();
-                            return [3 /*break*/, 7];
-                        case 5: return [4 /*yield*/, VariationUtils.CreateSettingsBasedOnFileName(variationSettings, zipContent)];
+                            if (!zipContent.files['index.json']) return [3 /*break*/, 6];
+                            return [4 /*yield*/, zipContent.files['index.json'].async('string')];
+                        case 5:
+                            indexFile = _b.sent();
+                            index = JSON.parse(indexFile);
+                            _b.label = 6;
                         case 6:
-                            _a.sent();
-                            _a.label = 7;
-                        case 7: return [2 /*return*/, variationSettings];
+                            if (!index) return [3 /*break*/, 8];
+                            return [4 /*yield*/, VariationUtils.CreateSettingsBasedOnIndex(index, variationSettings, zipContent)];
+                        case 7:
+                            _b.sent();
+                            return [3 /*break*/, 10];
+                        case 8: return [4 /*yield*/, VariationUtils.CreateSettingsBasedOnFileName(variationSettings, zipContent)];
+                        case 9:
+                            _b.sent();
+                            _b.label = 10;
+                        case 10: return [2 /*return*/, variationSettings];
                     }
                 });
             });
@@ -1520,6 +1530,25 @@
                 });
             });
         };
+        VariationUtils.LoadMaterialFromJson = function (material) {
+            var loader = new THREE__namespace.MaterialLoader();
+            if (material.textures) {
+                var textures = {};
+                for (var i = 0; i < material.textures.length; i++) {
+                    textures[material.textures[i].uuid] = material.textures[i];
+                }
+                loader.setTextures(textures);
+            }
+            return loader.parse(material);
+        };
+        VariationUtils.LoadMaterialFromGlb = function (material) {
+            return new Promise(function (resolve) {
+                var loader = new GLTFLoader.GLTFLoader();
+                loader.parse(material, null, function (object) {
+                    return resolve(object.scene.children[0].material);
+                });
+            });
+        };
         VariationUtils.LoadFileContentFromZip = function (zip, fileName, base64) {
             var _this = this;
             if (base64 === void 0) { base64 = true; }
@@ -1694,9 +1723,9 @@
                                             variationPromise = [];
                                             _loop_2 = function (j) {
                                                 variationPromise.push(this_1.loadTheVariation(variations[j].gameObjectName || parts[i].decoId).then(function (variationSettings) { return __awaiter(_this, void 0, void 0, function () {
-                                                    var newVariation, _a;
-                                                    return __generator(this, function (_b) {
-                                                        switch (_b.label) {
+                                                    var newVariation, _a, _b;
+                                                    return __generator(this, function (_c) {
+                                                        switch (_c.label) {
                                                             case 0:
                                                                 newVariation = new Variation();
                                                                 newVariation.decoId = parseFloat(variations[j].id);
@@ -1706,9 +1735,15 @@
                                                                 newVariation.supplierArticleNr = variations[j].supplierArticleNr;
                                                                 newVariation.materialId = variations[j].materialId;
                                                                 _a = newVariation;
-                                                                return [4 /*yield*/, AssetUtils.CreateMaterialFromAsset(variationSettings)];
-                                                            case 1:
-                                                                _a.material = _b.sent();
+                                                                if (!variationSettings.material) return [3 /*break*/, 1];
+                                                                _b = variationSettings.material;
+                                                                return [3 /*break*/, 3];
+                                                            case 1: return [4 /*yield*/, AssetUtils.CreateMaterialFromAsset(variationSettings)];
+                                                            case 2:
+                                                                _b = _c.sent();
+                                                                _c.label = 3;
+                                                            case 3:
+                                                                _a.material = _b;
                                                                 lastKnownVariations.push(newVariation);
                                                                 return [2 /*return*/];
                                                         }
@@ -1767,7 +1802,7 @@
                 this._variations.push(variations);
             }
         };
-        VariationHelper.prototype.preloadVariations = function (schema, fileNames) {
+        VariationHelper.prototype.preloadVariations = function (fileNames) {
             var _this = this;
             fileNames.forEach(function (fileName) {
                 if (fileName && !_this.get(fileName)) {
@@ -1868,13 +1903,23 @@
                                     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) {
-                                                mesh.material[m] = _this._setMeshMaterialFromVariation(mesh.material[m].name, variation, usePbr);
+                                                if (variation.material instanceof THREE__namespace.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__namespace.Material) {
+                                                mesh.material = variation.material;
+                                            }
+                                            else {
+                                                mesh.material = _this._setMeshMaterialFromVariation(mesh.material.name, variation, usePbr);
+                                            }
                                         }
                                     }
                                 }
@@ -2321,6 +2366,7 @@
                             return [4 /*yield*/, Promise.all(promises)];
                         case 5:
                             _a.sent();
+                            this._preloadMaterials();
                             if (this._answers.length > 0) {
                                 return [2 /*return*/];
                             }
@@ -2328,7 +2374,6 @@
                             return [4 /*yield*/, this._build()];
                         case 6:
                             build = _a.sent();
-                            this._cleanUp();
                             return [2 /*return*/, build];
                         case 7: throw 'GLB source not found!';
                         case 8: return [3 /*break*/, 10];
@@ -2360,7 +2405,7 @@
                             this._selections = selections;
                             this._decos = decos;
                             this._linkSelectionsAndDecos();
-                            this._preloadMaterials(schema);
+                            this._preloadMaterials();
                             return [4 /*yield*/, this._build()];
                         case 3:
                             build = _a.sent();
@@ -2386,12 +2431,14 @@
         };
         Builder.prototype.selectSelection = function (selection) {
             return __awaiter(this, void 0, void 0, function () {
+                var questionsAndAnswers;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, this._configuratorService.selectSelection(selection, false)];
                         case 1:
-                            _a.sent();
-                            this.getQuestionAndAnswers();
+                            questionsAndAnswers = _a.sent();
+                            this._answers = questionsAndAnswers.answers;
+                            this.answersReceived.next(questionsAndAnswers.answers);
                             return [2 /*return*/];
                     }
                 });
@@ -2414,16 +2461,17 @@
         };
         Builder.prototype.selectAnswer = function (answer) {
             return __awaiter(this, void 0, void 0, function () {
-                var _a, _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var questionsAndAnswers;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0: return [4 /*yield*/, this._configuratorService.selectAnswer(answer, false)];
                         case 1:
-                            _c.sent();
-                            _b = (_a = this.modelLoaded).next;
-                            return [4 /*yield*/, this.buildModel()];
-                        case 2:
-                            _b.apply(_a, [_c.sent()]);
+                            questionsAndAnswers = _a.sent();
+                            this._answers = questionsAndAnswers.answers;
+                            this.answersReceived.next(questionsAndAnswers.answers);
+                            if (questionsAndAnswers.answers.length === 0) {
+                                this._build();
+                            }
                             return [2 /*return*/];
                     }
                 });
@@ -2477,8 +2525,8 @@
                 return '';
             }
         };
-        Builder.prototype._preloadMaterials = function (schema) {
-            this._variationHelper.preloadVariations(schema, this._decos.map(function (d) { return d.gameObjectName; }));
+        Builder.prototype._preloadMaterials = function () {
+            this._variationHelper.preloadVariations(__spreadArray([], __read(new Set(this._decos.filter(function (d) { return d.gameObjectName !== undefined; }).map(function (d) { return d.gameObjectName; })))));
         };
         Builder.prototype._setInstanceId = function (sku, instanceId, goodId) {
             return __awaiter(this, void 0, void 0, function () {
@@ -2603,7 +2651,9 @@
                             this._log('remove from scene');
                             this._scene.remove(obj);
                             ObjectUtils.DisposeObject(this._source);
+                            // this._cleanUp();
                             this._log('ready!');
+                            this.modelLoaded.next(obj);
                             return [2 /*return*/, obj];
                         case 2: throw 'No adjustables found!';
                     }