@colijnit/configurator 12.0.11 → 12.0.13

package/bundles/colijnit-configurator.umd.js

@@ -797,7 +797,8 @@
     var ImageUtils = /** @class */ (function () {
         function ImageUtils() {
         }
-        ImageUtils.CreateTextureFromBase64 = function (id, base64, material) {
+        ImageUtils.CreateTextureFromBase64 = function (id, base64, material, defaultFlip) {
+            if (defaultFlip === void 0) { defaultFlip = false; }
             return new Promise(function (resolve) {
                 if (ImageUtils.textures.has(id)) {
                     resolve(ImageUtils.textures.get(id));
@@ -813,6 +814,7 @@
                             texture.wrapS = THREE__namespace.RepeatWrapping;
                             texture.wrapT = THREE__namespace.RepeatWrapping;
                             texture.repeat = new THREE__namespace.Vector2(material ? material.repeatX : 1, material ? material.repeatY : 1);
+                            texture.flipY = defaultFlip;
                             texture.needsUpdate = true;
                             ImageUtils.textures.set(id, texture);
                             resolve(texture);
@@ -865,9 +867,9 @@
         }
         AssetUtils.CreateMaterialFromAsset = function (asset) {
             return __awaiter(this, void 0, void 0, function () {
-                var material, _a, _b, _c, _d, _e, _f, _g, _h, _j;
-                return __generator(this, function (_k) {
-                    switch (_k.label) {
+                var material, _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, metalness, roughness;
+                return __generator(this, function (_m) {
+                    switch (_m.label) {
                         case 0:
                             material = new Material();
                             if (!asset) {
@@ -880,24 +882,24 @@
                             _a = material;
                             return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_texture', asset.texture, material)];
                         case 1:
-                            _a.texture = _k.sent();
+                            _a.texture = _m.sent();
                             material.texture.encoding = THREE.sRGBEncoding;
                             material.textureFilename = asset.textureFilename;
-                            _k.label = 2;
+                            _m.label = 2;
                         case 2:
                             if (!asset.normal) return [3 /*break*/, 4];
                             _b = material;
                             return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_normal', asset.normal, material)];
                         case 3:
-                            _b.normal = _k.sent();
+                            _b.normal = _m.sent();
                             material.normalFilename = asset.normalFilename;
-                            _k.label = 4;
+                            _m.label = 4;
                         case 4:
                             if (!asset.orm) return [3 /*break*/, 6];
                             _c = material;
                             return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_orm', asset.orm, material)];
                         case 5:
-                            _c.ao = _k.sent();
+                            _c.ao = _m.sent();
                             material.roughness = material.ao;
                             material.metalness = material.ao;
                             material.aoFilename = asset.ormFilename;
@@ -909,50 +911,88 @@
                             _d = material;
                             return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_ao', asset.ao, material)];
                         case 7:
-                            _d.ao = _k.sent();
+                            _d.ao = _m.sent();
                             material.aoFilename = asset.aoFilename;
-                            _k.label = 8;
+                            _m.label = 8;
                         case 8:
                             if (!asset.metalness) return [3 /*break*/, 10];
                             _e = material;
                             return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_metalness', asset.metalness, material)];
                         case 9:
-                            _e.metalness = _k.sent();
+                            _e.metalness = _m.sent();
                             material.metalnessFilename = asset.metalnessFilename;
-                            _k.label = 10;
+                            _m.label = 10;
                         case 10:
                             if (!asset.roughness) return [3 /*break*/, 12];
                             _f = material;
                             return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_roughness', asset.roughness, material)];
                         case 11:
-                            _f.roughness = _k.sent();
+                            _f.roughness = _m.sent();
                             material.roughnessFilename = asset.roughnessFilename;
-                            _k.label = 12;
+                            _m.label = 12;
                         case 12:
                             if (!asset.displacement) return [3 /*break*/, 14];
                             _g = material;
                             return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_displacement', asset.displacement, material)];
                         case 13:
-                            _g.displacement = _k.sent();
+                            _g.displacement = _m.sent();
                             material.displacementFilename = asset.displacementFilename;
-                            _k.label = 14;
+                            _m.label = 14;
                         case 14:
                             if (!asset.envMap) return [3 /*break*/, 16];
                             _h = material;
-                            return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_env', asset.envMap, material)];
+                            return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_env', asset.envMap, material, true)];
                         case 15:
-                            _h.envMap = _k.sent();
+                            _h.envMap = _m.sent();
                             material.envMapFilename = asset.envMapFilename;
-                            _k.label = 16;
+                            _m.label = 16;
                         case 16:
-                            if (!asset.emissive) return [3 /*break*/, 18];
+                            if (!asset.sheenColorMap) return [3 /*break*/, 18];
                             _j = material;
-                            return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_emissive', asset.emissive, material)];
+                            return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_sheen_color', asset.sheenColorMap, material)];
                         case 17:
-                            _j.emissive = _k.sent();
+                            _j.sheenColorMap = _m.sent();
+                            material.sheenColorMapFileName = asset.sheenColorMapFilename;
+                            _m.label = 18;
+                        case 18:
+                            if (!asset.sheenRoughnessMap) return [3 /*break*/, 20];
+                            _k = material;
+                            return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_sheen_roughness', asset.sheenRoughnessMap, material)];
+                        case 19:
+                            _k.sheenRoughnessMap = _m.sent();
+                            material.sheenRoughnessMapFileName = asset.sheenRoughnessMapFilename;
+                            _m.label = 20;
+                        case 20:
+                            if (!asset.emissive) return [3 /*break*/, 22];
+                            _l = material;
+                            return [4 /*yield*/, ImageUtils.CreateTextureFromBase64(asset.id + '_emissive', asset.emissive, material)];
+                        case 21:
+                            _l.emissive = _m.sent();
                             material.emissiveFileName = asset.emissiveFilename;
-                            _k.label = 18;
-                        case 18: return [2 /*return*/, material];
+                            _m.label = 22;
+                        case 22:
+                            metalness = parseFloat(asset['metalness']);
+                            if (!isNaN(metalness)) {
+                                material.metalnessValue = Math.min(1, metalness);
+                            }
+                            roughness = parseFloat(asset['roughness']);
+                            if (!isNaN(roughness)) {
+                                material.roughnessValue = Math.min(1, roughness);
+                            }
+                            material.sheen = asset.sheen;
+                            material.emissiveIntensityValue = asset.emissiveIntensity;
+                            material.emissiveValue = asset.emissiveValue;
+                            material.side = asset.side;
+                            material.sheenColor = asset.sheenColor;
+                            material.sheenRoughness = asset.sheenRoughness;
+                            material.opacity = asset.opacity;
+                            material.transparent = asset.transparent;
+                            material.envMapIntensity = asset.envMapIntensity;
+                            material.reflectivity = asset.reflectivity;
+                            material.displacementValue = asset.displacementValue;
+                            material.transparency = asset.transparency;
+                            material.transmission = asset.transmission;
+                            return [2 /*return*/, material];
                     }
                 });
             });
@@ -976,44 +1016,6 @@
             if (!isNaN(repeaty)) {
                 material.repeatY = repeaty;
             }
-            var metalness = parseFloat(settings['metalness']);
-            if (!isNaN(metalness)) {
-                material.metalnessValue = Math.min(1, metalness);
-            }
-            var roughness = parseFloat(settings['roughness']);
-            if (!isNaN(roughness)) {
-                material.roughnessValue = Math.min(1, roughness);
-            }
-            if (settings.hasOwnProperty('side')) {
-                material.side = settings.side;
-            }
-            if (settings.hasOwnProperty('sheenColor')) {
-                material.sheenColor = settings.sheenColor;
-            }
-            if (settings.hasOwnProperty('opacity')) {
-                material.opacity = settings.opacity;
-            }
-            if (settings.hasOwnProperty('transparent')) {
-                material.transparent = settings.transparent;
-            }
-            if (settings.hasOwnProperty('envMap')) {
-                material.envMap = settings.envMap;
-            }
-            if (settings.hasOwnProperty('envMapIntensity')) {
-                material.envMapIntensity = settings.envMapIntensity;
-            }
-            if (settings.hasOwnProperty('reflectivity')) {
-                material.reflectivity = settings.reflectivity;
-            }
-            if (settings.hasOwnProperty('displacementValue')) {
-                material.displacementValue = settings.displacementValue;
-            }
-            if (settings.hasOwnProperty('transparency')) {
-                material.transparency = settings.transparency;
-            }
-            if (settings.hasOwnProperty('transmission')) {
-                material.transmission = settings.transmission;
-            }
         };
         return AssetUtils;
     }());
@@ -1162,31 +1164,31 @@
         };
         VariationUtils.CreateSettingsBasedOnIndex = function (index, variationSettings, zipContent) {
             return __awaiter(this, void 0, void 0, function () {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                return __generator(this, function (_l) {
-                    switch (_l.label) {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+                return __generator(this, function (_m) {
+                    switch (_m.label) {
                         case 0:
                             if (!index.normalFile) return [3 /*break*/, 2];
                             _a = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.normalFile], index.normalFile)];
                         case 1:
-                            _a.normal = _l.sent();
+                            _a.normal = _m.sent();
                             variationSettings.normalFilename = index.normalFile;
-                            _l.label = 2;
+                            _m.label = 2;
                         case 2:
                             if (!index.diffuseFile) return [3 /*break*/, 4];
                             _b = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.diffuseFile], index.diffuseFile)];
                         case 3:
-                            _b.texture = _l.sent();
+                            _b.texture = _m.sent();
                             variationSettings.textureFilename = index.diffuseFile;
-                            _l.label = 4;
+                            _m.label = 4;
                         case 4:
                             if (!index.ormFile) return [3 /*break*/, 6];
                             _c = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.ormFile], index.ormFile)];
                         case 5:
-                            _c.orm = _l.sent();
+                            _c.orm = _m.sent();
                             variationSettings.ormFilename = index.ormFile;
                             return [3 /*break*/, 12];
                         case 6:
@@ -1194,74 +1196,93 @@
                             _d = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.aoFile], index.aoFile)];
                         case 7:
-                            _d.ao = _l.sent();
+                            _d.ao = _m.sent();
                             variationSettings.aoFilename = index.aoFile;
-                            _l.label = 8;
+                            _m.label = 8;
                         case 8:
                             if (!index.metalnessFile) return [3 /*break*/, 10];
                             _e = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.metalnessFile], index.metalnessFile)];
                         case 9:
-                            _e.metalness = _l.sent();
+                            _e.metalness = _m.sent();
                             variationSettings.metalnessFilename = index.metalnessFile;
-                            _l.label = 10;
+                            _m.label = 10;
                         case 10:
                             if (!index.roughnessFile) return [3 /*break*/, 12];
                             _f = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.roughnessFile], index.roughnessFile)];
                         case 11:
-                            _f.roughness = _l.sent();
+                            _f.roughness = _m.sent();
                             variationSettings.roughnessFilename = index.roughnessFile;
-                            _l.label = 12;
+                            _m.label = 12;
                         case 12:
                             if (!index.displacementFile) return [3 /*break*/, 14];
                             _g = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.displacementFile], index.displacementFile)];
                         case 13:
-                            _g.displacement = _l.sent();
+                            _g.displacement = _m.sent();
                             variationSettings.displacementFilename = index.displacementFile;
-                            _l.label = 14;
+                            _m.label = 14;
                         case 14:
                             if (!index.emissiveFile) return [3 /*break*/, 16];
                             _h = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.emissiveFile], index.emissiveFile)];
                         case 15:
-                            _h.emissive = _l.sent();
+                            _h.emissive = _m.sent();
                             variationSettings.emissiveFilename = index.emissiveFile;
-                            _l.label = 16;
+                            _m.label = 16;
                         case 16:
                             if (!index.envMapFile) return [3 /*break*/, 18];
                             _j = variationSettings;
                             return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.envMapFile], index.envMapFile)];
                         case 17:
-                            _j.envMap = _l.sent();
+                            _j.envMap = _m.sent();
                             variationSettings.envMapFilename = index.envMapFile;
-                            _l.label = 18;
+                            _m.label = 18;
                         case 18:
+                            if (!index.sheenColorMapFile) return [3 /*break*/, 20];
                             _k = variationSettings;
-                            return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files['repeat.json'], 'repeat.json', false)];
+                            return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.sheenColorMapFile], index.sheenColorMapFile)];
                         case 19:
-                            _k.settings =
-                                (_l.sent()) || {};
-                            Object.assign(variationSettings.settings, index.repeat);
-                            variationSettings.settings.metalness = index.metalness;
-                            variationSettings.settings.roughness = index.roughness;
+                            _k.sheenColorMap = _m.sent();
+                            variationSettings.sheenColorMapFilename = index.sheenColorMapFile;
+                            _m.label = 20;
+                        case 20:
+                            if (!index.sheenRoughnessMapFile) return [3 /*break*/, 22];
+                            _l = variationSettings;
+                            return [4 /*yield*/, VariationUtils.LoadFileContentFromZip(zipContent.files[index.sheenRoughnessMapFile], index.sheenRoughnessMapFile)];
+                        case 21:
+                            _l.sheenRoughnessMap = _m.sent();
+                            variationSettings.sheenRoughnessMapFilename = index.sheenColorMapFile;
+                            _m.label = 22;
+                        case 22:
+                            if (index.repeat) {
+                                variationSettings.settings = {
+                                    repeatx: index.repeat.repeatx,
+                                    repeaty: index.repeat.repeaty
+                                };
+                            }
+                            // variationSettings.settings =
+                            //     await VariationUtils.LoadFileContentFromZip(zipContent.files['repeat.json'], 'repeat.json', false) || {};
+                            variationSettings.metalness = index.metalness;
+                            variationSettings.roughness = index.roughness;
+                            variationSettings.sheen = index.sheen;
                             if (index.sheenColor) {
-                                variationSettings.settings.sheenColor = new THREE__namespace.Color(index.sheenColor.r, index.sheenColor.g, index.sheenColor.b);
+                                variationSettings.sheenColor = new THREE__namespace.Color(index.sheenColor.r, index.sheenColor.g, index.sheenColor.b);
                             }
-                            variationSettings.settings.envMap = index.envMap;
-                            variationSettings.settings.envMapIntensity = index.envMapIntensity;
-                            variationSettings.settings.transparent = index.transparent;
-                            variationSettings.settings.opacity = index.opacity;
+                            variationSettings.sheenRoughness = index.sheenRoughness;
+                            variationSettings.envMapIntensity = index.envMapIntensity;
+                            variationSettings.transparent = index.transparent;
+                            variationSettings.opacity = index.opacity;
                             if (index.emissiveValue) {
-                                variationSettings.settings.emissiveValue = new THREE__namespace.Color(index.emissiveValue.r, index.emissiveValue.g, index.emissiveValue.b);
+                                variationSettings.emissiveValue = new THREE__namespace.Color(index.emissiveValue.r, index.emissiveValue.g, index.emissiveValue.b);
                             }
-                            variationSettings.settings.emissiveIntensity = index.emissiveIntensity;
-                            variationSettings.settings.reflectivity = index.reflectivity;
-                            variationSettings.settings.displacementValue = index.displacementValue;
-                            variationSettings.settings.side = index.side;
-                            variationSettings.settings.transparency = index.transparency;
-                            variationSettings.settings.transmission = index.transmission;
+                            variationSettings.emissiveIntensity = index.emissiveIntensity;
+                            variationSettings.reflectivity = index.reflectivity;
+                            variationSettings.displacementValue = index.displacementValue;
+                            variationSettings.side = index.side;
+                            variationSettings.transparency = index.transparency;
+                            variationSettings.transmission = index.transmission;
                             return [2 /*return*/];
                     }
                 });
@@ -1332,6 +1353,18 @@
                                                     variationSettings.envMapFilename = fileName;
                                                 }));
                                             }
+                                            else if (file_1.name.toLowerCase().indexOf('sheenColorMap') > -1 && this_1.FileIsImage(file_1.name)) {
+                                                allLoaded.push(zipContent.files[fileName].async('base64').then(function (sheenColorMapFile) {
+                                                    variationSettings.sheenColorMap = "data:image/" + _this.GetBase64FileType(file_1.name) + ";base64," + sheenColorMapFile;
+                                                    variationSettings.sheenColorMapFilename = fileName;
+                                                }));
+                                            }
+                                            else if (file_1.name.toLowerCase().indexOf('sheenRoughnessMap') > -1 && this_1.FileIsImage(file_1.name)) {
+                                                allLoaded.push(zipContent.files[fileName].async('base64').then(function (sheenRoughnessMapFile) {
+                                                    variationSettings.sheenRoughnessMap = "data:image/" + _this.GetBase64FileType(file_1.name) + ";base64," + sheenRoughnessMapFile;
+                                                    variationSettings.sheenRoughnessMapFilename = fileName;
+                                                }));
+                                            }
                                             else if (file_1.name.indexOf('.jp') > -1) {
                                                 allLoaded.push(zipContent.files[fileName].async('base64').then(function (textureFile) {
                                                     variationSettings.texture = 'data:image/jpeg;base64,' + textureFile;
@@ -1793,171 +1826,198 @@
         };
         VariationHelper.prototype._setMeshMaterialFromVariation = function (name, variation, usePbr) {
             if (usePbr === void 0) { usePbr = false; }
-            if (variation.material.texture) {
-                variation.material.texture.needsUpdate = true;
-                variation.material.texture.mapping = THREE__namespace.EquirectangularReflectionMapping;
+            var material = variation.material;
+            if (material.texture) {
+                material.texture.needsUpdate = true;
+                material.texture.mapping = THREE__namespace.EquirectangularReflectionMapping;
             }
             if (!usePbr) {
                 var newMaterial = new THREE__namespace.MeshPhongMaterial({
                     name: name,
-                    shininess: variation.material.shininess,
-                    specular: variation.material.specular,
-                    map: variation.material.texture,
-                    normalMap: variation.material.normal
+                    shininess: material.shininess,
+                    specular: material.specular,
+                    map: material.texture,
+                    normalMap: material.normal
                 });
                 newMaterial.color.setRGB(0.8, 0.8, 0.8);
                 newMaterial.needsUpdate = true;
                 return newMaterial;
             }
-            if (variation.material.sheenColor || variation.material.reflectivity) {
+            if (material.sheen || material.sheenColor || material.reflectivity) { // TODO: Proper check for all unique physical material properties
                 var params = {
                     // side: material.side ? material.side : FrontSide,
                     name: name,
-                    roughness: variation.material.roughnessValue ? variation.material.roughnessValue : 1,
-                    metalness: variation.material.metalnessValue ? variation.material.metalnessValue : 0,
-                    envMapIntensity: variation.material.envMapIntensity ? variation.material.envMapIntensity : 0.01,
-                    clearcoatMap: variation.material.clearcoatMap ? variation.material.clearcoatMap : null,
-                    clearcoatRoughnessMap: variation.material.clearcoatRoughnessMap ? variation.material.clearcoatRoughnessMap : null,
+                    roughness: material.roughnessValue ? material.roughnessValue : 1,
+                    metalness: material.metalnessValue ? material.metalnessValue : 0,
+                    envMapIntensity: material.envMapIntensity ? material.envMapIntensity : 0.01,
+                    clearcoatMap: material.clearcoatMap ? material.clearcoatMap : null,
+                    clearcoatRoughnessMap: material.clearcoatRoughnessMap ? material.clearcoatRoughnessMap : null,
                     // wireframe: true,
                     // opacity: 0.3,
                     // transparent: true,
                 };
-                if (variation.material.displacementValue) {
-                    params.displacementScale = variation.material.displacementValue;
+                if (material.displacementValue) {
+                    params.displacementScale = material.displacementValue;
                 }
-                if (variation.material.sheenColor) {
-                    params.sheen = variation.material.sheenColor;
+                if (material.opacity) {
+                    params.opacity = material.opacity;
                 }
-                if (variation.material.opacity) {
-                    params.opacity = variation.material.opacity;
+                if (material.transparency) {
+                    params.transmission = material.transparency;
                 }
-                if (variation.material.transparent) {
-                    params.transparent = variation.material.transparent;
+                if (material.transmission) {
+                    params.transmission = material.transmission;
                 }
-                if (variation.material.emissiveValue) {
-                    params.emissive = variation.material.emissiveValue;
+                if (material.transparent) {
+                    params.transparent = material.transparent;
                 }
-                if (variation.material.emissiveIntensityValue) {
-                    params.emissiveIntensity = variation.material.emissiveIntensityValue;
+                if (material.emissiveValue) {
+                    params.emissive = material.emissiveValue;
                 }
-                if (variation.material.texture) {
-                    params.map = variation.material.texture;
+                if (material.emissiveIntensityValue) {
+                    params.emissiveIntensity = material.emissiveIntensityValue;
+                }
+                if (material.texture) {
+                    params.map = material.texture;
                     params.map.needsUpdate = true;
                 }
-                if (variation.material.ao) {
-                    params.aoMap = variation.material.ao;
+                if (material.ao) {
+                    params.aoMap = material.ao;
                     params.aoMap.needsUpdate = true;
                 }
-                if (variation.material.roughness) {
-                    params.roughnessMap = variation.material.roughness;
+                if (material.roughness) {
+                    params.roughnessMap = material.roughness;
                     params.roughnessMap.needsUpdate = true;
-                    // variation.material.roughness.magFilter = NearestFilter;
+                    // material.roughness.magFilter = NearestFilter;
                 }
-                if (variation.material.metalness) {
-                    params.metalnessMap = variation.material.metalness;
+                if (material.metalness) {
+                    params.metalnessMap = material.metalness;
                     params.metalnessMap.needsUpdate = true;
                 }
-                if (variation.material.normal) {
-                    params.normalMap = variation.material.normal;
+                if (material.normal) {
+                    params.normalMap = material.normal;
                     params.normalMap.needsUpdate = true;
                 }
-                if (variation.material.displacement) {
-                    params.displacementMap = variation.material.displacement;
+                if (material.displacement) {
+                    params.displacementMap = material.displacement;
                     params.displacementMap.needsUpdate = true;
                 }
-                if (variation.material.emissive) {
-                    params.emissiveMap = variation.material.emissive;
+                if (material.emissive) {
+                    params.emissiveMap = material.emissive;
                     params.emissiveMap.needsUpdate = true;
                 }
-                if (variation.material.envMap) {
-                    if (variation.material.envMapIntensity != null || 0) {
-                        params.envMap = variation.material.envMap;
+                if (material.envMap) {
+                    if (material.envMapIntensity != null || 0) {
+                        params.envMap = material.envMap;
                         params.envMap.needsUpdate = true;
-                        variation.material.envMap.mapping = THREE__namespace.EquirectangularReflectionMapping;
-                        variation.material.envMap.minFilter = THREE__namespace.NearestFilter;
-                        variation.material.envMap.magFilter = THREE__namespace.NearestFilter;
+                        material.envMap.mapping = THREE__namespace.EquirectangularReflectionMapping;
+                        material.envMap.minFilter = THREE__namespace.NearestFilter;
+                        material.envMap.magFilter = THREE__namespace.NearestFilter;
                     }
                 }
-                if (variation.material.reflectivity) {
-                    params.reflectivity = variation.material.reflectivity;
+                if (material.reflectivity) {
+                    params.reflectivity = material.reflectivity;
                 }
-                if (variation.material.side) {
-                    params.side = variation.material.side;
+                if (material.side) {
+                    params.side = material.side;
                 }
                 var newMaterial = new THREE__namespace.MeshPhysicalMaterial(params);
                 newMaterial.color.setRGB(1, 1, 1);
-                newMaterial.needsUpdate = true;
-                if (variation.material.transmission) {
-                    newMaterial.transmission = variation.material.transmission;
+                if (material.sheen) {
+                    newMaterial.sheen = material.sheen;
                 }
+                if (material.sheenColor) {
+                    newMaterial.sheenColor = material.sheenColor;
+                }
+                if (material.sheenRoughness) {
+                    newMaterial.sheenRoughness = material.sheenRoughness;
+                }
+                if (material.sheenColorMap) {
+                    newMaterial.sheenColorMap = material.sheenColorMap;
+                    newMaterial.sheenColorMap.needsUpdate = true;
+                }
+                if (material.sheenRoughnessMap) {
+                    newMaterial.sheenRoughnessMap = material.sheenRoughnessMap;
+                    newMaterial.sheenRoughnessMap.needsUpdate = true;
+                }
+                if (material.transmission) {
+                    newMaterial.transmission = material.transmission;
+                }
+                newMaterial.needsUpdate = true;
                 return newMaterial;
             }
             else {
                 var params = {
                     // side: material.side ? material.side : FrontSide,
                     name: name,
-                    roughness: variation.material.roughnessValue ? variation.material.roughnessValue : 1,
-                    metalness: variation.material.metalnessValue ? variation.material.metalnessValue : 0,
-                    envMapIntensity: variation.material.envMapIntensity ? variation.material.envMapIntensity : 0.01
+                    roughness: material.roughnessValue ? material.roughnessValue : 1,
+                    metalness: material.metalnessValue ? material.metalnessValue : 0,
+                    envMapIntensity: material.envMapIntensity ? material.envMapIntensity : 0.01
                     // wireframe: true,
                     // opacity: 0.3,
                     // transparent: true,
                 };
-                if (variation.material.displacementValue) {
-                    params.displacementScale = variation.material.displacementValue;
+                if (material.displacementValue) {
+                    params.displacementScale = material.displacementValue;
+                }
+                if (material.opacity) {
+                    params.opacity = material.opacity;
+                }
+                if (material.transparency) {
+                    params.opacity = material.transparency;
                 }
-                if (variation.material.opacity) {
-                    params.opacity = variation.material.opacity;
+                if (material.transmission) {
+                    params.opacity = material.transmission;
                 }
-                if (variation.material.transparent) {
-                    params.transparent = variation.material.transparent;
+                if (material.transparent) {
+                    params.transparent = material.transparent;
                 }
-                if (variation.material.emissiveValue) {
-                    params.emissive = variation.material.emissiveValue;
+                if (material.emissiveValue) {
+                    params.emissive = material.emissiveValue;
                 }
-                if (variation.material.emissiveIntensityValue) {
-                    params.emissiveIntensity = variation.material.emissiveIntensityValue;
+                if (material.emissiveIntensityValue) {
+                    params.emissiveIntensity = material.emissiveIntensityValue;
                 }
-                if (variation.material.texture) {
-                    params.map = variation.material.texture;
+                if (material.texture) {
+                    params.map = material.texture;
                     params.map.needsUpdate = true;
                 }
-                if (variation.material.ao) {
-                    params.aoMap = variation.material.ao;
+                if (material.ao) {
+                    params.aoMap = material.ao;
                     params.aoMap.needsUpdate = true;
                 }
-                if (variation.material.roughness) {
-                    params.roughnessMap = variation.material.roughness;
+                if (material.roughness) {
+                    params.roughnessMap = material.roughness;
                     params.roughnessMap.needsUpdate = true;
-                    // variation.material.roughness.magFilter = NearestFilter;
+                    // material.roughness.magFilter = NearestFilter;
                 }
-                if (variation.material.metalness) {
-                    params.metalnessMap = variation.material.metalness;
+                if (material.metalness) {
+                    params.metalnessMap = material.metalness;
                     params.metalnessMap.needsUpdate = true;
                 }
-                if (variation.material.normal) {
-                    params.normalMap = variation.material.normal;
+                if (material.normal) {
+                    params.normalMap = material.normal;
                     params.normalMap.needsUpdate = true;
                 }
-                if (variation.material.displacement) {
-                    params.displacementMap = variation.material.displacement;
+                if (material.displacement) {
+                    params.displacementMap = material.displacement;
                     params.displacementMap.needsUpdate = true;
                 }
-                if (variation.material.emissive) {
-                    params.emissiveMap = variation.material.emissive;
+                if (material.emissive) {
+                    params.emissiveMap = material.emissive;
                     params.emissiveMap.needsUpdate = true;
                 }
-                if (variation.material.envMap) {
-                    if (variation.material.envMapIntensity != null || 0) {
-                        params.envMap = variation.material.envMap;
+                if (material.envMap) {
+                    if (material.envMapIntensity != null || 0) {
+                        params.envMap = material.envMap;
                         params.envMap.needsUpdate = true;
-                        variation.material.envMap.mapping = THREE__namespace.EquirectangularReflectionMapping;
-                        variation.material.envMap.minFilter = THREE__namespace.NearestFilter;
-                        variation.material.envMap.magFilter = THREE__namespace.NearestFilter;
+                        material.envMap.mapping = THREE__namespace.EquirectangularReflectionMapping;
+                        material.envMap.minFilter = THREE__namespace.NearestFilter;
+                        material.envMap.magFilter = THREE__namespace.NearestFilter;
                     }
                 }
-                if (variation.material.side) {
-                    params.side = variation.material.side;
+                if (material.side) {
+                    params.side = material.side;
                 }
                 var newMaterial = new THREE__namespace.MeshStandardMaterial(params);
                 newMaterial.color.setRGB(1, 1, 1);
@@ -2796,7 +2856,7 @@
                     deco = new decoNode.DecoNode();
                 }
                 var variation = this_1._getVariations().find(function (v) { return v.parentId === _this._selections[i].artNodeIdDeco; });
-                if (variation) {
+                if (variation && deco.type !== decoNodeType_enum.DecoNodeType.Variation) {
                     deco.variation = variation;
                 }
                 this_1._selections[i].decoNode = deco;