kitchen-simulator 4.4.4 → 4.4.6

package/es/constants.js

@@ -452,7 +452,7 @@ export var UNIT_FOOT = 'ft';
 export var UNIT_MILE = 'mi';
 export var UNITS_LENGTH = [UNIT_MILLIMETER, UNIT_CENTIMETER, UNIT_METER, UNIT_INCH, UNIT_FOOT, UNIT_MILE];
 export var CEIL_UNITS_LENGTH = [UNIT_CENTIMETER, UNIT_METER, UNIT_INCH, UNIT_FOOT];
-export var EPSILON = 1e-2;
+export var EPSILON = 0.5;
 
 // distance between item and wall
 export var DISTANCE_EPSILON = 5.0; //5.08; // 2 inch

package/es/utils/skinPanelEngine.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-import { BASE_CABINET_LAYOUTPOS, WALL_CABINET_LAYOUTPOS, TALL_CABINET_LAYOUTPOS, OVERLAP_INCLUDED, OVERLAP_SAME, OVERLAP_LINK, OVERLAP_SOME, EPSILON } from "../constants";
+import { BASE_CABINET_LAYOUTPOS, WALL_CABINET_LAYOUTPOS, TALL_CABINET_LAYOUTPOS, OVERLAP_INCLUDED, OVERLAP_SAME, OVERLAP_LINK, OVERLAP_SOME, EPSILON, VANITY_CABINET_LAYOUTPOS } from "../constants";
 import { buildRectFromLines, getAllLines, pointsDistance, relationshipOfTwoOverlappedLines, rotatePointAroundPoint } from "./geometry";
 import { MathUtils } from "./export";
 import { convert } from "./convert-units-lite";
@@ -66,6 +66,7 @@ export function getSideFaces(item, layer) {
       var skinPanelSKU = 'unknown';
       switch (item.layoutpos) {
         case BASE_CABINET_LAYOUTPOS:
+        case VANITY_CABINET_LAYOUTPOS:
           skinPanelSKU = i === 2 ? 'unknown' : SKIN_SKU_BSV_24;
           break;
         case WALL_CABINET_LAYOUTPOS:
@@ -96,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]);
+  var skinLayouts = new Set([BASE_CABINET_LAYOUTPOS, WALL_CABINET_LAYOUTPOS, TALL_CABINET_LAYOUTPOS, 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) {
@@ -187,8 +188,7 @@ function filterFacesBlockedByFaces(sourceFaces, blockingFaces) {
   var overlapList = [OVERLAP_INCLUDED, 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;
@@ -237,11 +237,16 @@ function filterFacesBlockedByFaces(sourceFaces, blockingFaces) {
         break;
       } else if (relationship.result === 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(_toConsumableArray(newFaces), _toConsumableArray(tFaceSegs));
         break;
       }
     }
+  };
+  for (var i = 0; i < sourceFaces.length; i++) {
+    _loop3(i);
   }
   sourceFaces = sourceFaces.filter(function (face, idx) {
     return !removeIdxs.includes(idx);
@@ -382,13 +387,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;
@@ -412,7 +417,7 @@ function buildSkinPanelData(faces) {
         }
       };
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        _loop5();
+        _loop6();
       }
     } catch (err) {
       _iterator.e(err);
@@ -421,13 +426,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);
@@ -470,7 +475,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/lib/constants.js

@@ -462,7 +462,7 @@ var UNIT_FOOT = exports.UNIT_FOOT = 'ft';
 var UNIT_MILE = exports.UNIT_MILE = 'mi';
 var UNITS_LENGTH = exports.UNITS_LENGTH = [UNIT_MILLIMETER, UNIT_CENTIMETER, UNIT_METER, UNIT_INCH, UNIT_FOOT, UNIT_MILE];
 var CEIL_UNITS_LENGTH = exports.CEIL_UNITS_LENGTH = [UNIT_CENTIMETER, UNIT_METER, UNIT_INCH, UNIT_FOOT];
-var EPSILON = exports.EPSILON = 1e-2;
+var EPSILON = exports.EPSILON = 0.5;
 
 // distance between item and wall
 var DISTANCE_EPSILON = exports.DISTANCE_EPSILON = 5.0; //5.08; // 2 inch

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": "4.4.6",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",