kitchen-simulator 4.0.0-queuedEvents → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (111) hide show
  1. package/es/LiteKitchenConfigurator.js +141 -288
  2. package/es/LiteRenderer.js +159 -398
  3. package/es/actions/items-actions.js +10 -6
  4. package/es/actions/lines-actions.js +3 -1
  5. package/es/actions/project-actions.js +15 -5
  6. package/es/assets/img/svg/bottombar/elevation.svg +12 -5
  7. package/es/catalog/areas/area/planner-element.js +10 -5
  8. package/es/catalog/catalog.js +1 -4
  9. package/es/catalog/factories/area-factory-3d.js +2 -1
  10. package/es/catalog/factories/wall-factory-3d.js +2 -2
  11. package/es/catalog/factories/wall-factory.js +8 -8
  12. package/es/catalog/lines/wall/planner-element.js +18 -9
  13. package/es/catalog/utils/exporter.js +7 -3
  14. package/es/catalog/utils/item-loader.js +24 -14
  15. package/es/catalog/utils/mtl-loader.js +2 -2
  16. package/es/catalog/utils/obj-loader.js +2 -2
  17. package/es/class/hole.js +0 -2
  18. package/es/class/item.js +183 -184
  19. package/es/class/line.js +11 -3
  20. package/es/class/project.js +165 -48
  21. package/es/components/content.js +19 -6
  22. package/es/components/viewer2d/grids/grid-streak.js +1 -1
  23. package/es/components/viewer2d/item.js +84 -51
  24. package/es/components/viewer2d/line.js +315 -243
  25. package/es/components/viewer2d/ruler.js +20 -38
  26. package/es/components/viewer2d/rulerDist.js +48 -78
  27. package/es/components/viewer2d/utils.js +6 -0
  28. package/es/components/viewer2d/viewer2d.js +298 -220
  29. package/es/components/viewer3d/front3D.js +3 -2
  30. package/es/components/viewer3d/libs/mtl-loader.js +2 -2
  31. package/es/components/viewer3d/libs/obj-loader.js +2 -2
  32. package/es/components/viewer3d/libs/orbit-controls.js +3 -4
  33. package/es/components/viewer3d/libs/pointer-lock-controls.js +6 -7
  34. package/es/components/viewer3d/scene-creator.js +51 -15
  35. package/es/components/viewer3d/viewer3d.js +121 -82
  36. package/es/constants.js +111 -3
  37. package/es/devLiteRenderer.js +688 -31
  38. package/es/index.js +567 -87
  39. package/es/models.js +9 -5
  40. package/es/plugins/SVGLoader.js +7 -5
  41. package/es/plugins/console-debugger.js +0 -2
  42. package/es/plugins/keyboard.js +15 -6
  43. package/es/reducers/items-reducer.js +5 -5
  44. package/es/reducers/lines-reducer.js +1 -1
  45. package/es/reducers/project-reducer.js +5 -3
  46. package/es/shared-style.js +4 -4
  47. package/es/utils/geometry.js +163 -2
  48. package/es/utils/get-edges-of-subgraphs.js +1 -1
  49. package/es/utils/graph-cycles.js +1 -1
  50. package/es/utils/graph.js +1 -1
  51. package/es/utils/helper.js +105 -3
  52. package/es/utils/isolate-event-handler.js +1542 -164
  53. package/es/utils/molding.js +461 -11
  54. package/lib/LiteKitchenConfigurator.js +141 -289
  55. package/lib/LiteRenderer.js +159 -399
  56. package/lib/actions/items-actions.js +10 -6
  57. package/lib/actions/lines-actions.js +3 -1
  58. package/lib/actions/project-actions.js +15 -4
  59. package/lib/assets/img/svg/bottombar/elevation.svg +12 -5
  60. package/lib/catalog/areas/area/planner-element.js +11 -5
  61. package/lib/catalog/catalog.js +1 -4
  62. package/lib/catalog/factories/area-factory-3d.js +2 -1
  63. package/lib/catalog/factories/wall-factory-3d.js +2 -2
  64. package/lib/catalog/factories/wall-factory.js +8 -8
  65. package/lib/catalog/lines/wall/planner-element.js +19 -9
  66. package/lib/catalog/utils/exporter.js +7 -3
  67. package/lib/catalog/utils/item-loader.js +24 -14
  68. package/lib/catalog/utils/mtl-loader.js +9 -2
  69. package/lib/catalog/utils/obj-loader.js +10 -2
  70. package/lib/class/hole.js +0 -2
  71. package/lib/class/item.js +180 -181
  72. package/lib/class/line.js +9 -1
  73. package/lib/class/project.js +164 -47
  74. package/lib/components/content.js +19 -6
  75. package/lib/components/viewer2d/grids/grid-streak.js +1 -1
  76. package/lib/components/viewer2d/item.js +83 -50
  77. package/lib/components/viewer2d/line.js +315 -242
  78. package/lib/components/viewer2d/ruler.js +19 -37
  79. package/lib/components/viewer2d/rulerDist.js +48 -78
  80. package/lib/components/viewer2d/utils.js +7 -0
  81. package/lib/components/viewer2d/viewer2d.js +296 -219
  82. package/lib/components/viewer3d/front3D.js +3 -2
  83. package/lib/components/viewer3d/libs/mtl-loader.js +9 -2
  84. package/lib/components/viewer3d/libs/obj-loader.js +9 -2
  85. package/lib/components/viewer3d/libs/orbit-controls.js +11 -5
  86. package/lib/components/viewer3d/libs/pointer-lock-controls.js +13 -7
  87. package/lib/components/viewer3d/scene-creator.js +49 -13
  88. package/lib/components/viewer3d/viewer3d.js +119 -80
  89. package/lib/constants.js +116 -7
  90. package/lib/devLiteRenderer.js +687 -30
  91. package/lib/index.js +567 -87
  92. package/lib/models.js +9 -5
  93. package/lib/plugins/SVGLoader.js +7 -5
  94. package/lib/plugins/console-debugger.js +0 -2
  95. package/lib/plugins/keyboard.js +15 -6
  96. package/lib/reducers/items-reducer.js +5 -5
  97. package/lib/reducers/lines-reducer.js +1 -1
  98. package/lib/reducers/project-reducer.js +4 -2
  99. package/lib/shared-style.js +4 -4
  100. package/lib/utils/geometry.js +164 -2
  101. package/lib/utils/get-edges-of-subgraphs.js +6 -1
  102. package/lib/utils/graph-cycles.js +7 -8
  103. package/lib/utils/graph.js +6 -1
  104. package/lib/utils/helper.js +108 -2
  105. package/lib/utils/isolate-event-handler.js +1538 -159
  106. package/lib/utils/molding.js +463 -9
  107. package/package.json +1 -1
  108. package/es/assets/Window.hdr +0 -2100
  109. package/es/assets/img/1.jpg +0 -0
  110. package/lib/assets/Window.hdr +0 -2100
  111. package/lib/assets/img/1.jpg +0 -0
@@ -83,9 +83,11 @@ function editWidth(newWidth, layerID, itemID) {
83
83
  };
84
84
  }
85
85
  function duplicateSelected(currentObject) {
86
+ var onInternalEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
86
87
  return {
87
88
  type: _constants.DUPLICATE_SELECTED,
88
- currentObject: currentObject
89
+ currentObject: currentObject,
90
+ onInternalEvent: onInternalEvent
89
91
  };
90
92
  }
91
93
  function replaceItem(selectedPos, currentObject, selectedObject) {
@@ -127,11 +129,13 @@ function selectToolDrawingItem3D(sceneComponentType) {
127
129
  };
128
130
  }
129
131
  function updateDrawingItem(layerID, x, y) {
132
+ var isInitialPos = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
130
133
  return {
131
134
  type: _constants.UPDATE_DRAWING_ITEM,
132
135
  layerID: layerID,
133
136
  x: x,
134
- y: y
137
+ y: y,
138
+ isInitialPos: isInitialPos
135
139
  };
136
140
  }
137
141
  function endDrawingItem(layerID, x, y) {
@@ -274,10 +278,11 @@ function updateItemsAltitude(layerID, itemID, value) {
274
278
  value: value
275
279
  };
276
280
  }
277
- function setDoorStyle(doorStyle, isAll) {
281
+ function setDoorStyle(doorStyle, itemCDS, isAll) {
278
282
  return {
279
283
  type: _constants.SET_DOOR_STYLE,
280
284
  doorStyle: doorStyle,
285
+ itemCDS: itemCDS,
281
286
  isAll: isAll
282
287
  };
283
288
  }
@@ -342,11 +347,10 @@ function setModelling(model) {
342
347
  model: model
343
348
  };
344
349
  }
345
- function setInitialDoorStyle(doorStyle, oStyle) {
350
+ function setInitialDoorStyle(doorStyle) {
346
351
  return {
347
352
  type: _constants.SET_INITIAL_DOOR_STYLE,
348
- doorStyle: doorStyle,
349
- oStyle: oStyle
353
+ doorStyle: doorStyle
350
354
  };
351
355
  }
352
356
  function setMoveStatus(status) {
@@ -28,12 +28,14 @@ function selectToolDrawingLine(sceneComponentType) {
28
28
  };
29
29
  }
30
30
  function beginDrawingLine(layerID, x, y, snapMask) {
31
+ var onInternalEvent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
31
32
  return {
32
33
  type: _constants.BEGIN_DRAWING_LINE,
33
34
  layerID: layerID,
34
35
  x: x,
35
36
  y: y,
36
- snapMask: snapMask
37
+ snapMask: snapMask,
38
+ onInternalEvent: onInternalEvent
37
39
  };
38
40
  }
39
41
  function updateDrawingLine(x, y, relatedLines, snapMask) {
@@ -9,6 +9,7 @@ exports.addHorizontalGuide = addHorizontalGuide;
9
9
  exports.addVerticalGuide = addVerticalGuide;
10
10
  exports.changeCatalogPage = changeCatalogPage;
11
11
  exports.copyProperties = copyProperties;
12
+ exports.createRoomWithShape = createRoomWithShape;
12
13
  exports.goBackToCatalogPage = goBackToCatalogPage;
13
14
  exports.initCatalog = initCatalog;
14
15
  exports.loadProject = loadProject;
@@ -69,11 +70,10 @@ function setStateProperties(properties) {
69
70
  properties: properties
70
71
  };
71
72
  }
72
- function loadProject(sceneJSON, categoryData) {
73
+ function loadProject(sceneJSON) {
73
74
  return {
74
75
  type: _constants.LOAD_PROJECT,
75
- sceneJSON: sceneJSON,
76
- categoryData: categoryData
76
+ sceneJSON: sceneJSON
77
77
  };
78
78
  }
79
79
  function newProject() {
@@ -151,8 +151,10 @@ function setHolesAttributes(holesAttributes) {
151
151
  };
152
152
  }
153
153
  function remove() {
154
+ var delObject = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
154
155
  return {
155
- type: _constants.REMOVE
156
+ type: _constants.REMOVE,
157
+ delObject: delObject
156
158
  };
157
159
  }
158
160
  function undo() {
@@ -336,4 +338,13 @@ function selectAll() {
336
338
  type: _constants.SELECT_ALL,
337
339
  value: value
338
340
  };
341
+ }
342
+ function createRoomWithShape(roomShapeType, width, height, doorStyle) {
343
+ return {
344
+ type: _constants.CREATE_ROOM_WITH_SHAPE,
345
+ width: width,
346
+ height: height,
347
+ roomShapeType: roomShapeType,
348
+ doorStyle: doorStyle
349
+ };
339
350
  }
@@ -1,6 +1,13 @@
1
- <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
- <path d="M14.5566 21L1.90534 17.3692L0.994629 4.08225L14.8953 6.34589L14.5566 21Z" stroke="#4C12A1" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 3"/>
3
- <path d="M14.5564 21L20.2416 14.9342L21.0051 2.53974L14.8952 6.34589" stroke="#4C12A1" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 3"/>
4
- <path d="M8.91868 1L9.14126 12.3969L1.90534 17.3692L0.994629 4.08224L8.91868 1Z" stroke="#4C12A1" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 3"/>
5
- <path d="M8.9187 1L21.0053 2.53972L20.2418 14.9342L9.14128 12.3969L8.9187 1Z" stroke="#4C12A1" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 3"/>
1
+ <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+ <g clip-path="url(#clip0_1516_100789)">
3
+ <path d="M4.25 6L2 7.125L8 10.125L14 7.125L11.75 6" stroke="rgba(58, 11, 128, 1)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
4
+ <path d="M2 10.125L8 13.125L14 10.125" stroke="rgba(58, 11, 128, 1)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
5
+ <path d="M8 7.125V1.875" stroke="rgba(58, 11, 128, 1)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
6
+ <path d="M5.75 4.125L8 1.875L10.25 4.125" stroke="rgba(58, 11, 128, 1)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
7
+ </g>
8
+ <defs>
9
+ <clipPath id="clip0_1516_100789">
10
+ <rect width="16" height="16" fill="white"/>
11
+ </clipPath>
12
+ </defs>
6
13
  </svg>
@@ -1,10 +1,16 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports["default"] = void 0;
7
8
  var _export = require("../../factories/export");
9
+ var _parquet = _interopRequireDefault(require("./textures/parquet.jpg"));
10
+ var _tile = _interopRequireDefault(require("./textures/tile1.jpg"));
11
+ var _ceramicTile = _interopRequireDefault(require("./textures/ceramic-tile.jpg"));
12
+ var _strandPorcelain = _interopRequireDefault(require("./textures/strand-porcelain.jpg"));
13
+ var _grass = _interopRequireDefault(require("./textures/grass.jpg"));
8
14
  var info = {
9
15
  title: 'area',
10
16
  tag: ['area'],
@@ -14,31 +20,31 @@ var info = {
14
20
  var textures = {
15
21
  parquet: {
16
22
  name: 'Parquet',
17
- uri: require("./textures/parquet.jpg"),
23
+ uri: _parquet["default"],
18
24
  lengthRepeatScale: 0.004,
19
25
  heightRepeatScale: 0.004
20
26
  },
21
27
  tile1: {
22
28
  name: 'Tile1',
23
- uri: require("./textures/tile1.jpg"),
29
+ uri: _tile["default"],
24
30
  lengthRepeatScale: 0.01,
25
31
  heightRepeatScale: 0.01
26
32
  },
27
33
  ceramic: {
28
34
  name: 'Ceramic Tile',
29
- uri: require("./textures/ceramic-tile.jpg"),
35
+ uri: _ceramicTile["default"],
30
36
  lengthRepeatScale: 0.02,
31
37
  heightRepeatScale: 0.02
32
38
  },
33
39
  strand_porcelain: {
34
40
  name: 'Strand Porcelain Tile',
35
- uri: require("./textures/strand-porcelain.jpg"),
41
+ uri: _strandPorcelain["default"],
36
42
  lengthRepeatScale: 0.02,
37
43
  heightRepeatScale: 0.02
38
44
  },
39
45
  grass: {
40
46
  name: 'Grass',
41
- uri: require("./textures/grass.jpg"),
47
+ uri: _grass["default"],
42
48
  lengthRepeatScale: 0.01,
43
49
  heightRepeatScale: 0.01
44
50
  }
@@ -254,10 +254,7 @@ var Catalog = exports["default"] = /*#__PURE__*/function () {
254
254
  if (name === '') {
255
255
  throw new Error('Category has empty name');
256
256
  }
257
- if (this.hasCategory(name)) {
258
- throw new Error('Category has already been registered');
259
- }
260
- return true;
257
+ return !this.hasCategory(name);
261
258
  }
262
259
 
263
260
  /**
@@ -85,7 +85,8 @@ function createArea(element, layer, scene, textures) {
85
85
  color = SharedStyle.AREA_MESH_COLOR.unselected;
86
86
  }
87
87
  if (texture.uri === undefined || texture.uri == '') {
88
- texture.uri = layer.floorStyle.uri;
88
+ // @todo THIS IS A TEMPORARY FIX TO HAVE A DEFAULT FLOOR TEXTURE
89
+ texture.uri = layer.floorStyle.uri || 'https://media.test.diydesignspace.com/uploads/CountTop/202203162950_2/texture/oak-barcelona-s.jpg';
89
90
  }
90
91
  var shape = new _three.Shape();
91
92
  shape.moveTo(vertices[0].x, vertices[0].y);
@@ -35,13 +35,13 @@ var halfPI = Math.PI / 2;
35
35
  var applyTexture = function applyTexture(material, texture, length, height) {
36
36
  var loader = new _three.TextureLoader();
37
37
  if (texture) {
38
- material.map = loader.load(texture.uri["default"]);
38
+ material.map = loader.load(texture.uri);
39
39
  material.map.colorSpace = Three.SRGBColorSpace, material.needsUpdate = true;
40
40
  material.map.wrapS = _three.RepeatWrapping;
41
41
  material.map.wrapT = _three.RepeatWrapping;
42
42
  material.map.repeat.set(length * texture.lengthRepeatScale, height * texture.heightRepeatScale);
43
43
  if (texture.normal) {
44
- material.normalMap = loader.load(texture.normal.uri["default"]);
44
+ material.normalMap = loader.load(texture.normal.uri);
45
45
  material.normalScale = new _three.Vector2(texture.normal.normalScaleX, texture.normal.normalScaleY);
46
46
  material.normalMap.wrapS = _three.RepeatWrapping;
47
47
  material.normalMap.wrapT = _three.RepeatWrapping;
@@ -27,11 +27,11 @@ var STYLE_LINE = {
27
27
  // strokeWidth:1
28
28
  };
29
29
  var STYLE_INTERIOR_LINE = {
30
- strokeWidth: 1,
30
+ strokeWidth: 2,
31
31
  stroke: SharedStyle.INTERIOR_LINE.unselected
32
32
  };
33
33
  var STYLE_INTERIOR_LINE_SELECTED = {
34
- strokeWidth: 2,
34
+ strokeWidth: 4,
35
35
  stroke: SharedStyle.INTERIOR_LINE.selected,
36
36
  fill: SharedStyle.INTERIOR_LINE.selected,
37
37
  rx: '2px'
@@ -224,9 +224,9 @@ function WallFactory(name, info, textures) {
224
224
  })));
225
225
  return !element.selected ? /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("polygon", {
226
226
  points: "".concat(x1, ",").concat(y1, " ").concat(related0x, ",").concat(related0y, " ").concat(related1x, ",").concat(related1y, " ").concat(x2, ",").concat(y2),
227
- fill: "url(#pat)",
228
- fillRule: "evenodd"
229
- }), outwall, /*#__PURE__*/_react["default"].createElement("line", {
227
+ fill: "#CFD8DC"
228
+ // fillRule="evenodd"
229
+ }), /*#__PURE__*/_react["default"].createElement("line", {
230
230
  x1: x1,
231
231
  y1: y1,
232
232
  x2: x2,
@@ -234,9 +234,9 @@ function WallFactory(name, info, textures) {
234
234
  style: STYLE_INTERIOR_LINE
235
235
  })) : /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("polygon", {
236
236
  points: "".concat(x1, ",").concat(y1, " ").concat(related0x, ",").concat(related0y, " ").concat(related1x, ",").concat(related1y, " ").concat(x2, ",").concat(y2),
237
- fill: "url(#pat)",
238
- fillRule: "evenodd"
239
- }), outwall, /*#__PURE__*/_react["default"].createElement("line", {
237
+ fill: "#CFD8DC"
238
+ // fillRule="evenodd"
239
+ }), /*#__PURE__*/_react["default"].createElement("line", {
240
240
  x1: x1,
241
241
  y1: y1,
242
242
  x2: x2,
@@ -1,15 +1,25 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports["default"] = void 0;
7
8
  var _export = require("../../factories/export");
9
+ var _wall = _interopRequireDefault(require("./wall.png"));
10
+ var _plaster = _interopRequireDefault(require("./textures/plaster.jpg"));
11
+ var _plasterNormal = _interopRequireDefault(require("./textures/plaster-normal.jpg"));
12
+ var _bricks = _interopRequireDefault(require("./textures/bricks.jpg"));
13
+ var _bricksNormal = _interopRequireDefault(require("./textures/bricks-normal.jpg"));
14
+ var _painted = _interopRequireDefault(require("./textures/painted.jpg"));
15
+ var _paintedNormal = _interopRequireDefault(require("./textures/painted-normal.jpg"));
16
+ var _morden = _interopRequireDefault(require("./textures/morden.jpg"));
17
+ var _mordenNormal = _interopRequireDefault(require("./textures/morden-normal.jpg"));
8
18
  var info = {
9
19
  title: 'wall',
10
20
  tag: ['wall'],
11
21
  description: 'Wall with bricks or painted',
12
- image: require("./wall.png"),
22
+ image: _wall["default"],
13
23
  visibility: {
14
24
  catalog: true,
15
25
  layerElementsVisible: true
@@ -18,11 +28,11 @@ var info = {
18
28
  var textures = {
19
29
  plaster: {
20
30
  name: 'Plaster',
21
- uri: require("./textures/plaster.jpg"),
31
+ uri: _plaster["default"],
22
32
  lengthRepeatScale: 0.005,
23
33
  heightRepeatScale: 0.005,
24
34
  normal: {
25
- uri: require("./textures/plaster-normal.jpg"),
35
+ uri: _plasterNormal["default"],
26
36
  lengthRepeatScale: 0.005,
27
37
  heightRepeatScale: 0.005,
28
38
  normalScaleX: 0.4,
@@ -32,11 +42,11 @@ var textures = {
32
42
  },
33
43
  bricks: {
34
44
  name: 'Bricks',
35
- uri: require("./textures/bricks.jpg"),
45
+ uri: _bricks["default"],
36
46
  lengthRepeatScale: 0.009,
37
47
  heightRepeatScale: 0.009,
38
48
  normal: {
39
- uri: require("./textures/bricks-normal.jpg"),
49
+ uri: _bricksNormal["default"],
40
50
  lengthRepeatScale: 0.009,
41
51
  heightRepeatScale: 0.009,
42
52
  normalScaleX: 0.4,
@@ -46,11 +56,11 @@ var textures = {
46
56
  },
47
57
  painted: {
48
58
  name: 'Painted',
49
- uri: require("./textures/painted.jpg"),
59
+ uri: _painted["default"],
50
60
  lengthRepeatScale: 0.005,
51
61
  heightRepeatScale: 0.005,
52
62
  normal: {
53
- uri: require("./textures/painted-normal.jpg"),
63
+ uri: _paintedNormal["default"],
54
64
  lengthRepeatScale: 0.005,
55
65
  heightRepeatScale: 0.005,
56
66
  normalScaleX: 0.4,
@@ -60,11 +70,11 @@ var textures = {
60
70
  },
61
71
  morden: {
62
72
  name: 'Morden',
63
- uri: require("./textures/morden.jpg"),
73
+ uri: _morden["default"],
64
74
  lengthRepeatScale: 0.005,
65
75
  heightRepeatScale: 0.005,
66
76
  normal: {
67
- uri: require("./textures/morden-normal.jpg"),
77
+ uri: _mordenNormal["default"],
68
78
  lengthRepeatScale: 0.005,
69
79
  heightRepeatScale: 0.005,
70
80
  normalScaleX: 0.4,
@@ -26,10 +26,12 @@ function _default(_ref) {
26
26
  is_corner = _ref.is_corner,
27
27
  alti = _ref.alti,
28
28
  obj_property = _ref.obj_property,
29
- outlineSVGData = _ref.outlineSVGData;
29
+ outlineSVGData = _ref.outlineSVGData,
30
+ cds = _ref.cds;
30
31
  var _length = alti || 0;
31
- // const length = convert(_length).from("in").to("cm");
32
- var length = _length;
32
+ var length = (0, _convertUnitsLite.convert)(_length).from('in').to('cm');
33
+ // const length = _length;
34
+
33
35
  var additional_props = [];
34
36
  if (type === 'cabinet' && long_name.toLowerCase().includes('filler')) {
35
37
  additional_props = {
@@ -141,6 +143,8 @@ function _default(_ref) {
141
143
  }),
142
144
  img: base,
143
145
  obj: obj_property,
146
+ cds: cds,
147
+ structure_json: structure_json,
144
148
  render2D: function render2D(element, layer, scene) {
145
149
  return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
146
150
  },
@@ -24,6 +24,7 @@ var _models = require("../../models");
24
24
  var GeomUtils = _interopRequireWildcard(require("./geom-utils"));
25
25
  var _loadObj = require("./load-obj");
26
26
  var _helper = require("../../utils/helper");
27
+ var _utils = require("../../components/viewer2d/utils");
27
28
  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); }
28
29
  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; }
29
30
  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; }
@@ -188,7 +189,6 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
188
189
  var rendered = null;
189
190
  var svg_url, svg_width, svg_depth;
190
191
  if (shape_svg || el_euro_shape_svg) {
191
- var _element$toJS$doorSty;
192
192
  if (typeof shape_svg == 'string' || typeof el_euro_shape_svg == 'string') {
193
193
  if (el_DSN === 'Euro & Frameless' && el_is_euro_cds) {
194
194
  svg_url = el_euro_shape_svg;
@@ -221,13 +221,22 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
221
221
  transform: "translate(".concat(-transX, "px, ").concat(-transY, "px)")
222
222
  },
223
223
  onMouseEnter: function onMouseEnter(event) {
224
- var bbox = event.target.getBoundingClientRect();
225
- document.getElementById('warning_box_2d').style.display = 'flex';
226
- document.getElementById('warning_box_2d').style.top = "".concat(bbox.top - 60, "px");
227
- document.getElementById('warning_box_2d').style.left = "".concat(bbox.left, "px");
224
+ var target = event.currentTarget;
225
+ var tooltip = document.getElementById('warning_box_2d');
226
+ var parent = document.querySelector('#kitchen-simulator-container');
227
+ if (!tooltip || !parent) return;
228
+ var targetRect = target.getBoundingClientRect();
229
+ var parentRect = parent.getBoundingClientRect();
230
+ var left = targetRect.left - parentRect.left;
231
+ var top = targetRect.top - parentRect.top;
232
+ tooltip.style.display = 'flex';
233
+ tooltip.style.left = "".concat(left, "px");
234
+ tooltip.style.top = "".concat(top - 60, "px");
228
235
  },
229
236
  onMouseLeave: function onMouseLeave() {
230
- document.getElementById('warning_box_2d').style.display = 'none';
237
+ if (document.getElementById('warning_box_2d')) {
238
+ document.getElementById('warning_box_2d').style.display = 'none';
239
+ }
231
240
  }
232
241
  }, /*#__PURE__*/_react["default"].createElement("circle", {
233
242
  cx: 0,
@@ -313,9 +322,7 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
313
322
  }), /*#__PURE__*/_react["default"].createElement("g", {
314
323
  transform: "translate(".concat(padding_width, ",").concat(padding_depth, ")")
315
324
  }, txtContent)), element.category === 'cabinet' && /*#__PURE__*/_react["default"].createElement("g", {
316
- 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) {
317
- return cd.itemID == (element === null || element === void 0 ? void 0 : element.getIn(['itemID']));
318
- }).length) > 0 ? 'hidden' : 'visible'
325
+ visibility: (0, _utils.isWarningItem)(element) ? 'visible' : 'hidden'
319
326
  }, warning_buttons)));
320
327
  } else {
321
328
  rendered = /*#__PURE__*/_react["default"].createElement("g", {
@@ -461,7 +468,8 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
461
468
  var tempDoorStyles = doorStyles.toJS();
462
469
  var tempPlaceholders = structure.tempPlaceholders;
463
470
  var tPlaceholders = tempPlaceholders.find(function (el) {
464
- return el.id === tempDoorStyles.cabinet_door_style_id;
471
+ var _tempDoorStyles$cds$;
472
+ 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);
465
473
  });
466
474
  if (tPlaceholders !== undefined) {
467
475
  placeholders = tPlaceholders.placeholders;
@@ -652,10 +660,10 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
652
660
  vLine3.material.depthTest = false;
653
661
  // translate vector to center of object
654
662
  var uVec = new Three.Vector3(-posVec.x / scalevec.x, -posVec.y / scalevec.y, -posVec.z / scalevec.z);
655
- vLine.translateY(0.1);
656
- vLine1.translateY(0.1);
657
- vLine2.translateY(0.1);
658
- vLine3.translateY(0.1);
663
+ vLine.translateY(_boundingBox.min.y + 0.1);
664
+ vLine1.translateY(_boundingBox.min.y + 0.1);
665
+ vLine2.translateY(_boundingBox.min.y + 0.1);
666
+ vLine3.translateY(_boundingBox.min.y + 0.1);
659
667
 
660
668
  //rotObj.translateOnAxis(uVec, 1);
661
669
  upObj.translateOnAxis(uVec, 1);
@@ -1007,6 +1015,8 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
1007
1015
  try {
1008
1016
  counterTop = counterTop.toJS();
1009
1017
  } catch (error) {
1018
+ //@todo THIS IS A TEMPORARY FIX FOR COUNTERTOP TEXTURE UNDEFINED ISSUE
1019
+ counterTop.uri = 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg';
1010
1020
  console.log(error);
1011
1021
  }
1012
1022
  }
@@ -1,12 +1,18 @@
1
1
  "use strict";
2
2
 
3
+ var _typeof = require("@babel/runtime/helpers/typeof");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports["default"] = void 0;
8
+ var THREE = _interopRequireWildcard(require("three"));
9
+ 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); }
3
10
  /**
4
11
  * Loads a Wavefront .mtl file specifying materials
5
12
  *
6
13
  * @author angelxuanchang
7
14
  */
8
15
 
9
- var THREE = window.THREE || require('three');
10
16
  var MTLLoader;
11
17
  MTLLoader = function MTLLoader(manager) {
12
18
  this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
@@ -356,4 +362,5 @@ MTLLoader.MaterialCreator.prototype = {
356
362
  return texture;
357
363
  }
358
364
  };
359
- module.exports = MTLLoader;
365
+ var _default = exports["default"] = MTLLoader;
366
+ module.exports = exports.default;
@@ -1,9 +1,16 @@
1
1
  "use strict";
2
2
 
3
+ var _typeof = require("@babel/runtime/helpers/typeof");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports["default"] = void 0;
8
+ var THREE = _interopRequireWildcard(require("three"));
9
+ 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); }
3
10
  /**
4
11
  * @author mrdoob / http://mrdoob.com/
5
12
  */
6
- var THREE = window.THREE || require('three');
13
+
7
14
  var OBJLoader;
8
15
  OBJLoader = function () {
9
16
  // o object_name | g group_name
@@ -475,4 +482,5 @@ OBJLoader = function () {
475
482
  };
476
483
  return OBJLoader;
477
484
  }();
478
- module.exports = OBJLoader;
485
+ var _default = exports["default"] = OBJLoader;
486
+ module.exports = exports.default;
package/lib/class/hole.js CHANGED
@@ -783,11 +783,9 @@ var Hole = exports["default"] = /*#__PURE__*/function () {
783
783
  scene: scene.mergeIn(['layers', layerID, 'holes', holeID], hole)
784
784
  });
785
785
  state = state.updateIn(['scene', 'layers', layerID, 'lines', hole.line, 'holes'], function (holes) {
786
- console.log(holes, 'holes');
787
786
  var index = holes.findIndex(function (ID) {
788
787
  return holeID === ID;
789
788
  });
790
- console.log(index, 'index');
791
789
  return index === -1 ? holes.push(holeID) : holes;
792
790
  });
793
791
  return {