kitchen-simulator 3.1.15 → 4.0.0-alpha.12

package/lib/catalog/areas/area/planner-element.js

@@ -1,16 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 var _export = require("../../factories/export");
-var _parquet = _interopRequireDefault(require("./textures/parquet.jpg"));
-var _tile = _interopRequireDefault(require("./textures/tile1.jpg"));
-var _ceramicTile = _interopRequireDefault(require("./textures/ceramic-tile.jpg"));
-var _strandPorcelain = _interopRequireDefault(require("./textures/strand-porcelain.jpg"));
-var _grass = _interopRequireDefault(require("./textures/grass.jpg"));
 var info = {
   title: 'area',
   tag: ['area'],
@@ -20,31 +14,31 @@ var info = {
 var textures = {
   parquet: {
     name: 'Parquet',
-    uri: _parquet["default"],
+    uri: require("./textures/parquet.jpg"),
     lengthRepeatScale: 0.004,
     heightRepeatScale: 0.004
   },
   tile1: {
     name: 'Tile1',
-    uri: _tile["default"],
+    uri: require("./textures/tile1.jpg"),
     lengthRepeatScale: 0.01,
     heightRepeatScale: 0.01
   },
   ceramic: {
     name: 'Ceramic Tile',
-    uri: _ceramicTile["default"],
+    uri: require("./textures/ceramic-tile.jpg"),
     lengthRepeatScale: 0.02,
     heightRepeatScale: 0.02
   },
   strand_porcelain: {
     name: 'Strand Porcelain Tile',
-    uri: _strandPorcelain["default"],
+    uri: require("./textures/strand-porcelain.jpg"),
     lengthRepeatScale: 0.02,
     heightRepeatScale: 0.02
   },
   grass: {
     name: 'Grass',
-    uri: _grass["default"],
+    uri: require("./textures/grass.jpg"),
     lengthRepeatScale: 0.01,
     heightRepeatScale: 0.01
   }

package/lib/catalog/catalog.js

@@ -254,7 +254,10 @@ var Catalog = exports["default"] = /*#__PURE__*/function () {
       if (name === '') {
         throw new Error('Category has empty name');
       }
-      return !this.hasCategory(name);
+      if (this.hasCategory(name)) {
+        throw new Error('Category has already been registered');
+      }
+      return true;
     }
 
     /**

package/lib/catalog/factories/area-factory-3d.js

@@ -12,7 +12,7 @@ var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
 var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
 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" != _typeof(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 _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var params = {
-  envMap: "HDR",
+  envMap: 'HDR',
   roughness: 0.9,
   metalness: 0.8,
   exposure: 1.0
@@ -67,7 +67,7 @@ var assignUVs = function assignUVs(geometry) {
     var y3 = position.getY(i + 2);
     uvArray.push((x1 + offset.x) / range.x, (y1 + offset.y) / range.y, (x2 + offset.x) / range.x, (y2 + offset.y) / range.y, (x3 + offset.x) / range.x, (y3 + offset.y) / range.y);
   }
-  geometry.setAttribute("uv", new Three.BufferAttribute(new Float32Array(uvArray), 2));
+  geometry.setAttribute('uv', new Three.BufferAttribute(new Float32Array(uvArray), 2));
   geometry.needsUpdate = true;
 };
 function createArea(element, layer, scene, textures) {
@@ -78,15 +78,14 @@ function createArea(element, layer, scene, textures) {
   var texture = element.texture;
   texture.lengthRepeatScale = 0.01;
   texture.heightRepeatScale = 0.01;
-  var color = element.properties.get("patternColor");
+  var color = element.properties.get('patternColor');
   if (element.selected) {
     color = SharedStyle.AREA_MESH_COLOR.selected;
   } else {
     color = SharedStyle.AREA_MESH_COLOR.unselected;
   }
-  if (texture.uri === undefined || texture.uri == "") {
-    // @todo THIS IS A TEMPORARY FIX TO HAVE A DEFAULT FLOOR TEXTURE
-    texture.uri = layer.floorStyle.uri || "https://media.test.diydesignspace.com/uploads/CountTop/202203162950_2/texture/oak-barcelona-s.jpg";
+  if (texture.uri === undefined || texture.uri == '') {
+    texture.uri = layer.floorStyle.uri;
   }
   var shape = new _three.Shape();
   shape.moveTo(vertices[0].x, vertices[0].y);
@@ -94,7 +93,7 @@ function createArea(element, layer, scene, textures) {
     shape.lineTo(vertices[i].x, vertices[i].y);
   }
   function loadFloorENV() {
-    return new _RGBELoader.RGBELoader().load("/assets/Window.hdr", function (texture) {
+    return new _RGBELoader.RGBELoader().load('/assets/Window.hdr', function (texture) {
       texture.mapping = Three.EquirectangularReflectionMapping;
       return texture;
     });
@@ -114,8 +113,8 @@ function createArea(element, layer, scene, textures) {
   /* Create holes for the area */
   element.holes.forEach(function (holeID) {
     var holeCoords = [];
-    layer.getIn(["areas", holeID, "vertices"]).forEach(function (vertexID) {
-      var _layer$getIn = layer.getIn(["vertices", vertexID]),
+    layer.getIn(['areas', holeID, 'vertices']).forEach(function (vertexID) {
+      var _layer$getIn = layer.getIn(['vertices', vertexID]),
         x = _layer$getIn.x,
         y = _layer$getIn.y;
       holeCoords.push([x, y]);
@@ -142,7 +141,7 @@ function createArea(element, layer, scene, textures) {
   var area = new _three.Mesh(shapeGeometry, areaMaterial);
   area.rotation.x -= Math.PI / 2;
   area.receiveShadow = true;
-  area.name = "floor";
+  area.name = 'floor';
   // This mesh is use for creating ceiling mesh
 
   var shapeGeometry2 = new Three.ShapeGeometry(shape);
@@ -153,7 +152,7 @@ function createArea(element, layer, scene, textures) {
   area2.castShadow = true;
   area2.rotation.x -= Math.PI / 2;
   area2.receiveShadow = true;
-  area2.name = "floorSupport";
+  area2.name = 'floorSupport';
   var floorSupport = area2.clone();
   area.userData.floorSupport = floorSupport;
   return Promise.resolve(area);
@@ -163,13 +162,13 @@ function updatedArea(element, layer, scene, textures, mesh, oldElement, differen
     selfDestroy();
     return selfBuild();
   };
-  var floor = mesh.getObjectByName("floor");
+  var floor = mesh.getObjectByName('floor');
   floor.receiveShadow = true;
-  if (differences[0] == "selected") {
+  if (differences[0] == 'selected') {
     var color = element.selected ? SharedStyle.AREA_MESH_COLOR.selected : SharedStyle.AREA_MESH_COLOR.unselected;
     floor.material.color.set(color);
-  } else if (differences[0] == "properties") {
-    if (differences[1] === "texture") {
+  } else if (differences[0] == 'properties') {
+    if (differences[1] === 'texture') {
       return noPerf();
     }
   } else return noPerf();

package/lib/catalog/factories/wall-factory-3d.js

@@ -35,13 +35,13 @@ var halfPI = Math.PI / 2;
 var applyTexture = function applyTexture(material, texture, length, height) {
   var loader = new _three.TextureLoader();
   if (texture) {
-    material.map = loader.load(texture.uri);
+    material.map = loader.load(texture.uri["default"]);
     material.map.colorSpace = Three.SRGBColorSpace, material.needsUpdate = true;
     material.map.wrapS = _three.RepeatWrapping;
     material.map.wrapT = _three.RepeatWrapping;
     material.map.repeat.set(length * texture.lengthRepeatScale, height * texture.heightRepeatScale);
     if (texture.normal) {
-      material.normalMap = loader.load(texture.normal.uri);
+      material.normalMap = loader.load(texture.normal.uri["default"]);
       material.normalScale = new _three.Vector2(texture.normal.normalScaleX, texture.normal.normalScaleY);
       material.normalMap.wrapS = _three.RepeatWrapping;
       material.normalMap.wrapT = _three.RepeatWrapping;

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

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

package/lib/catalog/lines/wall/planner-element.js

@@ -1,25 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 var _export = require("../../factories/export");
-var _wall = _interopRequireDefault(require("./wall.png"));
-var _plaster = _interopRequireDefault(require("./textures/plaster.jpg"));
-var _plasterNormal = _interopRequireDefault(require("./textures/plaster-normal.jpg"));
-var _bricks = _interopRequireDefault(require("./textures/bricks.jpg"));
-var _bricksNormal = _interopRequireDefault(require("./textures/bricks-normal.jpg"));
-var _painted = _interopRequireDefault(require("./textures/painted.jpg"));
-var _paintedNormal = _interopRequireDefault(require("./textures/painted-normal.jpg"));
-var _morden = _interopRequireDefault(require("./textures/morden.jpg"));
-var _mordenNormal = _interopRequireDefault(require("./textures/morden-normal.jpg"));
 var info = {
   title: 'wall',
   tag: ['wall'],
   description: 'Wall with bricks or painted',
-  image: _wall["default"],
+  image: require("./wall.png"),
   visibility: {
     catalog: true,
     layerElementsVisible: true
@@ -28,11 +18,11 @@ var info = {
 var textures = {
   plaster: {
     name: 'Plaster',
-    uri: _plaster["default"],
+    uri: require("./textures/plaster.jpg"),
     lengthRepeatScale: 0.005,
     heightRepeatScale: 0.005,
     normal: {
-      uri: _plasterNormal["default"],
+      uri: require("./textures/plaster-normal.jpg"),
       lengthRepeatScale: 0.005,
       heightRepeatScale: 0.005,
       normalScaleX: 0.4,
@@ -42,11 +32,11 @@ var textures = {
   },
   bricks: {
     name: 'Bricks',
-    uri: _bricks["default"],
+    uri: require("./textures/bricks.jpg"),
     lengthRepeatScale: 0.009,
     heightRepeatScale: 0.009,
     normal: {
-      uri: _bricksNormal["default"],
+      uri: require("./textures/bricks-normal.jpg"),
       lengthRepeatScale: 0.009,
       heightRepeatScale: 0.009,
       normalScaleX: 0.4,
@@ -56,11 +46,11 @@ var textures = {
   },
   painted: {
     name: 'Painted',
-    uri: _painted["default"],
+    uri: require("./textures/painted.jpg"),
     lengthRepeatScale: 0.005,
     heightRepeatScale: 0.005,
     normal: {
-      uri: _paintedNormal["default"],
+      uri: require("./textures/painted-normal.jpg"),
       lengthRepeatScale: 0.005,
       heightRepeatScale: 0.005,
       normalScaleX: 0.4,
@@ -70,11 +60,11 @@ var textures = {
   },
   morden: {
     name: 'Morden',
-    uri: _morden["default"],
+    uri: require("./textures/morden.jpg"),
     lengthRepeatScale: 0.005,
     heightRepeatScale: 0.005,
     normal: {
-      uri: _mordenNormal["default"],
+      uri: require("./textures/morden-normal.jpg"),
       lengthRepeatScale: 0.005,
       heightRepeatScale: 0.005,
       normalScaleX: 0.4,

package/lib/catalog/utils/exporter.js

@@ -26,12 +26,10 @@ function _default(_ref) {
     is_corner = _ref.is_corner,
     alti = _ref.alti,
     obj_property = _ref.obj_property,
-    outlineSVGData = _ref.outlineSVGData,
-    cds = _ref.cds;
+    outlineSVGData = _ref.outlineSVGData;
   var _length = alti || 0;
-  var length = (0, _convertUnitsLite.convert)(_length).from('in').to('cm');
-  // const length = _length;
-
+  // const length = convert(_length).from("in").to("cm");
+  var length = _length;
   var additional_props = [];
   if (type === 'cabinet' && long_name.toLowerCase().includes('filler')) {
     additional_props = {
@@ -143,7 +141,6 @@ function _default(_ref) {
     }),
     img: base,
     obj: obj_property,
-    cds: cds,
     render2D: function render2D(element, layer, scene) {
       return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
     },