kitchen-simulator 2.0.31 → 2.0.41
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/actions/items-actions.js +3 -1
- package/es/actions/project-actions.js +9 -1
- package/es/catalog/factories/area-factory-3d.js +2 -1
- package/es/catalog/utils/item-loader.js +2 -0
- package/es/class/item.js +15 -8
- package/es/class/project.js +93 -1
- package/es/components/viewer2d/viewer2d.js +15 -20
- package/es/constants.js +22 -7
- package/es/devLiteRenderer.js +11 -1
- package/es/models.js +3 -1
- package/es/reducers/items-reducer.js +1 -1
- package/es/reducers/project-reducer.js +3 -1
- package/es/utils/helper.js +66 -1
- package/es/utils/isolate-event-handler.js +13 -67
- package/lib/actions/items-actions.js +3 -1
- package/lib/actions/project-actions.js +9 -0
- package/lib/catalog/factories/area-factory-3d.js +2 -1
- package/lib/catalog/utils/item-loader.js +2 -0
- package/lib/class/item.js +15 -8
- package/lib/class/project.js +92 -0
- package/lib/components/viewer2d/viewer2d.js +15 -20
- package/lib/constants.js +27 -12
- package/lib/devLiteRenderer.js +11 -1
- package/lib/models.js +3 -1
- package/lib/reducers/items-reducer.js +1 -1
- package/lib/reducers/project-reducer.js +2 -0
- package/lib/utils/helper.js +68 -1
- package/lib/utils/isolate-event-handler.js +14 -68
- package/package.json +1 -1
|
@@ -5,8 +5,8 @@ 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_SET_INITIAL_DATA, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT,
|
|
9
|
-
import { isEmpty } from "./helper";
|
|
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_SET_INITIAL_DATA, 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 } from "../constants";
|
|
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";
|
|
12
12
|
import { convert } from "./convert-units-lite";
|
|
@@ -14,29 +14,6 @@ import { GeometryUtils } from "./export";
|
|
|
14
14
|
import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
|
|
15
15
|
import { SVGLoader } from 'three/addons/loaders/SVGLoader';
|
|
16
16
|
var PRECISION = 2;
|
|
17
|
-
var compareSVGRect = function compareSVGRect(value) {
|
|
18
|
-
return value.e <= 10 && value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth && value.f <= 80 && value.f + value.d * value.SVGHeight + 10 >= value.viewerHeight ? true : false;
|
|
19
|
-
};
|
|
20
|
-
var updateViwer2D = function updateViwer2D(value, viewer2DActions) {
|
|
21
|
-
var _zoomValue = parseInt((value.a - 0.5) / ZOOM_VARIABLE);
|
|
22
|
-
if (_zoomValue > MAX_ZOOM_IN_SCALE) return;
|
|
23
|
-
if (_zoomValue < 0 || Number.isNaN(_zoomValue)) return;
|
|
24
|
-
|
|
25
|
-
// modify e, f to fit to SVG
|
|
26
|
-
while (!(value.e <= 10)) {
|
|
27
|
-
value.e -= 0.1;
|
|
28
|
-
}
|
|
29
|
-
while (!(value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth)) {
|
|
30
|
-
value.e += 0.1;
|
|
31
|
-
}
|
|
32
|
-
while (!(value.f <= 80)) {
|
|
33
|
-
value.f -= 0.1;
|
|
34
|
-
}
|
|
35
|
-
while (!(value.f + value.a * value.SVGHeight + 10 >= value.viewerHeight)) {
|
|
36
|
-
value.f += 0.1;
|
|
37
|
-
}
|
|
38
|
-
if (compareSVGRect(value)) viewer2DActions.updateCameraView(value);
|
|
39
|
-
};
|
|
40
17
|
function loadJSON(_x) {
|
|
41
18
|
return _loadJSON.apply(this, arguments);
|
|
42
19
|
}
|
|
@@ -996,7 +973,7 @@ export function handleExternalEvent(_x10) {
|
|
|
996
973
|
function _handleExternalEvent() {
|
|
997
974
|
_handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(props) {
|
|
998
975
|
var _evt$payload3, _evt$payload4;
|
|
999
|
-
var evt, state, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, _evt$payload5, moveType, moveValue, value, defaulTitle, _evt$payload6, doorStyle, itemCDS, isAll, _doorStyle, _value, _value2,
|
|
976
|
+
var evt, state, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, _evt$payload5, moveType, moveValue, value, defaulTitle, _evt$payload6, doorStyle, itemCDS, isAll, _doorStyle, _value, _value2, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value3, layerId, layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i2, _i3, _i4, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven2, _t5, _t6;
|
|
1000
977
|
return _regeneratorRuntime.wrap(function (_context9) {
|
|
1001
978
|
while (1) switch (_context9.prev = _context9.next) {
|
|
1002
979
|
case 0:
|
|
@@ -1126,7 +1103,7 @@ function _handleExternalEvent() {
|
|
|
1126
1103
|
vPosX = (mouseX - v2d.e) / v2d.a;
|
|
1127
1104
|
vPosY = (mouseY - v2d.f) / v2d.d;
|
|
1128
1105
|
layerID = state.scene.selectedLayer; // move cabinet to initial position
|
|
1129
|
-
props.itemsActions.updateDrawingItem(layerID, vPosX, -vPosY + state.scene.height);
|
|
1106
|
+
props.itemsActions.updateDrawingItem(layerID, vPosX, -vPosY + state.scene.height, true);
|
|
1130
1107
|
}
|
|
1131
1108
|
}
|
|
1132
1109
|
props.projectActions.pushLastSelectedCatalogElementToHistory(element);
|
|
@@ -1171,7 +1148,7 @@ function _handleExternalEvent() {
|
|
|
1171
1148
|
props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
|
|
1172
1149
|
return _context9.abrupt("continue", 37);
|
|
1173
1150
|
case 22:
|
|
1174
|
-
props.projectActions.
|
|
1151
|
+
props.projectActions.createRoomWithShape(evt.payload.roomShapeType, evt.payload.width, evt.payload.height);
|
|
1175
1152
|
return _context9.abrupt("continue", 37);
|
|
1176
1153
|
case 23:
|
|
1177
1154
|
_value = state.getIn(['viewer2D']).toJS();
|
|
@@ -1190,38 +1167,7 @@ function _handleExternalEvent() {
|
|
|
1190
1167
|
updateViwer2D(_value2, props.viewer2DActions);
|
|
1191
1168
|
return _context9.abrupt("continue", 37);
|
|
1192
1169
|
case 25:
|
|
1193
|
-
|
|
1194
|
-
layer = state.scene.getIn(['layers', state.scene.selectedLayer]);
|
|
1195
|
-
bb = {
|
|
1196
|
-
minX: Infinity,
|
|
1197
|
-
maxX: -Infinity,
|
|
1198
|
-
minY: Infinity,
|
|
1199
|
-
maxY: -Infinity
|
|
1200
|
-
};
|
|
1201
|
-
bb = layer.vertices.reduce(function (pre, cur) {
|
|
1202
|
-
pre.minX = Math.min(pre.minX, cur.x);
|
|
1203
|
-
pre.maxX = Math.max(pre.maxX, cur.x);
|
|
1204
|
-
pre.minY = Math.min(pre.minY, cur.y);
|
|
1205
|
-
pre.maxY = Math.max(pre.maxY, cur.y);
|
|
1206
|
-
return pre;
|
|
1207
|
-
}, bb);
|
|
1208
|
-
w = bb.maxX - bb.minX;
|
|
1209
|
-
h = bb.maxY - bb.minY; // calc scale and offset to fit view
|
|
1210
|
-
viewer = state.getIn(['viewer2D']).toJS();
|
|
1211
|
-
if (w != 0 && Math.abs(w) != Infinity && h != 0 && Math.abs(h) != Infinity) {
|
|
1212
|
-
// elements are exist && bounding box size > 0
|
|
1213
|
-
viewer.a = viewer.viewerHeight < h ? viewer.viewerHeight / h : viewer.viewerHeight / h * 3 / 5 / ZOOM_VARIABLE > MAX_ZOOM_IN_SCALE ? viewer.viewerHeight / h * MAX_ZOOM_IN_SCALE / (viewer.viewerHeight / h / ZOOM_VARIABLE) : viewer.viewerHeight / h * 3 / 5;
|
|
1214
|
-
viewer.d = viewer.a;
|
|
1215
|
-
viewer.e = (viewer.viewerWidth - (bb.maxX + bb.minX) * viewer.a) / 2;
|
|
1216
|
-
viewer.f = (viewer.viewerHeight - (bb.maxY + bb.minY) * viewer.a) / 2;
|
|
1217
|
-
} else {
|
|
1218
|
-
// there is no any element && bounding box size == 0
|
|
1219
|
-
viewer.e = viewer.viewerWidth / 2 - viewer.SVGWidth / 2;
|
|
1220
|
-
viewer.f = viewer.viewerHeight / 2 - viewer.SVGHeight / 2;
|
|
1221
|
-
viewer.a = 0.99;
|
|
1222
|
-
viewer.d = 0.99;
|
|
1223
|
-
}
|
|
1224
|
-
updateViwer2D(viewer, props.viewer2DActions);
|
|
1170
|
+
centering2D(state, props.viewer2DActions);
|
|
1225
1171
|
return _context9.abrupt("continue", 37);
|
|
1226
1172
|
case 26:
|
|
1227
1173
|
props.projectActions.undo();
|
|
@@ -1261,17 +1207,17 @@ function _handleExternalEvent() {
|
|
|
1261
1207
|
return _context9.abrupt("continue", 37);
|
|
1262
1208
|
case 33:
|
|
1263
1209
|
layerId = state.getIn(['scene', 'selectedLayer']);
|
|
1264
|
-
|
|
1265
|
-
_layer$getIn =
|
|
1266
|
-
for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(
|
|
1267
|
-
for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(
|
|
1268
|
-
for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(
|
|
1210
|
+
layer = state.getIn(['scene', 'layers', layerId]);
|
|
1211
|
+
_layer$getIn = layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
|
|
1212
|
+
for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1213
|
+
for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1214
|
+
for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1269
1215
|
return _context9.abrupt("continue", 37);
|
|
1270
1216
|
case 34:
|
|
1271
1217
|
_layerID = state.scene.selectedLayer;
|
|
1272
|
-
|
|
1218
|
+
_layer = state.scene.getIn(['layers', _layerID]).toJS();
|
|
1273
1219
|
orginalItemInfo = evt === null || evt === void 0 || (_evt$payload9 = evt.payload) === null || _evt$payload9 === void 0 ? void 0 : _evt$payload9.orginalItemInfo;
|
|
1274
|
-
originalItem =
|
|
1220
|
+
originalItem = _layer === null || _layer === void 0 ? void 0 : _layer.items[orginalItemInfo.id];
|
|
1275
1221
|
_context9.next = 35;
|
|
1276
1222
|
return addItemToCatalog(evt.payload.replaceItemInfo, state, props.catalog, props.projectActions);
|
|
1277
1223
|
case 35:
|
|
@@ -129,11 +129,13 @@ function selectToolDrawingItem3D(sceneComponentType) {
|
|
|
129
129
|
};
|
|
130
130
|
}
|
|
131
131
|
function updateDrawingItem(layerID, x, y) {
|
|
132
|
+
var isInitialPos = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
132
133
|
return {
|
|
133
134
|
type: _constants.UPDATE_DRAWING_ITEM,
|
|
134
135
|
layerID: layerID,
|
|
135
136
|
x: x,
|
|
136
|
-
y: y
|
|
137
|
+
y: y,
|
|
138
|
+
isInitialPos: isInitialPos
|
|
137
139
|
};
|
|
138
140
|
}
|
|
139
141
|
function endDrawingItem(layerID, x, y) {
|
|
@@ -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;
|
|
@@ -337,4 +338,12 @@ function selectAll() {
|
|
|
337
338
|
type: _constants.SELECT_ALL,
|
|
338
339
|
value: value
|
|
339
340
|
};
|
|
341
|
+
}
|
|
342
|
+
function createRoomWithShape(roomShapeType, width, height) {
|
|
343
|
+
return {
|
|
344
|
+
type: _constants.CREATE_ROOM_WITH_SHAPE,
|
|
345
|
+
width: width,
|
|
346
|
+
height: height,
|
|
347
|
+
roomShapeType: roomShapeType
|
|
348
|
+
};
|
|
340
349
|
}
|
|
@@ -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
|
-
|
|
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);
|
|
@@ -1009,6 +1009,8 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
|
|
|
1009
1009
|
try {
|
|
1010
1010
|
counterTop = counterTop.toJS();
|
|
1011
1011
|
} catch (error) {
|
|
1012
|
+
//@todo THIS IS A TEMPORARY FIX FOR COUNTERTOP TEXTURE UNDEFINED ISSUE
|
|
1013
|
+
counterTop.uri = 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg';
|
|
1012
1014
|
console.log(error);
|
|
1013
1015
|
}
|
|
1014
1016
|
}
|
package/lib/class/item.js
CHANGED
|
@@ -36,6 +36,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
|
|
|
36
36
|
key: "create",
|
|
37
37
|
value: function create(state, layerID, type, x, y, width, height, rotation, isDuplication) {
|
|
38
38
|
var molding = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : [];
|
|
39
|
+
var isInitialPos = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
|
|
39
40
|
var itemID = _export2.IDBroker.acquireID();
|
|
40
41
|
var item = state.catalog.factoryElement(type, {
|
|
41
42
|
id: itemID,
|
|
@@ -52,7 +53,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
|
|
|
52
53
|
x: x,
|
|
53
54
|
y: y,
|
|
54
55
|
rotation: rotation,
|
|
55
|
-
isDuplication: isDuplication
|
|
56
|
+
isDuplication: isDuplication,
|
|
57
|
+
isInitialPos: isInitialPos ? isInitialPos : false
|
|
56
58
|
}, null, state);
|
|
57
59
|
if (item.category === 'cabinet') {
|
|
58
60
|
var _state$doorStyle;
|
|
@@ -595,13 +597,15 @@ var Item = exports["default"] = /*#__PURE__*/function () {
|
|
|
595
597
|
}, {
|
|
596
598
|
key: "updateDrawingItem",
|
|
597
599
|
value: function updateDrawingItem(state, layerID, x, y) {
|
|
600
|
+
var isInitialPos = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
598
601
|
if (state.hasIn(['drawingSupport', 'currentID'])) {
|
|
599
602
|
var mode = state.get('mode');
|
|
600
603
|
if ([_constants.MODE_DRAWING_ITEM_3D].includes(mode)) {
|
|
601
604
|
state = state.updateIn(['scene', 'layers', layerID, 'items', state.getIn(['drawingSupport', 'currentID'])], function (item) {
|
|
602
605
|
return item && item.merge({
|
|
603
606
|
x: x,
|
|
604
|
-
y: y
|
|
607
|
+
y: y,
|
|
608
|
+
isInitialPos: isInitialPos ? isInitialPos : false
|
|
605
609
|
});
|
|
606
610
|
});
|
|
607
611
|
state = state.merge({
|
|
@@ -615,12 +619,13 @@ var Item = exports["default"] = /*#__PURE__*/function () {
|
|
|
615
619
|
state = state.updateIn(['scene', 'layers', layerID, 'items', state.getIn(['drawingSupport', 'currentID'])], function (item) {
|
|
616
620
|
return item && item.merge({
|
|
617
621
|
x: x,
|
|
618
|
-
y: y
|
|
622
|
+
y: y,
|
|
623
|
+
isInitialPos: isInitialPos ? isInitialPos : false
|
|
619
624
|
});
|
|
620
625
|
});
|
|
621
626
|
}
|
|
622
627
|
} else {
|
|
623
|
-
var _this$create5 = this.create(state, layerID, state.getIn(['drawingSupport', 'type']), x, y, 200, 100, 0, false),
|
|
628
|
+
var _this$create5 = this.create(state, layerID, state.getIn(['drawingSupport', 'type']), x, y, 200, 100, 0, false, [], isInitialPos),
|
|
624
629
|
stateI = _this$create5.updatedState,
|
|
625
630
|
item = _this$create5.item;
|
|
626
631
|
if (item === null) {
|
|
@@ -656,7 +661,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
|
|
|
656
661
|
// tY = tY > 500 ? 500 : tY < 0 ? 0 : tY;
|
|
657
662
|
item = item.merge({
|
|
658
663
|
x: x,
|
|
659
|
-
y: y
|
|
664
|
+
y: y,
|
|
665
|
+
isInitialPos: false
|
|
660
666
|
});
|
|
661
667
|
state = state.merge({
|
|
662
668
|
scene: scene.mergeIn(['layers', layerID, 'items', itemID], item)
|
|
@@ -670,8 +676,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
|
|
|
670
676
|
}, {
|
|
671
677
|
key: "endDrawingItem",
|
|
672
678
|
value: function endDrawingItem(state, layerID, x, y) {
|
|
673
|
-
|
|
674
|
-
state = this.updateDrawingItem(state, layerID, x, y
|
|
679
|
+
// let catalog = state.catalog;
|
|
680
|
+
state = this.updateDrawingItem(state, layerID, x, y).updatedState;
|
|
675
681
|
state = _export.Layer.unselectAll(state, layerID).updatedState;
|
|
676
682
|
var popup = state.get('popup');
|
|
677
683
|
state = state.merge({
|
|
@@ -754,7 +760,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
|
|
|
754
760
|
tY = tY > scene.height ? scene.height : tY < 0 ? 0 : tY;
|
|
755
761
|
item = item.merge({
|
|
756
762
|
x: tX,
|
|
757
|
-
y: tY
|
|
763
|
+
y: tY,
|
|
764
|
+
isInitialPos: false
|
|
758
765
|
});
|
|
759
766
|
state = state.merge({
|
|
760
767
|
scene: scene.mergeIn(['layers', layerID, 'items', itemID], item)
|
package/lib/class/project.js
CHANGED
|
@@ -17,6 +17,7 @@ var _export = require("../utils/export");
|
|
|
17
17
|
var _export2 = require("../class/export");
|
|
18
18
|
var viewer2DActions = _interopRequireWildcard(require("../actions/viewer2d-actions"));
|
|
19
19
|
var _helper = require("../utils/helper");
|
|
20
|
+
var _convertUnitsLite = require("../utils/convert-units-lite");
|
|
20
21
|
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); }
|
|
21
22
|
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; }
|
|
22
23
|
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; }
|
|
@@ -831,6 +832,97 @@ var Project = exports["default"] = /*#__PURE__*/function () {
|
|
|
831
832
|
updatedState: state
|
|
832
833
|
};
|
|
833
834
|
}
|
|
835
|
+
}, {
|
|
836
|
+
key: "createRoomWithShape",
|
|
837
|
+
value: function createRoomWithShape(state, roomShapeType, width, height) {
|
|
838
|
+
var catalog = state.catalog;
|
|
839
|
+
state = this.newProject(state).updatedState;
|
|
840
|
+
state = state.merge({
|
|
841
|
+
catalog: catalog
|
|
842
|
+
});
|
|
843
|
+
var _viewer2D = state.viewer2D;
|
|
844
|
+
var viewer = _viewer2D.toJS();
|
|
845
|
+
width = (0, _convertUnitsLite.convert)(width).from('in').to('cm');
|
|
846
|
+
height = (0, _convertUnitsLite.convert)(height).from('in').to('cm');
|
|
847
|
+
var layerID = state.scene.selectedLayer;
|
|
848
|
+
if ((0, _helper.isEmpty)(viewer)) return {
|
|
849
|
+
updatedState: state
|
|
850
|
+
};
|
|
851
|
+
var halfWidth = width / 2;
|
|
852
|
+
var halfHeight = height / 2;
|
|
853
|
+
var viewerWidth = viewer.SVGWidth;
|
|
854
|
+
var viewerHeight = viewer.SVGHeight;
|
|
855
|
+
var centerPos = {
|
|
856
|
+
x: viewerWidth / 2,
|
|
857
|
+
y: viewerHeight / 2
|
|
858
|
+
};
|
|
859
|
+
var vtLB = {
|
|
860
|
+
x: centerPos.x - halfWidth,
|
|
861
|
+
y: centerPos.y - halfHeight
|
|
862
|
+
};
|
|
863
|
+
var vtRB = {
|
|
864
|
+
x: centerPos.x + halfWidth,
|
|
865
|
+
y: centerPos.y - halfHeight
|
|
866
|
+
};
|
|
867
|
+
var vtRT = {
|
|
868
|
+
x: centerPos.x + halfWidth,
|
|
869
|
+
y: centerPos.y + halfHeight
|
|
870
|
+
};
|
|
871
|
+
var vtLT = {
|
|
872
|
+
x: centerPos.x - halfWidth,
|
|
873
|
+
y: centerPos.y + halfHeight
|
|
874
|
+
};
|
|
875
|
+
var vertices = [];
|
|
876
|
+
switch (roomShapeType) {
|
|
877
|
+
case 'rectangle':
|
|
878
|
+
vertices = [vtLB, vtLT, vtRT, vtRB];
|
|
879
|
+
break;
|
|
880
|
+
case constants.ROOM_SHAPE_TYPE.TWO_WALLS_RIGHT_BOTTOM:
|
|
881
|
+
vertices = [vtLB, vtRB, vtRT];
|
|
882
|
+
break;
|
|
883
|
+
case constants.ROOM_SHAPE_TYPE.TWO_WALLS_RIGHT_TOP:
|
|
884
|
+
vertices = [vtRB, vtRT, vtLT];
|
|
885
|
+
break;
|
|
886
|
+
case constants.ROOM_SHAPE_TYPE.TWO_WALLS_LEFT_TOP:
|
|
887
|
+
vertices = [vtRT, vtLT, vtLB];
|
|
888
|
+
break;
|
|
889
|
+
case constants.ROOM_SHAPE_TYPE.TWO_WALLS_LEFT_BOTTOM:
|
|
890
|
+
vertices = [vtLT, vtLB, vtRB];
|
|
891
|
+
break;
|
|
892
|
+
case constants.ROOM_SHAPE_TYPE.THREE_WALLS_LEFT_TOP_RIGHT:
|
|
893
|
+
vertices = [vtRB, vtRT, vtLT, vtLB];
|
|
894
|
+
break;
|
|
895
|
+
case constants.ROOM_SHAPE_TYPE.THREE_WALLS_TOP_RIGHT_BOTTOM:
|
|
896
|
+
vertices = [vtLB, vtRB, vtRT, vtLT];
|
|
897
|
+
break;
|
|
898
|
+
case constants.ROOM_SHAPE_TYPE.THREE_WALLS_RIGHT_BOTTOM_LEFT:
|
|
899
|
+
vertices = [vtLT, vtLB, vtRB, vtRT];
|
|
900
|
+
break;
|
|
901
|
+
case constants.ROOM_SHAPE_TYPE.THREE_WALLS_BOTTOM_LEFT_TOP:
|
|
902
|
+
vertices = [vtRT, vtLT, vtLB, vtRB];
|
|
903
|
+
break;
|
|
904
|
+
}
|
|
905
|
+
for (var i = 0; i < vertices.length - 1; i++) {
|
|
906
|
+
state = _export2.Line.create(state, layerID, 'wall', vertices[i].x, vertices[i].y, vertices[i + 1].x, vertices[i + 1].y).updatedState;
|
|
907
|
+
}
|
|
908
|
+
if (roomShapeType === constants.ROOM_SHAPE_TYPE.RECTANGLE) {
|
|
909
|
+
state = _export2.Line.create(state, layerID, 'wall', vertices[vertices.length - 1].x, vertices[vertices.length - 1].y, vertices[0].x, vertices[0].y).updatedState;
|
|
910
|
+
}
|
|
911
|
+
var layer = state.getIn(['scene', 'layers', layerID]);
|
|
912
|
+
var lines = layer.getIn(['lines']).toJS();
|
|
913
|
+
var drawingInfo = {};
|
|
914
|
+
var lineKey = Object.keys(lines);
|
|
915
|
+
for (var _i = 0; _i < lineKey.length; _i++) {
|
|
916
|
+
if (!(0, _helper.isEmpty)(lineKey)) {
|
|
917
|
+
drawingInfo.drawingLine = layer.getIn(['lines', lineKey[_i]]);
|
|
918
|
+
}
|
|
919
|
+
state = _export2.Layer.detectAndUpdateAreas(state, layerID, drawingInfo).updatedState;
|
|
920
|
+
}
|
|
921
|
+
state = (0, _helper.centering2D)(state);
|
|
922
|
+
return {
|
|
923
|
+
updatedState: state
|
|
924
|
+
};
|
|
925
|
+
}
|
|
834
926
|
}]);
|
|
835
927
|
}();
|
|
836
928
|
module.exports = exports.default;
|
|
@@ -792,17 +792,13 @@ function Viewer2D(_ref, _ref2) {
|
|
|
792
792
|
return;
|
|
793
793
|
}
|
|
794
794
|
}
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
}
|
|
795
|
+
mouseDownPoint = {
|
|
796
|
+
x: x,
|
|
797
|
+
y: y
|
|
798
|
+
};
|
|
799
799
|
if (mode === constants.MODE_IDLE) {
|
|
800
800
|
var elementData = extractElementData(event.target);
|
|
801
801
|
if (!elementData) return;
|
|
802
|
-
mouseDownPoint = {
|
|
803
|
-
x: x,
|
|
804
|
-
y: y
|
|
805
|
-
};
|
|
806
802
|
if (sCount < 2) {
|
|
807
803
|
switch (elementData.prototype) {
|
|
808
804
|
case 'lines':
|
|
@@ -867,6 +863,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
867
863
|
var _mapCursorPosition3 = mapCursorPosition(viewerEvent),
|
|
868
864
|
x = _mapCursorPosition3.x,
|
|
869
865
|
y = _mapCursorPosition3.y;
|
|
866
|
+
var draggingDistance = Math.sqrt((x - mouseDownPoint.x) * (x - mouseDownPoint.x) + (y - mouseDownPoint.y) * (y - mouseDownPoint.y));
|
|
870
867
|
var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
|
|
871
868
|
var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
872
869
|
var elementData = extractElementData(event.target);
|
|
@@ -1242,7 +1239,10 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1242
1239
|
holesActions.endDrawingHole(layerID, x, y);
|
|
1243
1240
|
break;
|
|
1244
1241
|
case constants.MODE_DRAWING_ITEM:
|
|
1245
|
-
|
|
1242
|
+
{
|
|
1243
|
+
var itemData = state.getIn(['scene', 'layers', layerID, elementData === null || elementData === void 0 ? void 0 : elementData.prototype, elementData === null || elementData === void 0 ? void 0 : elementData.id]);
|
|
1244
|
+
itemsActions.endDrawingItem(layerID, itemData.isInitialPos ? itemData.x : endPoint.x, itemData.isInitialPos ? itemData.y : endPoint.y);
|
|
1245
|
+
}
|
|
1246
1246
|
break;
|
|
1247
1247
|
case constants.MODE_DRAGGING_LINE:
|
|
1248
1248
|
linesActions.endDraggingLine(x, y, relatedLines, state.snapMask);
|
|
@@ -1265,23 +1265,18 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1265
1265
|
}
|
|
1266
1266
|
if (internalType) {
|
|
1267
1267
|
var _currentObject = null;
|
|
1268
|
-
var draggingDistance = Math.sqrt((x - mouseDownPoint.x) * (x - mouseDownPoint.x) + (y - mouseDownPoint.y) * (y - mouseDownPoint.y));
|
|
1269
1268
|
if (internalType === _constants.INTERNAL_EVENT_SELECT_ELEMENT || internalType === constants.INTERNAL_EVENT_REPLACE_CABINET) {
|
|
1269
|
+
var _currentObject2;
|
|
1270
1270
|
_currentObject = state.getIn(['scene', 'layers', layerID, elementData === null || elementData === void 0 ? void 0 : elementData.prototype, elementData === null || elementData === void 0 ? void 0 : elementData.id]);
|
|
1271
|
-
|
|
1272
|
-
// internalType === INTERNAL_EVENT_SELECT_ELEMENT &&
|
|
1273
|
-
// currentObject?.prototype === 'items' &&
|
|
1274
|
-
// draggingDistance > constants.EPSILON
|
|
1275
|
-
// )
|
|
1276
|
-
// internalType = INTERNAL_EVENT_DRAG_ELEMENT;
|
|
1271
|
+
if (internalType === _constants.INTERNAL_EVENT_SELECT_ELEMENT && ((_currentObject2 = _currentObject) === null || _currentObject2 === void 0 ? void 0 : _currentObject2.prototype) === 'items' && draggingDistance > constants.EPSILON) internalType = _constants.INTERNAL_EVENT_DRAG_ELEMENT;
|
|
1277
1272
|
} else if (draggingDistance > constants.EPSILON) {
|
|
1278
1273
|
var elementID = state.getIn(['scene', 'layers', layerID, 'selected', elementPrototype]).first();
|
|
1279
1274
|
_currentObject = state.getIn(['scene', 'layers', layerID, elementPrototype, elementID]);
|
|
1280
1275
|
}
|
|
1281
1276
|
if (_currentObject) {
|
|
1282
|
-
var
|
|
1283
|
-
var payload = (
|
|
1284
|
-
if (((
|
|
1277
|
+
var _currentObject3, _currentObject4, _currentObject5;
|
|
1278
|
+
var payload = (_currentObject3 = _currentObject) === null || _currentObject3 === void 0 ? void 0 : _currentObject3.toJS();
|
|
1279
|
+
if (((_currentObject4 = _currentObject) === null || _currentObject4 === void 0 ? void 0 : _currentObject4.prototype) === 'lines') {
|
|
1285
1280
|
// caculating length of selected line//
|
|
1286
1281
|
var v_a = layer.vertices.get(_currentObject.vertices.get(0));
|
|
1287
1282
|
var v_b = layer.vertices.get(_currentObject.vertices.get(1));
|
|
@@ -1289,7 +1284,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1289
1284
|
var _length3 = (0, _convertUnitsLite.convert)(distance).from('cm').to('in');
|
|
1290
1285
|
payload.length = _length3;
|
|
1291
1286
|
//////////////////////////////////////
|
|
1292
|
-
} else if (((
|
|
1287
|
+
} else if (((_currentObject5 = _currentObject) === null || _currentObject5 === void 0 ? void 0 : _currentObject5.prototype) === 'items') {
|
|
1293
1288
|
// check this cabinet has warning box
|
|
1294
1289
|
payload.isWarning = (0, _utils.isWarningItem)(_currentObject);
|
|
1295
1290
|
}
|
package/lib/constants.js
CHANGED
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
7
|
-
exports.
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
10
|
-
exports.ZOOM_VARIABLE = exports.WARRANTY_VIEW = exports.WARRANTY_SUPPORT = exports.WARNING_MESSAGE = exports.WALL_ITEM_MEASUREMENT_LINE_COLOR = exports.WALL_CABINET_LAYOUTPOS = exports.VIEWER3D_ACTIONS = exports.VIEWER2D_ACTIONS = exports.VERTEX_ACTIONS = exports.VALIDATE_ITEM_POSTIONS = exports.USER_ACTIONS = exports.UPDATE_ZOOM_SCALE = exports.UPDATE_ROTATING_ITEM_CHANGED = exports.UPDATE_ROTATING_ITEM = exports.UPDATE_ROTATING = exports.UPDATE_POPUP_OPEN = exports.UPDATE_MOVING_STATE = exports.UPDATE_MOUSE_COORDS = exports.UPDATE_MOLDING = void 0;
|
|
6
|
+
exports.END_ROTATING_ITEM_3D = exports.END_ROTATING_ITEM = exports.END_LOADING = exports.END_FITTING_IMAGE = exports.END_DRAWING_LINE = exports.END_DRAWING_ITEM = exports.END_DRAWING_HOLE_3D = exports.END_DRAWING_HOLE = exports.END_DRAGGING_VERTEX = exports.END_DRAGGING_LINE = exports.END_DRAGGING_ITEM_3D = exports.END_DRAGGING_ITEM = exports.END_DRAGGING_HOLE_3D = exports.END_DRAGGING_HOLE = exports.END_CREATING_HOLE = exports.END_CREATING_CABINET = exports.ELEVATION_VIEW_TITLE = exports.ELEVATION_VIEW_RIGHT = exports.ELEVATION_VIEW_LEFT = exports.ELEVATION_VIEW_KEYWORD = exports.ELEVATION_VIEW_FRONT = exports.ELEVATION_VIEW_BACK = exports.ELEVATION_VIEW = exports.ELEMENT_VERTEX = exports.ELEMENT_LINE = exports.ELEMENT_ITEM = exports.ELEMENT_HOLE = exports.ELEMENT_AREA = exports.EDIT_WIDTH = exports.EDIT = exports.DUPLICATE_SELECTED = exports.DISTANCE_MEASUREMENT_LINE_COLOR = exports.DISTANCE_EPSILON = exports.DIFFERENT_VALUES_PATH_LENGTH = exports.DELTA = exports.DEFAULT_FONT_FAMILY = exports.DECIMAL_PLACES_3 = exports.DECIMAL_PLACES_2 = exports.DASH_LINE_COLOR = exports.CREATE_ROOM_WITH_SHAPE = exports.COPY_PROPERTIES = exports.CLIENTS_NAME = exports.CHANGE_WINDOW_DOOR_MEASURE = exports.CHANGE_WALL_LENGTH_MEASURE = exports.CHANGE_WALL_CABINET_MEASURE = exports.CHANGE_CATALOG_PAGE = exports.CHANGE_BASE_CABINET_MEASURE = exports.CEIL_UNITS_LENGTH = exports.BROWN_COLOR = exports.BOTTOM_MOLDING_LOCATION = exports.BOTTOM = exports.BG_COLOR_OVERLAY = exports.BG_COLOR_HOVER = exports.BG_COLOR_1 = exports.BG_COLOR_0 = exports.BEGIN_UPLOADING_IMAGE = exports.BEGIN_ROTATING_ITEM_3D = exports.BEGIN_ROTATING_ITEM = exports.BEGIN_FITTING_IMAGE = exports.BEGIN_DRAWING_LINE = exports.BEGIN_DRAGGING_VERTEX = exports.BEGIN_DRAGGING_LINE = exports.BEGIN_DRAGGING_ITEM_3D = exports.BEGIN_DRAGGING_ITEM = exports.BEGIN_DRAGGING_HOLE_3D = exports.BEGIN_DRAGGING_HOLE = exports.BASE_ITEM_MEASUREMENT_LINE_COLOR = exports.BASE_CABINET_LAYOUTPOS = exports.BACK_DIST_ANG = exports.ATT_VERTEXT_TWO = exports.ATT_VERTEXT_ONE = exports.ATT_LINE_LENGTH = exports.ATT_ITEM_ROTATION = exports.ATT_ITEM_POS = exports.ATT_HOLE_OFFSET_B = exports.ATT_HOLE_OFFSET_A = exports.ARROW_TEXT_FORECOLOR = exports.ARROW_TEXT_FONTFACE = exports.ARROW_TEXT_BACKCOLOR = exports.ARROW_COLOR = exports.ARRAY_ELEVATION_VIEW_MODES = exports.ARRAY_3D_MODES = exports.AREA_ACTIONS = exports.API_SERVER_URL = exports.ANIMATE_STEP_MIN = exports.ANIMATE_STEP_MAX = exports.ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT = exports.ANIMATE_OBJECT = exports.ALTERATE_STATE = exports.ADD_VERTICAL_GUIDE = exports.ADD_TO_GROUP = exports.ADD_LAYER = exports.ADD_HORIZONTAL_GUIDE = exports.ADD_GROUP_FROM_SELECTED = exports.ADD_GROUP = exports.ADD_ELEMENT_TO_CATALOG = exports.ADD_CIRCULAR_GUIDE = exports.ADD_CABINETS = exports.ADD_APPLIANCES = exports.ACCENT_COLOR = void 0;
|
|
7
|
+
exports.MODE_FRONT_ELEVATION_VIEW = exports.MODE_FITTING_IMAGE = exports.MODE_ELEVATION_VIEW = exports.MODE_DRAWING_LINE = exports.MODE_DRAWING_ITEM_3D = exports.MODE_DRAWING_ITEM = exports.MODE_DRAWING_HOLE_3D = exports.MODE_DRAWING_HOLE = exports.MODE_DRAGGING_VERTEX = exports.MODE_DRAGGING_LINE = exports.MODE_DRAGGING_ITEM_3D = exports.MODE_DRAGGING_ITEM = exports.MODE_DRAGGING_HOLE_3D = exports.MODE_DRAGGING_HOLE = exports.MODE_CONFIGURING_PROJECT = exports.MODE_BACK_ELEVATION_VIEW = exports.MODE_3D_VIEW = exports.MODE_3D_FIRST_PERSON = exports.MODE_2D_ZOOM_OUT = exports.MODE_2D_ZOOM_IN = exports.MODE_2D_PAN = exports.MODE = exports.MIN_ANGLE_DISALLOW_DRAW_WALL = exports.MIDDLE_MOLDING_LOCATION = exports.MEPSILON = exports.MAX_ZOOM_IN_SCALE = exports.MAX_ANGLE_SCALE = exports.MAKE_FLOOR_PLAN = exports.LOGOUT = exports.LOGIN_SUCCESS = exports.LOGIN_ERROR = exports.LOCAL_STORAGE_TOKEN_VALUE = exports.LOCAL_STORAGE_TOKEN_NAME = exports.LOCAL_STORAGE_ORIGINAL_TOKEN = exports.LOCAL_STORAGE_CUSTOMER_INFO = exports.LOCAL_STORAGE_CART_ACTION = exports.LOAD_PROJECT = exports.LIST_QUANTITIES = exports.LIST_PARTS = exports.LINE_THICKNESS = exports.LINE_ACTIONS = exports.LEFT_DIST_ANG = exports.LEFT = exports.LABEL_COLOR = exports.KITCHEN_KONFIGURATOR = exports.KEYBOARD_BUTTON_CODE = exports.ITEM_TYPE = exports.ITEM_MOVE_UP = exports.ITEMS_ACTIONS = exports.INVERT = exports.INTERNAL_EVENT_UNSELECT_ALL = exports.INTERNAL_EVENT_SYNC_SCENE = exports.INTERNAL_EVENT_SELECT_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_ITEMS_CATALOG = exports.INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAG_ELEMENT = exports.INSTALLATION_TYPE_SKU_SUFFIX = exports.INSTALLATION_TYPE_NAME = exports.INSTALLATION_SUFFIX_TYPE = exports.INIT_CATALOG = exports.HOLE_NAMES = exports.HOLE_ACTIONS = exports.HDR_URLS = exports.HAS_LOADINGBAR = exports.GROUP_TRANSLATE = exports.GROUP_ROTATE = exports.GROUP_ACTIONS = exports.GO_BACK_TO_CATALOG_PAGE = exports.FRONT_DIST_ANG = exports.FINISHING_TOUCH = exports.EXTERNAL_EVENT_ZOOM_OUT = exports.EXTERNAL_EVENT_ZOOM_IN = exports.EXTERNAL_EVENT_UPDATE_PROPERTY = exports.EXTERNAL_EVENT_UPDATE_ATTRIBUTE = exports.EXTERNAL_EVENT_UNDO = exports.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.EXTERNAL_EVENT_TOGGLE_TO_3D = exports.EXTERNAL_EVENT_TOGGLE_TO_2D = exports.EXTERNAL_EVENT_SYNC_SCENE = exports.EXTERNAL_EVENT_SET_MOLDING = exports.EXTERNAL_EVENT_SET_INITIAL_DATA = exports.EXTERNAL_EVENT_REPLACE_CABINET = exports.EXTERNAL_EVENT_REDO = exports.EXTERNAL_EVENT_PROJECT_SETTING = exports.EXTERNAL_EVENT_NEW_PROJECT = exports.EXTERNAL_EVENT_MOVE_PAN = exports.EXTERNAL_EVENT_LOAD_PROJECT = exports.EXTERNAL_EVENT_DUPLICATE_ELEMENT = exports.EXTERNAL_EVENT_DELETE_ELEMENT = exports.EXTERNAL_EVENT_CHANGE_DOORSTYLE = exports.EXTERNAL_EVENT_CENTERING_2D = exports.EXTERNAL_EVENT_ADD_WALL = exports.EXTERNAL_EVENT_ADD_ROOM_SHAPE = exports.EXTERNAL_EVENT_ADD_ITEM = exports.EXTERNAL_EVENT_ADD_HOLE = exports.ERROR_DATABASE = exports.EPSILON = exports.END_UPLOADING_IMAGE = void 0;
|
|
8
|
+
exports.SET_GROUP_PROPERTIES = exports.SET_GROUP_BARYCENTER = exports.SET_GROUP_ATTRIBUTES = exports.SET_FLOOR_STYLES = exports.SET_DOOR_STYLE = exports.SET_DOOR_HANDLE = exports.SET_DISTANT = exports.SET_COUNTER_TOP = exports.SET_BACKSPLASH_VISIBLE = exports.SET_BACKSPLASH = exports.SET_APPLIANCE_MATERIAL = exports.SELECT_TOOL_ZOOM_OUT = exports.SELECT_TOOL_ZOOM_IN = exports.SELECT_TOOL_UPLOAD_IMAGE = exports.SELECT_TOOL_PAN = exports.SELECT_TOOL_EDIT = exports.SELECT_TOOL_DRAWING_LINE = exports.SELECT_TOOL_DRAWING_ITEM_3D = exports.SELECT_TOOL_DRAWING_ITEM = exports.SELECT_TOOL_DRAWING_HOLE_3D = exports.SELECT_TOOL_DRAWING_HOLE = exports.SELECT_TOOL_3D_VIEW = exports.SELECT_TOOL_3D_FIRST_PERSON = exports.SELECT_LINE = exports.SELECT_LAYER = exports.SELECT_ITEM = exports.SELECT_HOLE = exports.SELECT_GROUP = exports.SELECT_DOOR_STYLE = exports.SELECT_AREA = exports.SELECT_ALL = exports.SELECTALL = exports.SECONDARY_PURPLE_COLOR = exports.SECONDARY_BLUE_COLOR = exports.SCENE_ACTIONS = exports.SAVE_PROJECT = exports.SAVE_DESIGN = exports.ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_MEASUREMENT_LINE_COLOR = exports.ROOM_ELEMENT_MEASUREMENT_LINE_COLOR = exports.ROLLBACK = exports.RIGHT_DIST_ANG = exports.RIGHT = exports.REVIEW_AND_QUOTE = exports.REQUEST_ASSISTANCE = exports.REPLACE_SUBMODULE = exports.REPLACE_ITEM = exports.REMOVE_VERTICAL_GUIDE = exports.REMOVE_REPLACE_SUBMODULE = exports.REMOVE_LINEAR = exports.REMOVE_LAYER = exports.REMOVE_HORIZONTAL_GUIDE = exports.REMOVE_GROUP_AND_DELETE_ELEMENTS = exports.REMOVE_GROUP = exports.REMOVE_FROM_GROUP = exports.REMOVE_DRAWING_SUPPORT = exports.REMOVE_CIRCULAR_GUIDE = exports.REMOVE = exports.REDO = exports.RECREATE = exports.PUSH_LAST_SELECTED_CATALOG_ELEMENT_TO_HISTORY = exports.PROP_RESIZE_WIDTH = exports.PROP_RESIZE_HEIGHT = exports.PROP_RESIZE_DEPTH = exports.PROP_OPEN_DOORS = exports.PROP_FLIP_DOOR_HANDLE = exports.PROP_ALTITUDE = exports.PROJECT_SETTING_OPTION = exports.PROJECT_RE_NAME = exports.PROJECT_NAME_LENGTH_LIMIT = exports.PROJECT_ACTIONS = exports.PRODUCT = exports.PRIMARY_GREEN_COLOR = exports.PASTE_PROPERTIES = exports.OVERLAP_SOME = exports.OVERLAP_SAME = exports.OVERLAP_NONE = exports.OVERLAP_LINK = exports.OVERLAP_INCLUDED = exports.OPEN_PROJECT_CONFIGURATOR = exports.OPEN_CATALOG = exports.OBJTYPE_MESH = exports.OBJTYPE_GROUP = exports.NO_DATA_DATABASE = exports.NEW_PROJECT_BTN = exports.NEW_PROJECT = exports.NEW_DESIGN = exports.MOVE_COMPONENT = exports.MOLDING_LOCATIONS = exports.MODE_WAITING_DRAWING_LINE = exports.MODE_VIEWING_CATALOG = exports.MODE_UPLOADING_IMAGE = exports.MODE_SNAPPING = exports.MODE_ROTATING_ITEM_3D = exports.MODE_ROTATING_ITEM = exports.MODE_RIGHT_ELEVATION_VIEW = exports.MODE_LEFT_ELEVATION_VIEW = exports.MODE_IDLE_3D = exports.MODE_IDLE = exports.MODE_FRONT_VIEW = void 0;
|
|
9
|
+
exports.UPDATE_DRAWING_ITEM = exports.UPDATE_DRAWING_HOLE_3D = exports.UPDATE_DRAWING_HOLE = exports.UPDATE_DRAGGING_VERTEX = exports.UPDATE_DRAGGING_LINE = exports.UPDATE_DRAGGING_ITEM_CHANGED = exports.UPDATE_DRAGGING_ITEM_3DY = exports.UPDATE_DRAGGING_ITEM_3DX = exports.UPDATE_DRAGGING_ITEM = exports.UPDATE_DRAGGING_HOLE_RULER_CHANGED = exports.UPDATE_DRAGGING_HOLE_CHANGED = exports.UPDATE_DRAGGING_HOLE_3D = exports.UPDATE_DRAGGING_HOLE = exports.UPDATE_CEIL_HEIGHT_UNIT = exports.UPDATE_CEIL_HEIGHT = exports.UPDATE_3D_CEIL_HEIGHT_UNIT = exports.UPDATE_3D_CEIL_HEIGHT = exports.UPDATE_2D_CAMERA = exports.UNSELECT_GROUP = exports.UNSELECT_ALL = exports.UNIT_MILLIMETER = exports.UNIT_MILE = exports.UNIT_METER = exports.UNIT_INCH = exports.UNIT_FOOT = exports.UNIT_CENTIMETER = exports.UNIT_ANGLE = exports.UNITS_LENGTH = exports.UNDO = exports.UNCREATE = exports.TWO_D_FLOOR_PLAN = exports.TOP_MOLDING_LOCATION = exports.TOP = exports.TOGGLE_SNAP = exports.TOGGLE_LOADING_CABINET = exports.TOE_KICK_MOLDING = exports.TITLE_SMALL_COLOR = exports.TITLE_COLOR = exports.THROW_WARNING = exports.THROW_ERROR = exports.TEXT_COLOR_NEUTRAL_7 = exports.TEXT_COLOR_NEUTRAL_6 = exports.TEXT_COLOR_NEUTRAL_5 = exports.TEXT_COLOR_NEUTRAL_4 = exports.TEXT_COLOR_NEUTRAL_3 = exports.TEXT_COLOR_NEUTRAL_2 = exports.TEXT_COLOR_NEUTRAL_1 = exports.TEXT_COLOR_NEUTRAL_0 = exports.TEXT_COLOR = exports.TECHNICAL_VIEW = exports.TALL_CABINET_LAYOUTPOS = exports.TAKE_PICTURE = exports.SUBTOTAL = exports.SUBMIT_REQUEST_ASSIST = exports.SUBMIT_DESIGN = exports.SUBMIT_ADD_CART = exports.STORE_DIST_ARRAY = exports.STOP_DRAWING_LINE = exports.STEP_CABINET_CHOOSE_PRODUCT = exports.STATUS_WARNING_LIGHT_COLOR = exports.STATUS_WARNING_COLOR = exports.STATUS_POSITIVE_LIGHT_COLOR = exports.STATUS_POSITIVE_COLOR = exports.STATUS_OVERDUE_LIGHT_COLOR = exports.STATUS_OVERDUE_COLOR = exports.STATUS_NEGATIVE_LIGHT_COLOR = exports.STATUS_NEGATIVE_COLOR = exports.STATUS_INFO_LIGHT_COLOR = exports.STATUS_INFO_COLOR = exports.SHIFT2DON = exports.SHIFT2DOFF = exports.SHAPE_SVG_WIDTH = exports.SHAPE_SVG_PADDING = exports.SHAPE_SVG_DEPTH = exports.SHADE_LIGHT_PURPLE_COLOR = exports.SHADE_LIGHT_GREEN_COLOR = exports.SHADE_LIGHT_BLUE_COLOR = exports.SHADE_DARK_PURPLE_COLOR = exports.SHADE_DARK_GREEN_COLOR = exports.SHADE_DARK_BLUE_COLOR = exports.SET_WALL_COLOR = exports.SET_USER_DATA = exports.SET_STATE_PROPERTIES = exports.SET_ROTATE_STATUS = exports.SET_RELATED_LINE = exports.SET_PROPERTIES = exports.SET_PROJECT_PROPERTIES = exports.SET_PROJECT_ID = exports.SET_MOVE_STATUS = exports.SET_MOLDING = exports.SET_MODELLING = exports.SET_MODE = exports.SET_LINES_ATTRIBUTES = exports.SET_LAYER_PROPERTIES = exports.SET_ITEMS_ATTRIBUTES = exports.SET_IS_HELP = exports.SET_IS_CABINET_DRAWING = exports.SET_INITIAL_DOOR_STYLE = exports.SET_HOLES_ATTRIBUTES = exports.SET_HANDLE_MATERIAL = void 0;
|
|
10
|
+
exports.ZOOM_VARIABLE = exports.WARRANTY_VIEW = exports.WARRANTY_SUPPORT = exports.WARNING_MESSAGE = exports.WALL_ITEM_MEASUREMENT_LINE_COLOR = exports.WALL_CABINET_LAYOUTPOS = exports.VIEWER3D_ACTIONS = exports.VIEWER2D_ACTIONS = exports.VERTEX_ACTIONS = exports.VALIDATE_ITEM_POSTIONS = exports.USER_ACTIONS = exports.UPDATE_ZOOM_SCALE = exports.UPDATE_ROTATING_ITEM_CHANGED = exports.UPDATE_ROTATING_ITEM = exports.UPDATE_ROTATING = exports.UPDATE_POPUP_OPEN = exports.UPDATE_MOVING_STATE = exports.UPDATE_MOUSE_COORDS = exports.UPDATE_MOLDING = exports.UPDATE_ITEM_POSITION = exports.UPDATE_DRAWING_LINE = void 0;
|
|
11
11
|
//API server
|
|
12
12
|
// export const API_SERVER = 'http://localhost:3000/';
|
|
13
13
|
// ACTIONS project
|
|
@@ -65,6 +65,7 @@ var REMOVE_CIRCULAR_GUIDE = exports.REMOVE_CIRCULAR_GUIDE = 'REMOVE_CIRCULAR_GUI
|
|
|
65
65
|
var REMOVE_DRAWING_SUPPORT = exports.REMOVE_DRAWING_SUPPORT = 'REMOVE_DRAWING_SUPPORT';
|
|
66
66
|
var SET_IS_HELP = exports.SET_IS_HELP = 'SET_IS_HELP';
|
|
67
67
|
var SET_IS_CABINET_DRAWING = exports.SET_IS_CABINET_DRAWING = 'SET_IS_CABINET_DRAWING';
|
|
68
|
+
var CREATE_ROOM_WITH_SHAPE = exports.CREATE_ROOM_WITH_SHAPE = 'CREATE_ROOM_WITH_SHAPE';
|
|
68
69
|
|
|
69
70
|
// ACTIONS viewer2D
|
|
70
71
|
var SELECT_TOOL_ZOOM_IN = exports.SELECT_TOOL_ZOOM_IN = 'SELECT_TOOL_ZOOM_IN';
|
|
@@ -254,7 +255,8 @@ var PROJECT_ACTIONS = exports.PROJECT_ACTIONS = {
|
|
|
254
255
|
SHIFT2DOFF: SHIFT2DOFF,
|
|
255
256
|
SHIFT2DON: SHIFT2DON,
|
|
256
257
|
SET_IS_HELP: SET_IS_HELP,
|
|
257
|
-
SET_IS_CABINET_DRAWING: SET_IS_CABINET_DRAWING
|
|
258
|
+
SET_IS_CABINET_DRAWING: SET_IS_CABINET_DRAWING,
|
|
259
|
+
CREATE_ROOM_WITH_SHAPE: CREATE_ROOM_WITH_SHAPE
|
|
258
260
|
};
|
|
259
261
|
var VIEWER2D_ACTIONS = exports.VIEWER2D_ACTIONS = {
|
|
260
262
|
SELECT_TOOL_ZOOM_IN: SELECT_TOOL_ZOOM_IN,
|
|
@@ -664,11 +666,11 @@ var HOLE_NAMES = exports.HOLE_NAMES = {
|
|
|
664
666
|
WINDOW_CLEAR: 'Window',
|
|
665
667
|
WINDOW_CROSS: 'Cross Window',
|
|
666
668
|
WINDOW_DOUBLE_HUNG: 'Double Hung Window',
|
|
667
|
-
WINDOW_VERTICAL: '
|
|
668
|
-
DOOR_CLOSET: 'Closet
|
|
669
|
-
DOOR_EXTERIOR: 'Exterior
|
|
670
|
-
DOOR_INTERIOR: 'Interior
|
|
671
|
-
DOOR_SLIDING: 'Sliding
|
|
669
|
+
WINDOW_VERTICAL: 'window-vertical',
|
|
670
|
+
DOOR_CLOSET: 'Closet',
|
|
671
|
+
DOOR_EXTERIOR: 'Exterior',
|
|
672
|
+
DOOR_INTERIOR: 'Interior',
|
|
673
|
+
DOOR_SLIDING: 'Sliding',
|
|
672
674
|
DOOR_FRAMED: 'Framed Doorway',
|
|
673
675
|
DOOR_FRAMELESS: 'FrameLess Doorway'
|
|
674
676
|
};
|
|
@@ -745,4 +747,17 @@ var INTERNAL_EVENT_SELECT_ELEMENT = exports.INTERNAL_EVENT_SELECT_ELEMENT = 'INT
|
|
|
745
747
|
var INTERNAL_EVENT_DRAG_ELEMENT = exports.INTERNAL_EVENT_DRAG_ELEMENT = 'INTERNAL_EVENT_DRAG_ELEMENT';
|
|
746
748
|
var INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAW_ELEMENT = 'INTERNAL_EVENT_DRAW_ELEMENT';
|
|
747
749
|
var INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = 'INTERNAL_EVENT_ROTATE_ELEMENT';
|
|
748
|
-
var INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_REPLACE_CABINET = 'INTERNAL_EVENT_REPLACE_CABINET';
|
|
750
|
+
var INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_REPLACE_CABINET = 'INTERNAL_EVENT_REPLACE_CABINET';
|
|
751
|
+
|
|
752
|
+
// room shape type
|
|
753
|
+
var ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_TYPE = {
|
|
754
|
+
RECTANGLE: 'rectangle',
|
|
755
|
+
TWO_WALLS_LEFT_TOP: '2wLeftTop',
|
|
756
|
+
TWO_WALLS_RIGHT_TOP: '2wRightTop',
|
|
757
|
+
TWO_WALLS_LEFT_BOTTOM: '2wLeftBottom',
|
|
758
|
+
TWO_WALLS_RIGHT_BOTTOM: '2wRightBottom',
|
|
759
|
+
THREE_WALLS_LEFT_TOP_RIGHT: '3wLeftTopRight',
|
|
760
|
+
THREE_WALLS_TOP_RIGHT_BOTTOM: '3wTopRightBottom',
|
|
761
|
+
THREE_WALLS_RIGHT_BOTTOM_LEFT: '3wRightBottomLeft',
|
|
762
|
+
THREE_WALLS_BOTTOM_LEFT_TOP: '3wBottomLeftTop'
|
|
763
|
+
};
|
package/lib/devLiteRenderer.js
CHANGED
|
@@ -13,6 +13,7 @@ var _mockProps = _interopRequireDefault(require("./mocks/mockProps.json"));
|
|
|
13
13
|
var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload2.json"));
|
|
14
14
|
var _appliancePayload = _interopRequireDefault(require("./mocks/appliancePayload.json"));
|
|
15
15
|
var _doorStylePayload = _interopRequireDefault(require("./mocks/doorStylePayload2.json"));
|
|
16
|
+
var _roomShapePayload = _interopRequireDefault(require("./mocks/roomShapePayload.json"));
|
|
16
17
|
var _itemCDSPayload = _interopRequireDefault(require("./mocks/itemCDSPayload.json"));
|
|
17
18
|
var _lightingPayload = _interopRequireDefault(require("./mocks/lightingPayload.json"));
|
|
18
19
|
var _furnishingPayload = _interopRequireDefault(require("./mocks/furnishingPayload.json"));
|
|
@@ -511,7 +512,16 @@ function WorkSpace(props) {
|
|
|
511
512
|
};
|
|
512
513
|
setExternalEvent(evt);
|
|
513
514
|
}
|
|
514
|
-
}, "Replace cabinet to B12")
|
|
515
|
+
}, "Replace cabinet to B12"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
516
|
+
actionType: "danger",
|
|
517
|
+
onClick: function onClick() {
|
|
518
|
+
var evt = {
|
|
519
|
+
type: _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE,
|
|
520
|
+
payload: _roomShapePayload["default"]
|
|
521
|
+
};
|
|
522
|
+
setExternalEvent(evt);
|
|
523
|
+
}
|
|
524
|
+
}, "Add room shape from width, height")), /*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], {
|
|
515
525
|
width: props.width,
|
|
516
526
|
height: props.height,
|
|
517
527
|
configData: _mockProps["default"].configData,
|
package/lib/models.js
CHANGED
|
@@ -46,7 +46,7 @@ var DefaultGrids = exports.DefaultGrids = new _immutable.Map({
|
|
|
46
46
|
type: 'horizontal-streak',
|
|
47
47
|
properties: {
|
|
48
48
|
step: 30,
|
|
49
|
-
colors: ['rgb(
|
|
49
|
+
colors: ['rgb(115, 125, 153)']
|
|
50
50
|
}
|
|
51
51
|
}),
|
|
52
52
|
v1: new Grid({
|
|
@@ -206,6 +206,8 @@ var Item = exports.Item = /*#__PURE__*/function (_Record7) {
|
|
|
206
206
|
uri: ''
|
|
207
207
|
},
|
|
208
208
|
molding: [],
|
|
209
|
+
isInitialPos: false,
|
|
210
|
+
//current {x,y} is the initial position from host?
|
|
209
211
|
backsplashVisible: false,
|
|
210
212
|
applianceMaterial: {
|
|
211
213
|
roughness: 0.4,
|