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