@colijnit/configurator 12.0.14 → 12.0.16

package/app/builder.d.ts

@@ -49,6 +49,12 @@ export declare class Builder {
     private _downloadAsset;
     private _build;
     private _prepareTheSelections;
+    /**
+     * Returns the materialId of the parent up the tree until presentionlevel 1 is reached
+     * @param id
+     * @private
+     */
+    private _getMaterialIdFromParent;
     private _createAdjustable;
     private _createAddable;
     private _placeAddables;

package/bundles/colijnit-configurator.umd.js

@@ -532,7 +532,7 @@
         };
         ThreedUtils.prototype.loadGlbSource = function (file) {
             return __awaiter(this, void 0, void 0, function () {
-                var obj, children;
+                var obj, children, name, parent;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, this.loadGlbModel(file, false)];
@@ -549,8 +549,12 @@
                                 });
                                 if (obj.children.length === 1 && obj.children[0] instanceof THREE__namespace.Group) { // flatten children
                                     children = obj.children[0].children.slice();
+                                    name = obj.children[0].name;
                                     obj.children.length = 0;
-                                    obj.children = children;
+                                    parent = new THREE__namespace.Object3D();
+                                    parent.name = name;
+                                    parent.children = children;
+                                    obj.add(parent);
                                 }
                             }
                             return [2 /*return*/, obj];
@@ -2593,37 +2597,66 @@
                 .filter(function (s) { return s.generic && s.decoNode.variation && !s.decoNode.type; })
                 .map(function (value, index, array) {
                 // find selection of variation
-                var sel = _this._selections.find(function (s) { return s.artNodeIdDeco === value.decoNode.variation.id; });
+                var sel = _this._selections.find(function (s) { return s.artNodeIdDeco === value.decoNode.variation.parentId; });
                 if (sel) {
                     value.decoNode.variation.supplierArticleNr = sel.supplierArticleNr;
                 }
-                value.decoNode.variation.materialId = value.hdecoGameObject;
+                value.decoNode.variation.materialId = _this._getMaterialIdFromParent(value.node);
                 return value.decoNode.variation;
             });
-            // const usedVariations: FurniturePartVariation[] = [];
+            var selections = this._selections.slice();
+            // commented out for the moment
+            // globalVariations.forEach(g => {
+            //   const parentIdx = selections.findIndex(s => s.decoNode && s.decoNode.id === g.parentId);
+            //   if (parentIdx) { // remove parent selection
+            //     selections.splice(parentIdx, 1);
+            //   }
+            //   const idx = selections.findIndex(s => s.decoNode && s.decoNode.id === g.id);
+            //   if (idx) { // move generic variations to top
+            //     const selection = selections[idx];
+            //     selections.splice(idx, 1);
+            //     selections.unshift(selection);
+            //   }
+            // });
             var globalVariationsRewrite = true;
-            var len = this._selections.length;
+            var len = selections.length;
             var lastAdded;
             var lastAdjustable;
             var newPart = false;
             var previousPresLevel = -1;
             var positioning;
+            var optionText;
+            var selectionOfArticle = selections.find(function (s) { return s.nodeType === nodeType_enum.NodeType.Article; });
+            var adjustableSelections = selections.filter(function (s) { return s.addAdjust === '2'; });
+            var isArticleWithMaterial = adjustableSelections.length === 0 &&
+                selectionOfArticle.gameObject &&
+                selectionOfArticle.gameObject.length > 0;
             for (var i = 0; i < len; i++) {
-                var selection = this._selections[i];
+                var selection = selections[i];
                 if (selection.presentationLevel === 1) {
                     positioning = selection.hdecoPositioning;
+                    optionText = selection.question;
                 }
                 if (selection.presentationLevel > previousPresLevel) {
                     selection.hdecoPositioning = selection.hdecoPositioning || positioning;
                 }
                 if (selection.decoNode) {
                     if (selection.decoNode.type === decoNodeType_enum.DecoNodeType.Variation) {
+                        var decoNode = selection.decoNode;
+                        decoNode.optionText = optionText;
+                        // find selection of variation and set materialId in case of multimaterial
+                        decoNode.materialId = this._getMaterialIdFromParent(decoNode.nodeId);
                         if (lastAdded) {
                             if (newPart) {
-                                lastAdded.variations = [selection.decoNode];
+                                if (decoNode.materialId) {
+                                    lastAdded.variations.push(decoNode);
+                                }
+                                else {
+                                    lastAdded.variations = [decoNode];
+                                }
                             }
                             else {
-                                lastAdded.variations.push(selection.decoNode);
+                                lastAdded.variations.push(decoNode);
                             }
                             newPart = false;
                         }
@@ -2632,7 +2665,7 @@
                                 globalVariations.length = 0;
                                 globalVariationsRewrite = false;
                             }
-                            globalVariations.push(selection.decoNode);
+                            globalVariations.push(decoNode);
                         }
                         // const variation: FurniturePartVariation = new FurniturePartVariation();
                         // variation.BrandId = selection.decoNode.brandId;
@@ -2640,19 +2673,14 @@
                         // variation.MaterialId = (selection.decoNode as any).materialId;
                         // variation.SupplierArticleNr = (selection.decoNode as any).supplierArticleNr;
                         // usedVariations.push(variation);
-                        // this._upsertFurniture(this.activeInstance, {
-                        //     Variation: selection.decoNode.brandId,
-                        //     VariationDescription: selection.decoNode.gameObjectName,
-                        //     SupplierArticleNr: (selection.decoNode as any).supplierArticleNr
-                        // });
                     }
-                    else if (selection.decoNode.type === decoNodeType_enum.DecoNodeType.Part &&
+                    else if ((selection.decoNode.type === decoNodeType_enum.DecoNodeType.Part &&
                         typeof selection.decoNode.gameObjectName === 'string' &&
-                        selection.decoNode.gameObjectName.length) {
-                        if (selection.decoNode.kind === decoNodeKind_enum.DecoNodeKind.Adjustable) {
+                        selection.decoNode.gameObjectName.length) || (isArticleWithMaterial)) {
+                        if (selection.decoNode.kind === decoNodeKind_enum.DecoNodeKind.Adjustable || (isArticleWithMaterial)) {
                             selection.variations = globalVariations;
                             this._adjustables.push(selection);
-                            if (!lastAdded || lastAdded.nodeId !== selection.nodeId) {
+                            if (!lastAdded || (lastAdded.nodeId !== selection.nodeId || lastAdded.node !== selection.node)) {
                                 newPart = true;
                             }
                             lastAdded = selection;
@@ -2664,7 +2692,7 @@
                                 lastAdjustable.addables.push(selection);
                             }
                             this._addables.push(selection);
-                            if (!lastAdded || lastAdded.nodeId !== selection.nodeId) {
+                            if (!lastAdded || (lastAdded.nodeId !== selection.nodeId || lastAdded.node !== selection.node)) {
                                 newPart = true;
                             }
                             lastAdded = selection;
@@ -2676,14 +2704,36 @@
             // this._upsertFurniture(this.activeInstance,
             //   {Variations: usedVariations});
         };
+        /**
+         * Returns the materialId of the parent up the tree until presentionlevel 1 is reached
+         * @param id
+         * @private
+         */
+        Builder.prototype._getMaterialIdFromParent = function (id) {
+            var idx = this._selections.findIndex(function (s) { return s.node === id; });
+            var currentLevel = 999;
+            if (idx > -1) {
+                for (var i = idx; i > 0; i--) {
+                    var selection = this._selections[i];
+                    if (selection.presentationLevel >= currentLevel) {
+                        break;
+                    }
+                    currentLevel = selection.presentationLevel;
+                    if (selection.hdecoGameObject) {
+                        return selection.hdecoGameObject;
+                    }
+                }
+            }
+            return undefined;
+        };
         Builder.prototype._createAdjustable = function (parent, adj) {
-            var obj = this._source ? this._source.getObjectByName(adj.decoNode.gameObjectName) : null;
+            var obj = this._source ? this._source.getObjectByName(adj.decoNode.gameObjectName || adj.gameObject) : null;
             if (!obj) {
                 // in case of glb files, the importer removes dots from names
                 var name = adj.decoNode.gameObjectName.replace(/[.]/g, '');
                 obj = this._source ? this._source.getObjectByName(name) : null;
                 if (!obj) {
-                    // console.warn(`No object with name ${adj.decoNode.gameObjectName} found!`);
+                    console.warn("No object with name " + adj.decoNode.gameObjectName + " found!");
                     return null;
                 }
             }
@@ -2691,11 +2741,13 @@
             adjustable.name = this._createUniqueName(parent, obj);
             adjustable.userData.selection = adj;
             adjustable.position.set(0, 0, 0);
-            adjustable.visible = true;
+            adjustable.traverse(function (c) {
+                c.visible = !c.name.toLowerCase().startsWith('c_');
+            });
             parent.add(adjustable);
             // the object being added to the customFloorGroup is being recreated so we loose the reference
             // therefor we need to retrieve the created object again
-            // adjustable = parent.getObjectByName(adjustable.name);
+            adjustable = parent.getObjectByName(adjustable.name);
             this._placedAdjustables.push(adjustable);
             return adjustable;
         };