kitchen-simulator 1.1.1-test.70 → 1.1.1-test.71
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/@history.js +2 -8
- package/es/AppContext.js +3 -8
- package/es/KitchenConfigurator.js +70 -77
- package/es/KitchenConfiguratorApp.js +98 -105
- package/es/actions/area-actions.js +5 -10
- package/es/actions/export.js +12 -27
- package/es/actions/groups-actions.js +27 -43
- package/es/actions/holes-actions.js +34 -53
- package/es/actions/items-actions.js +94 -143
- package/es/actions/lines-actions.js +21 -34
- package/es/actions/project-actions.js +94 -143
- package/es/actions/scene-actions.js +11 -19
- package/es/actions/vertices-actions.js +7 -13
- package/es/actions/viewer2d-actions.js +21 -34
- package/es/actions/viewer3d-actions.js +9 -16
- package/es/catalog/areas/area/planner-element.js +2 -7
- package/es/catalog/catalog.js +15 -19
- package/es/catalog/factories/area-factory-3d.js +22 -29
- package/es/catalog/factories/area-factory.js +11 -18
- package/es/catalog/factories/export.js +6 -12
- package/es/catalog/factories/wall-factory-3d.js +31 -39
- package/es/catalog/factories/wall-factory.js +21 -29
- package/es/catalog/holes/door-closet/planner-element.js +15 -22
- package/es/catalog/holes/door-double/planner-element.js +15 -22
- package/es/catalog/holes/door-exterior/planner-element.js +16 -23
- package/es/catalog/holes/door-interior/planner-element.js +16 -23
- package/es/catalog/holes/door-panic/planner-element.js +7 -14
- package/es/catalog/holes/door-panic-double/planner-element.js +15 -22
- package/es/catalog/holes/door-sliding/planner-element.js +16 -23
- package/es/catalog/holes/doorway-framed/planner-element.js +11 -18
- package/es/catalog/holes/doorway-frameless/planner-element.js +7 -14
- package/es/catalog/holes/export.js +13 -31
- package/es/catalog/holes/window-clear/planner-element.js +10 -17
- package/es/catalog/holes/window-cross/planner-element.js +10 -17
- package/es/catalog/holes/window-double-hung/planner-element.js +10 -17
- package/es/catalog/holes/window-vertical/planner-element.js +10 -17
- package/es/catalog/lines/wall/planner-element.js +2 -7
- package/es/catalog/molding/molding-dcm/planner-element.js +5 -12
- package/es/catalog/molding/molding-fbm/planner-element.js +5 -12
- package/es/catalog/molding/molding-lrm/planner-element.js +5 -12
- package/es/catalog/properties/export.js +20 -33
- package/es/catalog/properties/property-checkbox.js +24 -29
- package/es/catalog/properties/property-color.js +16 -21
- package/es/catalog/properties/property-enum.js +24 -29
- package/es/catalog/properties/property-hidden.js +9 -14
- package/es/catalog/properties/property-lenght-measure.js +38 -43
- package/es/catalog/properties/property-length-measure.js +36 -41
- package/es/catalog/properties/property-length-measure_hole.js +38 -43
- package/es/catalog/properties/property-number.js +17 -22
- package/es/catalog/properties/property-read-only.js +16 -21
- package/es/catalog/properties/property-string.js +16 -21
- package/es/catalog/properties/property-toggle.js +16 -21
- package/es/catalog/properties/shared-property-style.js +1 -5
- package/es/catalog/utils/FuseUtils.js +8 -13
- package/es/catalog/utils/exporter.js +8 -13
- package/es/catalog/utils/geom-utils.js +13 -27
- package/es/catalog/utils/item-loader.js +84 -95
- package/es/catalog/utils/load-obj.js +20 -26
- package/es/catalog/utils/mtl-loader.js +3 -6
- package/es/catalog/utils/obj-loader.js +3 -6
- package/es/class/FuseUtils.js +8 -13
- package/es/class/area.js +22 -26
- package/es/class/export.js +23 -38
- package/es/class/group.js +53 -57
- package/es/class/guide.js +15 -19
- package/es/class/hole.js +83 -87
- package/es/class/item.js +141 -145
- package/es/class/layer.js +59 -63
- package/es/class/line.js +135 -141
- package/es/class/project.js +90 -96
- package/es/class/vertex.js +29 -33
- package/es/components/content.js +19 -26
- package/es/components/disclaimer/disclaimer.js +10 -16
- package/es/components/export.js +8 -15
- package/es/components/style/button.js +23 -29
- package/es/components/style/cancel-button.js +7 -12
- package/es/components/style/content-container.js +9 -14
- package/es/components/style/content-title.js +11 -18
- package/es/components/style/delete-button.js +8 -15
- package/es/components/style/export.js +30 -48
- package/es/components/style/form-block.js +8 -13
- package/es/components/style/form-color-input.js +7 -12
- package/es/components/style/form-label.js +8 -13
- package/es/components/style/form-number-input.js +41 -47
- package/es/components/style/form-number-input_2.js +36 -42
- package/es/components/style/form-select.js +17 -22
- package/es/components/style/form-slider.js +10 -15
- package/es/components/style/form-submit-button.js +8 -15
- package/es/components/style/form-text-input.js +26 -32
- package/es/components/viewer2d/area.js +17 -22
- package/es/components/viewer2d/export.js +30 -48
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +10 -15
- package/es/components/viewer2d/grids/grid-streak.js +10 -15
- package/es/components/viewer2d/grids/grid-vertical-streak.js +10 -15
- package/es/components/viewer2d/grids/grids.js +10 -17
- package/es/components/viewer2d/group.js +15 -22
- package/es/components/viewer2d/item.js +61 -68
- package/es/components/viewer2d/layer.js +23 -28
- package/es/components/viewer2d/line.js +101 -109
- package/es/components/viewer2d/ruler.js +22 -27
- package/es/components/viewer2d/rulerDist.js +21 -26
- package/es/components/viewer2d/rulerX.js +39 -45
- package/es/components/viewer2d/rulerY.js +37 -43
- package/es/components/viewer2d/scene.js +30 -36
- package/es/components/viewer2d/snap.js +13 -20
- package/es/components/viewer2d/state.js +18 -25
- package/es/components/viewer2d/utils.js +24 -35
- package/es/components/viewer2d/vertex.js +8 -15
- package/es/components/viewer2d/viewer2d.js +153 -161
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +17 -21
- package/es/components/viewer3d/dcm.js +1 -5
- package/es/components/viewer3d/fbm.js +1 -5
- package/es/components/viewer3d/front3D.js +12 -19
- package/es/components/viewer3d/grid-creator.js +8 -15
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +6 -12
- package/es/components/viewer3d/grids/grid-streak.js +5 -11
- package/es/components/viewer3d/grids/grid-vertical-streak.js +6 -12
- package/es/components/viewer3d/libs/first-person-controls.js +2 -7
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +1 -5
- package/es/components/viewer3d/libs/mtl-loader.js +1 -5
- package/es/components/viewer3d/libs/obj-loader.js +1 -5
- package/es/components/viewer3d/libs/orbit-controls.js +2 -6
- package/es/components/viewer3d/libs/pointer-lock-controls.js +2 -6
- package/es/components/viewer3d/lrm.js +1 -5
- package/es/components/viewer3d/model.js +1 -5
- package/es/components/viewer3d/pointer-lock-navigation.js +3 -8
- package/es/components/viewer3d/ruler-utils/itemRect.js +18 -23
- package/es/components/viewer3d/ruler-utils/layer3D.js +59 -64
- package/es/components/viewer3d/ruler-utils/ruler3D.js +39 -44
- package/es/components/viewer3d/ruler-utils/scene3D.js +9 -15
- package/es/components/viewer3d/ruler-utils/state3D.js +4 -9
- package/es/components/viewer3d/scene-creator.js +191 -224
- package/es/components/viewer3d/three-memory-cleaner.js +3 -10
- package/es/components/viewer3d/viewer3d-first-person.js +40 -44
- package/es/components/viewer3d/viewer3d.js +196 -200
- package/es/constants.js +349 -356
- package/es/index.js +7 -13
- package/es/models.js +177 -182
- package/es/plugins/SVGLoader.js +48 -51
- package/es/plugins/autosave.js +3 -7
- package/es/plugins/console-debugger.js +5 -10
- package/es/plugins/export.js +8 -15
- package/es/plugins/keyboard.js +29 -33
- package/es/reducers/areas-reducer.js +7 -11
- package/es/reducers/export.js +24 -39
- package/es/reducers/groups-reducer.js +31 -35
- package/es/reducers/holes-reducer.js +43 -47
- package/es/reducers/items-reducer.js +106 -110
- package/es/reducers/lines-reducer.js +28 -32
- package/es/reducers/project-reducer.js +105 -109
- package/es/reducers/reducer.js +16 -21
- package/es/reducers/scene-reducer.js +15 -19
- package/es/reducers/user-reducer.js +5 -9
- package/es/reducers/vertices-reducer.js +11 -15
- package/es/reducers/viewer2d-reducer.js +18 -22
- package/es/reducers/viewer3d-reducer.js +16 -20
- package/es/shared-style.js +10 -14
- package/es/styles/export.js +3 -9
- package/es/translator/en.js +1 -5
- package/es/translator/it.js +1 -5
- package/es/translator/ru.js +1 -5
- package/es/translator/translator.js +13 -17
- package/es/utils/browser.js +2 -7
- package/es/utils/convert-units-lite.js +1 -5
- package/es/utils/email-validator.js +1 -5
- package/es/utils/export.js +15 -32
- package/es/utils/geometry.js +181 -276
- package/es/utils/get-edges-of-subgraphs.js +2 -7
- package/es/utils/graph-cycles.js +8 -9
- package/es/utils/graph-inner-cycles.js +10 -16
- package/es/utils/graph.js +9 -15
- package/es/utils/helper.js +39 -61
- package/es/utils/history.js +8 -13
- package/es/utils/id-broker.js +8 -13
- package/es/utils/logger.js +1 -5
- package/es/utils/math.js +5 -10
- package/es/utils/molding.js +119 -142
- package/es/utils/name-generator.js +7 -11
- package/es/utils/objects-utils.js +7 -17
- package/es/utils/phone-validator.js +1 -5
- package/es/utils/process-black-list.js +3 -8
- package/es/utils/react-if.js +6 -10
- package/es/utils/snap-scene.js +27 -32
- package/es/utils/snap.js +45 -57
- package/es/utils/summarizeCart.js +1 -5
- package/es/utils/threeCSG.es6.js +13 -20
- package/es/version.js +1 -5
- package/package.json +1 -1
package/es/class/group.js
CHANGED
|
@@ -1,47 +1,42 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
var
|
|
9
|
-
var _export = require("./export");
|
|
10
|
-
var _immutable = require("immutable");
|
|
11
|
-
var _models = require("../models");
|
|
12
|
-
var _export2 = require("../utils/export");
|
|
13
|
-
var Group = exports["default"] = /*#__PURE__*/function () {
|
|
1
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
|
+
import { Area, Hole, Item, Layer, Line, Project, Vertex } from "./export";
|
|
5
|
+
import { List, Map } from 'immutable';
|
|
6
|
+
import { Group as GroupModel } from "../models";
|
|
7
|
+
import { GeometryUtils, IDBroker } from "../utils/export";
|
|
8
|
+
var Group = /*#__PURE__*/function () {
|
|
14
9
|
function Group() {
|
|
15
|
-
(
|
|
10
|
+
_classCallCheck(this, Group);
|
|
16
11
|
}
|
|
17
|
-
return (
|
|
12
|
+
return _createClass(Group, null, [{
|
|
18
13
|
key: "select",
|
|
19
14
|
value: function select(state, groupID) {
|
|
20
15
|
var layerList = state.getIn(['scene', 'groups', groupID, 'elements']);
|
|
21
|
-
state =
|
|
16
|
+
state = Project.setAlterate(state).updatedState;
|
|
22
17
|
layerList.entrySeq().forEach(function (_ref) {
|
|
23
|
-
var _ref2 = (
|
|
18
|
+
var _ref2 = _slicedToArray(_ref, 2),
|
|
24
19
|
groupLayerID = _ref2[0],
|
|
25
20
|
groupLayerElements = _ref2[1];
|
|
26
|
-
state =
|
|
21
|
+
state = Layer.unselectAll(state, groupLayerID).updatedState;
|
|
27
22
|
var lines = groupLayerElements.get('lines');
|
|
28
23
|
var holes = groupLayerElements.get('holes');
|
|
29
24
|
var items = groupLayerElements.get('items');
|
|
30
25
|
var areas = groupLayerElements.get('areas');
|
|
31
26
|
if (lines) lines.forEach(function (lineID) {
|
|
32
|
-
state =
|
|
27
|
+
state = Line.select(state, groupLayerID, lineID).updatedState;
|
|
33
28
|
});
|
|
34
29
|
if (holes) holes.forEach(function (holeID) {
|
|
35
|
-
state =
|
|
30
|
+
state = Hole.select(state, groupLayerID, holeID).updatedState;
|
|
36
31
|
});
|
|
37
32
|
if (items) items.forEach(function (itemID) {
|
|
38
|
-
state =
|
|
33
|
+
state = Item.select(state, groupLayerID, itemID).updatedState;
|
|
39
34
|
});
|
|
40
35
|
if (areas) areas.forEach(function (areaID) {
|
|
41
|
-
state =
|
|
36
|
+
state = Area.select(state, groupLayerID, areaID).updatedState;
|
|
42
37
|
});
|
|
43
38
|
});
|
|
44
|
-
state =
|
|
39
|
+
state = Project.setAlterate(state).updatedState;
|
|
45
40
|
var groups = state.getIn(['scene', 'groups']).map(function (g) {
|
|
46
41
|
return g.set('selected', false);
|
|
47
42
|
});
|
|
@@ -55,7 +50,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
55
50
|
value: function unselect(state, groupID) {
|
|
56
51
|
var layerList = state.getIn(['scene', 'groups', groupID, 'elements']);
|
|
57
52
|
var reduced = layerList.reduce(function (newState, layer, layerID) {
|
|
58
|
-
return
|
|
53
|
+
return Layer.unselectAll(newState, layerID).updatedState;
|
|
59
54
|
}, state);
|
|
60
55
|
state = reduced.setIn(['scene', 'groups', groupID, 'selected'], false);
|
|
61
56
|
return {
|
|
@@ -65,8 +60,8 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
65
60
|
}, {
|
|
66
61
|
key: "create",
|
|
67
62
|
value: function create(state) {
|
|
68
|
-
var groupID =
|
|
69
|
-
state = state.setIn(['scene', 'groups', groupID], new
|
|
63
|
+
var groupID = IDBroker.acquireID();
|
|
64
|
+
state = state.setIn(['scene', 'groups', groupID], new GroupModel({
|
|
70
65
|
id: groupID,
|
|
71
66
|
name: groupID
|
|
72
67
|
}));
|
|
@@ -78,8 +73,8 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
78
73
|
key: "createFromSelectedElements",
|
|
79
74
|
value: function createFromSelectedElements(state) {
|
|
80
75
|
var _this = this;
|
|
81
|
-
var groupID =
|
|
82
|
-
state = state.setIn(['scene', 'groups', groupID], new
|
|
76
|
+
var groupID = IDBroker.acquireID();
|
|
77
|
+
state = state.setIn(['scene', 'groups', groupID], new GroupModel({
|
|
83
78
|
id: groupID,
|
|
84
79
|
name: groupID
|
|
85
80
|
}));
|
|
@@ -115,7 +110,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
115
110
|
}, {
|
|
116
111
|
key: "addElement",
|
|
117
112
|
value: function addElement(state, groupID, layerID, elementPrototype, elementID) {
|
|
118
|
-
var actualList = state.getIn(['scene', 'groups', groupID, 'elements', layerID, elementPrototype]) || new
|
|
113
|
+
var actualList = state.getIn(['scene', 'groups', groupID, 'elements', layerID, elementPrototype]) || new List();
|
|
119
114
|
if (!actualList.contains(elementID)) {
|
|
120
115
|
state = state.setIn(['scene', 'groups', groupID, 'elements', layerID, elementPrototype], actualList.push(elementID));
|
|
121
116
|
state = this.reloadBaricenter(state, groupID).updatedState;
|
|
@@ -150,10 +145,10 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
150
145
|
var yBar = 0;
|
|
151
146
|
var elementCount = 0;
|
|
152
147
|
layerList.entrySeq().forEach(function (_ref3) {
|
|
153
|
-
var _ref4 = (
|
|
148
|
+
var _ref4 = _slicedToArray(_ref3, 2),
|
|
154
149
|
groupLayerID = _ref4[0],
|
|
155
150
|
groupLayerElements = _ref4[1];
|
|
156
|
-
state =
|
|
151
|
+
state = Layer.unselectAll(state, groupLayerID).updatedState;
|
|
157
152
|
var lines = groupLayerElements.get('lines');
|
|
158
153
|
var holes = groupLayerElements.get('holes');
|
|
159
154
|
var items = groupLayerElements.get('items');
|
|
@@ -168,7 +163,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
168
163
|
var _vertices$get2 = vertices.get(1),
|
|
169
164
|
x2 = _vertices$get2.x,
|
|
170
165
|
y2 = _vertices$get2.y;
|
|
171
|
-
var _GeometryUtils$midPoi =
|
|
166
|
+
var _GeometryUtils$midPoi = GeometryUtils.midPoint(x1, y1, x2, y2),
|
|
172
167
|
xM = _GeometryUtils$midPoi.x,
|
|
173
168
|
yM = _GeometryUtils$midPoi.y;
|
|
174
169
|
xBar += xM;
|
|
@@ -186,7 +181,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
186
181
|
var _lineVertices$get2 = lineVertices.get(1),
|
|
187
182
|
x2 = _lineVertices$get2.x,
|
|
188
183
|
y2 = _lineVertices$get2.y;
|
|
189
|
-
var _GeometryUtils$extend =
|
|
184
|
+
var _GeometryUtils$extend = GeometryUtils.extendLine(x1, y1, x2, y2, hole.offset * GeometryUtils.pointsDistance(x1, y1, x2, y2)),
|
|
190
185
|
x = _GeometryUtils$extend.x,
|
|
191
186
|
y = _GeometryUtils$extend.y;
|
|
192
187
|
xBar += x;
|
|
@@ -205,7 +200,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
205
200
|
var areaVertices = state.getIn(['scene', 'layers', groupLayerID, 'areas', areaID, 'vertices']).map(function (vID) {
|
|
206
201
|
return state.getIn(['scene', 'layers', groupLayerID, 'vertices', vID]);
|
|
207
202
|
}).toJS();
|
|
208
|
-
var _GeometryUtils$vertic =
|
|
203
|
+
var _GeometryUtils$vertic = GeometryUtils.verticesMidPoint(areaVertices),
|
|
209
204
|
x = _GeometryUtils$vertic.x,
|
|
210
205
|
y = _GeometryUtils$vertic.y;
|
|
211
206
|
xBar += x;
|
|
@@ -265,29 +260,29 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
265
260
|
value: function removeAndDeleteElements(state, groupID) {
|
|
266
261
|
var layerList = state.getIn(['scene', 'groups', groupID, 'elements']);
|
|
267
262
|
layerList.entrySeq().forEach(function (_ref5) {
|
|
268
|
-
var _ref6 = (
|
|
263
|
+
var _ref6 = _slicedToArray(_ref5, 2),
|
|
269
264
|
groupLayerID = _ref6[0],
|
|
270
265
|
groupLayerElements = _ref6[1];
|
|
271
|
-
state =
|
|
266
|
+
state = Layer.unselectAll(state, groupLayerID).updatedState;
|
|
272
267
|
var lines = groupLayerElements.get('lines');
|
|
273
268
|
var holes = groupLayerElements.get('holes');
|
|
274
269
|
var items = groupLayerElements.get('items');
|
|
275
270
|
var areas = groupLayerElements.get('areas');
|
|
276
271
|
if (lines) {
|
|
277
272
|
lines.forEach(function (lineID) {
|
|
278
|
-
state =
|
|
279
|
-
state =
|
|
273
|
+
state = Line.remove(state, groupLayerID, lineID).updatedState;
|
|
274
|
+
state = Layer.detectAndUpdateAreas(state, groupLayerID, {}).updatedState;
|
|
280
275
|
});
|
|
281
276
|
}
|
|
282
277
|
if (holes) holes.forEach(function (holeID) {
|
|
283
|
-
state =
|
|
278
|
+
state = Hole.remove(state, groupLayerID, holeID).updatedState;
|
|
284
279
|
});
|
|
285
280
|
if (items) items.forEach(function (itemID) {
|
|
286
|
-
state =
|
|
281
|
+
state = Item.remove(state, groupLayerID, itemID).updatedState;
|
|
287
282
|
});
|
|
288
283
|
//( actually ) no effect by area's destruction
|
|
289
284
|
if (false && areas) areas.forEach(function (areaID) {
|
|
290
|
-
state =
|
|
285
|
+
state = Area.remove(state, groupLayerID, areaID).updatedState;
|
|
291
286
|
});
|
|
292
287
|
});
|
|
293
288
|
state = state.deleteIn(['scene', 'groups', groupID]);
|
|
@@ -302,7 +297,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
302
297
|
var deltaY = y - state.getIn(['scene', 'groups', groupID, 'y']);
|
|
303
298
|
var layerList = state.getIn(['scene', 'groups', groupID, 'elements']);
|
|
304
299
|
layerList.entrySeq().forEach(function (_ref7) {
|
|
305
|
-
var _ref8 = (
|
|
300
|
+
var _ref8 = _slicedToArray(_ref7, 2),
|
|
306
301
|
groupLayerID = _ref8[0],
|
|
307
302
|
groupLayerElements = _ref8[1];
|
|
308
303
|
var lines = groupLayerElements.get('lines');
|
|
@@ -322,7 +317,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
322
317
|
var _vertices$vertexID = vertices[vertexID],
|
|
323
318
|
xV = _vertices$vertexID.x,
|
|
324
319
|
yV = _vertices$vertexID.y;
|
|
325
|
-
state =
|
|
320
|
+
state = Vertex.setAttributes(state, groupLayerID, vertexID, new Map({
|
|
326
321
|
x: xV + deltaX,
|
|
327
322
|
y: yV + deltaY
|
|
328
323
|
})).updatedState;
|
|
@@ -330,8 +325,8 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
330
325
|
|
|
331
326
|
//need to be separated from setAttributes cycle
|
|
332
327
|
for (var _vertexID in vertices) {
|
|
333
|
-
state =
|
|
334
|
-
state =
|
|
328
|
+
state = Vertex.beginDraggingVertex(state, groupLayerID, _vertexID).updatedState;
|
|
329
|
+
state = Vertex.endDraggingVertex(state).updatedState;
|
|
335
330
|
}
|
|
336
331
|
}
|
|
337
332
|
if (items) state = items.map(function (itemID) {
|
|
@@ -339,7 +334,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
339
334
|
}).reduce(function (newState, item) {
|
|
340
335
|
var xI = item.x,
|
|
341
336
|
yI = item.y;
|
|
342
|
-
return
|
|
337
|
+
return Item.setAttributes(newState, groupLayerID, item.id, new Map({
|
|
343
338
|
x: xI + deltaX,
|
|
344
339
|
y: yI + deltaY
|
|
345
340
|
})).updatedState;
|
|
@@ -349,7 +344,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
349
344
|
//if( holes ) holes.forEach( holeID => { state = Hole.select( state, groupLayerID, holeID ).updatedState; });
|
|
350
345
|
//if( areas ) areas.forEach( areaID => { state = Area.select( state, groupLayerID, areaID ).updatedState; });
|
|
351
346
|
|
|
352
|
-
state =
|
|
347
|
+
state = Layer.detectAndUpdateAreas(state, groupLayerID, {}).updatedState;
|
|
353
348
|
});
|
|
354
349
|
state = this.setBarycenter(state, groupID, x, y).updatedState;
|
|
355
350
|
state = Group.select(state, groupID).updatedState;
|
|
@@ -365,12 +360,12 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
365
360
|
barY = _state$getIn2.y,
|
|
366
361
|
rotation = _state$getIn2.rotation;
|
|
367
362
|
var alpha = newAlpha - rotation;
|
|
368
|
-
state = Group.setAttributes(state, groupID, new
|
|
363
|
+
state = Group.setAttributes(state, groupID, new Map({
|
|
369
364
|
rotation: newAlpha
|
|
370
365
|
})).updatedState;
|
|
371
366
|
var layerList = state.getIn(['scene', 'groups', groupID, 'elements']);
|
|
372
367
|
layerList.entrySeq().forEach(function (_ref9) {
|
|
373
|
-
var _ref0 = (
|
|
368
|
+
var _ref0 = _slicedToArray(_ref9, 2),
|
|
374
369
|
groupLayerID = _ref0[0],
|
|
375
370
|
groupLayerElements = _ref0[1];
|
|
376
371
|
var lines = groupLayerElements.get('lines');
|
|
@@ -390,18 +385,18 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
390
385
|
var _vertices$vertexID2 = vertices[vertexID],
|
|
391
386
|
xV = _vertices$vertexID2.x,
|
|
392
387
|
yV = _vertices$vertexID2.y;
|
|
393
|
-
var _GeometryUtils$rotate =
|
|
388
|
+
var _GeometryUtils$rotate = GeometryUtils.rotatePointAroundPoint(xV, yV, barX, barY, alpha),
|
|
394
389
|
newX = _GeometryUtils$rotate.x,
|
|
395
390
|
newY = _GeometryUtils$rotate.y;
|
|
396
|
-
state =
|
|
391
|
+
state = Vertex.setAttributes(state, groupLayerID, vertexID, new Map({
|
|
397
392
|
x: newX,
|
|
398
393
|
y: newY
|
|
399
394
|
})).updatedState;
|
|
400
395
|
}
|
|
401
396
|
//need to be separated from setAttributes cycle
|
|
402
397
|
for (var _vertexID2 in vertices) {
|
|
403
|
-
state =
|
|
404
|
-
state =
|
|
398
|
+
state = Vertex.beginDraggingVertex(state, groupLayerID, _vertexID2).updatedState;
|
|
399
|
+
state = Vertex.endDraggingVertex(state).updatedState;
|
|
405
400
|
}
|
|
406
401
|
}
|
|
407
402
|
if (items) state = items.map(function (itemID) {
|
|
@@ -410,10 +405,10 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
410
405
|
var xI = item.x,
|
|
411
406
|
yI = item.y,
|
|
412
407
|
rI = item.rotation;
|
|
413
|
-
var _GeometryUtils$rotate2 =
|
|
408
|
+
var _GeometryUtils$rotate2 = GeometryUtils.rotatePointAroundPoint(xI, yI, barX, barY, alpha),
|
|
414
409
|
newX = _GeometryUtils$rotate2.x,
|
|
415
410
|
newY = _GeometryUtils$rotate2.y;
|
|
416
|
-
return
|
|
411
|
+
return Item.setAttributes(newState, groupLayerID, item.id, new Map({
|
|
417
412
|
x: newX,
|
|
418
413
|
y: newY,
|
|
419
414
|
rotation: rI + alpha
|
|
@@ -424,7 +419,7 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
424
419
|
//if( holes ) holes.forEach( holeID => { state = Hole.select( state, groupLayerID, holeID ).updatedState; });
|
|
425
420
|
//if( areas ) areas.forEach( areaID => { state = Area.select( state, groupLayerID, areaID ).updatedState; });
|
|
426
421
|
|
|
427
|
-
state =
|
|
422
|
+
state = Layer.detectAndUpdateAreas(state, groupLayerID, {}).updatedState;
|
|
428
423
|
});
|
|
429
424
|
state = Group.select(state, groupID).updatedState;
|
|
430
425
|
return {
|
|
@@ -432,4 +427,5 @@ var Group = exports["default"] = /*#__PURE__*/function () {
|
|
|
432
427
|
};
|
|
433
428
|
}
|
|
434
429
|
}]);
|
|
435
|
-
}();
|
|
430
|
+
}();
|
|
431
|
+
export { Group as default };
|
package/es/class/guide.js
CHANGED
|
@@ -1,19 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
exports["default"] = exports.VerticalGuide = exports.HorizontalGuide = exports.CircularGuide = void 0;
|
|
6
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
7
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
8
|
-
var _export = require("../utils/export");
|
|
9
|
-
var HorizontalGuide = exports.HorizontalGuide = /*#__PURE__*/function () {
|
|
1
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
2
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
3
|
+
import { IDBroker } from "../utils/export";
|
|
4
|
+
var HorizontalGuide = /*#__PURE__*/function () {
|
|
10
5
|
function HorizontalGuide() {
|
|
11
|
-
(
|
|
6
|
+
_classCallCheck(this, HorizontalGuide);
|
|
12
7
|
}
|
|
13
|
-
return (
|
|
8
|
+
return _createClass(HorizontalGuide, null, [{
|
|
14
9
|
key: "create",
|
|
15
10
|
value: function create(state, coordinate) {
|
|
16
|
-
var hGuideID =
|
|
11
|
+
var hGuideID = IDBroker.acquireID();
|
|
17
12
|
state = state.setIn(['scene', 'guides', 'horizontal', hGuideID], coordinate);
|
|
18
13
|
return {
|
|
19
14
|
updatedState: state
|
|
@@ -29,14 +24,14 @@ var HorizontalGuide = exports.HorizontalGuide = /*#__PURE__*/function () {
|
|
|
29
24
|
}
|
|
30
25
|
}]);
|
|
31
26
|
}();
|
|
32
|
-
var VerticalGuide =
|
|
27
|
+
var VerticalGuide = /*#__PURE__*/function () {
|
|
33
28
|
function VerticalGuide() {
|
|
34
|
-
(
|
|
29
|
+
_classCallCheck(this, VerticalGuide);
|
|
35
30
|
}
|
|
36
|
-
return (
|
|
31
|
+
return _createClass(VerticalGuide, null, [{
|
|
37
32
|
key: "create",
|
|
38
33
|
value: function create(state, coordinate) {
|
|
39
|
-
var vGuideID =
|
|
34
|
+
var vGuideID = IDBroker.acquireID();
|
|
40
35
|
state = state.setIn(['scene', 'guides', 'vertical', vGuideID], coordinate);
|
|
41
36
|
return {
|
|
42
37
|
updatedState: state
|
|
@@ -52,10 +47,11 @@ var VerticalGuide = exports.VerticalGuide = /*#__PURE__*/function () {
|
|
|
52
47
|
}
|
|
53
48
|
}]);
|
|
54
49
|
}();
|
|
55
|
-
var CircularGuide =
|
|
56
|
-
(
|
|
50
|
+
var CircularGuide = /*#__PURE__*/_createClass(function CircularGuide() {
|
|
51
|
+
_classCallCheck(this, CircularGuide);
|
|
57
52
|
});
|
|
58
|
-
|
|
53
|
+
export { HorizontalGuide, VerticalGuide, CircularGuide };
|
|
54
|
+
export default {
|
|
59
55
|
HorizontalGuide: HorizontalGuide,
|
|
60
56
|
VerticalGuide: VerticalGuide,
|
|
61
57
|
CircularGuide: CircularGuide
|