kitchen-simulator 4.4.4 → 5.0.0-new-api

package/lib/utils/molding.js

@@ -591,7 +591,23 @@ function getLinesFromItems2(moldingGroup, layer, catalog) {
       })) return 1; // continue
       var mergedResult = getMergedLine(MGlines[_i3], filteredMGlines, 0);
       if (mergedResult) {
-        newMGlines.push(mergedResult.mergedLine);
+        // keep origin line direction
+        var rstLine = mergedResult.mergedLine;
+        // if (
+        //   (Math.abs(MGlines[i][0].x - rstLine[1].x) < EPSILON &&
+        //     Math.abs(MGlines[i][0].y - rstLine[1].y) < EPSILON) ||
+        //   (Math.abs(MGlines[i][1].x - rstLine[0].x) < EPSILON &&
+        //     Math.abs(MGlines[i][1].y - rstLine[0].y) < EPSILON)
+        // ) {
+        //   // swap two end points
+        //   const tx = rstLine[0].x;
+        //   const ty = rstLine[0].y;
+        //   rstLine[0].x = rstLine[1].x;
+        //   rstLine[0].y = rstLine[1].y;
+        //   rstLine[1].x = tx;
+        //   rstLine[1].y = ty;
+        // }
+        newMGlines.push(rstLine);
         filteredMGlines = mergedResult.filteredMGlines;
       }
     },

package/lib/utils/skinPanelEngine.js

@@ -74,6 +74,7 @@ function getSideFaces(item, layer) {
       var skinPanelSKU = 'unknown';
       switch (item.layoutpos) {
         case _constants.BASE_CABINET_LAYOUTPOS:
+        case _constants.VANITY_CABINET_LAYOUTPOS:
           skinPanelSKU = i === 2 ? 'unknown' : _skinPanel.SKIN_SKU_BSV_24;
           break;
         case _constants.WALL_CABINET_LAYOUTPOS:
@@ -104,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]);
+  var skinLayouts = new Set([_constants.BASE_CABINET_LAYOUTPOS, _constants.WALL_CABINET_LAYOUTPOS, _constants.TALL_CABINET_LAYOUTPOS, _constants.VANITY_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) {
@@ -195,8 +196,7 @@ function filterFacesBlockedByFaces(sourceFaces, blockingFaces) {
   var overlapList = [_constants.OVERLAP_INCLUDED, _constants.OVERLAP_SAME];
   var removeIdxs = [];
   var newFaces = []; // new countour edge segment that except the overlapped part
-
-  for (var i = 0; i < sourceFaces.length; i++) {
+  var _loop3 = function _loop3(i) {
     var iFace = sourceFaces[i];
     for (var j = 0; j < blockingFaces.length; j++) {
       var _relationship$trimmed;
@@ -245,11 +245,16 @@ function filterFacesBlockedByFaces(sourceFaces, blockingFaces) {
         break;
       } else if (relationship.result === _constants.OVERLAP_SOME && ((_relationship$trimmed = relationship.trimmedSegs) === null || _relationship$trimmed === void 0 ? void 0 : _relationship$trimmed.length) > 0 && verticallyIncluded) {
         removeIdxs.push(i);
-        var tFaceSegs = getTrimmedFaceSegs([iFace], blockingFaces, 0);
+        var tFaceSegs = getTrimmedFaceSegs([iFace], sourceFaces === blockingFaces ? blockingFaces.filter(function (v, idx) {
+          return idx !== i;
+        }) : blockingFaces, 0);
         if (tFaceSegs.length > 0) newFaces = [].concat((0, _toConsumableArray2["default"])(newFaces), (0, _toConsumableArray2["default"])(tFaceSegs));
         break;
       }
     }
+  };
+  for (var i = 0; i < sourceFaces.length; i++) {
+    _loop3(i);
   }
   sourceFaces = sourceFaces.filter(function (face, idx) {
     return !removeIdxs.includes(idx);
@@ -390,13 +395,13 @@ function resolveSkinPanelSKU(face) {
  */
 function buildSkinPanelData(faces) {
   var tempResult = [];
-  var _loop3 = function _loop3() {
+  var _loop4 = function _loop4() {
     var sf = faces[i];
     var skus = resolveSkinPanelSKU(sf);
     var _iterator = _createForOfIteratorHelper(skus),
       _step;
     try {
-      var _loop5 = function _loop5() {
+      var _loop6 = function _loop6() {
         var sku = _step.value;
         var idx = tempResult.findIndex(function (v) {
           var _sf$itemInfo;
@@ -420,7 +425,7 @@ function buildSkinPanelData(faces) {
         }
       };
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        _loop5();
+        _loop6();
       }
     } catch (err) {
       _iterator.e(err);
@@ -429,13 +434,13 @@ function buildSkinPanelData(faces) {
     }
   };
   for (var i = 0; i < faces.length; i++) {
-    _loop3();
+    _loop4();
   }
 
   // calculate back face panel quantity of island base cabinets
   var removeIdxs = [];
   var newDatas = [];
-  var _loop4 = function _loop4() {
+  var _loop5 = function _loop5() {
     var iData = tempResult[_i];
     if (iData.isBackFace) {
       removeIdxs.push(_i);
@@ -478,7 +483,7 @@ function buildSkinPanelData(faces) {
     }
   };
   for (var _i = 0; _i < tempResult.length; _i++) {
-    _loop4();
+    _loop5();
   }
   tempResult = tempResult.filter(function (data, idx) {
     return !removeIdxs.includes(idx);

package/package.json

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