kitchen-simulator 1.0.0-clark.71 → 1.0.0-clark.85
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/assets/img/svg/logo.svg +11 -0
- package/es/assets/img/svg/logo_with_text.svg +25 -0
- package/es/catalog/factories/wall-factory.js +8 -8
- package/es/catalog/utils/item-loader.js +114 -39
- package/es/components/viewer2d/grids/grid-streak.js +1 -1
- package/es/components/viewer2d/item.js +6 -77
- package/es/components/viewer2d/line.js +243 -315
- package/es/components/viewer2d/ruler.js +36 -16
- package/es/components/viewer2d/rulerDist.js +32 -18
- package/es/constants.js +9 -7
- package/es/devLiteRenderer.js +26 -2
- package/es/models.js +4 -4
- package/es/shared-style.js +4 -4
- package/es/utils/isolate-event-handler.js +33 -18
- package/lib/assets/img/svg/logo.svg +11 -0
- package/lib/assets/img/svg/logo_with_text.svg +25 -0
- package/lib/catalog/factories/wall-factory.js +8 -8
- package/lib/catalog/utils/item-loader.js +113 -39
- package/lib/components/viewer2d/grids/grid-streak.js +1 -1
- package/lib/components/viewer2d/item.js +6 -77
- package/lib/components/viewer2d/line.js +242 -315
- package/lib/components/viewer2d/ruler.js +35 -15
- package/lib/components/viewer2d/rulerDist.js +32 -18
- package/lib/constants.js +13 -11
- package/lib/devLiteRenderer.js +25 -1
- package/lib/models.js +4 -4
- package/lib/shared-style.js +4 -4
- package/lib/utils/isolate-event-handler.js +32 -17
- package/package.json +1 -1
|
@@ -2,8 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import PropTypes from 'prop-types';
|
|
3
3
|
import { convert } from "../../utils/convert-units-lite";
|
|
4
4
|
import IDBroker from "../../utils/id-broker";
|
|
5
|
-
import { TEXT_COLOR_NEUTRAL_7 } from "../../constants";
|
|
6
|
-
import { STYLE_ROOM_SHAPE } from "./line";
|
|
5
|
+
import { LINE_THICKNESS, SHADE_LIGHT_BLUE_COLOR, TEXT_COLOR_NEUTRAL_7 } from "../../constants";
|
|
7
6
|
var STYLE = {
|
|
8
7
|
stroke: TEXT_COLOR_NEUTRAL_7,
|
|
9
8
|
strokeWidth: '1px'
|
|
@@ -16,7 +15,6 @@ var STYLE_TEXT = {
|
|
|
16
15
|
textAnchor: 'middle',
|
|
17
16
|
fontSize: '12px',
|
|
18
17
|
pointerEvents: 'none',
|
|
19
|
-
fill: '#455A64',
|
|
20
18
|
//http://stackoverflow.com/questions/826782/how-to-disable-text-selection-highlighting-using-css
|
|
21
19
|
WebkitTouchCallout: 'none' /* iOS Safari */,
|
|
22
20
|
WebkitUserSelect: 'none' /* Chrome/Safari/Opera */,
|
|
@@ -30,9 +28,37 @@ export default function Ruler(_ref) {
|
|
|
30
28
|
unit = _ref.unit,
|
|
31
29
|
rulerUnit = _ref.rulerUnit,
|
|
32
30
|
transform = _ref.transform,
|
|
33
|
-
|
|
31
|
+
flag = _ref.flag;
|
|
32
|
+
var update = function update(lengthInput, unitInput, type) {
|
|
33
|
+
var newLength = toFixedFloat(lengthInput);
|
|
34
|
+
var merged = null;
|
|
35
|
+
if (type === 0) {
|
|
36
|
+
merged = value.merge({
|
|
37
|
+
_length: newLength,
|
|
38
|
+
length: convert(newLength).from(unitInput).to('cm')
|
|
39
|
+
});
|
|
40
|
+
} else {
|
|
41
|
+
merged = value.merge({
|
|
42
|
+
_length: convert(newLength).from(UNIT_INCH).to(unitInput),
|
|
43
|
+
_unit: unitInput
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
// if (hook) {
|
|
47
|
+
// return hook(merged, sourceElement, internalState, state).then(val => {
|
|
48
|
+
// return onUpdate(val);
|
|
49
|
+
// });
|
|
50
|
+
// }
|
|
51
|
+
// return onUpdate(merged);
|
|
52
|
+
};
|
|
53
|
+
// let _unit = "in";
|
|
54
|
+
// let distanceText = convert(length).from(unit).to(rulerUnit);
|
|
34
55
|
var distanceText = convert(length).from(unit).to(rulerUnit).toFixed(0);
|
|
35
|
-
var
|
|
56
|
+
var thickness = convert(LINE_THICKNESS).from(unit).to(rulerUnit).toFixed(0);
|
|
57
|
+
// let _ft_len = convert(_length).from('in').to('ft');
|
|
58
|
+
// let _ft_val = Math.floor(_ft_len); _ft_len -= _ft_val;
|
|
59
|
+
// let _in_val = convert(_ft_len).from('ft').to('in').toFixed(0);
|
|
60
|
+
// let distanceText = `${_ft_val}'${_in_val}"`;
|
|
61
|
+
var textLength = (distanceText.length + layer.unit.length) * 18;
|
|
36
62
|
return /*#__PURE__*/React.createElement("g", {
|
|
37
63
|
transform: transform
|
|
38
64
|
}, /*#__PURE__*/React.createElement("g", {
|
|
@@ -53,24 +79,18 @@ export default function Ruler(_ref) {
|
|
|
53
79
|
style: STYLE_TEXT,
|
|
54
80
|
fill: TEXT_COLOR_NEUTRAL_7
|
|
55
81
|
}, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
|
|
56
|
-
x1:
|
|
82
|
+
x1: "0",
|
|
57
83
|
y1: "0",
|
|
58
84
|
x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
|
|
59
85
|
y2: "0",
|
|
60
|
-
style:
|
|
86
|
+
style: STYLE
|
|
61
87
|
}), /*#__PURE__*/React.createElement("line", {
|
|
62
88
|
x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
|
|
63
89
|
y1: "0",
|
|
64
|
-
x2:
|
|
90
|
+
x2: length,
|
|
65
91
|
y2: "0",
|
|
66
|
-
style:
|
|
67
|
-
})
|
|
68
|
-
points: "3, 0, 6.5, -2, 6.5, 2 ",
|
|
69
|
-
style: style
|
|
70
|
-
}), /*#__PURE__*/React.createElement("polygon", {
|
|
71
|
-
points: "".concat(length - 3, ", 0, ").concat(length - 6.5, ", 2, ").concat(length - 6.5, ", -2"),
|
|
72
|
-
style: style
|
|
73
|
-
})));
|
|
92
|
+
style: STYLE
|
|
93
|
+
}));
|
|
74
94
|
}
|
|
75
95
|
Ruler.propTypes = {
|
|
76
96
|
length: PropTypes.number.isRequired,
|
|
@@ -7,15 +7,13 @@ var ARROW_STYLE = {
|
|
|
7
7
|
strokeLinecap: 'round'
|
|
8
8
|
};
|
|
9
9
|
var STYLE = {
|
|
10
|
-
stroke: '
|
|
11
|
-
|
|
12
|
-
strokeWidth: '1.5px'
|
|
10
|
+
stroke: 'black',
|
|
11
|
+
strokeWidth: '1.1px'
|
|
13
12
|
};
|
|
14
13
|
var STYLE_TEXT = {
|
|
15
14
|
textAnchor: 'middle',
|
|
16
15
|
fontSize: '10px',
|
|
17
16
|
pointerEvents: 'none',
|
|
18
|
-
fill: '#455A64',
|
|
19
17
|
//http://stackoverflow.com/questions/826782/how-to-disable-text-selection-highlighting-using-css
|
|
20
18
|
WebkitTouchCallout: 'none' /* iOS Safari */,
|
|
21
19
|
WebkitUserSelect: 'none' /* Chrome/Safari/Opera */,
|
|
@@ -77,24 +75,32 @@ export default function RulerDist(_ref) {
|
|
|
77
75
|
y: "0",
|
|
78
76
|
transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
|
|
79
77
|
style: STYLE_TEXT
|
|
80
|
-
}, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit
|
|
78
|
+
}, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit)), /*#__PURE__*/React.createElement("circle", {
|
|
79
|
+
cx: "1",
|
|
80
|
+
cy: "0",
|
|
81
|
+
fill: "white",
|
|
82
|
+
r: "1.1",
|
|
83
|
+
stroke: "black",
|
|
84
|
+
strokeWidth: "0.6"
|
|
85
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
81
86
|
x1: "2",
|
|
82
87
|
y1: "0",
|
|
83
88
|
x2: (length - textLength) / 2 < 0 ? 0 : length,
|
|
84
89
|
y2: "0",
|
|
85
90
|
style: STYLE
|
|
86
|
-
}), /*#__PURE__*/React.createElement("polygon", {
|
|
87
|
-
points: "1, 0, 4.5, -2, 4.5, 2 ",
|
|
88
|
-
style: STYLE
|
|
89
91
|
}), /*#__PURE__*/React.createElement("line", {
|
|
90
92
|
x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
|
|
91
93
|
y1: "0",
|
|
92
94
|
x2: length,
|
|
93
95
|
y2: "0",
|
|
94
96
|
style: STYLE
|
|
95
|
-
}), /*#__PURE__*/React.createElement("
|
|
96
|
-
|
|
97
|
-
|
|
97
|
+
}), /*#__PURE__*/React.createElement("circle", {
|
|
98
|
+
cx: length - 1,
|
|
99
|
+
cy: "0",
|
|
100
|
+
fill: "white",
|
|
101
|
+
r: "1.1",
|
|
102
|
+
stroke: "black",
|
|
103
|
+
strokeWidth: "0.6"
|
|
98
104
|
}));
|
|
99
105
|
} else {
|
|
100
106
|
return /*#__PURE__*/React.createElement("g", {
|
|
@@ -104,24 +110,32 @@ export default function RulerDist(_ref) {
|
|
|
104
110
|
y: "0",
|
|
105
111
|
transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
|
|
106
112
|
style: STYLE_TEXT
|
|
107
|
-
}, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit
|
|
113
|
+
}, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit)), /*#__PURE__*/React.createElement("circle", {
|
|
114
|
+
cx: "1",
|
|
115
|
+
cy: "0",
|
|
116
|
+
fill: "white",
|
|
117
|
+
r: "1.1",
|
|
118
|
+
stroke: "black",
|
|
119
|
+
strokeWidth: "0.6"
|
|
120
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
108
121
|
x1: "2",
|
|
109
122
|
y1: "0",
|
|
110
123
|
x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
|
|
111
124
|
y2: "0",
|
|
112
125
|
style: STYLE
|
|
113
|
-
}), /*#__PURE__*/React.createElement("polygon", {
|
|
114
|
-
points: "1, 0, 4.5, -2, 4.5, 2 ",
|
|
115
|
-
style: STYLE
|
|
116
126
|
}), /*#__PURE__*/React.createElement("line", {
|
|
117
127
|
x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
|
|
118
128
|
y1: "0",
|
|
119
129
|
x2: length,
|
|
120
130
|
y2: "0",
|
|
121
131
|
style: STYLE
|
|
122
|
-
}), /*#__PURE__*/React.createElement("
|
|
123
|
-
|
|
124
|
-
|
|
132
|
+
}), /*#__PURE__*/React.createElement("circle", {
|
|
133
|
+
cx: length - 1,
|
|
134
|
+
cy: "0",
|
|
135
|
+
fill: "white",
|
|
136
|
+
r: "1.1",
|
|
137
|
+
stroke: "black",
|
|
138
|
+
strokeWidth: "0.6"
|
|
125
139
|
}));
|
|
126
140
|
}
|
|
127
141
|
}
|
package/es/constants.js
CHANGED
|
@@ -545,12 +545,6 @@ export var LABEL_COLOR = '#6E7191';
|
|
|
545
545
|
export var TEXT_COLOR = '#000000';
|
|
546
546
|
export var ACCENT_COLOR = '#AD00FF';
|
|
547
547
|
export var BROWN_COLOR = '#624100';
|
|
548
|
-
export var ROOM_SHAPE_MEASUREMENT_LINE_COLOR = '#455A64';
|
|
549
|
-
export var ROOM_ELEMENT_MEASUREMENT_LINE_COLOR = '#B0BEC5';
|
|
550
|
-
export var BASE_ITEM_MEASUREMENT_LINE_COLOR = '#0277BD';
|
|
551
|
-
export var WALL_ITEM_MEASUREMENT_LINE_COLOR = '#00897B';
|
|
552
|
-
export var DISTANCE_MEASUREMENT_LINE_COLOR = '#7B1FA2';
|
|
553
|
-
export var DASH_LINE_COLOR = '#78909C';
|
|
554
548
|
export var DEFAULT_FONT_FAMILY = 'Open Sans';
|
|
555
549
|
|
|
556
550
|
// Download summary
|
|
@@ -643,6 +637,13 @@ export var ITEM_TYPE = {
|
|
|
643
637
|
LIGHTING: 'lighting',
|
|
644
638
|
FURNISHING: 'furnishing'
|
|
645
639
|
};
|
|
640
|
+
export var PROJECT_SETTING_OPTION = {
|
|
641
|
+
UPDATE_CEIL_HEIGHT: UPDATE_CEIL_HEIGHT,
|
|
642
|
+
CHANGE_WALL_LENGTH_MEASURE: CHANGE_WALL_LENGTH_MEASURE,
|
|
643
|
+
CHANGE_BASE_CABINET_MEASURE: CHANGE_BASE_CABINET_MEASURE,
|
|
644
|
+
CHANGE_WALL_CABINET_MEASURE: CHANGE_WALL_CABINET_MEASURE,
|
|
645
|
+
CHANGE_WINDOW_DOOR_MEASURE: CHANGE_WINDOW_DOOR_MEASURE
|
|
646
|
+
};
|
|
646
647
|
|
|
647
648
|
// direction type
|
|
648
649
|
export var LEFT = 'Left';
|
|
@@ -665,4 +666,5 @@ export var EXTERNAL_EVENT_ZOOM_IN = 'EXTERNAL_EVENT_ZOOM_IN';
|
|
|
665
666
|
export var EXTERNAL_EVENT_ZOOM_OUT = 'EXTERNAL_EVENT_ZOOM_OUT';
|
|
666
667
|
export var EXTERNAL_EVENT_UNDO = 'EXTERNAL_EVENT_UNDO';
|
|
667
668
|
export var EXTERNAL_EVENT_REDO = 'EXTERNAL_EVENT_REDO';
|
|
668
|
-
export var EXTERNAL_EVENT_SET_MOLDING = 'EXTERNAL_EVENT_SET_MOLDING';
|
|
669
|
+
export var EXTERNAL_EVENT_SET_MOLDING = 'EXTERNAL_EVENT_SET_MOLDING';
|
|
670
|
+
export var EXTERNAL_EVENT_PROJECT_SETTING = 'EXTERNAL_EVENT_PROJECT_SETTING';
|
package/es/devLiteRenderer.js
CHANGED
|
@@ -12,7 +12,7 @@ import moldingPayload from "./mocks/moldingPayload.json";
|
|
|
12
12
|
import ReactDOM from 'react-dom';
|
|
13
13
|
import LiteRenderer from "./LiteRenderer";
|
|
14
14
|
import { Button } from 'antd';
|
|
15
|
-
import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, 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 } from "./constants";
|
|
15
|
+
import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, 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 } from "./constants";
|
|
16
16
|
|
|
17
17
|
// --- renderer props ---
|
|
18
18
|
var options = {
|
|
@@ -235,7 +235,31 @@ function WorkSpace(props) {
|
|
|
235
235
|
};
|
|
236
236
|
setExternalEvent(evt);
|
|
237
237
|
}
|
|
238
|
-
}, "Individual Molding (FBM)"), /*#__PURE__*/React.createElement(
|
|
238
|
+
}, "Individual Molding (FBM)"), /*#__PURE__*/React.createElement(Button, {
|
|
239
|
+
actionType: "danger",
|
|
240
|
+
onClick: function onClick() {
|
|
241
|
+
var evt = {
|
|
242
|
+
type: EXTERNAL_EVENT_PROJECT_SETTING,
|
|
243
|
+
payload: {
|
|
244
|
+
option: PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT,
|
|
245
|
+
value: 100 // ceiling length
|
|
246
|
+
}
|
|
247
|
+
};
|
|
248
|
+
setExternalEvent(evt);
|
|
249
|
+
}
|
|
250
|
+
}, "Setting-CeilingHeight"), /*#__PURE__*/React.createElement(Button, {
|
|
251
|
+
actionType: "danger",
|
|
252
|
+
onClick: function onClick() {
|
|
253
|
+
var evt = {
|
|
254
|
+
type: EXTERNAL_EVENT_PROJECT_SETTING,
|
|
255
|
+
payload: {
|
|
256
|
+
option: PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE,
|
|
257
|
+
value: 1 // 0-false, 1-true
|
|
258
|
+
}
|
|
259
|
+
};
|
|
260
|
+
setExternalEvent(evt);
|
|
261
|
+
}
|
|
262
|
+
}, "Setting-WallLength"), /*#__PURE__*/React.createElement(LiteRenderer, {
|
|
239
263
|
width: props.width,
|
|
240
264
|
height: props.height,
|
|
241
265
|
projectElement: mockProps.projectElement,
|
package/es/models.js
CHANGED
|
@@ -38,16 +38,16 @@ export var DefaultGrids = new Map({
|
|
|
38
38
|
id: 'h1',
|
|
39
39
|
type: 'horizontal-streak',
|
|
40
40
|
properties: {
|
|
41
|
-
step:
|
|
42
|
-
colors: ['
|
|
41
|
+
step: 30.48,
|
|
42
|
+
colors: ['#bbb', '#bbb', '#bbb', '#bbb', '#bbb'] // dot's color
|
|
43
43
|
}
|
|
44
44
|
}),
|
|
45
45
|
v1: new Grid({
|
|
46
46
|
id: 'v1',
|
|
47
47
|
type: 'vertical-streak',
|
|
48
48
|
properties: {
|
|
49
|
-
step:
|
|
50
|
-
colors: ['
|
|
49
|
+
step: 30.48,
|
|
50
|
+
colors: ['#bbb', '#bbb', '#bbb', '#bbb', '#bbb'] // dot's color
|
|
51
51
|
}
|
|
52
52
|
})
|
|
53
53
|
});
|
package/es/shared-style.js
CHANGED
|
@@ -54,13 +54,13 @@ export var AREA_MESH_COLOR = {
|
|
|
54
54
|
unselected: 'rgb(221,221,255)'
|
|
55
55
|
};
|
|
56
56
|
export var INTERIOR_LINE = {
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
unselected: ' #0a0a10',
|
|
58
|
+
selected: '#4C12A1'
|
|
59
59
|
};
|
|
60
60
|
export var LINE_MESH_COLOR = {
|
|
61
|
-
selected: '#
|
|
61
|
+
selected: '#4C12A1',
|
|
62
62
|
unselected: 'rgb(135,145,171)'
|
|
63
63
|
};
|
|
64
64
|
export var LINE_MESH = {
|
|
65
|
-
selected: '#
|
|
65
|
+
selected: '#4C12A1'
|
|
66
66
|
};
|
|
@@ -4,7 +4,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
4
4
|
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; }
|
|
5
5
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
6
6
|
import { fromJS, List, Map, Record } from 'immutable';
|
|
7
|
-
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, 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, ZOOM_VARIABLE, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING } from "../constants";
|
|
7
|
+
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, 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, ZOOM_VARIABLE, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION } from "../constants";
|
|
8
8
|
import { isEmpty } from "./helper";
|
|
9
9
|
import exporter from "../catalog/utils/exporter";
|
|
10
10
|
import { render2DItem, render3DItem } from "../catalog/utils/item-loader";
|
|
@@ -472,31 +472,31 @@ export function handleExternalEvent(_x7) {
|
|
|
472
472
|
}
|
|
473
473
|
function _handleExternalEvent() {
|
|
474
474
|
_handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(props) {
|
|
475
|
-
var evt, state, sLineCnt, elementJs, _element, catalog, outlineSVGData, catalogInstance, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, itemCDS, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _evt$payload3, moldingInfo, isGlobal, _t5, _t6;
|
|
475
|
+
var evt, state, sLineCnt, elementJs, _element, catalog, outlineSVGData, catalogInstance, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, itemCDS, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _evt$payload3, moldingInfo, isGlobal, _evt$payload4, option, _value3, _t5, _t6;
|
|
476
476
|
return _regeneratorRuntime.wrap(function (_context5) {
|
|
477
477
|
while (1) switch (_context5.prev = _context5.next) {
|
|
478
478
|
case 0:
|
|
479
479
|
evt = props.externalEvent;
|
|
480
480
|
state = props.state.get('KitchenConfigurator');
|
|
481
481
|
_t5 = evt === null || evt === void 0 ? void 0 : evt.type;
|
|
482
|
-
_context5.next = _t5 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t5 === EXTERNAL_EVENT_ADD_WALL ? 4 : _t5 === EXTERNAL_EVENT_ADD_ITEM ? 5 : _t5 === EXTERNAL_EVENT_MOVE_PAN ? 10 : _t5 === EXTERNAL_EVENT_NEW_PROJECT ? 16 : _t5 === EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 17 : _t5 === EXTERNAL_EVENT_SET_INITIAL_DATA ? 18 : _t5 === EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === EXTERNAL_EVENT_ZOOM_OUT ? 23 : _t5 === EXTERNAL_EVENT_UNDO ? 26 : _t5 === EXTERNAL_EVENT_REDO ? 27 : _t5 === EXTERNAL_EVENT_SET_MOLDING ? 28 : 29;
|
|
482
|
+
_context5.next = _t5 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t5 === EXTERNAL_EVENT_ADD_WALL ? 4 : _t5 === EXTERNAL_EVENT_ADD_ITEM ? 5 : _t5 === EXTERNAL_EVENT_MOVE_PAN ? 10 : _t5 === EXTERNAL_EVENT_NEW_PROJECT ? 16 : _t5 === EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 17 : _t5 === EXTERNAL_EVENT_SET_INITIAL_DATA ? 18 : _t5 === EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === EXTERNAL_EVENT_ZOOM_OUT ? 23 : _t5 === EXTERNAL_EVENT_UNDO ? 26 : _t5 === EXTERNAL_EVENT_REDO ? 27 : _t5 === EXTERNAL_EVENT_SET_MOLDING ? 28 : _t5 === EXTERNAL_EVENT_PROJECT_SETTING ? 29 : 30;
|
|
483
483
|
break;
|
|
484
484
|
case 1:
|
|
485
485
|
props.projectActions.setMode(MODE_IDLE_3D);
|
|
486
|
-
return _context5.abrupt("continue",
|
|
486
|
+
return _context5.abrupt("continue", 30);
|
|
487
487
|
case 2:
|
|
488
488
|
props.projectActions.setMode(MODE_IDLE);
|
|
489
|
-
return _context5.abrupt("continue",
|
|
489
|
+
return _context5.abrupt("continue", 30);
|
|
490
490
|
case 3:
|
|
491
491
|
sLineCnt = state.getIn(['scene', 'layers', 'layer-1', 'selected', 'lines']).size;
|
|
492
492
|
if (sLineCnt > 0) props.projectActions.setMode(MODE_ELEVATION_VIEW);
|
|
493
|
-
return _context5.abrupt("continue",
|
|
493
|
+
return _context5.abrupt("continue", 30);
|
|
494
494
|
case 4:
|
|
495
495
|
if (state.mode === MODE_IDLE || state.mode === MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
|
|
496
496
|
props.projectActions.setMode(MODE_IDLE);
|
|
497
497
|
props.linesActions.selectToolDrawingLine('wall');
|
|
498
498
|
}
|
|
499
|
-
return _context5.abrupt("continue",
|
|
499
|
+
return _context5.abrupt("continue", 30);
|
|
500
500
|
case 5:
|
|
501
501
|
if (isEmpty(evt === null || evt === void 0 ? void 0 : evt.payload)) {
|
|
502
502
|
_context5.next = 9;
|
|
@@ -538,7 +538,7 @@ function _handleExternalEvent() {
|
|
|
538
538
|
props.projectActions.pushLastSelectedCatalogElementToHistory(_element);
|
|
539
539
|
props.projectActions.setIsCabinetDrawing(true);
|
|
540
540
|
case 9:
|
|
541
|
-
return _context5.abrupt("continue",
|
|
541
|
+
return _context5.abrupt("continue", 30);
|
|
542
542
|
case 10:
|
|
543
543
|
_evt$payload = evt.payload, moveType = _evt$payload.moveType, moveValue = _evt$payload.moveValue;
|
|
544
544
|
value = state.getIn(['viewer2D']).toJS();
|
|
@@ -559,23 +559,23 @@ function _handleExternalEvent() {
|
|
|
559
559
|
return _context5.abrupt("continue", 15);
|
|
560
560
|
case 15:
|
|
561
561
|
if (compareSVGRect(value)) props.viewer2DActions.updateCameraView(value);
|
|
562
|
-
return _context5.abrupt("continue",
|
|
562
|
+
return _context5.abrupt("continue", 30);
|
|
563
563
|
case 16:
|
|
564
564
|
defaulTitle = 'Untitle';
|
|
565
565
|
props.projectActions.newProject();
|
|
566
566
|
props.projectActions.rename(defaulTitle);
|
|
567
|
-
return _context5.abrupt("continue",
|
|
567
|
+
return _context5.abrupt("continue", 30);
|
|
568
568
|
case 17:
|
|
569
569
|
_evt$payload2 = evt.payload, doorStyle = _evt$payload2.doorStyle, itemCDS = _evt$payload2.itemCDS, isAll = _evt$payload2.isAll;
|
|
570
570
|
props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
571
|
-
return _context5.abrupt("continue",
|
|
571
|
+
return _context5.abrupt("continue", 30);
|
|
572
572
|
case 18:
|
|
573
573
|
_doorStyle = evt.payload.doorStyle;
|
|
574
574
|
props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
|
|
575
|
-
return _context5.abrupt("continue",
|
|
575
|
+
return _context5.abrupt("continue", 30);
|
|
576
576
|
case 19:
|
|
577
577
|
props.projectActions.loadProject(evt.payload);
|
|
578
|
-
return _context5.abrupt("continue",
|
|
578
|
+
return _context5.abrupt("continue", 30);
|
|
579
579
|
case 20:
|
|
580
580
|
_value = state.getIn(['viewer2D']).toJS();
|
|
581
581
|
_value.a -= 0.1;
|
|
@@ -608,7 +608,7 @@ function _handleExternalEvent() {
|
|
|
608
608
|
_value.f += 0.1;
|
|
609
609
|
}
|
|
610
610
|
if (compareSVGRect(_value)) props.viewer2DActions.updateCameraView(_value);
|
|
611
|
-
return _context5.abrupt("continue",
|
|
611
|
+
return _context5.abrupt("continue", 30);
|
|
612
612
|
case 23:
|
|
613
613
|
_value2 = state.getIn(['viewer2D']).toJS();
|
|
614
614
|
_value2.a += 0.1;
|
|
@@ -629,18 +629,33 @@ function _handleExternalEvent() {
|
|
|
629
629
|
return _context5.abrupt("return");
|
|
630
630
|
case 25:
|
|
631
631
|
if (compareSVGRect(_value2)) props.viewer2DActions.updateCameraView(_value2);
|
|
632
|
-
return _context5.abrupt("continue",
|
|
632
|
+
return _context5.abrupt("continue", 30);
|
|
633
633
|
case 26:
|
|
634
634
|
props.projectActions.undo();
|
|
635
|
-
return _context5.abrupt("continue",
|
|
635
|
+
return _context5.abrupt("continue", 30);
|
|
636
636
|
case 27:
|
|
637
637
|
props.projectActions.redo();
|
|
638
|
-
return _context5.abrupt("continue",
|
|
638
|
+
return _context5.abrupt("continue", 30);
|
|
639
639
|
case 28:
|
|
640
640
|
_evt$payload3 = evt.payload, moldingInfo = _evt$payload3.moldingInfo, isGlobal = _evt$payload3.isGlobal;
|
|
641
641
|
props.itemsActions.setMolding(moldingInfo, isGlobal);
|
|
642
|
-
return _context5.abrupt("continue",
|
|
642
|
+
return _context5.abrupt("continue", 30);
|
|
643
643
|
case 29:
|
|
644
|
+
_evt$payload4 = evt.payload, option = _evt$payload4.option, _value3 = _evt$payload4.value;
|
|
645
|
+
if (option === PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT) {
|
|
646
|
+
props.viewer2DActions.updateCeilHeight(_value3);
|
|
647
|
+
props.viewer3DActions.update3DCeilHeight(_value3);
|
|
648
|
+
} else if (option === PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE) {
|
|
649
|
+
props.viewer2DActions.changeWallLengthMeasure(_value3);
|
|
650
|
+
} else if (option === PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE) {
|
|
651
|
+
props.viewer2DActions.changeBaseCabinetMeasure(_value3);
|
|
652
|
+
} else if (option === PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE) {
|
|
653
|
+
props.viewer2DActions.changeWallCabinetMeasure(_value3);
|
|
654
|
+
} else if (option === PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE) {
|
|
655
|
+
props.viewer2DActions.changeWindowDoorMeasure(_value3);
|
|
656
|
+
}
|
|
657
|
+
return _context5.abrupt("continue", 30);
|
|
658
|
+
case 30:
|
|
644
659
|
case "end":
|
|
645
660
|
return _context5.stop();
|
|
646
661
|
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
|
2
|
+
<path d="M2.53725 5.07449C3.93853 5.07449 5.07449 3.93853 5.07449 2.53725C5.07449 1.13596 3.93853 0 2.53725 0C1.13596 0 0 1.13596 0 2.53725C0 3.93853 1.13596 5.07449 2.53725 5.07449Z" fill="#6332AC"/>
|
|
3
|
+
<path d="M11.9788 5.07449C13.3801 5.07449 14.5161 3.93853 14.5161 2.53725C14.5161 1.13596 13.3801 0 11.9788 0C10.5775 0 9.44156 1.13596 9.44156 2.53725C9.44156 3.93853 10.5775 5.07449 11.9788 5.07449Z" fill="#4DCBCB"/>
|
|
4
|
+
<path d="M21.4628 5.07449C22.8641 5.07449 24 3.93853 24 2.53725C24 1.13596 22.8641 0 21.4628 0C20.0615 0 18.9255 1.13596 18.9255 2.53725C18.9255 3.93853 20.0615 5.07449 21.4628 5.07449Z" fill="#154AC5"/>
|
|
5
|
+
<path d="M2.53728 14.5169C3.93856 14.5169 5.07452 13.3809 5.07452 11.9796C5.07452 10.5783 3.93856 9.44238 2.53728 9.44238C1.13599 9.44238 3.05176e-05 10.5783 3.05176e-05 11.9796C3.05176e-05 13.3809 1.13599 14.5169 2.53728 14.5169Z" fill="#0C389D"/>
|
|
6
|
+
<path d="M11.9788 14.5169C13.3801 14.5169 14.5161 13.3809 14.5161 11.9796C14.5161 10.5783 13.3801 9.44238 11.9788 9.44238C10.5775 9.44238 9.44156 10.5783 9.44156 11.9796C9.44156 13.3809 10.5775 14.5169 11.9788 14.5169Z" fill="#4C12A1"/>
|
|
7
|
+
<path d="M21.4628 14.5169C22.8641 14.5169 24 13.3809 24 11.9796C24 10.5783 22.8641 9.44238 21.4628 9.44238C20.0615 9.44238 18.9255 10.5783 18.9255 11.9796C18.9255 13.3809 20.0615 14.5169 21.4628 14.5169Z" fill="#008D8D"/>
|
|
8
|
+
<path d="M2.53728 24C3.93856 24 5.07452 22.8641 5.07452 21.4628C5.07452 20.0615 3.93856 18.9255 2.53728 18.9255C1.13599 18.9255 3.05176e-05 20.0615 3.05176e-05 21.4628C3.05176e-05 22.8641 1.13599 24 2.53728 24Z" fill="#00B9B9"/>
|
|
9
|
+
<path d="M11.9788 24C13.3801 24 14.5161 22.8641 14.5161 21.4628C14.5161 20.0615 13.3801 18.9255 11.9788 18.9255C10.5775 18.9255 9.44156 20.0615 9.44156 21.4628C9.44156 22.8641 10.5775 24 11.9788 24Z" fill="#3A66CA"/>
|
|
10
|
+
<path d="M21.4628 24C22.8641 24 24 22.8641 24 21.4628C24 20.0615 22.8641 18.9255 21.4628 18.9255C20.0615 18.9255 18.9255 20.0615 18.9255 21.4628C18.9255 22.8641 20.0615 24 21.4628 24Z" fill="#3A0B80"/>
|
|
11
|
+
</svg>
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
<svg width="156" height="24" viewBox="0 0 156 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
|
2
|
+
<path d="M2.53725 5.07449C3.93853 5.07449 5.07449 3.93853 5.07449 2.53725C5.07449 1.13596 3.93853 0 2.53725 0C1.13596 0 0 1.13596 0 2.53725C0 3.93853 1.13596 5.07449 2.53725 5.07449Z" fill="#6332AC"/>
|
|
3
|
+
<path d="M11.9788 5.07449C13.3801 5.07449 14.516 3.93853 14.516 2.53725C14.516 1.13596 13.3801 0 11.9788 0C10.5775 0 9.44153 1.13596 9.44153 2.53725C9.44153 3.93853 10.5775 5.07449 11.9788 5.07449Z" fill="#4DCBCB"/>
|
|
4
|
+
<path d="M21.4628 5.07449C22.8641 5.07449 24 3.93853 24 2.53725C24 1.13596 22.8641 0 21.4628 0C20.0615 0 18.9255 1.13596 18.9255 2.53725C18.9255 3.93853 20.0615 5.07449 21.4628 5.07449Z" fill="#154AC5"/>
|
|
5
|
+
<path d="M2.53725 14.5168C3.93853 14.5168 5.07449 13.3809 5.07449 11.9796C5.07449 10.5783 3.93853 9.44232 2.53725 9.44232C1.13596 9.44232 0 10.5783 0 11.9796C0 13.3809 1.13596 14.5168 2.53725 14.5168Z" fill="#0C389D"/>
|
|
6
|
+
<path d="M11.9788 14.5168C13.3801 14.5168 14.516 13.3809 14.516 11.9796C14.516 10.5783 13.3801 9.44232 11.9788 9.44232C10.5775 9.44232 9.44153 10.5783 9.44153 11.9796C9.44153 13.3809 10.5775 14.5168 11.9788 14.5168Z" fill="#4C12A1"/>
|
|
7
|
+
<path d="M21.4628 14.5168C22.8641 14.5168 24 13.3809 24 11.9796C24 10.5783 22.8641 9.44232 21.4628 9.44232C20.0615 9.44232 18.9255 10.5783 18.9255 11.9796C18.9255 13.3809 20.0615 14.5168 21.4628 14.5168Z" fill="#008D8D"/>
|
|
8
|
+
<path d="M2.53725 24C3.93853 24 5.07449 22.8641 5.07449 21.4628C5.07449 20.0615 3.93853 18.9255 2.53725 18.9255C1.13596 18.9255 0 20.0615 0 21.4628C0 22.8641 1.13596 24 2.53725 24Z" fill="#00B9B9"/>
|
|
9
|
+
<path d="M11.9788 24C13.3801 24 14.516 22.8641 14.516 21.4628C14.516 20.0615 13.3801 18.9255 11.9788 18.9255C10.5775 18.9255 9.44153 20.0615 9.44153 21.4628C9.44153 22.8641 10.5775 24 11.9788 24Z" fill="#3A66CA"/>
|
|
10
|
+
<path d="M21.4628 24C22.8641 24 24 22.8641 24 21.4628C24 20.0615 22.8641 18.9255 21.4628 18.9255C20.0615 18.9255 18.9255 20.0615 18.9255 21.4628C18.9255 22.8641 20.0615 24 21.4628 24Z" fill="#3A0B80"/>
|
|
11
|
+
<path d="M43.3829 11.8957C43.3829 13.7675 42.8838 15.1817 41.8439 16.1384C40.8041 17.1366 39.3483 17.5941 37.3933 17.5941H34.2322V6.36371H37.7261C39.5146 6.36371 40.8872 6.86284 41.8855 7.81951C42.8838 8.77617 43.3829 10.1488 43.3829 11.8957ZM41.4696 11.9373C41.4696 9.23371 40.2217 7.90269 37.6845 7.90269H36.1039V16.0552H37.3933C40.097 16.0552 41.4696 14.6826 41.4696 11.9373Z" fill="#434B59"/>
|
|
12
|
+
<path d="M45.2551 17.5941V6.36371H47.0852V17.5941H45.2551Z" fill="#434B59"/>
|
|
13
|
+
<path d="M52.9083 11.5214L55.5703 6.40527H57.5669L53.8234 13.2683V17.6357H51.9932V13.3515L48.2498 6.40527H50.2463L52.9083 11.5214Z" fill="#434B59"/>
|
|
14
|
+
<path d="M71.6252 11.8957C71.6252 13.7675 71.126 15.1817 70.0862 16.1384C69.0463 17.1366 67.5905 17.5941 65.6356 17.5941H62.4744V6.36371H65.9683C67.7569 6.36371 69.1295 6.86284 70.1278 7.81951C71.126 8.77617 71.6252 10.1488 71.6252 11.8957ZM69.7118 11.9373C69.7118 9.23371 68.464 7.90269 65.9267 7.90269H64.3462V16.0552H65.6356C68.3392 16.0552 69.7118 14.6826 69.7118 11.9373Z" fill="#434B59"/>
|
|
15
|
+
<path d="M77.1157 17.7601C75.7847 17.7601 74.7449 17.3858 73.9962 16.5955C73.2475 15.8052 72.8731 14.7654 72.8731 13.3927C72.8731 12.0201 73.2059 10.8971 73.913 10.1068C74.6201 9.31651 75.5351 8.90057 76.783 8.90057C78.0308 8.90057 78.7795 9.23333 79.445 9.94043C80.1105 10.6059 80.4017 11.5626 80.4017 12.7688V13.7255H74.7448C74.7448 14.5574 74.9944 15.1813 75.4104 15.6388C75.8263 16.0964 76.4086 16.3043 77.1989 16.3043C77.9892 16.3043 78.1556 16.2627 78.6131 16.1796C79.0291 16.0964 79.5282 15.93 80.0273 15.722V17.1778C79.5698 17.3858 79.1538 17.5522 78.6963 17.6354C78.2388 17.7185 77.7396 17.7601 77.1573 17.7601H77.1157ZM76.783 10.3148C76.2006 10.3148 75.7431 10.4812 75.4104 10.8555C75.0776 11.2298 74.8696 11.729 74.7864 12.4361H78.6547C78.6547 11.729 78.4883 11.1883 78.1556 10.8555C77.8228 10.4812 77.3653 10.3148 76.783 10.3148Z" fill="#434B59"/>
|
|
16
|
+
<path d="M87.7639 15.1813C87.7639 16.0132 87.4728 16.6371 86.8488 17.0946C86.2249 17.5521 85.393 17.7601 84.27 17.7601C83.147 17.7601 82.2319 17.5937 81.5248 17.261V15.6804C82.523 16.1379 83.4381 16.3875 84.3116 16.3875C85.1851 16.3875 85.9754 16.0547 85.9754 15.3892C85.9754 14.7237 85.9338 15.0149 85.809 14.8485C85.6842 14.7237 85.4762 14.5574 85.1851 14.391C84.8939 14.2246 84.5196 14.0582 84.0204 13.8503C83.0222 13.4759 82.3983 13.1016 82.0239 12.7272C81.6912 12.3529 81.5248 11.8537 81.5248 11.2714C81.5248 10.6891 81.8159 9.98199 82.3983 9.56605C82.9806 9.15011 83.7709 8.94214 84.8107 8.94214C85.8506 8.94214 86.7657 9.15011 87.6391 9.56605L87.0568 10.9387C86.1417 10.5643 85.3514 10.3563 84.7275 10.3563C83.7709 10.3563 83.3133 10.6475 83.3133 11.1882C83.3133 11.729 83.4381 11.6874 83.6877 11.8537C83.9372 12.0201 84.478 12.3113 85.3099 12.6024C86.017 12.8936 86.5161 13.1432 86.8488 13.3511C87.1816 13.5591 87.3896 13.8503 87.5559 14.1414C87.7223 14.4326 87.8055 14.8069 87.8055 15.1813H87.7639Z" fill="#434B59"/>
|
|
17
|
+
<path d="M89.0953 6.86258C89.0953 6.52983 89.1785 6.28026 89.3449 6.11389C89.5113 5.94751 89.7608 5.86432 90.0936 5.86432C90.4263 5.86432 90.6759 5.94751 90.8423 6.11389C91.0087 6.28026 91.0919 6.52983 91.0919 6.86258C91.0919 7.19533 91.0087 7.40331 90.8423 7.56968C90.6759 7.73606 90.4263 7.81925 90.0936 7.81925C89.7608 7.81925 89.5113 7.73606 89.3449 7.56968C89.1785 7.40331 89.0953 7.15374 89.0953 6.86258ZM91.0087 17.5939H89.2201V9.10867H91.0087V17.5939Z" fill="#434B59"/>
|
|
18
|
+
<path d="M100.242 9.10852V10.1068L98.7864 10.3563C98.9112 10.5227 99.036 10.7723 99.1192 11.0219C99.2024 11.2714 99.244 11.5626 99.244 11.8537C99.244 12.7272 98.9528 13.4343 98.3289 13.9334C97.705 14.4326 96.8731 14.6821 95.8333 14.6821C94.7934 14.6821 95.3341 14.6821 95.0846 14.6405C94.7102 14.8901 94.5022 15.1813 94.5022 15.4724C94.5022 15.7636 94.5854 15.8052 94.7934 15.93C94.9598 16.0132 95.2925 16.0963 95.7917 16.0963H97.2891C98.2457 16.0963 98.9528 16.3043 99.4104 16.6787C99.8679 17.053 100.159 17.6353 100.159 18.4256C100.159 19.2159 99.7431 20.131 98.9528 20.6717C98.1625 21.2124 96.9979 21.462 95.5005 21.462C94.0031 21.462 93.4624 21.254 92.8385 20.8381C92.2146 20.4221 91.9234 19.8398 91.9234 19.0911C91.9234 18.3424 92.0898 18.1345 92.4225 17.7601C92.7553 17.3858 93.2128 17.1362 93.7951 17.0114C93.5456 16.9282 93.3376 16.7619 93.2128 16.5123C93.0464 16.3043 92.9633 16.0548 92.9633 15.8052C92.9633 15.5556 93.0464 15.2229 93.2128 15.0149C93.3792 14.8069 93.6704 14.5574 94.0031 14.3494C93.5456 14.1414 93.2128 13.8503 92.9217 13.4343C92.6305 13.0184 92.5057 12.5192 92.5057 11.9369C92.5057 11.0219 92.7969 10.3148 93.3792 9.77403C93.9615 9.2333 94.7934 9.02533 95.8749 9.02533C96.9563 9.02533 96.374 9.02533 96.6235 9.06692C96.8731 9.06692 97.0811 9.15011 97.2059 9.15011H100.159L100.242 9.10852ZM93.5872 18.9248C93.5872 19.2991 93.7535 19.6319 94.1279 19.8398C94.4606 20.0478 94.9598 20.1726 95.6253 20.1726C96.6235 20.1726 97.3306 20.0478 97.8298 19.7566C98.3289 19.4655 98.5369 19.0911 98.5369 18.6336C98.5369 18.1761 98.4121 18.0097 98.1209 17.8433C97.8714 17.6769 97.3722 17.5937 96.6651 17.5937H95.2925C94.7934 17.5937 94.3774 17.7185 94.0447 17.9681C93.7535 18.2177 93.5872 18.5504 93.5872 18.9663V18.9248ZM94.3359 11.8537C94.3359 12.3945 94.4606 12.8104 94.7518 13.1016C95.043 13.3927 95.4173 13.5175 95.9164 13.5175C96.9563 13.5175 97.497 12.9768 97.497 11.8537C97.497 10.7307 97.3722 10.8555 97.1227 10.5643C96.8731 10.2732 96.4572 10.1068 95.958 10.1068C95.4589 10.1068 95.043 10.2732 94.7518 10.5643C94.5022 10.8555 94.3359 11.313 94.3359 11.8537Z" fill="#434B59"/>
|
|
19
|
+
<path d="M108.81 17.5937H106.98V12.3529C106.98 11.6874 106.855 11.1882 106.564 10.8971C106.273 10.6059 105.899 10.3979 105.316 10.3979C104.734 10.3979 103.985 10.6059 103.653 11.0634C103.32 11.521 103.112 12.2697 103.112 13.3511V17.5937H101.323V9.10852H102.738L102.987 10.2316H103.07C103.32 9.81562 103.694 9.52446 104.152 9.27489C104.609 9.06692 105.15 8.94214 105.732 8.94214C107.77 8.94214 108.81 9.98199 108.81 12.0617V17.5937Z" fill="#434B59"/>
|
|
20
|
+
<path d="M121.456 14.5578C121.456 15.556 121.081 16.3463 120.374 16.9286C119.667 17.511 118.669 17.8021 117.379 17.8021C116.09 17.8021 115.05 17.5941 114.26 17.2198V15.4728C114.759 15.7224 115.3 15.8888 115.882 16.0552C116.464 16.2215 117.005 16.2631 117.504 16.2631C118.211 16.2631 118.752 16.1383 119.126 15.8472C119.501 15.556 119.625 15.1817 119.625 14.7241C119.625 14.2666 119.459 13.9339 119.168 13.6427C118.877 13.3515 118.211 13.0188 117.213 12.6028C116.173 12.1869 115.466 11.7294 115.05 11.1886C114.634 10.6479 114.426 10.024 114.426 9.2753C114.426 8.52661 114.759 7.61153 115.424 7.07081C116.09 6.53008 117.005 6.28052 118.086 6.28052C119.168 6.28052 120.249 6.53008 121.289 6.98762L120.707 8.48501C119.709 8.06907 118.835 7.8611 118.045 7.8611C117.254 7.8611 117.005 7.98588 116.672 8.23545C116.381 8.48501 116.215 8.81776 116.215 9.2753C116.215 9.73284 116.256 9.81603 116.381 10.024C116.506 10.232 116.714 10.4399 117.005 10.6063C117.296 10.7727 117.795 11.0223 118.544 11.355C119.376 11.6878 119.958 12.0205 120.374 12.3117C120.748 12.6028 121.04 12.9356 121.206 13.3099C121.372 13.6843 121.456 14.1418 121.456 14.641V14.5578Z" fill="#434B59"/>
|
|
21
|
+
<path d="M127.237 17.7601C126.156 17.7601 125.324 17.3858 124.742 16.5955H124.617C124.7 17.3026 124.742 17.7601 124.742 17.8849V21.3788H122.953V9.10852H124.409C124.409 9.27489 124.534 9.64924 124.658 10.2316H124.742C125.324 9.35808 126.156 8.94214 127.279 8.94214C128.402 8.94214 129.15 9.31649 129.774 10.1068C130.398 10.8971 130.648 11.9369 130.648 13.3511C130.648 14.7653 130.357 15.8052 129.733 16.5955C129.15 17.3858 128.319 17.7601 127.237 17.7601ZM126.821 10.4395C126.114 10.4395 125.573 10.6475 125.241 11.0634C124.908 11.4794 124.742 12.1449 124.742 13.06V13.3095C124.742 14.3494 124.908 15.0981 125.241 15.5556C125.573 16.0132 126.114 16.2627 126.863 16.2627C127.612 16.2627 127.986 16.0132 128.319 15.514C128.651 15.0149 128.818 14.2662 128.818 13.3095C128.818 12.3529 128.651 11.6458 128.319 11.1466C127.986 10.6475 127.487 10.3979 126.821 10.3979V10.4395Z" fill="#434B59"/>
|
|
22
|
+
<path d="M137.593 17.5937L137.219 16.4291H137.177C136.762 16.9282 136.346 17.3026 135.93 17.469C135.514 17.6353 134.973 17.7601 134.349 17.7601C133.725 17.7601 132.852 17.5521 132.394 17.0946C131.937 16.6371 131.687 16.0132 131.687 15.1813C131.687 14.3494 132.02 13.6423 132.644 13.1847C133.268 12.7272 134.266 12.4776 135.638 12.4361H137.094V11.9369C137.094 11.3962 136.969 10.9803 136.72 10.7307C136.47 10.4811 136.054 10.3147 135.555 10.3147C135.056 10.3147 134.682 10.3979 134.307 10.5227C133.892 10.6475 133.517 10.8139 133.143 10.9803L132.56 9.69083C133.018 9.44127 133.517 9.27489 134.058 9.15011C134.599 9.02533 135.139 8.94214 135.597 8.94214C136.678 8.94214 137.51 9.1917 138.051 9.64924C138.592 10.1068 138.883 10.8555 138.883 11.8537V17.5937H137.593ZM134.89 16.3875C135.555 16.3875 136.054 16.2211 136.47 15.8468C136.886 15.4724 137.053 14.9733 137.053 14.3078V13.5591H135.971C135.139 13.6423 134.515 13.7671 134.099 14.0166C133.684 14.2662 133.517 14.6405 133.517 15.1813C133.517 15.722 133.642 15.8468 133.85 16.0547C134.058 16.2627 134.432 16.3459 134.848 16.3459L134.89 16.3875Z" fill="#434B59"/>
|
|
23
|
+
<path d="M144.332 17.7601C143.042 17.7601 142.086 17.3858 141.42 16.6371C140.755 15.8884 140.422 14.8069 140.422 13.3927C140.422 11.9785 140.755 10.8555 141.462 10.1068C142.169 9.35808 143.167 8.94214 144.498 8.94214C145.829 8.94214 146.204 9.10852 146.911 9.44127L146.37 10.8971C145.621 10.6059 144.956 10.4395 144.498 10.4395C143.042 10.4395 142.294 11.3962 142.294 13.3511C142.294 15.3061 142.46 15.0149 142.834 15.514C143.209 16.0132 143.75 16.2211 144.457 16.2211C145.164 16.2211 146.037 16.0132 146.744 15.6388V17.2194C146.412 17.4274 146.079 17.5521 145.704 17.6353C145.33 17.7185 144.914 17.7601 144.373 17.7601H144.332Z" fill="#434B59"/>
|
|
24
|
+
<path d="M151.819 17.7601C150.488 17.7601 149.448 17.3858 148.699 16.5955C147.951 15.8052 147.576 14.7654 147.576 13.3927C147.576 12.0201 147.909 10.8971 148.616 10.1068C149.323 9.31651 150.238 8.90057 151.486 8.90057C152.734 8.90057 153.483 9.23333 154.148 9.94043C154.814 10.6059 155.105 11.5626 155.105 12.7688V13.7255H149.448C149.448 14.5574 149.698 15.1813 150.114 15.6388C150.529 16.0964 151.112 16.3043 151.902 16.3043C152.692 16.3043 152.859 16.2627 153.316 16.1796C153.732 16.0964 154.231 15.93 154.731 15.722V17.1778C154.273 17.3858 153.857 17.5522 153.399 17.6354C152.942 17.7185 152.443 17.7601 151.86 17.7601H151.819ZM151.486 10.3148C150.904 10.3148 150.446 10.4812 150.114 10.8555C149.781 11.2298 149.573 11.729 149.49 12.4361H153.358C153.358 11.729 153.192 11.1883 152.859 10.8555C152.526 10.5227 152.068 10.3148 151.486 10.3148Z" fill="#434B59"/>
|
|
25
|
+
</svg>
|
|
@@ -27,11 +27,11 @@ var STYLE_LINE = {
|
|
|
27
27
|
// strokeWidth:1
|
|
28
28
|
};
|
|
29
29
|
var STYLE_INTERIOR_LINE = {
|
|
30
|
-
strokeWidth:
|
|
30
|
+
strokeWidth: 1,
|
|
31
31
|
stroke: SharedStyle.INTERIOR_LINE.unselected
|
|
32
32
|
};
|
|
33
33
|
var STYLE_INTERIOR_LINE_SELECTED = {
|
|
34
|
-
strokeWidth:
|
|
34
|
+
strokeWidth: 2,
|
|
35
35
|
stroke: SharedStyle.INTERIOR_LINE.selected,
|
|
36
36
|
fill: SharedStyle.INTERIOR_LINE.selected,
|
|
37
37
|
rx: '2px'
|
|
@@ -224,9 +224,9 @@ function WallFactory(name, info, textures) {
|
|
|
224
224
|
})));
|
|
225
225
|
return !element.selected ? /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("polygon", {
|
|
226
226
|
points: "".concat(x1, ",").concat(y1, " ").concat(related0x, ",").concat(related0y, " ").concat(related1x, ",").concat(related1y, " ").concat(x2, ",").concat(y2),
|
|
227
|
-
fill: "#
|
|
228
|
-
|
|
229
|
-
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
227
|
+
fill: "url(#pat)",
|
|
228
|
+
fillRule: "evenodd"
|
|
229
|
+
}), outwall, /*#__PURE__*/_react["default"].createElement("line", {
|
|
230
230
|
x1: x1,
|
|
231
231
|
y1: y1,
|
|
232
232
|
x2: x2,
|
|
@@ -234,9 +234,9 @@ function WallFactory(name, info, textures) {
|
|
|
234
234
|
style: STYLE_INTERIOR_LINE
|
|
235
235
|
})) : /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("polygon", {
|
|
236
236
|
points: "".concat(x1, ",").concat(y1, " ").concat(related0x, ",").concat(related0y, " ").concat(related1x, ",").concat(related1y, " ").concat(x2, ",").concat(y2),
|
|
237
|
-
fill: "#
|
|
238
|
-
|
|
239
|
-
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
237
|
+
fill: "url(#pat)",
|
|
238
|
+
fillRule: "evenodd"
|
|
239
|
+
}), outwall, /*#__PURE__*/_react["default"].createElement("line", {
|
|
240
240
|
x1: x1,
|
|
241
241
|
y1: y1,
|
|
242
242
|
x2: x2,
|