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

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

@@ -27,7 +27,8 @@ var _helper = require("../../utils/helper");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-// env Map ///////////////
+var INITIAL_NORMAL_MAP = '';
+
 // env Map ///////////////
 var paramsCounter = {
   envMap: 'HDR',
@@ -51,6 +52,13 @@ var paramsModel = {
   exposure: 1.0
   // debug: false
 };
+var buttons = [{
+  name: 'Edit',
+  thumbnail: '/assets/img/svg/3d_item_warning_edit.svg'
+}, {
+  name: 'Info',
+  thumbnail: '/assets/img/svg/3d_item_warning_info.svg'
+}];
 
 // /////////////////////////
 
@@ -178,8 +186,9 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
   // let arrow_style = { stroke: element.selected ? '#0096fd' : null, strokeWidth: "2px", fill: "#84e1ce" };
 
   var rendered = null;
+  var svg_url, svg_width, svg_depth;
   if (shape_svg || el_euro_shape_svg) {
-    var svg_url, svg_width, svg_depth;
+    var _element$toJS$doorSty;
     if (typeof shape_svg == 'string' || typeof el_euro_shape_svg == 'string') {
       if (el_DSN === 'Euro & Frameless' && el_is_euro_cds) {
         svg_url = el_euro_shape_svg;
@@ -201,7 +210,73 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
     }
     var padding_width = padding * newWidth / svg_width;
     var padding_depth = padding * newDepth / svg_depth;
+
+    // offset of the warning icons(by default, show the icons with width direction and if depth is bigger than width, show with depth direction.)
+    var transX = svg_width < svg_depth ? 0 : 10;
+    var transY = svg_width < svg_depth ? 10 : 0;
+    var warning_buttons = /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", {
+      id: "warning_info_2d",
+      style: {
+        cursor: 'pointer',
+        transform: "translate(".concat(-transX, "px, ").concat(-transY, "px)")
+      },
+      onMouseEnter: function onMouseEnter(event) {
+        var bbox = event.target.getBoundingClientRect();
+        document.getElementById('warning_box_2d').style.display = 'flex';
+        document.getElementById('warning_box_2d').style.top = "".concat(bbox.top - 60, "px");
+        document.getElementById('warning_box_2d').style.left = "".concat(bbox.left, "px");
+      },
+      onMouseLeave: function onMouseLeave() {
+        document.getElementById('warning_box_2d').style.display = 'none';
+      }
+    }, /*#__PURE__*/_react["default"].createElement("circle", {
+      cx: 0,
+      cy: 0,
+      r: 8,
+      fill: "white"
+    }), /*#__PURE__*/_react["default"].createElement("image", {
+      width: 15,
+      height: 15,
+      x: -7.5,
+      y: -7.5,
+      style: {
+        transform: "rotate(".concat(180 - element.rotation, "deg)")
+      },
+      href: buttons[1].thumbnail
+    })), /*#__PURE__*/_react["default"].createElement("g", {
+      style: {
+        cursor: 'pointer',
+        transform: "translate(".concat(transX, "px, ").concat(transY, "px)")
+      },
+      "data-element-root": true,
+      "data-prototype": element.prototype,
+      "data-id": element.id,
+      "data-selected": element.selected,
+      "data-layer": layer.id,
+      "data-part": "warning_edit"
+    }, /*#__PURE__*/_react["default"].createElement("circle", {
+      cx: 0,
+      cy: 0,
+      r: 8,
+      fill: "white"
+    }), /*#__PURE__*/_react["default"].createElement("image", {
+      width: 15,
+      height: 15,
+      x: -7.5,
+      y: -7.5,
+      style: {
+        transform: "rotate(".concat(90 - element.rotation, "deg)")
+      },
+      href: buttons[0].thumbnail
+    })));
+
+    // show item
     rendered = /*#__PURE__*/_react["default"].createElement("g", {
+      "data-element-root": true,
+      "data-prototype": element.prototype,
+      "data-id": element.id,
+      "data-selected": element.selected,
+      "data-layer": layer.id,
       onMouseOver: function onMouseOver(event) {
         setHover(true);
       },
@@ -229,20 +304,19 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
       y: "".concat(padding_depth),
       width: "".concat(newWidth),
       height: "".concat(newDepth),
-      visibility: element.toJS().doorStyle.doorStyles !== undefined ? element.toJS().doorStyle.doorStyles && element.toJS().doorStyle.doorStyles.cds && element.toJS().doorStyle.doorStyles.cds.length != 0 && element.toJS().doorStyle.doorStyles.cds.filter(function (cd) {
-        return cd.itemID == element.getIn(['itemID']);
-      }) ? 'hidden' : 'visible' : 'hidden',
+      visibility: 'hidden',
       style: {
         pointerEvents: 'all',
         opacity: 0.7,
         postion: 'relative'
-      },
-      fill: _constants.STATUS_WARNING_LIGHT_COLOR,
-      stroke: _constants.STATUS_WARNING_COLOR,
-      strokeWidth: "2px"
+      }
     }), /*#__PURE__*/_react["default"].createElement("g", {
       transform: "translate(".concat(padding_width, ",").concat(padding_depth, ")")
-    }, txtContent))));
+    }, txtContent)), element.category === 'cabinet' && /*#__PURE__*/_react["default"].createElement("g", {
+      visibility: (element === null || element === void 0 || (_element$toJS$doorSty = element.toJS().doorStyle) === null || _element$toJS$doorSty === void 0 || (_element$toJS$doorSty = _element$toJS$doorSty.doorStyles) === null || _element$toJS$doorSty === void 0 || (_element$toJS$doorSty = _element$toJS$doorSty.cds) === null || _element$toJS$doorSty === void 0 ? void 0 : _element$toJS$doorSty.filter(function (cd) {
+        return cd.itemID == (element === null || element === void 0 ? void 0 : element.getIn(['itemID']));
+      }).length) > 0 ? 'hidden' : 'visible'
+    }, warning_buttons)));
   } else {
     rendered = /*#__PURE__*/_react["default"].createElement("g", {
       onMouseOver: function onMouseOver(event) {
@@ -369,14 +443,8 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
   if (layer.toJS().counterTop.uri) {
     counterTop.uri = layer.toJS().counterTop.uri;
   }
-  if (element.doorStyle.has('name')) {
-    var tempDoorStyle = element.doorStyle.toJS().doorStyles;
-    if (!tempDoorStyle.hasOwnProperty('base')) {
-      tempDoorStyle = _objectSpread(_objectSpread({}, tempDoorStyle), {}, {
-        base: ''
-      });
-    }
-    doorStyles = new _immutable.Map(tempDoorStyle);
+  if ('name' in element.doorStyle) {
+    doorStyles = new _immutable.Map(element.doorStyle.doorStyles);
     color = element.doorStyle.color;
     glossness = element.doorStyle.glossness;
     handleMaterial.metalness = element.doorStyle.metalness;
@@ -411,8 +479,8 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
     var areaMaterial = new Three.MeshStandardMaterial();
     areaMaterial.side = Three.DoubleSide;
     // areaMaterial.envMap = textureCube;
-    if (doorStyles != null) if (doorStyles.get('base') != undefined) {
-      var normalMap = doorStyles.get('base');
+    if ((0, _helper.isEmpty)(doorStyles)) {
+      var normalMap = doorStyles.get('base') || INITIAL_NORMAL_MAP;
       var interiortexture = loadTexture(normalMap);
       applyTexture(areaMaterial, interiortexture, 100, 100);
     }
@@ -835,9 +903,10 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
         }
 
         // set Door Style////
-        if (doorStyles != null) if (doorStyles.get(keys[i]) != undefined) {
+        if (doorStyles != null) {
+          // if (doorStyles.get(keys[i]) != undefined) {
           // let normalMap = "catalog/items/doorstyle/" + doorStyles.get(keys[i]);
-          var _normalMap = doorStyles.get(keys[i]);
+          var _normalMap = doorStyles.get(keys[i]) || INITIAL_NORMAL_MAP;
           var _mat;
           if (_normalMap === '') {
             var examplecolor = new Three.Color(parseInt(color.slice(1), 16)).convertLinearToSRGB();
@@ -871,27 +940,32 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
               });
             }
           }
-        } else {
-          var _mat2 = new Three.MeshStandardMaterial({
-            metalness: glossness === 1 ? params.metalness : params.metalness_glossy,
-            roughness: glossness || params.roughness
-          });
-          // mat2.envMap = textureCube;
-          for (var _j5 = 0; _j5 < object.children.length; _j5++) {
-            if (object.children[_j5].type === _constants.OBJTYPE_MESH) {
-              object.children[_j5].material = _mat2;
-              object.children[_j5].receiveShadow = true;
-            }
-          }
         }
+        // } else {
+        //   let mat2 = new Three.MeshStandardMaterial({
+        //     metalness:
+        //       glossness === 1
+        //         ? params.metalness
+        //         : params.metalness_glossy,
+        //     roughness: glossness || params.roughness
+        //   });
+        //   // mat2.envMap = textureCube;
+        //   for (let j = 0; j < object.children.length; j++) {
+        //     if (object.children[j].type === OBJTYPE_MESH) {
+        //       object.children[j].material = mat2;
+        //       object.children[j].receiveShadow = true;
+        //     }
+        //   }
+        // }
+
         for (var _i2 = 0; _i2 < phsArray.length; _i2++) {
           var _phs = phsArray[_i2];
           var parent = objGroup;
-          for (var _j6 = 0; _j6 < _phs.length; _j6++) {
-            var placeholder = _phs[_j6];
+          for (var _j5 = 0; _j5 < _phs.length; _j5++) {
+            var placeholder = _phs[_j5];
             for (var _k = 0; _k < ((_parent = parent) === null || _parent === void 0 ? void 0 : _parent.children.length); _k++) {
               var _parent;
-              if (_j6 != _phs.length - 1) {
+              if (_j5 != _phs.length - 1) {
                 if (parent.children[_k].name == placeholder) {
                   parent = parent.children[_k].children[0];
                   break;
@@ -927,8 +1001,8 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
     object.name = 'MainObject';
     object.receiveShadow = true;
     objGroup = object;
-    if (doorStyles != null) if (doorStyles.get('base') != undefined) {
-      var normalMap = doorStyles.get('base');
+    if (!(0, _helper.isEmpty)(doorStyles)) {
+      var normalMap = doorStyles.get('base') || INITIAL_NORMAL_MAP;
       if (counterTop.uri === undefined) {
         try {
           counterTop = counterTop.toJS();

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

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

package/lib/components/viewer2d/item.js

@@ -87,13 +87,6 @@ function Item(_ref, _ref2) {
       y: y
     };
   }
-  var buttons = [{
-    name: 'Edit',
-    thumbnail: '/assets/img/svg/3d_item_warning_edit.svg'
-  }, {
-    name: 'Info',
-    thumbnail: '/assets/img/svg/3d_item_warning_info.svg'
-  }];
   function getCalcRectFromItem(items) {
     var x = items.pos.x;
     var y = items.pos.y;
@@ -127,11 +120,11 @@ 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 = (0, _geometry.findCatalogElement)(catalog, _catid);
+      var catid = selectedItem.type;
+      var cat = (0, _geometry.findCatalogElement)(catalog, catid);
       currentItem = {
         selectedItem: selectedItem,
-        cat: _cat
+        cat: cat
       };
     }
     layer.items.forEach(function (item) {
@@ -269,7 +262,7 @@ function Item(_ref, _ref2) {
           if (_export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && _export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
             if (_export.GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > _export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
               comparelength.push(_export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
-              a = Math.max.apply(null, comparelength);
+              a = Math.min.apply(null, comparelength);
             }
           }
         }
@@ -284,13 +277,8 @@ 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);
@@ -319,7 +307,7 @@ 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 ? cat.info.is_corner !== 1 ? -(nh + 4) : -nh : 0, ") 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 ? -nh : 3 * nh / 4, ") rotate(").concat(element[1], ", 0, 0)")
         })));
       }
     });
@@ -328,66 +316,7 @@ function Item(_ref, _ref2) {
   var isSmall = false;
   if (width < 40) isSmall = true;
   var parts = [];
-  var warning_buttons = '';
   var newWidth = item.toJS().properties.width.length;
-  if (item.toJS().doorStyle.doorStyles && item.toJS().doorStyle.doorStyles.cds && item.toJS().doorStyle.doorStyles.cds.filter(function (cd) {
-    return cd.itemID == item.getIn(['itemID']);
-  }).length === 0 && item.category === 'cabinet') warning_buttons = /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", {
-    id: "warning_info_2d",
-    style: {
-      transform: "translate(0px,20px)",
-      cursor: 'pointer'
-    },
-    onMouseEnter: function onMouseEnter(event) {
-      var bbox = event.target.getBoundingClientRect();
-      if (!(0, _utils.isEmpty)(document.getElementById('warning_box_2d'))) {
-        document.getElementById('warning_box_2d').style.display = 'flex';
-        document.getElementById('warning_box_2d').style.top = "".concat(bbox.top - 60, "px");
-        document.getElementById('warning_box_2d').style.left = "".concat(bbox.left, "px");
-      }
-    },
-    onMouseLeave: function onMouseLeave() {
-      if (!(0, _utils.isEmpty)(document.getElementById('warning_box_2d'))) document.getElementById('warning_box_2d').style.display = 'none';
-    }
-  }, /*#__PURE__*/_react["default"].createElement("circle", {
-    cx: 0,
-    cy: 0,
-    r: 8,
-    fill: "white"
-  }), /*#__PURE__*/_react["default"].createElement("image", {
-    width: 15,
-    height: 15,
-    x: -7.5,
-    y: -7.5,
-    style: {
-      transform: "rotate(".concat(180 - item.rotation, "deg)")
-    },
-    href: buttons[1].thumbnail
-  })), /*#__PURE__*/_react["default"].createElement("g", {
-    style: {
-      cursor: 'pointer'
-    },
-    "data-element-root": true,
-    "data-prototype": item.prototype,
-    "data-id": item.id,
-    "data-selected": item.selected,
-    "data-layer": layer.id,
-    "data-part": "warning_edit"
-  }, /*#__PURE__*/_react["default"].createElement("circle", {
-    cx: 0,
-    cy: 0,
-    r: 8,
-    fill: "white"
-  }), /*#__PURE__*/_react["default"].createElement("image", {
-    width: 15,
-    height: 15,
-    x: -7.5,
-    y: -7.5,
-    style: {
-      transform: "rotate(".concat(90 - item.rotation, "deg)")
-    },
-    href: buttons[0].thumbnail
-  })));
   if (item.selected) parts = [/*#__PURE__*/_react["default"].createElement("g", {
     key: 0,
     "data-element-root": true,
@@ -509,7 +438,7 @@ function Item(_ref, _ref2) {
     style: {
       cursor: 'initial'
     }
-  }, measure ? renderedRuler : null, parts, warning_buttons));
+  }, measure ? renderedRuler : null, parts));
 }
 Item.propTypes = {
   item: _propTypes["default"].object.isRequired,