kitchen-simulator 11.31.0 → 11.33.0

package/es/catalog/utils/exporter.js

@@ -24,6 +24,7 @@ export default function (_ref) {
     obj_property = _ref.obj_property,
     outlineSVGData = _ref.outlineSVGData,
     cds = _ref.cds,
+    do_not_overwrite_textures = _ref.do_not_overwrite_textures,
     can_be_mirrored = _ref.can_be_mirrored,
     mirrored = _ref.mirrored,
     _ref$width_unit = _ref.width_unit,
@@ -152,6 +153,7 @@ export default function (_ref) {
     img: base,
     obj: obj_property,
     cds: cds,
+    do_not_overwrite_textures: do_not_overwrite_textures,
     can_be_mirrored: can_be_mirrored,
     mirrored: mirrored,
     structure_json: structure_json,

package/es/catalog/utils/item-loader.js

@@ -1158,7 +1158,9 @@ export function render3DApplianceItem(element, layer, scene, sizeinfo, structure
           roughness: 0.9,
           map: texture
         });
-        obj.material = mat;
+        if (!element.do_not_overwrite_textures) {
+          obj.material = mat;
+        }
       }
     });
     if (element.selected) {
@@ -1337,11 +1339,14 @@ export function render3DApplianceItem(element, layer, scene, sizeinfo, structure
       metalness: applianceMaterial.metalness,
       roughness: applianceMaterial.roughness
     });
-    // mat2.envMap = textureCube;
-    object.material = mat2;
+    if (!element.do_not_overwrite_textures) {
+      object.material = mat2;
+    }
     for (var j = 0; j < object.children.length; j++) {
       if (object.children[j].type === OBJTYPE_MESH) {
-        object.children[j].material = mat2;
+        if (!element.do_not_overwrite_textures) {
+          object.children[j].material = mat2;
+        }
         object.children[j].receiveShadow = true;
         object.children[j].castShadow = true; // change
       }

package/es/class/item.js

@@ -81,6 +81,7 @@ var Item = /*#__PURE__*/function () {
         category: state.catalog.getIn(['elements', type, 'type']),
         layoutpos: state.catalog.getIn(['elements', type, 'info', 'layoutpos']),
         cabinet_category: state.catalog.getIn(['elements', type, 'obj']).toJS().cabinet_category,
+        do_not_overwrite_textures: state.catalog.getIn(['elements', type, 'do_not_overwrite_textures']),
         can_be_mirrored: state.catalog.getIn(['elements', type, 'can_be_mirrored']),
         mirrored: state.catalog.getIn(['elements', type, 'mirrored']),
         type: type,
@@ -1505,10 +1506,10 @@ var Item = /*#__PURE__*/function () {
           var _itemGroup;
           itemGroup = MoldingUtils.getItemGroupFromMolding(layer, curItem, md);
           itemGroup = (_itemGroup = itemGroup) === null || _itemGroup === void 0 ? void 0 : _itemGroup.filter(function (it) {
-            return isWarningCabinet(it);
+            return !isWarningCabinet(it);
           });
           itemGroup.forEach(function (it) {
-            state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], []);
+            state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], tmpMolding);
           });
         });
       };

package/es/models.js

@@ -208,6 +208,7 @@ export var Item = /*#__PURE__*/function (_Record7) {
     uri: ''
   },
   molding: [],
+  do_not_overwrite_textures: false,
   can_be_mirrored: false,
   mirrored: false,
   isInitialPos: false,
@@ -358,6 +359,7 @@ export var CatalogElement = /*#__PURE__*/function (_Record1) {
   type: '',
   cds: new Map(),
   ccdf_list: new List(),
+  do_not_overwrite_textures: false,
   can_be_mirrored: false,
   mirrored: false,
   structure_json: {},

package/lib/catalog/utils/exporter.js

@@ -31,6 +31,7 @@ function _default(_ref) {
     obj_property = _ref.obj_property,
     outlineSVGData = _ref.outlineSVGData,
     cds = _ref.cds,
+    do_not_overwrite_textures = _ref.do_not_overwrite_textures,
     can_be_mirrored = _ref.can_be_mirrored,
     mirrored = _ref.mirrored,
     _ref$width_unit = _ref.width_unit,
@@ -159,6 +160,7 @@ function _default(_ref) {
     img: base,
     obj: obj_property,
     cds: cds,
+    do_not_overwrite_textures: do_not_overwrite_textures,
     can_be_mirrored: can_be_mirrored,
     mirrored: mirrored,
     structure_json: structure_json,

package/lib/catalog/utils/item-loader.js

@@ -1172,7 +1172,9 @@ function render3DApplianceItem(element, layer, scene, sizeinfo, structure_json)
           roughness: 0.9,
           map: texture
         });
-        obj.material = mat;
+        if (!element.do_not_overwrite_textures) {
+          obj.material = mat;
+        }
       }
     });
     if (element.selected) {
@@ -1351,11 +1353,14 @@ function render3DApplianceItem(element, layer, scene, sizeinfo, structure_json)
       metalness: applianceMaterial.metalness,
       roughness: applianceMaterial.roughness
     });
-    // mat2.envMap = textureCube;
-    object.material = mat2;
+    if (!element.do_not_overwrite_textures) {
+      object.material = mat2;
+    }
     for (var j = 0; j < object.children.length; j++) {
       if (object.children[j].type === _constants.OBJTYPE_MESH) {
-        object.children[j].material = mat2;
+        if (!element.do_not_overwrite_textures) {
+          object.children[j].material = mat2;
+        }
         object.children[j].receiveShadow = true;
         object.children[j].castShadow = true; // change
       }

package/lib/class/item.js

@@ -88,6 +88,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         category: state.catalog.getIn(['elements', type, 'type']),
         layoutpos: state.catalog.getIn(['elements', type, 'info', 'layoutpos']),
         cabinet_category: state.catalog.getIn(['elements', type, 'obj']).toJS().cabinet_category,
+        do_not_overwrite_textures: state.catalog.getIn(['elements', type, 'do_not_overwrite_textures']),
         can_be_mirrored: state.catalog.getIn(['elements', type, 'can_be_mirrored']),
         mirrored: state.catalog.getIn(['elements', type, 'mirrored']),
         type: type,
@@ -1512,10 +1513,10 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           var _itemGroup;
           itemGroup = _export2.MoldingUtils.getItemGroupFromMolding(layer, curItem, md);
           itemGroup = (_itemGroup = itemGroup) === null || _itemGroup === void 0 ? void 0 : _itemGroup.filter(function (it) {
-            return (0, _cabinetWarning.isWarningCabinet)(it);
+            return !(0, _cabinetWarning.isWarningCabinet)(it);
           });
           itemGroup.forEach(function (it) {
-            state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], []);
+            state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], tmpMolding);
           });
         });
       };

package/lib/models.js

@@ -215,6 +215,7 @@ var Item = exports.Item = /*#__PURE__*/function (_Record7) {
     uri: ''
   },
   molding: [],
+  do_not_overwrite_textures: false,
   can_be_mirrored: false,
   mirrored: false,
   isInitialPos: false,
@@ -365,6 +366,7 @@ var CatalogElement = exports.CatalogElement = /*#__PURE__*/function (_Record1) {
   type: '',
   cds: new _immutable.Map(),
   ccdf_list: new _immutable.List(),
+  do_not_overwrite_textures: false,
   can_be_mirrored: false,
   mirrored: false,
   structure_json: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "11.31.0",
+  "version": "11.33.0",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",