kitchen-simulator 3.1.12 → 3.1.13

package/lib/utils/geometry.js

@@ -2581,7 +2581,7 @@ function getAllItems2(curItem, layer) {
       height: height
     };
     if (curItem.get('id') !== item.id) {
-      var detectObjectsAtSameAltitudeFlag = item.layoutpos === 'Base' ? item.properties.getIn(['altitude', '_length']) <= curItem.get('properties').getIn(['altitude', '_length']) + tempHeight.get('_length') : item.properties.getIn(['altitude', '_length']) + item.properties.getIn(['height', '_length']) >= curItem.get('properties').getIn(['altitude', '_length']);
+      var detectObjectsAtSameAltitudeFlag = curItem.get('layoutpos') === 'Base' ? item.properties.getIn(['altitude', '_length']) <= curItem.get('properties').getIn(['altitude', '_length']) + tempHeight.get('_length') : item.properties.getIn(['altitude', '_length']) + item.properties.getIn(['height', '_length']) >= curItem.get('properties').getIn(['altitude', '_length']);
       if (detectObjectsAtSameAltitudeFlag) {
         var x = val.pos.x;
         var y = val.pos.y;
@@ -2631,9 +2631,9 @@ function calcDistancesFromItemToWalls(curItem, layer) {
     height = (0, _convertUnitsLite.convert)(curItem.info.sizeinfo.depth).from('in').to('cm');
   }
   var center_h = 3 * height / 8;
-  var center_x = x;
+  var center_x = x; // middle of front line of cabinet rect
   var center_y = y;
-  var center_x1 = x - center_h * Math.sin(rotRad);
+  var center_x1 = x - center_h * Math.sin(rotRad); // center point of cabinet rect
   var center_y1 = y + center_h * Math.cos(rotRad);
   var PointArray = [];
   var itemInfo = {
@@ -2652,20 +2652,33 @@ function calcDistancesFromItemToWalls(curItem, layer) {
   var allLines = getAllLines(layer);
   var allLineRects = buildRectFromLines(layer, allLines);
   var allRect = allLineRects.concat(allItemRect.others);
-  curiteminfo.rectCenterPoint.forEach(function (centerpoint) {
-    var comparelength = [];
+  var _loop = function _loop(i) {
+    // [rectCenterPoint] has four middle points of cabinet rect edges
+    var centerpoint = curiteminfo.rectCenterPoint[i];
+    var comparelength = []; // distance array from rectCenterPoint[i] to other lines(walls, other cabinet rect edges)
     var a;
-    var RectLineFuction;
+    var RectLineFuction; // normal line of cabinet rect edge
     if (centerpoint[1] === 180 || centerpoint[1] === 0) RectLineFuction = linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x1, center_y1);else RectLineFuction = linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x, center_y);
     allRect.forEach(function (linerect) {
+      // calc distance to all other lines
       var p0 = clone_point(linerect.rect[2]);
       var p1 = clone_point(linerect.rect[3]);
-      var lineFunction = {};
+      var lineFunction = {}; // other line function
       if (p0.x !== p1.x || p0.y !== p1.y) lineFunction = linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
+      // intersection between normal line and other line
       var coordinatePoint = twoLinesIntersection(lineFunction.a, lineFunction.b, lineFunction.c, RectLineFuction.a, RectLineFuction.b, RectLineFuction.c);
       if (coordinatePoint !== undefined) {
-        if (pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
-          if (pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
+        if (
+        // intersection point is on the other line
+        pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
+          // check the intersection point is outside direction of edge
+          var isOutside = true;
+          for (var j = 0; j < curiteminfo.rectCenterPoint.length; j++) {
+            if (j === i) continue;
+            var otherCenterPoint = curiteminfo.rectCenterPoint[j];
+            if (isPointOnLineSegment(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y, otherCenterPoint[0].x, otherCenterPoint[0].y)) isOutside = false;
+          }
+          if (isOutside && pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
             comparelength.push(pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
             a = Math.min.apply(null, comparelength);
           }
@@ -2673,7 +2686,10 @@ function calcDistancesFromItemToWalls(curItem, layer) {
       }
     });
     PointArray.push([a, centerpoint[1]]);
-  });
+  };
+  for (var i = 0; i < curiteminfo.rectCenterPoint.length; i++) {
+    _loop(i);
+  }
   PointArray.forEach(function (pointElement, index) {
     if (pointElement[0] == undefined) PointArray[index][0] = 0;
   });

package/lib/utils/isolate-event-handler.js

@@ -1046,14 +1046,14 @@ function movePan2D3D(props, payload, state) {
       case _constants.RIGHT:
         window.interval = setTimeout(function () {
           window.tDKeyDown({
-            keyCode: 39
+            keyCode: 37
           });
         }, 50);
         break;
       case _constants.LEFT:
         window.interval = setTimeout(function () {
           window.tDKeyDown({
-            keyCode: 37
+            keyCode: 39
           });
         }, 50);
         break;
@@ -1066,7 +1066,7 @@ function handleExternalEvent(_x10) {
 function _handleExternalEvent() {
   _handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(props) {
     var _evt$payload3, _evt$payload4;
-    var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5;
+    var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, _state$getIn, element, cds, _cds$find, currentCdsId, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5;
     return _regenerator["default"].wrap(function (_context1) {
       while (1) switch (_context1.prev = _context1.next) {
         case 0:
@@ -1183,7 +1183,19 @@ function _handleExternalEvent() {
             _context1.next = 11;
             break;
           }
-          element = evt.payload;
+          element = evt.payload; ///// filter the tempPlaceholders using layer-doorstyle-cds
+          cds = (_state$getIn = state.getIn(['scene', 'layers', 'layer-1', 'doorStyle'])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.cds;
+          if (cds) {
+            currentCdsId = (_cds$find = cds.find(function (c) {
+              return c.itemID === element.itemID;
+            })) === null || _cds$find === void 0 ? void 0 : _cds$find.cabinet_door_style_id;
+            if (currentCdsId && element.structure_json.tempPlaceholders.length > 0) {
+              element.structure_json.tempPlaceholders[0] = element.structure_json.tempPlaceholders.find(function (tPlaceholder) {
+                return tPlaceholder.id === currentCdsId;
+              });
+            }
+          }
+          /////
           _context1.next = 10;
           return addItemToCatalog(element, state, props.catalog, props.projectActions);
         case 10:

package/package.json

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