@colijnit/configurator 12.0.17 → 256.1.0

package/app/builder.d.ts

@@ -1,11 +1,11 @@
-import * as THREE from "three";
-import { Scene } from "three";
-import { Options } from "@colijnit/configuratorapi/build/model/options";
-import { DecoNode } from "@colijnit/configuratorapi/build/model/deco-node";
-import { Selection } from "@colijnit/configuratorapi/build/model/selection";
-import { Article } from "@colijnit/configuratorapi/build/model/article";
-import { Answer } from "@colijnit/configuratorapi/build/model/answer";
-import { BehaviorSubject } from "rxjs";
+import * as THREE from 'three';
+import { Scene } from 'three';
+import { DecoNode } from '@colijnit/configuratorapi/build/model/deco-node';
+import { Selection } from '@colijnit/configuratorapi/build/model/selection';
+import { Article } from '@colijnit/configuratorapi/build/model/article';
+import { Answer } from '@colijnit/configuratorapi/build/model/answer';
+import { BehaviorSubject } from 'rxjs';
+import { Options } from '@colijnit/ioneconnector/build/model/options';
 export declare class Builder {
     selectionsReceived: BehaviorSubject<Selection[]>;
     articleLoaded: BehaviorSubject<Article>;

package/app/services/configurator.service.d.ts

@@ -1,8 +1,8 @@
 import { Selection } from '@colijnit/configuratorapi/build/model/selection';
 import { Answer } from '@colijnit/configuratorapi/build/model/answer';
-import { DataServiceResponseData } from '@colijnit/configuratorapi/build/model/data-service-response-data';
-import { Options } from "@colijnit/configuratorapi/build/model/options";
-import { QuestionAndAnswers } from "@colijnit/configuratorapi/build/model/question-and-answers";
+import { QuestionAndAnswers } from '@colijnit/configuratorapi/build/model/question-and-answers';
+import { Options } from '@colijnit/ioneconnector/build/model/options';
+import { DataServiceResponseData } from '@colijnit/ioneconnector/build/model/data-service-response-data';
 export declare class ConfiguratorService {
     private _configuratorApi;
     initApi(options: Options): void;
@@ -14,6 +14,6 @@ export declare class ConfiguratorService {
     getDecos(showLoader?: boolean): Promise<DataServiceResponseData>;
     getQuestionAndAnswers(showLoader?: boolean, publicationCode?: number): Promise<QuestionAndAnswers>;
     getSingleImage(nodeId: number | string, publication: number, includeMimetype: boolean, thumb: boolean, showLoader: boolean): Promise<DataServiceResponseData>;
-    selectSelection(selection: Selection, showLoader?: boolean): Promise<QuestionAndAnswers>;
-    selectAnswer(answer: Answer, showLoader?: boolean): Promise<QuestionAndAnswers>;
+    selectSelection(selection: Selection, showLoader?: boolean): Promise<DataServiceResponseData>;
+    selectAnswer(answer: Answer, showLoader?: boolean): Promise<DataServiceResponseData>;
 }

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('@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', '@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.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, 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/model/selection'), require('@colijnit/configuratorapi/build/enum/deco-node-type.enum'), 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('@colijnit/ioneconnector/build/service/business-object-factory'), 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/model/selection', '@colijnit/configuratorapi/build/enum/deco-node-type.enum', '@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', '@colijnit/ioneconnector/build/service/business-object-factory', '@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.selection, global.decoNodeType_enum, global.decoNodeKind_enum, global.rxjs, global.JSZip, global.article, global.configurator, global.notNill_function, global.nodeType_enum, global.isNill_function, global.ng.core, global.businessObjectFactory, global.ng.common, global.ng.animations));
+})(this, (function (exports, THREE, decoNode, selection, decoNodeType_enum, decoNodeKind_enum, rxjs, JSZip, article, configurator, notNill_function, nodeType_enum, isNill_function, i0, businessObjectFactory, common, animations) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -793,7 +793,7 @@
 
     var Material = /** @class */ (function () {
         function Material() {
-            this.specular = new THREE__namespace.Color(0.3, 0.3, 0.3);
+            this.specular = new THREE.Color(0.3, 0.3, 0.3);
             this.shininess = 0;
             this.repeatX = 4;
             this.repeatY = 4;
@@ -892,7 +892,7 @@
                             return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_texture', asset.texture, material)];
                         case 1:
                             _a.texture = _o.sent();
-                            material.texture.encoding = THREE.sRGBEncoding;
+                            material.texture.colorSpace = THREE.SRGBColorSpace;
                             material.textureFilename = asset.textureFilename;
                             _o.label = 2;
                         case 2:
@@ -1016,7 +1016,7 @@
             }
             var level = parseFloat(settings['level']);
             if (!isNaN(level)) {
-                material.specular = new THREE__namespace.Color(level, level, level);
+                material.specular = new THREE.Color(level, level, level);
             }
             var repeatObjectUsed = settings.hasOwnProperty('repeat');
             var repeatx = repeatObjectUsed ? parseFloat(settings['repeat']['repeatx']) : parseFloat(settings['repeatx']);
@@ -1291,20 +1291,20 @@
                             variationSettings.settings.roughness = index.roughness;
                             if (index.sheen && typeof index.sheen === 'object') {
                                 variationSettings.sheen = 1;
-                                variationSettings.sheenColor = new THREE__namespace.Color(index.sheen.r, index.sheen.g, index.sheen.b);
+                                variationSettings.sheenColor = new THREE.Color(index.sheen.r, index.sheen.g, index.sheen.b).getHexString(THREE.SRGBColorSpace);
                             }
                             else {
                                 variationSettings.sheen = index.sheen;
                             }
                             if (index.sheenColor) {
-                                variationSettings.sheenColor = new THREE__namespace.Color(index.sheenColor.r, index.sheenColor.g, index.sheenColor.b);
+                                variationSettings.sheenColor = new THREE.Color(index.sheenColor.r, index.sheenColor.g, index.sheenColor.b).getHexString(THREE.SRGBColorSpace);
                             }
                             variationSettings.sheenRoughness = index.sheenRoughness;
                             variationSettings.envMapIntensity = index.envMapIntensity;
                             variationSettings.transparent = index.transparent;
                             variationSettings.opacity = index.opacity;
                             if (index.emissiveValue) {
-                                variationSettings.emissiveValue = new THREE__namespace.Color(index.emissiveValue.r, index.emissiveValue.g, index.emissiveValue.b);
+                                variationSettings.emissiveValue = new THREE.Color(index.emissiveValue.r, index.emissiveValue.g, index.emissiveValue.b).getHexString(THREE.SRGBColorSpace);
                             }
                             variationSettings.emissiveIntensity = index.emissiveIntensity;
                             variationSettings.reflectivity = index.reflectivity;
@@ -1448,7 +1448,7 @@
             });
         };
         VariationUtils.LoadMaterialFromJson = function (material) {
-            var loader = new THREE__namespace.MaterialLoader();
+            var loader = new THREE.MaterialLoader();
             if (material.textures) {
                 var textures = {};
                 for (var i = 0; i < material.textures.length; i++) {
@@ -1800,7 +1800,7 @@
                 var child = children[i];
                 if (child !== null && child !== undefined) {
                     child.traverse(function (mesh) {
-                        if (mesh instanceof THREE__namespace.Mesh && partMaterial) {
+                        if (mesh instanceof THREE.Mesh && partMaterial) {
                             if (Array.isArray(mesh.material)) { // multimaterial support
                                 for (var j = 0, jlen = mesh.material.length; j < jlen; j++) {
                                     if (mesh.material[j].name.toLowerCase().indexOf('fixed_frame') !== -1) {
@@ -1827,7 +1827,7 @@
                 var child = children[i];
                 if (child !== null && child !== undefined) {
                     child.traverse(function (mesh) {
-                        if (mesh instanceof THREE__namespace.Mesh && part.variations && part.variations.length > 0 && mesh.name.toLowerCase().indexOf('c_')) {
+                        if (mesh instanceof THREE.Mesh && part.variations && part.variations.length > 0 && mesh.name.toLowerCase().indexOf('c_')) {
                             for (var j = 0; j < part.variations.length; j++) {
                                 var variation = part.variations[j];
                                 if (variation.material) {
@@ -1835,7 +1835,7 @@
                                     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) {
-                                                if (variation.material instanceof THREE__namespace.Material) {
+                                                if (variation.material instanceof THREE.Material) {
                                                     mesh.material[m] = variation.material;
                                                     if (mesh.material[m].name && (mesh.material[m].name === 'Fixed_Glass' || mesh.material[m].name === 'Default_Glass')) {
                                                         mesh.castShadow = false;
@@ -1852,7 +1852,7 @@
                                     }
                                     else {
                                         if (mesh.material.name.toLowerCase().indexOf(materialToSearch) !== -1) {
-                                            if (variation.material instanceof THREE__namespace.Material) {
+                                            if (variation.material instanceof THREE.Material) {
                                                 mesh.material = variation.material;
                                                 if (mesh.material.name && (mesh.material.name === 'Fixed_Glass' || mesh.material.name === 'Default_Glass')) {
                                                     mesh.castShadow = false;
@@ -1878,10 +1878,10 @@
             var material = variation.material;
             if (material.texture) {
                 material.texture.needsUpdate = true;
-                material.texture.mapping = THREE__namespace.EquirectangularReflectionMapping;
+                material.texture.mapping = THREE.EquirectangularReflectionMapping;
             }
             if (!usePbr) {
-                var newMaterial = new THREE__namespace.MeshPhongMaterial({
+                var newMaterial = new THREE.MeshPhongMaterial({
                     shininess: material.shininess,
                     specular: material.specular,
                     map: material.texture,
@@ -1952,9 +1952,9 @@
                     if (material.envMapIntensity != null || 0) {
                         params.envMap = material.envMap;
                         params.envMap.needsUpdate = true;
-                        material.envMap.mapping = THREE__namespace.EquirectangularReflectionMapping;
-                        material.envMap.minFilter = THREE__namespace.NearestFilter;
-                        material.envMap.magFilter = THREE__namespace.NearestFilter;
+                        material.envMap.mapping = THREE.EquirectangularReflectionMapping;
+                        material.envMap.minFilter = THREE.NearestFilter;
+                        material.envMap.magFilter = THREE.NearestFilter;
                     }
                 }
                 if (material.reflectivity !== undefined && material.reflectivity !== null) {
@@ -1963,7 +1963,7 @@
                 if (material.side) {
                     params.side = material.side;
                 }
-                var newMaterial = new THREE__namespace.MeshPhysicalMaterial(params);
+                var newMaterial = new THREE.MeshPhysicalMaterial(params);
                 newMaterial.name = name;
                 newMaterial.color.setRGB(1, 1, 1);
                 if (material.sheen) {
@@ -2000,7 +2000,7 @@
                     newMaterial.transmissionMap.needsUpdate = true;
                 }
                 if (newMaterial.name && (newMaterial.name === 'Fixed_Glass' || newMaterial.name === 'Default_Glass')) {
-                    newMaterial.format = THREE__namespace.RGBAFormat;
+                    // newMaterial.format = RGBAFormat;
                 }
                 newMaterial.needsUpdate = true;
                 return newMaterial;
@@ -2063,19 +2063,19 @@
                     if (material.envMapIntensity != null || 0) {
                         params.envMap = material.envMap;
                         params.envMap.needsUpdate = true;
-                        material.envMap.mapping = THREE__namespace.EquirectangularReflectionMapping;
-                        material.envMap.minFilter = THREE__namespace.NearestFilter;
-                        material.envMap.magFilter = THREE__namespace.NearestFilter;
+                        material.envMap.mapping = THREE.EquirectangularReflectionMapping;
+                        material.envMap.minFilter = THREE.NearestFilter;
+                        material.envMap.magFilter = THREE.NearestFilter;
                     }
                 }
                 if (material.side) {
                     params.side = material.side;
                 }
-                var newMaterial = new THREE__namespace.MeshStandardMaterial(params);
+                var newMaterial = new THREE.MeshStandardMaterial(params);
                 newMaterial.name = name;
                 newMaterial.color.setRGB(1, 1, 1);
                 if (newMaterial.name && (newMaterial.name === 'Fixed_Glass' || newMaterial.name === 'Default_Glass')) {
-                    newMaterial.format = THREE__namespace.RGBAFormat;
+                    // newMaterial.format = RGBAFormat;
                 }
                 newMaterial.needsUpdate = true;
                 return newMaterial;
@@ -2418,14 +2418,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:
-                            questionsAndAnswers = _a.sent();
-                            this._answers = questionsAndAnswers.answers;
-                            this.answersReceived.next(questionsAndAnswers.answers);
+                            _a.sent();
+                            return [4 /*yield*/, this.getQuestionAndAnswers()];
+                        case 2:
+                            _a.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -2448,15 +2448,15 @@
         };
         Builder.prototype.selectAnswer = function (answer) {
             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.selectAnswer(answer, false)];
                         case 1:
-                            questionsAndAnswers = _a.sent();
-                            this._answers = questionsAndAnswers.answers;
-                            this.answersReceived.next(questionsAndAnswers.answers);
-                            if (questionsAndAnswers.answers.length === 0) {
+                            _a.sent();
+                            return [4 /*yield*/, this.getQuestionAndAnswers()];
+                        case 2:
+                            _a.sent();
+                            if (this._answers.length === 0) {
                                 this._build();
                             }
                             return [2 /*return*/];