kitchen-simulator 3.13.0 → 3.14.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.
- package/es/catalog/factories/area-factory-3d.js +17 -17
- package/es/catalog/utils/item-loader.js +1 -1
- package/es/class/hole.js +0 -2
- package/es/class/project.js +12 -4
- package/es/devLiteRenderer.js +99 -99
- package/es/utils/geometry.js +1 -1
- package/es/utils/isolate-event-handler.js +6 -3
- package/es/utils/molding.js +242 -28
- package/lib/catalog/factories/area-factory-3d.js +14 -14
- package/lib/catalog/utils/item-loader.js +1 -1
- package/lib/class/hole.js +0 -2
- package/lib/class/project.js +12 -4
- package/lib/devLiteRenderer.js +94 -94
- package/lib/utils/geometry.js +1 -1
- package/lib/utils/isolate-event-handler.js +5 -2
- package/lib/utils/molding.js +243 -27
- package/package.json +1 -1
package/lib/devLiteRenderer.js
CHANGED
|
@@ -29,7 +29,7 @@ var _convertUnitsLite = require("./utils/convert-units-lite");
|
|
|
29
29
|
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 _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); }
|
|
30
30
|
// --- renderer props ---
|
|
31
31
|
var options = {
|
|
32
|
-
unit:
|
|
32
|
+
unit: 'in',
|
|
33
33
|
enable3D: true
|
|
34
34
|
};
|
|
35
35
|
var onInternalEvent = /*#__PURE__*/function () {
|
|
@@ -38,7 +38,7 @@ var onInternalEvent = /*#__PURE__*/function () {
|
|
|
38
38
|
return _regenerator["default"].wrap(function (_context) {
|
|
39
39
|
while (1) switch (_context.prev = _context.next) {
|
|
40
40
|
case 0:
|
|
41
|
-
console.log(
|
|
41
|
+
console.log('EVENT:', evt.type, evt.value);
|
|
42
42
|
_t = evt.type;
|
|
43
43
|
_context.next = _t === _constants.INTERNAL_EVENT_ITEMS_CATALOG ? 1 : 3;
|
|
44
44
|
break;
|
|
@@ -57,7 +57,7 @@ var onInternalEvent = /*#__PURE__*/function () {
|
|
|
57
57
|
return _ref.apply(this, arguments);
|
|
58
58
|
};
|
|
59
59
|
}();
|
|
60
|
-
document.getElementById(
|
|
60
|
+
document.getElementById('app').style.display = 'block';
|
|
61
61
|
function WorkSpace(props) {
|
|
62
62
|
var _useState = (0, _react.useState)(null),
|
|
63
63
|
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
@@ -246,91 +246,91 @@ function WorkSpace(props) {
|
|
|
246
246
|
var evt = {
|
|
247
247
|
type: _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE,
|
|
248
248
|
payload: {
|
|
249
|
-
roomShapeType:
|
|
249
|
+
roomShapeType: 'rectangle',
|
|
250
250
|
width: 250,
|
|
251
251
|
height: 100,
|
|
252
252
|
doorStyle: {
|
|
253
253
|
id: 36,
|
|
254
|
-
type:
|
|
255
|
-
name:
|
|
256
|
-
thumbnail:
|
|
257
|
-
texture:
|
|
258
|
-
color:
|
|
254
|
+
type: 'door',
|
|
255
|
+
name: 'Brilliant White Shaker',
|
|
256
|
+
thumbnail: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/thumbnail/Brilliant%20White%20Shaker%20-%20RTA.jpg',
|
|
257
|
+
texture: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
258
|
+
color: '#ffffff',
|
|
259
259
|
glossness: 1,
|
|
260
260
|
door_style_id: 42,
|
|
261
261
|
brightness: 1,
|
|
262
|
-
sku:
|
|
263
|
-
color_family:
|
|
264
|
-
color_sku_alias:
|
|
265
|
-
door_style_name:
|
|
266
|
-
install:
|
|
262
|
+
sku: 'SW',
|
|
263
|
+
color_family: ',10,',
|
|
264
|
+
color_sku_alias: 'SW',
|
|
265
|
+
door_style_name: 'Shaker',
|
|
266
|
+
install: '',
|
|
267
267
|
doorStyles: {
|
|
268
|
-
base:
|
|
269
|
-
counttop:
|
|
270
|
-
interior:
|
|
271
|
-
base_door_1:
|
|
272
|
-
base_fixed_drawer_door_1:
|
|
273
|
-
base_drawer_1:
|
|
274
|
-
base_drawer_door_1:
|
|
275
|
-
door_handle_1:
|
|
276
|
-
fixed_drawer_door_handle_1:
|
|
277
|
-
drawer_door_handle_1:
|
|
278
|
-
base_door_2:
|
|
279
|
-
base_fixed_drawer_door_2:
|
|
280
|
-
base_drawer_2:
|
|
281
|
-
base_drawer_door_2:
|
|
282
|
-
door_handle_2:
|
|
283
|
-
fixed_drawer_door_handle_2:
|
|
284
|
-
drawer_door_handle_2:
|
|
285
|
-
base_door_3:
|
|
286
|
-
base_fixed_drawer_door_3:
|
|
287
|
-
base_drawer_3:
|
|
288
|
-
base_drawer_door_3:
|
|
289
|
-
door_handle_3:
|
|
290
|
-
fixed_drawer_door_handle_3:
|
|
291
|
-
drawer_door_handle_3:
|
|
292
|
-
base_door_4:
|
|
293
|
-
base_fixed_drawer_door_4:
|
|
294
|
-
base_drawer_4:
|
|
295
|
-
base_drawer_door_4:
|
|
296
|
-
door_handle_4:
|
|
297
|
-
fixed_drawer_door_handle_4:
|
|
298
|
-
drawer_door_handle_4:
|
|
299
|
-
base_door_5:
|
|
300
|
-
base_fixed_drawer_door_5:
|
|
301
|
-
base_drawer_5:
|
|
302
|
-
base_drawer_door_5:
|
|
303
|
-
door_handle_5:
|
|
304
|
-
fixed_drawer_door_handle_5:
|
|
305
|
-
drawer_door_handle_5:
|
|
306
|
-
base_door_6:
|
|
307
|
-
base_fixed_drawer_door_6:
|
|
308
|
-
base_drawer_6:
|
|
309
|
-
base_drawer_door_6:
|
|
310
|
-
door_handle_6:
|
|
311
|
-
fixed_drawer_door_handle_6:
|
|
312
|
-
drawer_door_handle_6:
|
|
313
|
-
base_door_7:
|
|
314
|
-
base_fixed_drawer_door_7:
|
|
315
|
-
base_drawer_7:
|
|
316
|
-
base_drawer_door_7:
|
|
317
|
-
door_handle_7:
|
|
318
|
-
fixed_drawer_door_handle_7:
|
|
319
|
-
drawer_door_handle_7:
|
|
320
|
-
base_door_8:
|
|
321
|
-
base_fixed_drawer_door_8:
|
|
322
|
-
base_drawer_8:
|
|
323
|
-
base_drawer_door_8:
|
|
324
|
-
door_handle_8:
|
|
325
|
-
fixed_drawer_door_handle_8:
|
|
326
|
-
drawer_door_handle_8:
|
|
327
|
-
base_door_9:
|
|
328
|
-
base_fixed_drawer_door_9:
|
|
329
|
-
base_drawer_9:
|
|
330
|
-
base_drawer_door_9:
|
|
331
|
-
door_handle_9:
|
|
332
|
-
fixed_drawer_door_handle_9:
|
|
333
|
-
drawer_door_handle_9:
|
|
268
|
+
base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
269
|
+
counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
|
|
270
|
+
interior: 'http://127.0.0.1:4002/uploads/assets/default/maple.jpg',
|
|
271
|
+
base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
272
|
+
base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
273
|
+
base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
274
|
+
base_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
275
|
+
door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
276
|
+
fixed_drawer_door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
277
|
+
drawer_door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
278
|
+
base_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
279
|
+
base_fixed_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
280
|
+
base_drawer_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
281
|
+
base_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
282
|
+
door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
283
|
+
fixed_drawer_door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
284
|
+
drawer_door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
285
|
+
base_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
286
|
+
base_fixed_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
287
|
+
base_drawer_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
288
|
+
base_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
289
|
+
door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
290
|
+
fixed_drawer_door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
291
|
+
drawer_door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
292
|
+
base_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
293
|
+
base_fixed_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
294
|
+
base_drawer_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
295
|
+
base_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
296
|
+
door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
297
|
+
fixed_drawer_door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
298
|
+
drawer_door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
299
|
+
base_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
300
|
+
base_fixed_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
301
|
+
base_drawer_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
302
|
+
base_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
303
|
+
door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
304
|
+
fixed_drawer_door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
305
|
+
drawer_door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
306
|
+
base_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
307
|
+
base_fixed_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
308
|
+
base_drawer_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
309
|
+
base_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
310
|
+
door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
311
|
+
fixed_drawer_door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
312
|
+
drawer_door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
313
|
+
base_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
314
|
+
base_fixed_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
315
|
+
base_drawer_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
316
|
+
base_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
317
|
+
door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
318
|
+
fixed_drawer_door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
319
|
+
drawer_door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
320
|
+
base_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
321
|
+
base_fixed_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
322
|
+
base_drawer_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
323
|
+
base_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
324
|
+
door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
325
|
+
fixed_drawer_door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
326
|
+
drawer_door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
327
|
+
base_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
328
|
+
base_fixed_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
329
|
+
base_drawer_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
330
|
+
base_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
331
|
+
door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
332
|
+
fixed_drawer_door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
|
|
333
|
+
drawer_door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg'
|
|
334
334
|
},
|
|
335
335
|
installation_types: [125, 124]
|
|
336
336
|
}
|
|
@@ -489,7 +489,7 @@ function WorkSpace(props) {
|
|
|
489
489
|
// cm
|
|
490
490
|
_length: 10,
|
|
491
491
|
// inch
|
|
492
|
-
_unit:
|
|
492
|
+
_unit: 'in'
|
|
493
493
|
})
|
|
494
494
|
}
|
|
495
495
|
};
|
|
@@ -502,7 +502,7 @@ function WorkSpace(props) {
|
|
|
502
502
|
type: _constants.EXTERNAL_EVENT_DUPLICATE_ELEMENT,
|
|
503
503
|
payload: {
|
|
504
504
|
elementPrototype: _constants.ELEMENT_ITEM,
|
|
505
|
-
elementId:
|
|
505
|
+
elementId: '' // id of current operating element
|
|
506
506
|
}
|
|
507
507
|
};
|
|
508
508
|
setExternalEvent(evt);
|
|
@@ -514,7 +514,7 @@ function WorkSpace(props) {
|
|
|
514
514
|
type: _constants.EXTERNAL_EVENT_DELETE_ELEMENT,
|
|
515
515
|
payload: {
|
|
516
516
|
elementPrototype: _constants.ELEMENT_ITEM,
|
|
517
|
-
elementId:
|
|
517
|
+
elementId: '' // id of current operating element
|
|
518
518
|
}
|
|
519
519
|
};
|
|
520
520
|
setExternalEvent(evt);
|
|
@@ -575,7 +575,7 @@ function WorkSpace(props) {
|
|
|
575
575
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
576
576
|
payload: {
|
|
577
577
|
category: _constants.FINISHING_TYPE.COUNTER_TOP,
|
|
578
|
-
texture:
|
|
578
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202111302746_7/texture/Arabescato_texture.jpg'
|
|
579
579
|
}
|
|
580
580
|
};
|
|
581
581
|
setExternalEvent(evt);
|
|
@@ -587,7 +587,7 @@ function WorkSpace(props) {
|
|
|
587
587
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
588
588
|
payload: {
|
|
589
589
|
category: _constants.FINISHING_TYPE.BACKSPLASH,
|
|
590
|
-
texture:
|
|
590
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202305225249_14/texture/Unique_Marquina_texture.jpg'
|
|
591
591
|
}
|
|
592
592
|
};
|
|
593
593
|
setExternalEvent(evt);
|
|
@@ -599,7 +599,7 @@ function WorkSpace(props) {
|
|
|
599
599
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
600
600
|
payload: {
|
|
601
601
|
category: _constants.FINISHING_TYPE.FLOOR_STYLE,
|
|
602
|
-
texture:
|
|
602
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202203163338_3/texture/oak-chestnut.webp'
|
|
603
603
|
}
|
|
604
604
|
};
|
|
605
605
|
setExternalEvent(evt);
|
|
@@ -611,7 +611,7 @@ function WorkSpace(props) {
|
|
|
611
611
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
612
612
|
payload: {
|
|
613
613
|
category: _constants.FINISHING_TYPE.WALL_COLOR,
|
|
614
|
-
color:
|
|
614
|
+
color: '#bab863'
|
|
615
615
|
}
|
|
616
616
|
};
|
|
617
617
|
setExternalEvent(evt);
|
|
@@ -623,7 +623,7 @@ function WorkSpace(props) {
|
|
|
623
623
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
624
624
|
payload: {
|
|
625
625
|
category: _constants.FINISHING_TYPE.DOOR_HANDLE,
|
|
626
|
-
gltf:
|
|
626
|
+
gltf: 'https://media.test.diydesignspace.com/uploads/DoorHandle/202107294150_29/gltf/Handle1.gltf'
|
|
627
627
|
}
|
|
628
628
|
};
|
|
629
629
|
setExternalEvent(evt);
|
|
@@ -650,7 +650,7 @@ function WorkSpace(props) {
|
|
|
650
650
|
// cm
|
|
651
651
|
_length: 27,
|
|
652
652
|
// inch
|
|
653
|
-
_unit:
|
|
653
|
+
_unit: 'in'
|
|
654
654
|
})
|
|
655
655
|
}
|
|
656
656
|
};
|
|
@@ -678,7 +678,7 @@ function WorkSpace(props) {
|
|
|
678
678
|
actionType: "danger",
|
|
679
679
|
onClick: function onClick() {
|
|
680
680
|
var _tl = Math.floor(Math.random() * 50);
|
|
681
|
-
var tl = (0, _convertUnitsLite.convert)(_tl).from(
|
|
681
|
+
var tl = (0, _convertUnitsLite.convert)(_tl).from('in').to('cm');
|
|
682
682
|
var evt = {
|
|
683
683
|
type: _constants.EXTERNAL_EVENT_UPDATE_PROPERTY,
|
|
684
684
|
payload: {
|
|
@@ -686,7 +686,7 @@ function WorkSpace(props) {
|
|
|
686
686
|
value: new _immutable.Map({
|
|
687
687
|
_length: _tl,
|
|
688
688
|
// inch
|
|
689
|
-
_unit:
|
|
689
|
+
_unit: 'in',
|
|
690
690
|
length: tl // cm
|
|
691
691
|
})
|
|
692
692
|
}
|
|
@@ -752,7 +752,7 @@ function WorkSpace(props) {
|
|
|
752
752
|
type: _constants.EXTERNAL_EVENT_PROJECT_SETTING,
|
|
753
753
|
payload: {
|
|
754
754
|
option: _constants.PROJECT_SETTING_OPTION.CHANGE_MEASUREMENT_UNIT,
|
|
755
|
-
value:
|
|
755
|
+
value: 'cm'
|
|
756
756
|
}
|
|
757
757
|
};
|
|
758
758
|
setExternalEvent(evt);
|
|
@@ -775,7 +775,7 @@ function WorkSpace(props) {
|
|
|
775
775
|
// externalEvent: { id?, type, payload } | null,
|
|
776
776
|
// meta?: { filename?, lineno?, colno? }
|
|
777
777
|
// }
|
|
778
|
-
console.error(
|
|
778
|
+
console.error('TOOL ERROR:', payload);
|
|
779
779
|
}
|
|
780
780
|
}));
|
|
781
781
|
}
|
|
@@ -786,4 +786,4 @@ _reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(_reactC
|
|
|
786
786
|
width: width,
|
|
787
787
|
height: height
|
|
788
788
|
});
|
|
789
|
-
}), document.getElementById(
|
|
789
|
+
}), document.getElementById('app') && document.getElementById('app'));
|
package/lib/utils/geometry.js
CHANGED
|
@@ -2205,7 +2205,7 @@ function relationshipOfTwoOverlappedLines2(srcLine, destLine) {
|
|
|
2205
2205
|
lineSX = _sort4[0],
|
|
2206
2206
|
lineDX = _sort4[1];
|
|
2207
2207
|
var isReversedSrcLineIdx = false;
|
|
2208
|
-
if (lineSX[0].x === line1[0].x && lineSX[0].y === line1[0].y) isReversedSrcLineIdx = true;
|
|
2208
|
+
if (lineSX[0].x === line0[0].x && lineSX[0].y === line0[0].y) isReversedSrcLineIdx = false;else if (lineSX[0].x === line1[0].x && lineSX[0].y === line1[0].y) isReversedSrcLineIdx = true;
|
|
2209
2209
|
var compare0 = comparator(lineSX[0], lineDX[0]);
|
|
2210
2210
|
var compare1 = comparator(lineSX[1], lineDX[0]);
|
|
2211
2211
|
var compare2 = comparator(lineSX[1], lineDX[1]);
|
|
@@ -1408,7 +1408,7 @@ function _handleExternalEvent() {
|
|
|
1408
1408
|
} else props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
1409
1409
|
return _context1.abrupt("continue", 44);
|
|
1410
1410
|
case 20:
|
|
1411
|
-
_evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle;
|
|
1411
|
+
_evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle; // console.log('****', layer);
|
|
1412
1412
|
props.projectActions.createRoomWithShape(roomShapeType, width, height, _doorStyle);
|
|
1413
1413
|
return _context1.abrupt("continue", 44);
|
|
1414
1414
|
case 21:
|
|
@@ -1457,7 +1457,10 @@ function _handleExternalEvent() {
|
|
|
1457
1457
|
_context1.next = _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_MEASUREMENT_UNIT ? 31 : _t6 === _constants.PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT ? 32 : _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE ? 33 : _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE ? 34 : _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE ? 35 : _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE ? 36 : 37;
|
|
1458
1458
|
break;
|
|
1459
1459
|
case 31:
|
|
1460
|
+
props.viewer2DActions.updateCeilHeight((0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_value2));
|
|
1460
1461
|
props.viewer2DActions.updateCeilHeightUnit(_value2);
|
|
1462
|
+
props.viewer3DActions.update3DCeilHeightUnit(_value2);
|
|
1463
|
+
props.viewer3DActions.update3DCeilHeight((0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_value2));
|
|
1461
1464
|
case 32:
|
|
1462
1465
|
props.viewer2DActions.updateCeilHeight(_value2);
|
|
1463
1466
|
props.viewer3DActions.update3DCeilHeight(_value2);
|
|
@@ -1515,7 +1518,7 @@ function _handleExternalEvent() {
|
|
|
1515
1518
|
case 43:
|
|
1516
1519
|
sceneData = state.scene.toJS(); // get molding data for "ReviewForQuote"
|
|
1517
1520
|
currentTexture = layer.doorStyle !== null || layer.doorStyle !== undefined ? layer.doorStyle : props.state.doorStyle.toJS();
|
|
1518
|
-
sceneData.layers[layerId].moldingData = (0, _molding.
|
|
1521
|
+
sceneData.layers[layerId].moldingData = (0, _molding.getMoldingDataOfScene2)(layer, props.catalog, currentTexture);
|
|
1519
1522
|
// send scene object from 3DTool to HostApp using internalEvent
|
|
1520
1523
|
(_props$onInternalEven3 = props.onInternalEvent) === null || _props$onInternalEven3 === void 0 || _props$onInternalEven3.call(props, {
|
|
1521
1524
|
type: _constants.INTERNAL_EVENT_SYNC_SCENE,
|