kitchen-simulator 1.0.0-clark.70 → 1.0.0-clark.71

package/es/catalog/factories/wall-factory.js

@@ -16,11 +16,11 @@ var STYLE_LINE = {
   // strokeWidth:1
 };
 var STYLE_INTERIOR_LINE = {
-  strokeWidth: 1,
+  strokeWidth: 2,
   stroke: SharedStyle.INTERIOR_LINE.unselected
 };
 var STYLE_INTERIOR_LINE_SELECTED = {
-  strokeWidth: 2,
+  strokeWidth: 4,
   stroke: SharedStyle.INTERIOR_LINE.selected,
   fill: SharedStyle.INTERIOR_LINE.selected,
   rx: '2px'
@@ -213,9 +213,9 @@ export default function WallFactory(name, info, textures) {
       })));
       return !element.selected ? /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("polygon", {
         points: "".concat(x1, ",").concat(y1, " ").concat(related0x, ",").concat(related0y, " ").concat(related1x, ",").concat(related1y, " ").concat(x2, ",").concat(y2),
-        fill: "url(#pat)",
-        fillRule: "evenodd"
-      }), outwall, /*#__PURE__*/React.createElement("line", {
+        fill: "#CFD8DC"
+        // fillRule="evenodd"
+      }), /*#__PURE__*/React.createElement("line", {
         x1: x1,
         y1: y1,
         x2: x2,
@@ -223,9 +223,9 @@ export default function WallFactory(name, info, textures) {
         style: STYLE_INTERIOR_LINE
       })) : /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("polygon", {
         points: "".concat(x1, ",").concat(y1, " ").concat(related0x, ",").concat(related0y, " ").concat(related1x, ",").concat(related1y, " ").concat(x2, ",").concat(y2),
-        fill: "url(#pat)",
-        fillRule: "evenodd"
-      }), outwall, /*#__PURE__*/React.createElement("line", {
+        fill: "#CFD8DC"
+        // fillRule="evenodd"
+      }), /*#__PURE__*/React.createElement("line", {
         x1: x1,
         y1: y1,
         x2: x2,

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

@@ -354,8 +354,14 @@ export function render3DItem(element, layer, scene, sizeinfo, structure_json, is
   if (layer.toJS().counterTop.uri) {
     counterTop.uri = layer.toJS().counterTop.uri;
   }
-  if ('name' in element.doorStyle) {
-    doorStyles = new Map(element.doorStyle.doorStyles);
+  if (element.doorStyle.has('name')) {
+    var tempDoorStyle = element.doorStyle.toJS().doorStyles;
+    if (!tempDoorStyle.hasOwnProperty('base')) {
+      tempDoorStyle = _objectSpread(_objectSpread({}, tempDoorStyle), {}, {
+        base: ''
+      });
+    }
+    doorStyles = new Map(tempDoorStyle);
     color = element.doorStyle.color;
     glossness = element.doorStyle.glossness;
     handleMaterial.metalness = element.doorStyle.metalness;

package/es/class/line.js

@@ -501,7 +501,7 @@ var Line = /*#__PURE__*/function () {
       // let relatedLines = [];
       var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
       var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', lineID]).toJS();
-      var moveFlag = true;
+      var moveFlag = [];
       var tx = vertices[drawingLine.vertices[1]].x;
       var ty = vertices[drawingLine.vertices[1]].y;
       if (!isEmpty(relatedLines)) {
@@ -509,6 +509,7 @@ var Line = /*#__PURE__*/function () {
         vertices[drawingLine.vertices[1]].y = y;
       }
       var absAngle, lineAngle;
+      var angles = [];
 
       // get the angle of two lines and check the angle
       if (drawingLine.vertices[0] !== drawingLine.vertices[1]) {
@@ -520,9 +521,10 @@ var Line = /*#__PURE__*/function () {
               lineAngle = GeometryUtils.angleBetweenTwoLines(line, drawingLine, vertices);
               // check whether the angle is less than or bigger than specific value.
               absAngle = Math.abs(lineAngle);
+              angles.push(lineAngle);
               if (absAngle < MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
-                moveFlag = false;
-              } else moveFlag = true;
+                moveFlag.push(false);
+              } else moveFlag.push(true);
             }
           });
         } else {
@@ -534,23 +536,36 @@ var Line = /*#__PURE__*/function () {
       }
 
       // if the angle is bigger or less than specific value, the wall mustn't be drawn at new position
-      if (moveFlag) {
+      if (!moveFlag.some(function (flag) {
+        return flag === false;
+      })) {
         tx = x;
         ty = y;
       } else {
-        var rest = MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
         // the origin point of rotation(snapping)
         var ox = vertices[drawingLine.vertices[0]].x;
         var oy = vertices[drawingLine.vertices[0]].y;
-        // determine the direction of rotation.
-        rest = lineAngle > 0 ? -rest : rest;
-        // rotate the current point to last point around the first point of drawing line.
-        var res = GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
-        tx = res.x;
-        ty = res.y;
+        angles.forEach(function (angle, index) {
+          if (!moveFlag[index]) {
+            var absVal = Math.abs(angle);
+            var rest = MIN_ANGLE_DISALLOW_DRAW_WALL - absVal;
+            if (absVal > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
+              absVal = 360 - absVal;
+              rest = -(MIN_ANGLE_DISALLOW_DRAW_WALL - absVal);
+            }
+            // determine the direction of rotation.
+            rest = angle > 0 ? -rest : rest;
+            // rotate the current point to last point around the first point of drawing line.
+            var res = GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
+            tx = res.x;
+            ty = res.y;
+          }
+        });
       }
       // angle snapping as a value of UNIT_ANGLE
-      if (moveFlag && !isEmpty(absAngle) && absAngle % UNIT_ANGLE !== 0) {
+      if (!moveFlag.some(function (flag) {
+        return flag === false;
+      }) && !isEmpty(absAngle) && absAngle % UNIT_ANGLE !== 0) {
         var result = GeometryUtils.snapAngleByUnit(lineAngle, vertices, drawingLine, tx, ty, drawingLine.vertices[1]);
         tx = result.x;
         ty = result.y;

package/es/components/viewer2d/grids/grid-streak.js

@@ -22,7 +22,7 @@ export default function GridStreak(_ref) {
         key: i,
         cx: x,
         cy: y,
-        r: 1.5,
+        r: 2,
         fill: color
       }));
     }

package/es/components/viewer2d/item.js

@@ -118,11 +118,11 @@ export default function Item(_ref, _ref2) {
     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);
+      var _catid = selectedItem.type;
+      var _cat = findCatalogElement(catalog, _catid);
       currentItem = {
         selectedItem: selectedItem,
-        cat: cat
+        cat: _cat
       };
     }
     layer.items.forEach(function (item) {
@@ -260,7 +260,7 @@ export default function Item(_ref, _ref2) {
           if (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)) {
             if (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);
+              a = Math.max.apply(null, comparelength);
             }
           }
         }
@@ -275,8 +275,13 @@ export default function Item(_ref, _ref2) {
   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;
+    }
   });
   if (Array.isArray(PointArray)) {
     itemsActions.storeDistArray(layerID, id, PointArray);
@@ -305,7 +310,7 @@ export default function Item(_ref, _ref2) {
           length: itemDistanceFromLine,
           angle: rotation,
           rotation: element[1],
-          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? -nh : 3 * nh / 4, ") rotate(").concat(element[1], ", 0, 0)")
+          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? cat.info.is_corner !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
         })));
       }
     });