kitchen-simulator 11.8.0 → 11.9.0

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

@@ -1075,19 +1075,19 @@ export function render3DApplianceItem(element, layer, scene, sizeinfo, structure
   var structure = structure_json;
   var applianceMaterial = element.applianceMaterial;
   if (applianceMaterial.metalness == undefined) applianceMaterial = applianceMaterial.toJS();
+  var newAltitude = element.properties.get('altitude').get('_length');
+  var newUnit = element.properties.get('altitude').get('_unit') || 'in';
+  newAltitude = convert(newAltitude).from(newUnit).to(scene.unit);
+  var newWidth = element.properties.get('width').get('_length');
+  var newWidthUnit = element.properties.get('width').get('_unit') || 'in';
+  newWidth = convert(newWidth).from(newWidthUnit).to('in');
+  var newHeight = element.properties.get('height').get('_length');
+  var newHeightUnit = element.properties.get('height').get('_unit') || 'in';
+  newHeight = convert(newHeight).from(newHeightUnit).to('in');
+  var newDepth = element.properties.get('depth').get('_length');
+  var newDepthUnit = element.properties.get('depth').get('_unit') || 'in';
+  newDepth = convert(newDepth).from(newDepthUnit).to('in');
   var onLoadItem = function onLoadItem(object) {
-    var newAltitude = element.properties.get('altitude').get('_length');
-    var newUnit = element.properties.get('altitude').get('_unit') || 'in';
-    newAltitude = convert(newAltitude).from(newUnit).to(scene.unit);
-    var newWidth = element.properties.get('width').get('_length');
-    var newWidthUnit = element.properties.get('width').get('_unit') || 'in';
-    newWidth = convert(newWidth).from(newWidthUnit).to('in');
-    var newHeight = element.properties.get('height').get('_length');
-    var newHeightUnit = element.properties.get('height').get('_unit') || 'in';
-    newHeight = convert(newHeight).from(newHeightUnit).to('in');
-    var newDepth = element.properties.get('depth').get('_length');
-    var newDepthUnit = element.properties.get('depth').get('_unit') || 'in';
-    newDepth = convert(newDepth).from(newDepthUnit).to('in');
     object.scale.set(100 * newWidth / sizeinfo.width, 100 * newHeight / sizeinfo.height, 100 * newDepth / sizeinfo.depth);
     // Normalize the origin of the object
     var boundingBox = new Three.Box3().setFromObject(object);
@@ -1344,26 +1344,25 @@ export function render3DApplianceItem(element, layer, scene, sizeinfo, structure
 export function render3DLightingItem(element, layer, scene, sizeinfo, structure_json) {
   var mode = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
   var structure = structure_json;
+  var width = {
+    length: sizeinfo.width,
+    unit: 'in'
+  };
+  var depth = {
+    length: sizeinfo.depth,
+    unit: 'in'
+  };
+  var height = {
+    length: sizeinfo.height,
+    unit: 'in'
+  };
+  var newWidth = convert(width.length).from(width.unit).to('cm');
+  var newDepth = convert(depth.length).from(depth.unit).to('cm');
+  var newHeight = convert(height.length).from(height.unit).to('cm');
+  var newAltitude = element.properties.get('altitude').get('_length');
+  var newUnit = element.properties.get('altitude').get('_unit') || 'in';
+  newAltitude = convert(newAltitude).from(newUnit).to(scene.unit);
   var onLoadItem = function onLoadItem(object) {
-    var width = {
-      length: sizeinfo.width,
-      unit: 'in'
-    };
-    var depth = {
-      length: sizeinfo.depth,
-      unit: 'in'
-    };
-    var height = {
-      length: sizeinfo.height,
-      unit: 'in'
-    };
-    var newWidth = convert(width.length).from(width.unit).to('cm');
-    var newDepth = convert(depth.length).from(depth.unit).to('cm');
-    var newHeight = convert(height.length).from(height.unit).to('cm');
-    var newAltitude = element.properties.get('altitude').get('_length');
-    var newUnit = element.properties.get('altitude').get('_unit') || 'in';
-    newAltitude = convert(newAltitude).from(newUnit).to(scene.unit);
-
     //object.scale.set(newWidth, newHeight, newDepth);
     object.scale.set(100, 100, 100);
     // Normalize the origin of the object

package/es/utils/skinPanelEngine.js

@@ -97,7 +97,7 @@ export function getSideFaces(item, layer) {
 }
 function collectLayerItems(layer) {
   var _layer$items;
-  var skinLayouts = new Set([BASE_CABINET_LAYOUTPOS, WALL_CABINET_LAYOUTPOS, TALL_CABINET_LAYOUTPOS, VANITY_CABINET_LAYOUTPOS]);
+  var skinLayouts = new Set([BASE_CABINET_LAYOUTPOS, WALL_CABINET_LAYOUTPOS, TALL_CABINET_LAYOUTPOS]);
   var skinPanelItems = [];
   var otherItems = [];
   layer === null || layer === void 0 || (_layer$items = layer.items) === null || _layer$items === void 0 || _layer$items.forEach(function (it) {
@@ -368,6 +368,51 @@ function applyVerticalGrouping(faces) {
 function isMP3TallCabinet(sku) {
   return sku === null || sku === void 0 ? void 0 : sku.startsWith('MP3');
 }
+function buildMP3SkinPanelArray(bottomHeight, topHeight, mp3SkinPanelArray) {
+  var skinPanelHeightArray = [],
+    bIndex = -1,
+    tIndex = -1,
+    hArray = [],
+    skinPanelTypeArray = [],
+    temp = 0;
+  // make skinPanelHeightArray : [0,  sum(h1 + h2 +...+ hn)]
+  skinPanelHeightArray[0] = temp;
+  for (var i = 0; i < mp3SkinPanelArray.length; i++) {
+    temp += mp3SkinPanelArray[i][0];
+    skinPanelHeightArray.push(temp);
+  }
+  // calc the zBottom's index
+  for (var _i = 0; _i <= skinPanelHeightArray.length; _i++) {
+    if (bottomHeight < skinPanelHeightArray[_i]) {
+      bIndex = _i - 1;
+      break;
+    }
+  }
+  if (bIndex < 0) {
+    console.log('Error for bottomHeight in buildMP3SkinPanelArray');
+    return [];
+  }
+  // calc the zTop's index
+  for (var _i2 = 0; _i2 <= skinPanelHeightArray.length; _i2++) {
+    if (topHeight <= skinPanelHeightArray[_i2]) {
+      tIndex = _i2;
+      break;
+    }
+  }
+  if (tIndex < 0) {
+    console.log('Error for topHeight in buildMP3SkinPanelArray');
+    return [];
+  }
+  if (tIndex === 0 || bIndex === skinPanelHeightArray.length) return [];
+
+  // make the skinPanelTypeArray using zTop's index and zBottom's index
+  hArray = mp3SkinPanelArray.slice(bIndex, tIndex + 1);
+  for (var _i3 = 0; _i3 < hArray.length; _i3++) {
+    skinPanelTypeArray.push(hArray[_i3][1]);
+  }
+  // return skinPanelTypeArray : e.g. [SKIN_SKU_BSV_24, SKIN_SKU_WSV_2442]
+  return skinPanelTypeArray;
+}
 
 /**
  * Decide which skin panel pieces are needed for a tall cabinet.
@@ -375,7 +420,14 @@ function isMP3TallCabinet(sku) {
 function resolveTallCabinetBundle(face) {
   var item = face.itemInfo;
   if (isMP3TallCabinet(item.sku_number)) {
-    return [SKIN_SKU_BSV_24, SKIN_SKU_BSV_24, SKIN_SKU_WSV_2442];
+    var zBottom = face.zBottom;
+    var zTop = face.zTop;
+    var bottomHeight = convert(zBottom).from('cm').to('in');
+    var topHeight = convert(zTop).from('cm').to('in');
+    var mp3SkinPanelArray = [[34.5, SKIN_SKU_BSV_24],
+    // [height of skin panel, type of skin panel]
+    [item.properties.height._length - 76.5, SKIN_SKU_BSV_24], [42, SKIN_SKU_WSV_2442]];
+    return buildMP3SkinPanelArray(bottomHeight, topHeight, mp3SkinPanelArray);
   }
   if (face.height > SKIN_HEIGHT_53_25) {
     return [SKIN_SKU_USV245325, SKIN_SKU_WSV_2442];
@@ -445,9 +497,9 @@ function buildSkinPanelData(faces) {
   var removeIdxs = [];
   var newDatas = [];
   var _loop5 = function _loop5() {
-    var iData = tempResult[_i];
+    var iData = tempResult[_i4];
     if (iData.isBackFace) {
-      removeIdxs.push(_i);
+      removeIdxs.push(_i4);
       var count48 = Math.floor(iData.totalLength / 48);
       var count24 = iData.totalLength % 48 > 0 ? 1 : 0;
       var idx48 = tempResult.findIndex(function (v) {
@@ -486,7 +538,7 @@ function buildSkinPanelData(faces) {
       }
     }
   };
-  for (var _i = 0; _i < tempResult.length; _i++) {
+  for (var _i4 = 0; _i4 < tempResult.length; _i4++) {
     _loop5();
   }
   tempResult = tempResult.filter(function (data, idx) {

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

@@ -1089,19 +1089,19 @@ function render3DApplianceItem(element, layer, scene, sizeinfo, structure_json)
   var structure = structure_json;
   var applianceMaterial = element.applianceMaterial;
   if (applianceMaterial.metalness == undefined) applianceMaterial = applianceMaterial.toJS();
+  var newAltitude = element.properties.get('altitude').get('_length');
+  var newUnit = element.properties.get('altitude').get('_unit') || 'in';
+  newAltitude = (0, _convertUnitsLite.convert)(newAltitude).from(newUnit).to(scene.unit);
+  var newWidth = element.properties.get('width').get('_length');
+  var newWidthUnit = element.properties.get('width').get('_unit') || 'in';
+  newWidth = (0, _convertUnitsLite.convert)(newWidth).from(newWidthUnit).to('in');
+  var newHeight = element.properties.get('height').get('_length');
+  var newHeightUnit = element.properties.get('height').get('_unit') || 'in';
+  newHeight = (0, _convertUnitsLite.convert)(newHeight).from(newHeightUnit).to('in');
+  var newDepth = element.properties.get('depth').get('_length');
+  var newDepthUnit = element.properties.get('depth').get('_unit') || 'in';
+  newDepth = (0, _convertUnitsLite.convert)(newDepth).from(newDepthUnit).to('in');
   var onLoadItem = function onLoadItem(object) {
-    var newAltitude = element.properties.get('altitude').get('_length');
-    var newUnit = element.properties.get('altitude').get('_unit') || 'in';
-    newAltitude = (0, _convertUnitsLite.convert)(newAltitude).from(newUnit).to(scene.unit);
-    var newWidth = element.properties.get('width').get('_length');
-    var newWidthUnit = element.properties.get('width').get('_unit') || 'in';
-    newWidth = (0, _convertUnitsLite.convert)(newWidth).from(newWidthUnit).to('in');
-    var newHeight = element.properties.get('height').get('_length');
-    var newHeightUnit = element.properties.get('height').get('_unit') || 'in';
-    newHeight = (0, _convertUnitsLite.convert)(newHeight).from(newHeightUnit).to('in');
-    var newDepth = element.properties.get('depth').get('_length');
-    var newDepthUnit = element.properties.get('depth').get('_unit') || 'in';
-    newDepth = (0, _convertUnitsLite.convert)(newDepth).from(newDepthUnit).to('in');
     object.scale.set(100 * newWidth / sizeinfo.width, 100 * newHeight / sizeinfo.height, 100 * newDepth / sizeinfo.depth);
     // Normalize the origin of the object
     var boundingBox = new Three.Box3().setFromObject(object);
@@ -1358,26 +1358,25 @@ function render3DApplianceItem(element, layer, scene, sizeinfo, structure_json)
 function render3DLightingItem(element, layer, scene, sizeinfo, structure_json) {
   var mode = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
   var structure = structure_json;
+  var width = {
+    length: sizeinfo.width,
+    unit: 'in'
+  };
+  var depth = {
+    length: sizeinfo.depth,
+    unit: 'in'
+  };
+  var height = {
+    length: sizeinfo.height,
+    unit: 'in'
+  };
+  var newWidth = (0, _convertUnitsLite.convert)(width.length).from(width.unit).to('cm');
+  var newDepth = (0, _convertUnitsLite.convert)(depth.length).from(depth.unit).to('cm');
+  var newHeight = (0, _convertUnitsLite.convert)(height.length).from(height.unit).to('cm');
+  var newAltitude = element.properties.get('altitude').get('_length');
+  var newUnit = element.properties.get('altitude').get('_unit') || 'in';
+  newAltitude = (0, _convertUnitsLite.convert)(newAltitude).from(newUnit).to(scene.unit);
   var onLoadItem = function onLoadItem(object) {
-    var width = {
-      length: sizeinfo.width,
-      unit: 'in'
-    };
-    var depth = {
-      length: sizeinfo.depth,
-      unit: 'in'
-    };
-    var height = {
-      length: sizeinfo.height,
-      unit: 'in'
-    };
-    var newWidth = (0, _convertUnitsLite.convert)(width.length).from(width.unit).to('cm');
-    var newDepth = (0, _convertUnitsLite.convert)(depth.length).from(depth.unit).to('cm');
-    var newHeight = (0, _convertUnitsLite.convert)(height.length).from(height.unit).to('cm');
-    var newAltitude = element.properties.get('altitude').get('_length');
-    var newUnit = element.properties.get('altitude').get('_unit') || 'in';
-    newAltitude = (0, _convertUnitsLite.convert)(newAltitude).from(newUnit).to(scene.unit);
-
     //object.scale.set(newWidth, newHeight, newDepth);
     object.scale.set(100, 100, 100);
     // Normalize the origin of the object

package/lib/utils/skinPanelEngine.js

@@ -105,7 +105,7 @@ function getSideFaces(item, layer) {
 }
 function collectLayerItems(layer) {
   var _layer$items;
-  var skinLayouts = new Set([_constants.BASE_CABINET_LAYOUTPOS, _constants.WALL_CABINET_LAYOUTPOS, _constants.TALL_CABINET_LAYOUTPOS, _constants.VANITY_CABINET_LAYOUTPOS]);
+  var skinLayouts = new Set([_constants.BASE_CABINET_LAYOUTPOS, _constants.WALL_CABINET_LAYOUTPOS, _constants.TALL_CABINET_LAYOUTPOS]);
   var skinPanelItems = [];
   var otherItems = [];
   layer === null || layer === void 0 || (_layer$items = layer.items) === null || _layer$items === void 0 || _layer$items.forEach(function (it) {
@@ -376,6 +376,51 @@ function applyVerticalGrouping(faces) {
 function isMP3TallCabinet(sku) {
   return sku === null || sku === void 0 ? void 0 : sku.startsWith('MP3');
 }
+function buildMP3SkinPanelArray(bottomHeight, topHeight, mp3SkinPanelArray) {
+  var skinPanelHeightArray = [],
+    bIndex = -1,
+    tIndex = -1,
+    hArray = [],
+    skinPanelTypeArray = [],
+    temp = 0;
+  // make skinPanelHeightArray : [0,  sum(h1 + h2 +...+ hn)]
+  skinPanelHeightArray[0] = temp;
+  for (var i = 0; i < mp3SkinPanelArray.length; i++) {
+    temp += mp3SkinPanelArray[i][0];
+    skinPanelHeightArray.push(temp);
+  }
+  // calc the zBottom's index
+  for (var _i = 0; _i <= skinPanelHeightArray.length; _i++) {
+    if (bottomHeight < skinPanelHeightArray[_i]) {
+      bIndex = _i - 1;
+      break;
+    }
+  }
+  if (bIndex < 0) {
+    console.log('Error for bottomHeight in buildMP3SkinPanelArray');
+    return [];
+  }
+  // calc the zTop's index
+  for (var _i2 = 0; _i2 <= skinPanelHeightArray.length; _i2++) {
+    if (topHeight <= skinPanelHeightArray[_i2]) {
+      tIndex = _i2;
+      break;
+    }
+  }
+  if (tIndex < 0) {
+    console.log('Error for topHeight in buildMP3SkinPanelArray');
+    return [];
+  }
+  if (tIndex === 0 || bIndex === skinPanelHeightArray.length) return [];
+
+  // make the skinPanelTypeArray using zTop's index and zBottom's index
+  hArray = mp3SkinPanelArray.slice(bIndex, tIndex + 1);
+  for (var _i3 = 0; _i3 < hArray.length; _i3++) {
+    skinPanelTypeArray.push(hArray[_i3][1]);
+  }
+  // return skinPanelTypeArray : e.g. [SKIN_SKU_BSV_24, SKIN_SKU_WSV_2442]
+  return skinPanelTypeArray;
+}
 
 /**
  * Decide which skin panel pieces are needed for a tall cabinet.
@@ -383,7 +428,14 @@ function isMP3TallCabinet(sku) {
 function resolveTallCabinetBundle(face) {
   var item = face.itemInfo;
   if (isMP3TallCabinet(item.sku_number)) {
-    return [_skinPanel.SKIN_SKU_BSV_24, _skinPanel.SKIN_SKU_BSV_24, _skinPanel.SKIN_SKU_WSV_2442];
+    var zBottom = face.zBottom;
+    var zTop = face.zTop;
+    var bottomHeight = (0, _convertUnitsLite.convert)(zBottom).from('cm').to('in');
+    var topHeight = (0, _convertUnitsLite.convert)(zTop).from('cm').to('in');
+    var mp3SkinPanelArray = [[34.5, _skinPanel.SKIN_SKU_BSV_24],
+    // [height of skin panel, type of skin panel]
+    [item.properties.height._length - 76.5, _skinPanel.SKIN_SKU_BSV_24], [42, _skinPanel.SKIN_SKU_WSV_2442]];
+    return buildMP3SkinPanelArray(bottomHeight, topHeight, mp3SkinPanelArray);
   }
   if (face.height > _skinPanel.SKIN_HEIGHT_53_25) {
     return [_skinPanel.SKIN_SKU_USV245325, _skinPanel.SKIN_SKU_WSV_2442];
@@ -453,9 +505,9 @@ function buildSkinPanelData(faces) {
   var removeIdxs = [];
   var newDatas = [];
   var _loop5 = function _loop5() {
-    var iData = tempResult[_i];
+    var iData = tempResult[_i4];
     if (iData.isBackFace) {
-      removeIdxs.push(_i);
+      removeIdxs.push(_i4);
       var count48 = Math.floor(iData.totalLength / 48);
       var count24 = iData.totalLength % 48 > 0 ? 1 : 0;
       var idx48 = tempResult.findIndex(function (v) {
@@ -494,7 +546,7 @@ function buildSkinPanelData(faces) {
       }
     }
   };
-  for (var _i = 0; _i < tempResult.length; _i++) {
+  for (var _i4 = 0; _i4 < tempResult.length; _i4++) {
     _loop5();
   }
   tempResult = tempResult.filter(function (data, idx) {

package/package.json

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