kitchen-simulator 1.1.1-test.71 → 1.1.1-test.72
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 +5 -2
- package/es/AppContext.js +6 -3
- package/es/KitchenConfigurator.js +86 -87
- package/es/KitchenConfiguratorApp.js +128 -135
- package/es/actions/area-actions.js +8 -5
- package/es/actions/export.js +24 -12
- package/es/actions/groups-actions.js +41 -27
- package/es/actions/holes-actions.js +51 -34
- package/es/actions/items-actions.js +141 -94
- package/es/actions/lines-actions.js +32 -21
- package/es/actions/project-actions.js +141 -94
- package/es/actions/scene-actions.js +17 -11
- package/es/actions/vertices-actions.js +11 -7
- package/es/actions/viewer2d-actions.js +32 -21
- package/es/actions/viewer3d-actions.js +14 -9
- package/es/catalog/areas/area/planner-element.js +5 -2
- package/es/catalog/catalog.js +17 -15
- package/es/catalog/factories/area-factory-3d.js +26 -22
- package/es/catalog/factories/area-factory.js +15 -13
- package/es/catalog/factories/export.js +10 -6
- package/es/catalog/factories/wall-factory-3d.js +36 -31
- package/es/catalog/factories/wall-factory.js +26 -21
- package/es/catalog/holes/door-closet/planner-element.js +19 -15
- package/es/catalog/holes/door-double/planner-element.js +19 -15
- package/es/catalog/holes/door-exterior/planner-element.js +20 -16
- package/es/catalog/holes/door-interior/planner-element.js +20 -16
- package/es/catalog/holes/door-panic/planner-element.js +11 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +19 -15
- package/es/catalog/holes/door-sliding/planner-element.js +21 -17
- package/es/catalog/holes/doorway-framed/planner-element.js +15 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +11 -7
- package/es/catalog/holes/export.js +29 -13
- package/es/catalog/holes/window-clear/planner-element.js +14 -10
- package/es/catalog/holes/window-cross/planner-element.js +14 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +14 -10
- package/es/catalog/holes/window-vertical/planner-element.js +14 -10
- package/es/catalog/lines/wall/planner-element.js +5 -2
- package/es/catalog/molding/molding-dcm/planner-element.js +9 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +9 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +9 -5
- package/es/catalog/properties/export.js +31 -20
- package/es/catalog/properties/property-checkbox.js +29 -28
- package/es/catalog/properties/property-color.js +19 -16
- package/es/catalog/properties/property-enum.js +27 -24
- package/es/catalog/properties/property-hidden.js +12 -9
- package/es/catalog/properties/property-lenght-measure.js +41 -38
- package/es/catalog/properties/property-length-measure.js +39 -36
- package/es/catalog/properties/property-length-measure_hole.js +41 -38
- package/es/catalog/properties/property-number.js +20 -17
- package/es/catalog/properties/property-read-only.js +19 -16
- package/es/catalog/properties/property-string.js +19 -16
- package/es/catalog/properties/property-toggle.js +19 -16
- package/es/catalog/properties/shared-property-style.js +3 -1
- package/es/catalog/utils/FuseUtils.js +13 -12
- package/es/catalog/utils/exporter.js +11 -10
- package/es/catalog/utils/geom-utils.js +24 -13
- package/es/catalog/utils/item-loader.js +92 -86
- package/es/catalog/utils/load-obj.js +24 -20
- package/es/catalog/utils/mtl-loader.js +4 -3
- package/es/catalog/utils/obj-loader.js +4 -3
- package/es/class/FuseUtils.js +13 -12
- package/es/class/area.js +24 -24
- package/es/class/export.js +36 -23
- package/es/class/group.js +55 -53
- package/es/class/guide.js +17 -15
- package/es/class/hole.js +85 -83
- package/es/class/item.js +155 -155
- package/es/class/layer.js +61 -59
- package/es/class/line.js +138 -135
- package/es/class/project.js +94 -93
- package/es/class/vertex.js +31 -29
- package/es/components/content.js +23 -19
- package/es/components/disclaimer/disclaimer.js +13 -10
- package/es/components/export.js +13 -8
- package/es/components/style/button.js +25 -25
- package/es/components/style/cancel-button.js +10 -7
- package/es/components/style/content-container.js +12 -11
- package/es/components/style/content-title.js +15 -13
- package/es/components/style/delete-button.js +12 -8
- package/es/components/style/export.js +46 -30
- package/es/components/style/form-block.js +11 -10
- package/es/components/style/form-color-input.js +10 -7
- package/es/components/style/form-label.js +11 -10
- package/es/components/style/form-number-input.js +43 -45
- package/es/components/style/form-number-input_2.js +39 -41
- package/es/components/style/form-select.js +20 -19
- package/es/components/style/form-slider.js +13 -10
- package/es/components/style/form-submit-button.js +12 -8
- package/es/components/style/form-text-input.js +28 -30
- package/es/components/viewer2d/area.js +20 -17
- package/es/components/viewer2d/export.js +46 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +13 -10
- package/es/components/viewer2d/grids/grid-streak.js +13 -10
- package/es/components/viewer2d/grids/grid-vertical-streak.js +13 -10
- package/es/components/viewer2d/grids/grids.js +14 -10
- package/es/components/viewer2d/group.js +19 -15
- package/es/components/viewer2d/item.js +65 -61
- package/es/components/viewer2d/layer.js +26 -23
- package/es/components/viewer2d/line.js +106 -101
- package/es/components/viewer2d/ruler.js +25 -22
- package/es/components/viewer2d/rulerDist.js +24 -21
- package/es/components/viewer2d/rulerX.js +44 -46
- package/es/components/viewer2d/rulerY.js +42 -44
- package/es/components/viewer2d/scene.js +34 -35
- package/es/components/viewer2d/snap.js +17 -13
- package/es/components/viewer2d/state.js +22 -18
- package/es/components/viewer2d/utils.js +33 -24
- package/es/components/viewer2d/vertex.js +12 -8
- package/es/components/viewer2d/viewer2d.js +159 -156
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +19 -21
- package/es/components/viewer3d/dcm.js +3 -1
- package/es/components/viewer3d/fbm.js +3 -1
- package/es/components/viewer3d/front3D.js +16 -12
- package/es/components/viewer3d/grid-creator.js +12 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +9 -6
- package/es/components/viewer3d/grids/grid-streak.js +8 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +9 -6
- package/es/components/viewer3d/libs/first-person-controls.js +5 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +3 -1
- package/es/components/viewer3d/libs/mtl-loader.js +3 -1
- package/es/components/viewer3d/libs/obj-loader.js +3 -1
- package/es/components/viewer3d/libs/orbit-controls.js +4 -2
- package/es/components/viewer3d/libs/pointer-lock-controls.js +4 -2
- package/es/components/viewer3d/lrm.js +3 -1
- package/es/components/viewer3d/model.js +3 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +6 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +21 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +62 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +43 -42
- package/es/components/viewer3d/ruler-utils/scene3D.js +13 -9
- package/es/components/viewer3d/ruler-utils/state3D.js +7 -4
- package/es/components/viewer3d/scene-creator.js +223 -197
- package/es/components/viewer3d/three-memory-cleaner.js +7 -3
- package/es/components/viewer3d/viewer3d-first-person.js +42 -42
- package/es/components/viewer3d/viewer3d.js +198 -200
- package/es/constants.js +354 -349
- package/es/index.js +11 -7
- package/es/models.js +191 -193
- package/es/plugins/SVGLoader.js +49 -48
- package/es/plugins/autosave.js +5 -3
- package/es/plugins/console-debugger.js +7 -6
- package/es/plugins/export.js +13 -8
- package/es/plugins/keyboard.js +31 -29
- package/es/reducers/areas-reducer.js +9 -7
- package/es/reducers/export.js +37 -24
- package/es/reducers/groups-reducer.js +33 -31
- package/es/reducers/holes-reducer.js +45 -43
- package/es/reducers/items-reducer.js +108 -106
- package/es/reducers/lines-reducer.js +30 -28
- package/es/reducers/project-reducer.js +107 -105
- package/es/reducers/reducer.js +19 -16
- package/es/reducers/scene-reducer.js +17 -15
- package/es/reducers/user-reducer.js +7 -5
- package/es/reducers/vertices-reducer.js +13 -11
- package/es/reducers/viewer2d-reducer.js +20 -18
- package/es/reducers/viewer3d-reducer.js +18 -16
- package/es/shared-style.js +12 -10
- package/es/styles/export.js +6 -3
- package/es/translator/en.js +3 -1
- package/es/translator/it.js +3 -1
- package/es/translator/ru.js +3 -1
- package/es/translator/translator.js +15 -13
- package/es/utils/browser.js +5 -2
- package/es/utils/convert-units-lite.js +3 -1
- package/es/utils/email-validator.js +3 -1
- package/es/utils/export.js +29 -15
- package/es/utils/geometry.js +280 -190
- package/es/utils/get-edges-of-subgraphs.js +5 -2
- package/es/utils/graph-cycles.js +7 -8
- package/es/utils/graph-inner-cycles.js +14 -10
- package/es/utils/graph.js +13 -9
- package/es/utils/helper.js +58 -41
- package/es/utils/history.js +11 -8
- package/es/utils/id-broker.js +11 -8
- package/es/utils/logger.js +3 -1
- package/es/utils/math.js +8 -5
- package/es/utils/molding.js +146 -130
- package/es/utils/name-generator.js +9 -7
- package/es/utils/objects-utils.js +14 -7
- package/es/utils/phone-validator.js +3 -1
- package/es/utils/process-black-list.js +6 -5
- package/es/utils/react-if.js +9 -7
- package/es/utils/snap-scene.js +30 -27
- package/es/utils/snap.js +57 -53
- package/es/utils/summarizeCart.js +3 -1
- package/es/utils/threeCSG.es6.js +17 -13
- package/es/version.js +3 -1
- package/package.json +1 -1
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
|
|
1
|
+
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
|
|
2
|
+
exports.__esModule = true;
|
|
3
|
+
exports.disposeObject = disposeObject;
|
|
4
|
+
exports.disposeScene = disposeScene;
|
|
5
|
+
var Three = _interopRequireWildcard(require("three"));
|
|
2
6
|
function disposeGeometry(geometry) {
|
|
3
7
|
geometry.dispose();
|
|
4
8
|
}
|
|
@@ -37,13 +41,13 @@ function disposeMesh(mesh) {
|
|
|
37
41
|
mesh.geometry = null;
|
|
38
42
|
mesh.material = null;
|
|
39
43
|
}
|
|
40
|
-
|
|
44
|
+
function disposeScene(scene3D) {
|
|
41
45
|
scene3D.traverse(function (child) {
|
|
42
46
|
disposeMesh(child);
|
|
43
47
|
child = null;
|
|
44
48
|
});
|
|
45
49
|
}
|
|
46
|
-
|
|
50
|
+
function disposeObject(object) {
|
|
47
51
|
object.traverse(function (child) {
|
|
48
52
|
disposeMesh(child);
|
|
49
53
|
child = null;
|
|
@@ -1,27 +1,28 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
var
|
|
3
|
+
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
|
|
4
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
5
|
+
exports.__esModule = true;
|
|
6
|
+
exports["default"] = void 0;
|
|
7
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
8
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
9
|
+
var _callSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/callSuper"));
|
|
10
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
|
|
11
|
+
var _react = _interopRequireDefault(require("react"));
|
|
12
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
13
|
+
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
14
|
+
var Three = _interopRequireWildcard(require("three"));
|
|
15
|
+
var _sceneCreator = require("./scene-creator");
|
|
16
|
+
var _threeMemoryCleaner = require("./three-memory-cleaner");
|
|
17
|
+
var _immutablediff = _interopRequireDefault(require("immutablediff"));
|
|
18
|
+
var _pointerLockNavigation = require("./pointer-lock-navigation");
|
|
19
|
+
var _firstPersonControls = require("./libs/first-person-controls");
|
|
20
|
+
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
21
|
+
var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Component) {
|
|
21
22
|
function Viewer3DFirstPerson(props) {
|
|
22
23
|
var _this;
|
|
23
|
-
|
|
24
|
-
_this =
|
|
24
|
+
(0, _classCallCheck2["default"])(this, Viewer3DFirstPerson);
|
|
25
|
+
_this = (0, _callSuper2["default"])(this, Viewer3DFirstPerson, [props]);
|
|
25
26
|
_this.width = props.width;
|
|
26
27
|
_this.height = props.height;
|
|
27
28
|
_this.stopRendering = false;
|
|
@@ -31,8 +32,8 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
31
32
|
window.__threeRenderer = _this.renderer;
|
|
32
33
|
return _this;
|
|
33
34
|
}
|
|
34
|
-
|
|
35
|
-
return
|
|
35
|
+
(0, _inherits2["default"])(Viewer3DFirstPerson, _React$Component);
|
|
36
|
+
return (0, _createClass2["default"])(Viewer3DFirstPerson, [{
|
|
36
37
|
key: "componentDidMount",
|
|
37
38
|
value: function componentDidMount() {
|
|
38
39
|
var _this2 = this;
|
|
@@ -55,7 +56,7 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
55
56
|
};
|
|
56
57
|
var state = this.props.state;
|
|
57
58
|
var data = state.scene;
|
|
58
|
-
var canvasWrapper =
|
|
59
|
+
var canvasWrapper = _reactDom["default"].findDOMNode(this.refs.canvasWrapper);
|
|
59
60
|
var scene3D = new Three.Scene();
|
|
60
61
|
|
|
61
62
|
// As I need to show the pointer above all scene objects, I use this workaround http://stackoverflow.com/a/13309722
|
|
@@ -66,7 +67,7 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
66
67
|
this.renderer.setSize(this.width, this.height);
|
|
67
68
|
|
|
68
69
|
// LOAD DATA
|
|
69
|
-
this.planData = parseData(data, actions, catalog);
|
|
70
|
+
this.planData = (0, _sceneCreator.parseData)(data, actions, catalog);
|
|
70
71
|
scene3D.add(this.planData.plan);
|
|
71
72
|
|
|
72
73
|
// CAMERA
|
|
@@ -95,7 +96,7 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
95
96
|
|
|
96
97
|
document.body.requestPointerLock = document.body.requestPointerLock || document.body.mozRequestPointerLock || document.body.webkitRequestPointerLock;
|
|
97
98
|
document.body.requestPointerLock();
|
|
98
|
-
var _initPointerLock = initPointerLock(camera, this.renderer.domElement),
|
|
99
|
+
var _initPointerLock = (0, _pointerLockNavigation.initPointerLock)(camera, this.renderer.domElement),
|
|
99
100
|
controls = _initPointerLock.controls,
|
|
100
101
|
pointerlockChangeEvent = _initPointerLock.pointerlockChangeEvent,
|
|
101
102
|
requestPointerLockEvent = _initPointerLock.requestPointerLockEvent;
|
|
@@ -112,7 +113,7 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
112
113
|
|
|
113
114
|
// Add move controls on the page
|
|
114
115
|
this.keyDownEvent = function (event) {
|
|
115
|
-
var moveResult = firstPersonOnKeyDown(event, moveForward, moveLeft, moveBackward, moveRight, canJump, velocity);
|
|
116
|
+
var moveResult = (0, _firstPersonControls.firstPersonOnKeyDown)(event, moveForward, moveLeft, moveBackward, moveRight, canJump, velocity);
|
|
116
117
|
moveForward = moveResult.moveForward;
|
|
117
118
|
moveLeft = moveResult.moveLeft;
|
|
118
119
|
moveBackward = moveResult.moveBackward;
|
|
@@ -120,7 +121,7 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
120
121
|
canJump = moveResult.canJump;
|
|
121
122
|
};
|
|
122
123
|
this.keyUpEvent = function (event) {
|
|
123
|
-
var moveResult = firstPersonOnKeyUp(event, moveForward, moveLeft, moveBackward, moveRight, canJump);
|
|
124
|
+
var moveResult = (0, _firstPersonControls.firstPersonOnKeyUp)(event, moveForward, moveLeft, moveBackward, moveRight, canJump);
|
|
124
125
|
moveForward = moveResult.moveForward;
|
|
125
126
|
moveLeft = moveResult.moveLeft;
|
|
126
127
|
moveBackward = moveResult.moveBackward;
|
|
@@ -247,7 +248,7 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
247
248
|
document.removeEventListener('mozpointerlockchange', this.pointerlockChangeEvent);
|
|
248
249
|
document.removeEventListener('webkitpointerlockchange', this.pointerlockChangeEvent);
|
|
249
250
|
this.renderer.domElement.removeEventListener('click', this.requestPointerLockEvent);
|
|
250
|
-
disposeScene(this.scene3D);
|
|
251
|
+
(0, _threeMemoryCleaner.disposeScene)(this.scene3D);
|
|
251
252
|
this.scene3D.remove(this.planData.plan);
|
|
252
253
|
this.scene3D = null;
|
|
253
254
|
this.planData = null;
|
|
@@ -275,8 +276,8 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
275
276
|
camera.aspect = width / height;
|
|
276
277
|
camera.updateProjectionMatrix();
|
|
277
278
|
if (nextProps.scene !== this.props.state.scene) {
|
|
278
|
-
var changedValues =
|
|
279
|
-
updateScene(planData, nextProps.state.scene, this.props.state.scene, changedValues.toJS(), actions, this.context.catalog);
|
|
279
|
+
var changedValues = (0, _immutablediff["default"])(this.props.state.scene, nextProps.state.scene);
|
|
280
|
+
(0, _sceneCreator.updateScene)(planData, nextProps.state.scene, this.props.state.scene, changedValues.toJS(), actions, this.context.catalog);
|
|
280
281
|
}
|
|
281
282
|
renderer.setSize(width, height);
|
|
282
283
|
renderer.clear(); // clear buffers
|
|
@@ -287,23 +288,22 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
287
288
|
}, {
|
|
288
289
|
key: "render",
|
|
289
290
|
value: function render() {
|
|
290
|
-
return /*#__PURE__*/
|
|
291
|
+
return /*#__PURE__*/_react["default"].createElement('div', {
|
|
291
292
|
ref: 'canvasWrapper'
|
|
292
293
|
});
|
|
293
294
|
}
|
|
294
295
|
}]);
|
|
295
|
-
}(
|
|
296
|
-
export { Viewer3DFirstPerson as default };
|
|
296
|
+
}(_react["default"].Component);
|
|
297
297
|
Viewer3DFirstPerson.propTypes = {
|
|
298
|
-
state:
|
|
299
|
-
width:
|
|
300
|
-
height:
|
|
298
|
+
state: _propTypes["default"].object.isRequired,
|
|
299
|
+
width: _propTypes["default"].number.isRequired,
|
|
300
|
+
height: _propTypes["default"].number.isRequired
|
|
301
301
|
};
|
|
302
302
|
Viewer3DFirstPerson.contextTypes = {
|
|
303
|
-
areaActions:
|
|
304
|
-
holesActions:
|
|
305
|
-
itemsActions:
|
|
306
|
-
linesActions:
|
|
307
|
-
projectActions:
|
|
308
|
-
catalog:
|
|
303
|
+
areaActions: _propTypes["default"].object.isRequired,
|
|
304
|
+
holesActions: _propTypes["default"].object.isRequired,
|
|
305
|
+
itemsActions: _propTypes["default"].object.isRequired,
|
|
306
|
+
linesActions: _propTypes["default"].object.isRequired,
|
|
307
|
+
projectActions: _propTypes["default"].object.isRequired,
|
|
308
|
+
catalog: _propTypes["default"].object
|
|
309
309
|
};
|