kitchen-simulator 4.0.1 → 4.0.2

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

@@ -454,8 +454,9 @@ export function render3DItem(element, layer, scene, sizeinfo, structure_json, is
   var tempDoorStyles = doorStyles.toJS();
   var tempPlaceholders = structure.tempPlaceholders;
   var tPlaceholders = tempPlaceholders.find(function (el) {
-    var _tempDoorStyles$cds$;
-    return el.id === (tempDoorStyles === null || tempDoorStyles === void 0 ? void 0 : tempDoorStyles.cabinet_door_style_id) || el.id === (tempDoorStyles === null || tempDoorStyles === void 0 || (_tempDoorStyles$cds$ = tempDoorStyles.cds[0]) === null || _tempDoorStyles$cds$ === void 0 ? void 0 : _tempDoorStyles$cds$.cabinet_door_style_id);
+    var _tempDoorStyles$cds, _tempDoorStyles$cds$;
+    if (tempDoorStyles !== null && tempDoorStyles !== void 0 && tempDoorStyles.cabinet_door_style_id) return el.id === (tempDoorStyles === null || tempDoorStyles === void 0 ? void 0 : tempDoorStyles.cabinet_door_style_id);else if ((tempDoorStyles === null || tempDoorStyles === void 0 || (_tempDoorStyles$cds = tempDoorStyles.cds) === null || _tempDoorStyles$cds === void 0 ? void 0 : _tempDoorStyles$cds.length) > 0) return el.id === (tempDoorStyles === null || tempDoorStyles === void 0 || (_tempDoorStyles$cds$ = tempDoorStyles.cds[0]) === null || _tempDoorStyles$cds$ === void 0 ? void 0 : _tempDoorStyles$cds$.cabinet_door_style_id);
+    return false;
   });
   if (tPlaceholders !== undefined) {
     placeholders = tPlaceholders.placeholders;

package/es/class/project.js

@@ -830,10 +830,11 @@ var Project = /*#__PURE__*/function () {
     key: "createRoomWithShape",
     value: function createRoomWithShape(state, roomShapeType, width, height, doorStyle) {
       var catalog = state.catalog;
-      // keep measurement unit
+      // keep measurement unit, sceneHistory
       var curLayerID = state.scene.selectedLayer;
       var layerUnit = state.getIn(['scene', 'layers', curLayerID, 'unit']);
       var ceilHeight = state.getIn(['scene', 'layers', curLayerID, 'ceilHeight']);
+      var sceneHistory = state.getIn(['sceneHistory']);
       state = this.newProject(state).updatedState;
       state = state.merge({
         catalog: catalog
@@ -920,9 +921,10 @@ var Project = /*#__PURE__*/function () {
         }
       }
 
-      // copy keeped measurement unit
+      // copy keeped measurement unit, sceneHistory
       state = state.setIn(['scene', 'layers', layerID, 'unit'], layerUnit);
       state = state.setIn(['scene', 'layers', layerID, 'ceilHeight'], ceilHeight);
+      state = state.setIn(['sceneHistory'], sceneHistory);
       state = centering2D(state);
       return {
         updatedState: state

package/es/components/viewer2d/item.js

@@ -6,7 +6,7 @@ import { convert } from "../../utils/convert-units-lite";
 import { GeometryUtils } from "../../utils/export";
 import { MODE_ROTATING_ITEM, WALL_CABINET_LAYOUTPOS } from "../../constants";
 import { isEmpty, isWarningItem, returnReplaceableDeepSearchType } from "./utils";
-import { findCatalogElement } from "../../utils/geometry";
+import { calcDistancesFromItemToWalls, findCatalogElement } from "../../utils/geometry";
 var STYLE_LINE = {
   fill: '#0096fd',
   stroke: '#0096fd'
@@ -29,22 +29,6 @@ export default function Item(_ref, _ref2) {
     catalog = _ref.catalog,
     mode = _ref.mode;
   var itemsActions = _ref2.itemsActions;
-  var x = item.x,
-    y = item.y,
-    rotation = item.rotation,
-    id = item.id,
-    layoutpos = item.layoutpos;
-  var showBaseCabinetMeasure = scene.showBaseCabinetMeasure,
-    showWallCabinetMeasure = scene.showWallCabinetMeasure;
-  var vertices = layer.vertices;
-  var layerID = scene.selectedLayer;
-  var element = catalog.getElement(item.type);
-  var allLines;
-  var curiteminfo;
-  var allLineRects;
-  var allItemRect;
-  var width, height;
-  var altitude = item.properties.getIn(['altitude', '_length']);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     clockRotateState = _useState2[0],
@@ -53,13 +37,14 @@ export default function Item(_ref, _ref2) {
     _useState4 = _slicedToArray(_useState3, 2),
     antiClockRotateState = _useState4[0],
     setAntiClockRotateState = _useState4[1];
-  var val = {
-    pos: {
-      x: item.x,
-      y: item.y
-    },
-    rotRad: item.rotation / 180 * Math.PI
-  };
+  var x = item.x,
+    y = item.y,
+    rotation = item.rotation,
+    id = item.id;
+  var element = catalog.getElement(item.type);
+  var showBaseCabinetMeasure = scene.showBaseCabinetMeasure,
+    showWallCabinetMeasure = scene.showWallCabinetMeasure;
+  var width, height;
   var tempWidth = item.properties.get('width');
   var tempHeight = item.properties.get('depth');
   if (tempWidth || tempHeight) {
@@ -69,245 +54,16 @@ export default function Item(_ref, _ref2) {
     width = convert(element.info.sizeinfo.width).from('in').to('cm');
     height = convert(element.info.sizeinfo.depth).from('in').to('cm');
   }
-  var angle = rotation + 90;
-  val.size = {
-    width: width,
-    height: height
-  };
-  function point(x, y) {
-    return {
-      x: x,
-      y: y
-    };
-  }
-  function getCalcRectFromItem(items) {
-    var x = items.pos.x;
-    var y = items.pos.y;
-    var w = items.size.width / 2;
-    var h = items.size.height / 2;
-    var rotRad = items.rotRad;
-    var mh = 3 * h / 4;
-    var mx = x - w * Math.cos(rotRad) - mh * Math.sin(rotRad);
-    var my = y - w * Math.sin(rotRad) + mh * Math.cos(rotRad);
-    var m2x = x + w * Math.cos(rotRad) - mh * Math.sin(rotRad);
-    var m2y = y + w * Math.sin(rotRad) + mh * Math.cos(rotRad);
-    var m3x = x - h * Math.sin(rotRad);
-    var m3y = y + h * Math.cos(rotRad);
-    var m1x = x + h * Math.sin(rotRad);
-    var m1y = y - h * Math.cos(rotRad);
-    var x0 = mx + h * Math.sin(rotRad);
-    var y0 = my - h * Math.cos(rotRad);
-    var x3 = mx * 2 - x0;
-    var y3 = my * 2 - y0;
-    var x1 = x * 2 - x3;
-    var y1 = y * 2 - y3;
-    var x2 = x * 2 - x0;
-    var y2 = y * 2 - y0;
-    return {
-      rectCenterPoint: [[point(mx, my), 180], [point(m1x, m1y), -90], [point(m2x, m2y), 0], [point(m3x, m3y), 90]]
-    };
-  }
-  function getAllItems() {
-    var rectarray = [];
-    var currentItem;
-    var selectedItem;
-    if (layer.selected.items.size > 0) {
-      selectedItem = layer.getIn(['items', layer.selected.items.get(0)]);
-      var _catid = selectedItem.type;
-      var _cat = findCatalogElement(catalog, _catid);
-      currentItem = {
-        selectedItem: selectedItem,
-        cat: _cat
-      };
-    }
-    layer.items.forEach(function (item) {
-      var val = {
-        pos: {
-          x: item.x,
-          y: item.y
-        },
-        rotRad: item.rotation / 180 * Math.PI
-      };
-      var catid = item.type;
-      var cat = findCatalogElement(catalog, catid);
-      var width = convert(item.properties.getIn(['width', '_length'])).from('in').to('cm');
-      var height = convert(item.properties.getIn(['depth', '_length'])).from('in').to('cm');
-      // let width = cat.info.sizeinfo.width;
-      // let height = cat.info.sizeinfo.depth;
-      val.size = {
-        width: width,
-        height: height
-      };
-      var otherItem = {
-        item: item,
-        cat: cat
-      };
-
-      // if (!GeometryUtils.needSnap(currentItem, otherItem)) {
-      //   return;
-      // }
-
-      if (!item.selected) {
-        var detectObjectsAtSameAltitudeFlag = layoutpos === 'Base' ? item.properties.getIn(['altitude', '_length']) <= altitude + tempHeight.get('_length') : item.properties.getIn(['altitude', '_length']) + item.properties.getIn(['height', '_length']) >= altitude;
-        if (detectObjectsAtSameAltitudeFlag) {
-          var _x = val.pos.x;
-          var _y = val.pos.y;
-          var rotRad = val.rotRad;
-          var w = val.size.width / 2;
-          var h = val.size.height / 2;
-          var mx = _x - w * Math.cos(rotRad);
-          var my = _y - w * Math.sin(rotRad);
-          var x0 = mx + h * Math.sin(rotRad);
-          var y0 = my - h * Math.cos(rotRad);
-          var x3 = mx * 2 - x0;
-          var y3 = my * 2 - y0;
-          var x1 = _x * 2 - x3;
-          var y1 = _y * 2 - y3;
-          var x2 = _x * 2 - x0;
-          var y2 = _y * 2 - y0;
-          rectarray.push({
-            rect: [point(x0, y0), point(x1, y1), point(x0, y0), point(x1, y1)]
-          });
-          rectarray.push({
-            rect: [point(x1, y1), point(x2, y2), point(x1, y1), point(x2, y2)]
-          });
-          rectarray.push({
-            rect: [point(x2, y2), point(x3, y3), point(x2, y2), point(x3, y3)]
-          });
-          rectarray.push({
-            rect: [point(x3, y3), point(x0, y0), point(x3, y3), point(x0, y0)]
-          });
-        }
-      }
-    });
-
-    // layer.holes.forEach(hole => {
-    //   let val = {pos:{x:hole.x, y:hole.y}, rotRad:hole.rotation};
-    //   let catid = hole.type;
-    //   let cat = catalog.elements[catid];
-    //   let width = hole.properties.getIn(['width']).getIn(['length']);
-    //   let height = hole.properties.getIn(['height']).getIn(['length']);
-    //   val.size = {width, height};
-    //   let otherItem = {
-    //     hole,
-    //     cat
-    //   }
-
-    //   // if (!GeometryUtils.needSnap(currentItem, otherItem)) {
-    //   //   return;
-    //   // }
-
-    //   if (!hole.selected) {
-    //     let x = val.pos.x;
-    //     let y = val.pos.y;
-    //     let rotRad = val.rotRad;
-    //     let w = val.size.width / 2;
-    //     let mx = x - w * Math.cos(rotRad);
-    //     let my = y - w * Math.sin(rotRad);
-    //     let kx = x + w * Math.cos(rotRad);
-    //     let ky = y + w * Math.sin(rotRad);
-    //     let x0 = mx - 10 * Math.sin(rotRad);
-    //     let y0 = my + 10 * Math.cos(rotRad);
-    //     let x3 = mx + 10 * Math.sin(rotRad);
-    //     let y3 = my - 10 * Math.cos(rotRad);
-    //     let x1 = kx - 10 * Math.sin(rotRad);
-    //     let y1 = ky + 10 * Math.cos(rotRad);
-    //     let x2 = kx + 10 * Math.sin(rotRad);
-    //     let y2 = ky - 10 * Math.cos(rotRad);
-    //     rectarray.push({'rect':[point(x0,y0), point(x1,y1) ,point(x0,y0), point(x1,y1)]});
-    //     rectarray.push({'rect':[point(x1,y1), point(x2,y2), point(x1,y1), point(x2,y2)]}); // right
-    //     rectarray.push({'rect':[point(x2,y2), point(x3,y3), point(x2,y2), point(x3,y3)]}); // front
-    //     rectarray.push({'rect':[point(x3,y3), point(x0,y0), point(x3,y3), point(x0,y0)]}); // left
-    //   }
-    // });
-    return {
-      others: rectarray
-    };
-  }
-  allItemRect = getAllItems();
-  allLines = GeometryUtils.getAllLines(layer);
-  allLineRects = GeometryUtils.buildRectFromLines(layer, allLines);
-  var allRect = allLineRects.concat(allItemRect.others);
-  curiteminfo = getCalcRectFromItem(val);
-
-  /**
-   *
-   * @param x y position
-   * @param y x position
-   * @param rotRad item's rotation in radian
-   */
-  var getDistant = function getDistant(x, y, rotRad) {
-    var center_h = 3 * height / 8;
-    var center_x = x; // middle of front line of cabinet rect
-    var center_y = y;
-    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 _loop = function _loop(i) {
-      var centerpoint = curiteminfo.rectCenterPoint[i];
-      // [rectCenterPoint] has four middle points of cabinet rect edges
-      var comparelength = []; // distance array from rectCenterPoint[i] to other lines(walls, other cabinet rect edges)
-      var a;
-      var RectLineFuction; // normal line of cabinet rect edge
-      if (centerpoint[1] === 180 || centerpoint[1] === 0) RectLineFuction = GeometryUtils.linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x1, center_y1);else RectLineFuction = GeometryUtils.linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x, center_y);
-      allRect.forEach(function (linerect) {
-        // calc distance to all other lines
-        var p0 = GeometryUtils.clone_point(linerect.rect[2]);
-        var p1 = GeometryUtils.clone_point(linerect.rect[3]);
-        var lineFunction = {}; // other line function
-        if (p0.x !== p1.x || p0.y !== p1.y) lineFunction = GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
-        // intersection between normal line and other line
-        var coordinatePoint = GeometryUtils.twoLinesIntersection(lineFunction.a, lineFunction.b, lineFunction.c, RectLineFuction.a, RectLineFuction.b, RectLineFuction.c);
-        if (coordinatePoint !== undefined) {
-          if (
-          // intersection point is on the other line
-          GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > GeometryUtils.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 (GeometryUtils.isPointOnLineSegment(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y, otherCenterPoint[0].x, otherCenterPoint[0].y)) isOutside = false;
-            }
-            if (isOutside && GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
-              comparelength.push(GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
-              a = Math.min.apply(null, comparelength);
-            }
-          }
-        }
-      });
-      PointArray.push([a, centerpoint[1]]);
-    };
-    for (var i = 0; i < curiteminfo.rectCenterPoint.length; i++) {
-      _loop(i);
-    }
-    return {
-      PointArray: PointArray
-    };
-  };
-  var nw = width / 2;
-  var nh = height / 2;
-  var _getDistant = getDistant(x, y, val.rotRad),
-    PointArray = _getDistant.PointArray;
-  var catid = item.type;
-  var cat = catalog.elements[catid];
-  PointArray.forEach(function (pointElement, index) {
-    if (pointElement[0] == undefined) PointArray[index][0] = 0;
-    // if (pointElement[1] === -90 && cat.info.is_corner !== 1) {
-    //   PointArray[index][0] -= 4;
-    // }
-  });
-  var cnt = 0;
-  PointArray.forEach(function (pointElement) {
-    if (pointElement[0] == 0) cnt++;
-  });
-  if (cnt == 4 || cnt == 3) {
-    PointArray[0][0] = 100;
-    PointArray[1][0] = 100;
-  }
+  var _calcDistancesFromIte = calcDistancesFromItemToWalls(item, layer),
+    PointArray = _calcDistancesFromIte.PointArray;
+  var layerID = scene.selectedLayer;
   if (Array.isArray(PointArray)) {
     itemsActions.storeDistArray(layerID, id, PointArray);
   }
+  var catid = item.type;
+  var cat = catalog.elements[catid];
+  var nw = width / 2;
+  var nh = height / 2;
   var renderedRuler = [];
   var ep = 0.1;
   if (item.selected) {

package/es/components/viewer3d/ruler-utils/scene3D.js

@@ -14,7 +14,7 @@ export default function Scene3D(_ref) {
     downloadFlag = _ref.downloadFlag;
   var layers = scene.layers;
   var selectedLayer = layers.get(scene.selectedLayer);
-  var ceilHeight = selectedLayer.ceilHeight;
+  var ceilHeight = Number(selectedLayer.ceilHeight);
   var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
   var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
   var vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));

package/es/plugins/console-debugger.js

@@ -27,6 +27,8 @@ export default function consoleDebugger() {
     });
     console.groupCollapsed('KitchenConfigurator');
     console.info('KitchenConfigurator is ready');
+    console.info('console.log(KitchenConfigurator)');
+    console.log(window.KitchenConfigurator);
     console.groupEnd();
   };
 }

package/es/reducers/project-reducer.js

@@ -126,6 +126,9 @@ export default function (state, action) {
     case SET_IS_CABINET_DRAWING:
       return Project.setIsCabinetDrawing(state, action.isCabinetDrawing).updatedState;
     case CREATE_ROOM_WITH_SHAPE:
+      state = state.merge({
+        sceneHistory: history.historyPush(state.sceneHistory, state.scene)
+      });
       return Project.createRoomWithShape(state, action.roomShapeType, action.width, action.height, action.doorStyle).updatedState;
     default:
       return state;

package/es/utils/geometry.js

@@ -2450,11 +2450,10 @@ function getCalcRectFromItem2(itemInfo) {
   var w = itemInfo.size.width / 2;
   var h = itemInfo.size.height / 2;
   var rotRad = itemInfo.rotRad;
-  var mh = 3 * h / 4;
-  var mx = x - w * Math.cos(rotRad) - mh * Math.sin(rotRad);
-  var my = y - w * Math.sin(rotRad) + mh * Math.cos(rotRad);
-  var m2x = x + w * Math.cos(rotRad) - mh * Math.sin(rotRad);
-  var m2y = y + w * Math.sin(rotRad) + mh * Math.cos(rotRad);
+  var mx = x - w * Math.cos(rotRad);
+  var my = y - w * Math.sin(rotRad);
+  var m2x = x + w * Math.cos(rotRad);
+  var m2y = y + w * Math.sin(rotRad);
   var m3x = x - h * Math.sin(rotRad);
   var m3y = y + h * Math.cos(rotRad);
   var m1x = x + h * Math.sin(rotRad);
@@ -2465,7 +2464,6 @@ function getCalcRectFromItem2(itemInfo) {
 }
 function getAllItems2(curItem, layer) {
   var rectarray = [];
-  var tempHeight = curItem.get('properties').get('depth');
   layer.items.forEach(function (item) {
     var val = {
       pos: {
@@ -2474,14 +2472,21 @@ function getAllItems2(curItem, layer) {
       },
       rotRad: item.rotation / 180 * Math.PI
     };
-    var width = convert(item.properties.getIn(['width', '_length'])).from('in').to('cm');
-    var height = convert(item.properties.getIn(['depth', '_length'])).from('in').to('cm');
+    var width = convert(item.properties.getIn(['width', '_length'])).from(curItem.get('properties').get('width').get('_unit')).to('cm');
+    var height = convert(item.properties.getIn(['depth', '_length'])).from(curItem.get('properties').get('depth').get('_unit')).to('cm');
     val.size = {
       width: width,
       height: height
     };
+    var curItemTall = convert(curItem.get('properties').get('height').get('_length')).from(curItem.get('properties').get('height').get('_unit')).to('cm');
+    var zMinCurItem = convert(curItem.get('properties').get('altitude').get('_length')).from(curItem.get('properties').get('altitude').get('_unit')).to('cm');
+    var zMaxCurItem = zMinCurItem + curItemTall;
     if (curItem.get('id') !== item.id) {
-      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']);
+      var detectObjectsAtSameAltitudeFlag = false;
+      var itemTall = convert(item.properties.getIn(['height', '_length'])).from(item.get('properties').get('height').get('_unit')).to('cm');
+      var zMinItem = convert(item.properties.getIn(['altitude', '_length'])).from(item.get('properties').get('altitude').get('_unit')).to('cm');
+      var zMaxItem = zMinItem + itemTall;
+      if (zMinItem >= zMinCurItem && zMinItem < zMaxCurItem || zMinCurItem >= zMinItem && zMinCurItem < zMaxItem) detectObjectsAtSameAltitudeFlag = true;
       if (detectObjectsAtSameAltitudeFlag) {
         var x = val.pos.x;
         var y = val.pos.y;
@@ -2530,11 +2535,8 @@ export function calcDistancesFromItemToWalls(curItem, layer) {
     width = convert(curItem.info.sizeinfo.width).from('in').to('cm');
     height = convert(curItem.info.sizeinfo.depth).from('in').to('cm');
   }
-  var center_h = 3 * height / 8;
   var center_x = x; // middle of front line of cabinet rect
   var center_y = y;
-  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 = {
     pos: {
@@ -2557,8 +2559,8 @@ export function calcDistancesFromItemToWalls(curItem, layer) {
     var centerpoint = curiteminfo.rectCenterPoint[i];
     var comparelength = []; // distance array from rectCenterPoint[i] to other lines(walls, other cabinet rect edges)
     var a;
-    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);
+    var RectLineFuction = linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x, center_y); // normal line of cabinet rect edge
+
     allRect.forEach(function (linerect) {
       // calc distance to all other lines
       var p0 = clone_point(linerect.rect[2]);