kitchen-simulator 3.1.13 → 3.1.14
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/LiteKitchenConfigurator.js +5 -1
- package/es/catalog/factories/area-factory-3d.js +17 -17
- package/es/catalog/utils/item-loader.js +197 -197
- package/es/class/line.js +1 -1
- package/es/components/viewer2d/utils.js +2 -2
- package/es/components/viewer2d/viewer2d.js +1 -1
- package/es/components/viewer3d/viewer3d.js +1 -1
- package/es/constants.js +4 -1
- package/es/devLiteRenderer.js +164 -100
- package/es/utils/isolate-event-handler.js +121 -74
- package/lib/LiteKitchenConfigurator.js +5 -1
- package/lib/catalog/factories/area-factory-3d.js +14 -14
- package/lib/catalog/utils/item-loader.js +194 -194
- package/lib/class/line.js +1 -1
- package/lib/components/viewer2d/utils.js +2 -2
- package/lib/components/viewer2d/viewer2d.js +1 -1
- package/lib/components/viewer3d/viewer3d.js +1 -1
- package/lib/constants.js +9 -6
- package/lib/devLiteRenderer.js +158 -94
- package/lib/utils/isolate-event-handler.js +120 -73
- package/package.json +1 -1
|
@@ -5,7 +5,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
5
5
|
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) { _defineProperty(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; }
|
|
6
6
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
7
7
|
import { Map } from 'immutable';
|
|
8
|
-
import { EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, MODE_IDLE, MODE_2D_PAN, EXTERNAL_EVENT_ADD_ITEM, ARRAY_3D_MODES, MODE_IDLE_3D, MODE_ELEVATION_VIEW, MODE_DRAWING_LINE, TOP, BOTTOM, LEFT, RIGHT, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, INTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, ATT_ITEM_POS, ATT_LINE_LENGTH, ATT_VERTEXT_ONE, ATT_VERTEXT_TWO, ATT_HOLE_OFFSET_A, ATT_HOLE_OFFSET_B, UNIT_CENTIMETER, UNIT_INCH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, EXTERNAL_EVENT_CENTERING_2D, EXTERNAL_EVENT_DUPLICATE_ELEMENT, EXTERNAL_EVENT_DELETE_ELEMENT, ELEMENT_HOLE, ELEMENT_ITEM, ELEMENT_LINE, EXTERNAL_EVENT_REPLACE_CABINET, FINISHING_TYPE, EXTERNAL_EVENT_SET_FINISHING } from "../constants";
|
|
8
|
+
import { EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, MODE_IDLE, MODE_2D_PAN, EXTERNAL_EVENT_ADD_ITEM, ARRAY_3D_MODES, MODE_IDLE_3D, MODE_ELEVATION_VIEW, MODE_DRAWING_LINE, TOP, BOTTOM, LEFT, RIGHT, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, INTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, ATT_ITEM_POS, ATT_LINE_LENGTH, ATT_VERTEXT_ONE, ATT_VERTEXT_TWO, ATT_HOLE_OFFSET_A, ATT_HOLE_OFFSET_B, UNIT_CENTIMETER, UNIT_INCH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, EXTERNAL_EVENT_CENTERING_2D, EXTERNAL_EVENT_DUPLICATE_ELEMENT, EXTERNAL_EVENT_DELETE_ELEMENT, ELEMENT_HOLE, ELEMENT_ITEM, ELEMENT_LINE, EXTERNAL_EVENT_REPLACE_CABINET, FINISHING_TYPE, EXTERNAL_EVENT_SET_FINISHING, EXTERNAL_EVENT_ROTATE_PAN } from "../constants";
|
|
9
9
|
import { isEmpty, updateViwer2D, centering2D } from "./helper";
|
|
10
10
|
import exporter from "../catalog/utils/exporter";
|
|
11
11
|
import { render2DItem, render3DItem, render3DApplianceItem, render3DLightingItem } from "../catalog/utils/item-loader";
|
|
@@ -1000,53 +1000,87 @@ function setFinishing(props, state, payload) {
|
|
|
1000
1000
|
break;
|
|
1001
1001
|
}
|
|
1002
1002
|
}
|
|
1003
|
-
function
|
|
1004
|
-
|
|
1005
|
-
|
|
1006
|
-
|
|
1007
|
-
|
|
1008
|
-
|
|
1009
|
-
|
|
1010
|
-
|
|
1011
|
-
|
|
1012
|
-
|
|
1013
|
-
|
|
1014
|
-
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
|
|
1018
|
-
|
|
1019
|
-
|
|
1020
|
-
|
|
1003
|
+
function moveAndRotatePan2D3D(eventType, props, payload, state) {
|
|
1004
|
+
if (eventType === EXTERNAL_EVENT_MOVE_PAN) {
|
|
1005
|
+
var moveType = payload.moveType,
|
|
1006
|
+
moveValue = payload.moveValue;
|
|
1007
|
+
var value = state.getIn(['viewer2D']).toJS();
|
|
1008
|
+
if (state.mode === MODE_IDLE) {
|
|
1009
|
+
switch (moveType) {
|
|
1010
|
+
case TOP:
|
|
1011
|
+
value.f -= moveValue;
|
|
1012
|
+
break;
|
|
1013
|
+
case BOTTOM:
|
|
1014
|
+
value.f += moveValue;
|
|
1015
|
+
break;
|
|
1016
|
+
case RIGHT:
|
|
1017
|
+
value.e += moveValue;
|
|
1018
|
+
break;
|
|
1019
|
+
case LEFT:
|
|
1020
|
+
value.e -= moveValue;
|
|
1021
|
+
break;
|
|
1022
|
+
}
|
|
1023
|
+
updateViwer2D(value, props.viewer2DActions);
|
|
1024
|
+
} else if (state.mode === MODE_IDLE_3D) {
|
|
1025
|
+
switch (moveType) {
|
|
1026
|
+
case TOP:
|
|
1027
|
+
window.interval = setTimeout(function () {
|
|
1028
|
+
window.tDKeyDown({
|
|
1029
|
+
keyCode: 38
|
|
1030
|
+
});
|
|
1031
|
+
}, 50);
|
|
1032
|
+
break;
|
|
1033
|
+
case BOTTOM:
|
|
1034
|
+
window.interval = setTimeout(function () {
|
|
1035
|
+
window.tDKeyDown({
|
|
1036
|
+
keyCode: 40
|
|
1037
|
+
});
|
|
1038
|
+
}, 50);
|
|
1039
|
+
break;
|
|
1040
|
+
case RIGHT:
|
|
1041
|
+
window.interval = setTimeout(function () {
|
|
1042
|
+
window.tDKeyDown({
|
|
1043
|
+
keyCode: 37
|
|
1044
|
+
});
|
|
1045
|
+
}, 50);
|
|
1046
|
+
break;
|
|
1047
|
+
case LEFT:
|
|
1048
|
+
window.interval = setTimeout(function () {
|
|
1049
|
+
window.tDKeyDown({
|
|
1050
|
+
keyCode: 39
|
|
1051
|
+
});
|
|
1052
|
+
}, 50);
|
|
1053
|
+
break;
|
|
1054
|
+
}
|
|
1021
1055
|
}
|
|
1022
|
-
|
|
1023
|
-
|
|
1024
|
-
switch (
|
|
1056
|
+
} else if (eventType === EXTERNAL_EVENT_ROTATE_PAN) {
|
|
1057
|
+
var rotateType = payload.rotateType;
|
|
1058
|
+
switch (rotateType) {
|
|
1025
1059
|
case TOP:
|
|
1026
1060
|
window.interval = setTimeout(function () {
|
|
1027
|
-
window.
|
|
1028
|
-
keyCode:
|
|
1061
|
+
window.SPKeyDown({
|
|
1062
|
+
keyCode: 87
|
|
1029
1063
|
});
|
|
1030
1064
|
}, 50);
|
|
1031
1065
|
break;
|
|
1032
1066
|
case BOTTOM:
|
|
1033
1067
|
window.interval = setTimeout(function () {
|
|
1034
|
-
window.
|
|
1035
|
-
keyCode:
|
|
1068
|
+
window.SPKeyDown({
|
|
1069
|
+
keyCode: 83
|
|
1036
1070
|
});
|
|
1037
1071
|
}, 50);
|
|
1038
1072
|
break;
|
|
1039
1073
|
case RIGHT:
|
|
1040
1074
|
window.interval = setTimeout(function () {
|
|
1041
|
-
window.
|
|
1042
|
-
keyCode:
|
|
1075
|
+
window.SPKeyDown({
|
|
1076
|
+
keyCode: 68
|
|
1043
1077
|
});
|
|
1044
1078
|
}, 50);
|
|
1045
1079
|
break;
|
|
1046
1080
|
case LEFT:
|
|
1047
1081
|
window.interval = setTimeout(function () {
|
|
1048
|
-
window.
|
|
1049
|
-
keyCode:
|
|
1082
|
+
window.SPKeyDown({
|
|
1083
|
+
keyCode: 65
|
|
1050
1084
|
});
|
|
1051
1085
|
}, 50);
|
|
1052
1086
|
break;
|
|
@@ -1059,7 +1093,7 @@ export function handleExternalEvent(_x10) {
|
|
|
1059
1093
|
function _handleExternalEvent() {
|
|
1060
1094
|
_handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(props) {
|
|
1061
1095
|
var _evt$payload3, _evt$payload4;
|
|
1062
|
-
var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, _state$getIn, element, cds, _cds$find, currentCdsId, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5;
|
|
1096
|
+
var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, _state$getIn, element, cds, _cds$find, currentCdsId, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5, _t6;
|
|
1063
1097
|
return _regeneratorRuntime.wrap(function (_context1) {
|
|
1064
1098
|
while (1) switch (_context1.prev = _context1.next) {
|
|
1065
1099
|
case 0:
|
|
@@ -1069,7 +1103,7 @@ function _handleExternalEvent() {
|
|
|
1069
1103
|
layerId = state.getIn(['scene', 'selectedLayer']);
|
|
1070
1104
|
layer = state.getIn(['scene', 'layers', layerId]);
|
|
1071
1105
|
_t5 = evt === null || evt === void 0 ? void 0 : evt.type;
|
|
1072
|
-
_context1.next = _t5 === EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === EXTERNAL_EVENT_NEW_PROJECT ? 14 : _t5 === EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 15 : _t5 === EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === EXTERNAL_EVENT_ZOOM_OUT ? 21 : _t5 === EXTERNAL_EVENT_CENTERING_2D ? 22 : _t5 === EXTERNAL_EVENT_UNDO ? 23 : _t5 === EXTERNAL_EVENT_REDO ? 24 : _t5 === EXTERNAL_EVENT_SET_MOLDING ? 25 : _t5 === EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 27 : _t5 === EXTERNAL_EVENT_DELETE_ELEMENT ? 28 : _t5 === EXTERNAL_EVENT_PROJECT_SETTING ? 29 : _t5 === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ?
|
|
1106
|
+
_context1.next = _t5 === EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === EXTERNAL_EVENT_ROTATE_PAN ? 13 : _t5 === EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === EXTERNAL_EVENT_NEW_PROJECT ? 14 : _t5 === EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 15 : _t5 === EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === EXTERNAL_EVENT_ZOOM_OUT ? 21 : _t5 === EXTERNAL_EVENT_CENTERING_2D ? 22 : _t5 === EXTERNAL_EVENT_UNDO ? 23 : _t5 === EXTERNAL_EVENT_REDO ? 24 : _t5 === EXTERNAL_EVENT_SET_MOLDING ? 25 : _t5 === EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 27 : _t5 === EXTERNAL_EVENT_DELETE_ELEMENT ? 28 : _t5 === EXTERNAL_EVENT_PROJECT_SETTING ? 29 : _t5 === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 38 : _t5 === EXTERNAL_EVENT_UPDATE_PROPERTY ? 38 : _t5 === EXTERNAL_EVENT_REPLACE_CABINET ? 39 : _t5 === EXTERNAL_EVENT_SET_FINISHING ? 41 : _t5 === EXTERNAL_EVENT_SYNC_SCENE ? 42 : 43;
|
|
1073
1107
|
break;
|
|
1074
1108
|
case 1:
|
|
1075
1109
|
// prepare item data request
|
|
@@ -1154,23 +1188,23 @@ function _handleExternalEvent() {
|
|
|
1154
1188
|
};
|
|
1155
1189
|
}());
|
|
1156
1190
|
}
|
|
1157
|
-
return _context1.abrupt("continue",
|
|
1191
|
+
return _context1.abrupt("continue", 43);
|
|
1158
1192
|
case 5:
|
|
1159
1193
|
props.projectActions.setMode(MODE_IDLE_3D);
|
|
1160
|
-
return _context1.abrupt("continue",
|
|
1194
|
+
return _context1.abrupt("continue", 43);
|
|
1161
1195
|
case 6:
|
|
1162
1196
|
props.projectActions.setMode(MODE_IDLE);
|
|
1163
|
-
return _context1.abrupt("continue",
|
|
1197
|
+
return _context1.abrupt("continue", 43);
|
|
1164
1198
|
case 7:
|
|
1165
1199
|
sLineCnt = layer.selected.lines.size;
|
|
1166
1200
|
if (sLineCnt > 0) props.projectActions.setMode(MODE_ELEVATION_VIEW);
|
|
1167
|
-
return _context1.abrupt("continue",
|
|
1201
|
+
return _context1.abrupt("continue", 43);
|
|
1168
1202
|
case 8:
|
|
1169
1203
|
if (state.mode === MODE_IDLE || state.mode === MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
|
|
1170
1204
|
props.projectActions.setMode(MODE_IDLE);
|
|
1171
1205
|
props.linesActions.selectToolDrawingLine('wall');
|
|
1172
1206
|
}
|
|
1173
|
-
return _context1.abrupt("continue",
|
|
1207
|
+
return _context1.abrupt("continue", 43);
|
|
1174
1208
|
case 9:
|
|
1175
1209
|
if (isEmpty(evt === null || evt === void 0 ? void 0 : evt.payload)) {
|
|
1176
1210
|
_context1.next = 11;
|
|
@@ -1213,18 +1247,18 @@ function _handleExternalEvent() {
|
|
|
1213
1247
|
props.projectActions.pushLastSelectedCatalogElementToHistory(element);
|
|
1214
1248
|
props.projectActions.setIsCabinetDrawing(true);
|
|
1215
1249
|
case 11:
|
|
1216
|
-
return _context1.abrupt("continue",
|
|
1250
|
+
return _context1.abrupt("continue", 43);
|
|
1217
1251
|
case 12:
|
|
1218
1252
|
ARRAY_3D_MODES.includes(state.mode) ? props.holesActions.selectToolDrawingHole3D(evt === null || evt === void 0 || (_evt$payload3 = evt.payload) === null || _evt$payload3 === void 0 ? void 0 : _evt$payload3.holeName) : props.holesActions.selectToolDrawingHole(evt === null || evt === void 0 || (_evt$payload4 = evt.payload) === null || _evt$payload4 === void 0 ? void 0 : _evt$payload4.holeName);
|
|
1219
|
-
return _context1.abrupt("continue",
|
|
1253
|
+
return _context1.abrupt("continue", 43);
|
|
1220
1254
|
case 13:
|
|
1221
|
-
|
|
1222
|
-
return _context1.abrupt("continue",
|
|
1255
|
+
moveAndRotatePan2D3D(evt.type, props, evt.payload, state);
|
|
1256
|
+
return _context1.abrupt("continue", 43);
|
|
1223
1257
|
case 14:
|
|
1224
1258
|
defaulTitle = 'Untitle';
|
|
1225
1259
|
props.projectActions.newProject();
|
|
1226
1260
|
props.projectActions.rename(defaulTitle);
|
|
1227
|
-
return _context1.abrupt("continue",
|
|
1261
|
+
return _context1.abrupt("continue", 43);
|
|
1228
1262
|
case 15:
|
|
1229
1263
|
_evt$payload5 = evt.payload, doorStyle = _evt$payload5.doorStyle, itemCDS = _evt$payload5.itemCDS, isAll = _evt$payload5.isAll; // prepare item data request
|
|
1230
1264
|
_layerId = state.getIn(['scene', 'selectedLayer']);
|
|
@@ -1309,11 +1343,11 @@ function _handleExternalEvent() {
|
|
|
1309
1343
|
};
|
|
1310
1344
|
}());
|
|
1311
1345
|
} else props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
1312
|
-
return _context1.abrupt("continue",
|
|
1346
|
+
return _context1.abrupt("continue", 43);
|
|
1313
1347
|
case 19:
|
|
1314
1348
|
_evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle;
|
|
1315
1349
|
props.projectActions.createRoomWithShape(roomShapeType, width, height, _doorStyle);
|
|
1316
|
-
return _context1.abrupt("continue",
|
|
1350
|
+
return _context1.abrupt("continue", 43);
|
|
1317
1351
|
case 20:
|
|
1318
1352
|
value = state.getIn(['viewer2D']).toJS();
|
|
1319
1353
|
value.a += 0.1;
|
|
@@ -1321,7 +1355,7 @@ function _handleExternalEvent() {
|
|
|
1321
1355
|
value.e -= value.SVGWidth * 0.1 / 2;
|
|
1322
1356
|
value.f -= value.SVGHeight * 0.1 / 2;
|
|
1323
1357
|
updateViwer2D(value, props.viewer2DActions);
|
|
1324
|
-
return _context1.abrupt("continue",
|
|
1358
|
+
return _context1.abrupt("continue", 43);
|
|
1325
1359
|
case 21:
|
|
1326
1360
|
_value = state.getIn(['viewer2D']).toJS();
|
|
1327
1361
|
_value.a -= 0.1;
|
|
@@ -1329,62 +1363,74 @@ function _handleExternalEvent() {
|
|
|
1329
1363
|
_value.e += _value.SVGWidth * 0.1 / 2;
|
|
1330
1364
|
_value.f += _value.SVGHeight * 0.1 / 2;
|
|
1331
1365
|
updateViwer2D(_value, props.viewer2DActions);
|
|
1332
|
-
return _context1.abrupt("continue",
|
|
1366
|
+
return _context1.abrupt("continue", 43);
|
|
1333
1367
|
case 22:
|
|
1334
1368
|
centering2D(state, props.viewer2DActions);
|
|
1335
|
-
return _context1.abrupt("continue",
|
|
1369
|
+
return _context1.abrupt("continue", 43);
|
|
1336
1370
|
case 23:
|
|
1337
1371
|
props.projectActions.undo();
|
|
1338
|
-
return _context1.abrupt("continue",
|
|
1372
|
+
return _context1.abrupt("continue", 43);
|
|
1339
1373
|
case 24:
|
|
1340
1374
|
props.projectActions.redo();
|
|
1341
|
-
return _context1.abrupt("continue",
|
|
1375
|
+
return _context1.abrupt("continue", 43);
|
|
1342
1376
|
case 25:
|
|
1343
1377
|
_evt$payload7 = evt.payload, moldingInfo = _evt$payload7.moldingInfo, isGlobal = _evt$payload7.isGlobal;
|
|
1344
1378
|
_context1.next = 26;
|
|
1345
1379
|
return loadMoldingSvg(moldingInfo);
|
|
1346
1380
|
case 26:
|
|
1347
1381
|
props.itemsActions.setMolding(moldingInfo, isGlobal);
|
|
1348
|
-
return _context1.abrupt("continue",
|
|
1382
|
+
return _context1.abrupt("continue", 43);
|
|
1349
1383
|
case 27:
|
|
1350
1384
|
distElement = getElement(evt.payload, state);
|
|
1351
1385
|
if (distElement) props.itemsActions.duplicateSelected(distElement, props.onInternalEvent);
|
|
1352
|
-
return _context1.abrupt("continue",
|
|
1386
|
+
return _context1.abrupt("continue", 43);
|
|
1353
1387
|
case 28:
|
|
1354
1388
|
_distElement = getElement(evt.payload, state);
|
|
1355
1389
|
if (_distElement) props.projectActions.remove(_distElement);
|
|
1356
|
-
return _context1.abrupt("continue",
|
|
1390
|
+
return _context1.abrupt("continue", 43);
|
|
1357
1391
|
case 29:
|
|
1358
1392
|
_evt$payload8 = evt.payload, option = _evt$payload8.option, _value2 = _evt$payload8.value;
|
|
1359
|
-
|
|
1360
|
-
|
|
1361
|
-
|
|
1362
|
-
} else if (option === PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE) {
|
|
1363
|
-
props.viewer2DActions.changeWallLengthMeasure(_value2);
|
|
1364
|
-
} else if (option === PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE) {
|
|
1365
|
-
props.viewer2DActions.changeBaseCabinetMeasure(_value2);
|
|
1366
|
-
} else if (option === PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE) {
|
|
1367
|
-
props.viewer2DActions.changeWallCabinetMeasure(_value2);
|
|
1368
|
-
} else if (option === PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE) {
|
|
1369
|
-
props.viewer2DActions.changeWindowDoorMeasure(_value2);
|
|
1370
|
-
}
|
|
1371
|
-
return _context1.abrupt("continue", 35);
|
|
1393
|
+
_t6 = option;
|
|
1394
|
+
_context1.next = _t6 === PROJECT_SETTING_OPTION.CHANGE_MEASUREMENT_UNIT ? 30 : _t6 === PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT ? 31 : _t6 === PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE ? 32 : _t6 === PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE ? 33 : _t6 === PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE ? 34 : _t6 === PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE ? 35 : 36;
|
|
1395
|
+
break;
|
|
1372
1396
|
case 30:
|
|
1397
|
+
props.viewer2DActions.updateCeilHeightUnit(_value2);
|
|
1398
|
+
case 31:
|
|
1399
|
+
props.viewer2DActions.updateCeilHeight(_value2);
|
|
1400
|
+
props.viewer3DActions.update3DCeilHeight(_value2);
|
|
1401
|
+
return _context1.abrupt("continue", 37);
|
|
1402
|
+
case 32:
|
|
1403
|
+
props.viewer2DActions.changeWallLengthMeasure(_value2);
|
|
1404
|
+
return _context1.abrupt("continue", 37);
|
|
1405
|
+
case 33:
|
|
1406
|
+
props.viewer2DActions.changeBaseCabinetMeasure(_value2);
|
|
1407
|
+
return _context1.abrupt("continue", 37);
|
|
1408
|
+
case 34:
|
|
1409
|
+
props.viewer2DActions.changeWallCabinetMeasure(_value2);
|
|
1410
|
+
return _context1.abrupt("continue", 37);
|
|
1411
|
+
case 35:
|
|
1412
|
+
props.viewer2DActions.changeWindowDoorMeasure(_value2);
|
|
1413
|
+
return _context1.abrupt("continue", 37);
|
|
1414
|
+
case 36:
|
|
1415
|
+
return _context1.abrupt("continue", 37);
|
|
1416
|
+
case 37:
|
|
1417
|
+
return _context1.abrupt("continue", 43);
|
|
1418
|
+
case 38:
|
|
1373
1419
|
_layerId2 = state.getIn(['scene', 'selectedLayer']);
|
|
1374
1420
|
_layer = state.getIn(['scene', 'layers', _layerId2]);
|
|
1375
1421
|
_layer$getIn = _layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
|
|
1376
1422
|
for (_i4 = 0; _i4 < selectedLines.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1377
1423
|
for (_i5 = 0; _i5 < selectedHoles.size; _i5++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1378
1424
|
for (_i6 = 0; _i6 < selectedItems.size; _i6++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1379
|
-
return _context1.abrupt("continue",
|
|
1380
|
-
case
|
|
1425
|
+
return _context1.abrupt("continue", 43);
|
|
1426
|
+
case 39:
|
|
1381
1427
|
_layerID = state.scene.selectedLayer;
|
|
1382
1428
|
_layer2 = state.scene.getIn(['layers', _layerID]).toJS();
|
|
1383
1429
|
orginalItemInfo = evt === null || evt === void 0 || (_evt$payload9 = evt.payload) === null || _evt$payload9 === void 0 ? void 0 : _evt$payload9.orginalItemInfo;
|
|
1384
1430
|
originalItem = _layer2 === null || _layer2 === void 0 ? void 0 : _layer2.items[orginalItemInfo.id];
|
|
1385
|
-
_context1.next =
|
|
1431
|
+
_context1.next = 40;
|
|
1386
1432
|
return addItemToCatalog(evt.payload.replaceItemInfo, state, props.catalog, props.projectActions);
|
|
1387
|
-
case
|
|
1433
|
+
case 40:
|
|
1388
1434
|
originalItemPos = {
|
|
1389
1435
|
rotation: originalItem.rotation,
|
|
1390
1436
|
selectedItemId: originalItem.id,
|
|
@@ -1399,10 +1445,11 @@ function _handleExternalEvent() {
|
|
|
1399
1445
|
}
|
|
1400
1446
|
};
|
|
1401
1447
|
props.itemsActions.replaceItem(originalItemPos, originalItem, replaceItem);
|
|
1402
|
-
return _context1.abrupt("continue",
|
|
1403
|
-
case
|
|
1448
|
+
return _context1.abrupt("continue", 43);
|
|
1449
|
+
case 41:
|
|
1404
1450
|
setFinishing(props, state, evt.payload);
|
|
1405
|
-
|
|
1451
|
+
return _context1.abrupt("continue", 43);
|
|
1452
|
+
case 42:
|
|
1406
1453
|
sceneData = state.scene.toJS(); // get molding data for "ReviewForQuote"
|
|
1407
1454
|
currentTexture = layer.doorStyle !== null || layer.doorStyle !== undefined ? layer.doorStyle : props.state.doorStyle.toJS();
|
|
1408
1455
|
sceneData.layers[layerId].moldingData = getMoldingDataOfScene(layer, props.catalog, currentTexture);
|
|
@@ -1413,8 +1460,8 @@ function _handleExternalEvent() {
|
|
|
1413
1460
|
scene: sceneData
|
|
1414
1461
|
}
|
|
1415
1462
|
});
|
|
1416
|
-
return _context1.abrupt("continue",
|
|
1417
|
-
case
|
|
1463
|
+
return _context1.abrupt("continue", 43);
|
|
1464
|
+
case 43:
|
|
1418
1465
|
case "end":
|
|
1419
1466
|
return _context1.stop();
|
|
1420
1467
|
}
|
|
@@ -30,7 +30,7 @@ var _translator = _interopRequireDefault(require("./translator/translator"));
|
|
|
30
30
|
var _objectsUtils = require("./utils/objects-utils");
|
|
31
31
|
var _version = require("./version");
|
|
32
32
|
var _isolateEventHandler = require("./utils/isolate-event-handler");
|
|
33
|
-
var _excluded = ["width", "height", "state", "stateExtractor"];
|
|
33
|
+
var _excluded = ["width", "height", "state", "stateExtractor", "measurementUnit"];
|
|
34
34
|
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); }
|
|
35
35
|
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; }
|
|
36
36
|
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; }
|
|
@@ -371,6 +371,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
|
|
|
371
371
|
height = _this$props2.height,
|
|
372
372
|
state = _this$props2.state,
|
|
373
373
|
stateExtractor = _this$props2.stateExtractor,
|
|
374
|
+
measurementUnit = _this$props2.measurementUnit,
|
|
374
375
|
props = (0, _objectWithoutProperties2["default"])(_this$props2, _excluded);
|
|
375
376
|
var _this$state = this.state,
|
|
376
377
|
savePopupVisible = _this$state.savePopupVisible,
|
|
@@ -413,6 +414,9 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
|
|
|
413
414
|
extractedState = extractedState.merge({
|
|
414
415
|
viewer2D: _viewer2D
|
|
415
416
|
});
|
|
417
|
+
|
|
418
|
+
// set the measurement unit after project setup
|
|
419
|
+
if (measurementUnit) this.props.viewer2DActions.updateCeilHeightUnit(measurementUnit);
|
|
416
420
|
return /*#__PURE__*/_react["default"].createElement("section", null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
417
421
|
style: _objectSpread(_objectSpread({}, wrapperStyle), {}, {
|
|
418
422
|
height: height,
|
|
@@ -12,7 +12,7 @@ var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
|
12
12
|
var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
|
|
13
13
|
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); }
|
|
14
14
|
var params = {
|
|
15
|
-
envMap:
|
|
15
|
+
envMap: "HDR",
|
|
16
16
|
roughness: 0.9,
|
|
17
17
|
metalness: 0.8,
|
|
18
18
|
exposure: 1.0
|
|
@@ -67,7 +67,7 @@ var assignUVs = function assignUVs(geometry) {
|
|
|
67
67
|
var y3 = position.getY(i + 2);
|
|
68
68
|
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);
|
|
69
69
|
}
|
|
70
|
-
geometry.setAttribute(
|
|
70
|
+
geometry.setAttribute("uv", new Three.BufferAttribute(new Float32Array(uvArray), 2));
|
|
71
71
|
geometry.needsUpdate = true;
|
|
72
72
|
};
|
|
73
73
|
function createArea(element, layer, scene, textures) {
|
|
@@ -78,15 +78,15 @@ function createArea(element, layer, scene, textures) {
|
|
|
78
78
|
var texture = element.texture;
|
|
79
79
|
texture.lengthRepeatScale = 0.01;
|
|
80
80
|
texture.heightRepeatScale = 0.01;
|
|
81
|
-
var color = element.properties.get(
|
|
81
|
+
var color = element.properties.get("patternColor");
|
|
82
82
|
if (element.selected) {
|
|
83
83
|
color = SharedStyle.AREA_MESH_COLOR.selected;
|
|
84
84
|
} else {
|
|
85
85
|
color = SharedStyle.AREA_MESH_COLOR.unselected;
|
|
86
86
|
}
|
|
87
|
-
if (texture.uri === undefined || texture.uri ==
|
|
87
|
+
if (texture.uri === undefined || texture.uri == "") {
|
|
88
88
|
// @todo THIS IS A TEMPORARY FIX TO HAVE A DEFAULT FLOOR TEXTURE
|
|
89
|
-
texture.uri = layer.floorStyle.uri ||
|
|
89
|
+
texture.uri = layer.floorStyle.uri || "https://media.test.diydesignspace.com/uploads/CountTop/202203162950_2/texture/oak-barcelona-s.jpg";
|
|
90
90
|
}
|
|
91
91
|
var shape = new _three.Shape();
|
|
92
92
|
shape.moveTo(vertices[0].x, vertices[0].y);
|
|
@@ -94,7 +94,7 @@ function createArea(element, layer, scene, textures) {
|
|
|
94
94
|
shape.lineTo(vertices[i].x, vertices[i].y);
|
|
95
95
|
}
|
|
96
96
|
function loadFloorENV() {
|
|
97
|
-
return new _RGBELoader.RGBELoader().load(
|
|
97
|
+
return new _RGBELoader.RGBELoader().load("/assets/Window.hdr", function (texture) {
|
|
98
98
|
texture.mapping = Three.EquirectangularReflectionMapping;
|
|
99
99
|
return texture;
|
|
100
100
|
});
|
|
@@ -114,8 +114,8 @@ function createArea(element, layer, scene, textures) {
|
|
|
114
114
|
/* Create holes for the area */
|
|
115
115
|
element.holes.forEach(function (holeID) {
|
|
116
116
|
var holeCoords = [];
|
|
117
|
-
layer.getIn([
|
|
118
|
-
var _layer$getIn = layer.getIn([
|
|
117
|
+
layer.getIn(["areas", holeID, "vertices"]).forEach(function (vertexID) {
|
|
118
|
+
var _layer$getIn = layer.getIn(["vertices", vertexID]),
|
|
119
119
|
x = _layer$getIn.x,
|
|
120
120
|
y = _layer$getIn.y;
|
|
121
121
|
holeCoords.push([x, y]);
|
|
@@ -142,7 +142,7 @@ function createArea(element, layer, scene, textures) {
|
|
|
142
142
|
var area = new _three.Mesh(shapeGeometry, areaMaterial);
|
|
143
143
|
area.rotation.x -= Math.PI / 2;
|
|
144
144
|
area.receiveShadow = true;
|
|
145
|
-
area.name =
|
|
145
|
+
area.name = "floor";
|
|
146
146
|
// This mesh is use for creating ceiling mesh
|
|
147
147
|
|
|
148
148
|
var shapeGeometry2 = new Three.ShapeGeometry(shape);
|
|
@@ -153,7 +153,7 @@ function createArea(element, layer, scene, textures) {
|
|
|
153
153
|
area2.castShadow = true;
|
|
154
154
|
area2.rotation.x -= Math.PI / 2;
|
|
155
155
|
area2.receiveShadow = true;
|
|
156
|
-
area2.name =
|
|
156
|
+
area2.name = "floorSupport";
|
|
157
157
|
var floorSupport = area2.clone();
|
|
158
158
|
area.userData.floorSupport = floorSupport;
|
|
159
159
|
return Promise.resolve(area);
|
|
@@ -163,13 +163,13 @@ function updatedArea(element, layer, scene, textures, mesh, oldElement, differen
|
|
|
163
163
|
selfDestroy();
|
|
164
164
|
return selfBuild();
|
|
165
165
|
};
|
|
166
|
-
var floor = mesh.getObjectByName(
|
|
166
|
+
var floor = mesh.getObjectByName("floor");
|
|
167
167
|
floor.receiveShadow = true;
|
|
168
|
-
if (differences[0] ==
|
|
168
|
+
if (differences[0] == "selected") {
|
|
169
169
|
var color = element.selected ? SharedStyle.AREA_MESH_COLOR.selected : SharedStyle.AREA_MESH_COLOR.unselected;
|
|
170
170
|
floor.material.color.set(color);
|
|
171
|
-
} else if (differences[0] ==
|
|
172
|
-
if (differences[1] ===
|
|
171
|
+
} else if (differences[0] == "properties") {
|
|
172
|
+
if (differences[1] === "texture") {
|
|
173
173
|
return noPerf();
|
|
174
174
|
}
|
|
175
175
|
} else return noPerf();
|