kitchen-simulator 1.1.1-test.72 → 1.1.1-test.74
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
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
exports.__esModule = true;
|
|
3
|
-
exports.disposeObject = disposeObject;
|
|
4
|
-
exports.disposeScene = disposeScene;
|
|
5
|
-
var Three = _interopRequireWildcard(require("three"));
|
|
1
|
+
import * as Three from 'three';
|
|
6
2
|
function disposeGeometry(geometry) {
|
|
7
3
|
geometry.dispose();
|
|
8
4
|
}
|
|
@@ -41,13 +37,13 @@ function disposeMesh(mesh) {
|
|
|
41
37
|
mesh.geometry = null;
|
|
42
38
|
mesh.material = null;
|
|
43
39
|
}
|
|
44
|
-
function disposeScene(scene3D) {
|
|
40
|
+
export function disposeScene(scene3D) {
|
|
45
41
|
scene3D.traverse(function (child) {
|
|
46
42
|
disposeMesh(child);
|
|
47
43
|
child = null;
|
|
48
44
|
});
|
|
49
45
|
}
|
|
50
|
-
function disposeObject(object) {
|
|
46
|
+
export function disposeObject(object) {
|
|
51
47
|
object.traverse(function (child) {
|
|
52
48
|
disposeMesh(child);
|
|
53
49
|
child = null;
|
|
@@ -1,28 +1,27 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
var
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
var
|
|
21
|
-
var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Component) {
|
|
3
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
4
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
5
|
+
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
6
|
+
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
7
|
+
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
8
|
+
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
9
|
+
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
10
|
+
import React from 'react';
|
|
11
|
+
import PropTypes from 'prop-types';
|
|
12
|
+
import ReactDOM from 'react-dom';
|
|
13
|
+
import * as Three from 'three';
|
|
14
|
+
import { parseData, updateScene } from "./scene-creator";
|
|
15
|
+
import { disposeScene } from "./three-memory-cleaner";
|
|
16
|
+
import diff from 'immutablediff';
|
|
17
|
+
import { initPointerLock } from "./pointer-lock-navigation";
|
|
18
|
+
import { firstPersonOnKeyDown, firstPersonOnKeyUp } from "./libs/first-person-controls";
|
|
19
|
+
import * as SharedStyle from "../../shared-style";
|
|
20
|
+
var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
22
21
|
function Viewer3DFirstPerson(props) {
|
|
23
22
|
var _this;
|
|
24
|
-
(
|
|
25
|
-
_this = (
|
|
23
|
+
_classCallCheck(this, Viewer3DFirstPerson);
|
|
24
|
+
_this = _callSuper(this, Viewer3DFirstPerson, [props]);
|
|
26
25
|
_this.width = props.width;
|
|
27
26
|
_this.height = props.height;
|
|
28
27
|
_this.stopRendering = false;
|
|
@@ -32,8 +31,8 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
32
31
|
window.__threeRenderer = _this.renderer;
|
|
33
32
|
return _this;
|
|
34
33
|
}
|
|
35
|
-
(
|
|
36
|
-
return (
|
|
34
|
+
_inherits(Viewer3DFirstPerson, _React$Component);
|
|
35
|
+
return _createClass(Viewer3DFirstPerson, [{
|
|
37
36
|
key: "componentDidMount",
|
|
38
37
|
value: function componentDidMount() {
|
|
39
38
|
var _this2 = this;
|
|
@@ -56,7 +55,7 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
56
55
|
};
|
|
57
56
|
var state = this.props.state;
|
|
58
57
|
var data = state.scene;
|
|
59
|
-
var canvasWrapper =
|
|
58
|
+
var canvasWrapper = ReactDOM.findDOMNode(this.refs.canvasWrapper);
|
|
60
59
|
var scene3D = new Three.Scene();
|
|
61
60
|
|
|
62
61
|
// As I need to show the pointer above all scene objects, I use this workaround http://stackoverflow.com/a/13309722
|
|
@@ -67,7 +66,7 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
67
66
|
this.renderer.setSize(this.width, this.height);
|
|
68
67
|
|
|
69
68
|
// LOAD DATA
|
|
70
|
-
this.planData =
|
|
69
|
+
this.planData = parseData(data, actions, catalog);
|
|
71
70
|
scene3D.add(this.planData.plan);
|
|
72
71
|
|
|
73
72
|
// CAMERA
|
|
@@ -96,7 +95,7 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
96
95
|
|
|
97
96
|
document.body.requestPointerLock = document.body.requestPointerLock || document.body.mozRequestPointerLock || document.body.webkitRequestPointerLock;
|
|
98
97
|
document.body.requestPointerLock();
|
|
99
|
-
var _initPointerLock =
|
|
98
|
+
var _initPointerLock = initPointerLock(camera, this.renderer.domElement),
|
|
100
99
|
controls = _initPointerLock.controls,
|
|
101
100
|
pointerlockChangeEvent = _initPointerLock.pointerlockChangeEvent,
|
|
102
101
|
requestPointerLockEvent = _initPointerLock.requestPointerLockEvent;
|
|
@@ -113,7 +112,7 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
113
112
|
|
|
114
113
|
// Add move controls on the page
|
|
115
114
|
this.keyDownEvent = function (event) {
|
|
116
|
-
var moveResult =
|
|
115
|
+
var moveResult = firstPersonOnKeyDown(event, moveForward, moveLeft, moveBackward, moveRight, canJump, velocity);
|
|
117
116
|
moveForward = moveResult.moveForward;
|
|
118
117
|
moveLeft = moveResult.moveLeft;
|
|
119
118
|
moveBackward = moveResult.moveBackward;
|
|
@@ -121,7 +120,7 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
121
120
|
canJump = moveResult.canJump;
|
|
122
121
|
};
|
|
123
122
|
this.keyUpEvent = function (event) {
|
|
124
|
-
var moveResult =
|
|
123
|
+
var moveResult = firstPersonOnKeyUp(event, moveForward, moveLeft, moveBackward, moveRight, canJump);
|
|
125
124
|
moveForward = moveResult.moveForward;
|
|
126
125
|
moveLeft = moveResult.moveLeft;
|
|
127
126
|
moveBackward = moveResult.moveBackward;
|
|
@@ -248,7 +247,7 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
248
247
|
document.removeEventListener('mozpointerlockchange', this.pointerlockChangeEvent);
|
|
249
248
|
document.removeEventListener('webkitpointerlockchange', this.pointerlockChangeEvent);
|
|
250
249
|
this.renderer.domElement.removeEventListener('click', this.requestPointerLockEvent);
|
|
251
|
-
|
|
250
|
+
disposeScene(this.scene3D);
|
|
252
251
|
this.scene3D.remove(this.planData.plan);
|
|
253
252
|
this.scene3D = null;
|
|
254
253
|
this.planData = null;
|
|
@@ -276,8 +275,8 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
276
275
|
camera.aspect = width / height;
|
|
277
276
|
camera.updateProjectionMatrix();
|
|
278
277
|
if (nextProps.scene !== this.props.state.scene) {
|
|
279
|
-
var changedValues = (
|
|
280
|
-
|
|
278
|
+
var changedValues = diff(this.props.state.scene, nextProps.state.scene);
|
|
279
|
+
updateScene(planData, nextProps.state.scene, this.props.state.scene, changedValues.toJS(), actions, this.context.catalog);
|
|
281
280
|
}
|
|
282
281
|
renderer.setSize(width, height);
|
|
283
282
|
renderer.clear(); // clear buffers
|
|
@@ -288,22 +287,23 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
288
287
|
}, {
|
|
289
288
|
key: "render",
|
|
290
289
|
value: function render() {
|
|
291
|
-
return /*#__PURE__*/
|
|
290
|
+
return /*#__PURE__*/React.createElement('div', {
|
|
292
291
|
ref: 'canvasWrapper'
|
|
293
292
|
});
|
|
294
293
|
}
|
|
295
294
|
}]);
|
|
296
|
-
}(
|
|
295
|
+
}(React.Component);
|
|
296
|
+
export { Viewer3DFirstPerson as default };
|
|
297
297
|
Viewer3DFirstPerson.propTypes = {
|
|
298
|
-
state:
|
|
299
|
-
width:
|
|
300
|
-
height:
|
|
298
|
+
state: PropTypes.object.isRequired,
|
|
299
|
+
width: PropTypes.number.isRequired,
|
|
300
|
+
height: PropTypes.number.isRequired
|
|
301
301
|
};
|
|
302
302
|
Viewer3DFirstPerson.contextTypes = {
|
|
303
|
-
areaActions:
|
|
304
|
-
holesActions:
|
|
305
|
-
itemsActions:
|
|
306
|
-
linesActions:
|
|
307
|
-
projectActions:
|
|
308
|
-
catalog:
|
|
303
|
+
areaActions: PropTypes.object.isRequired,
|
|
304
|
+
holesActions: PropTypes.object.isRequired,
|
|
305
|
+
itemsActions: PropTypes.object.isRequired,
|
|
306
|
+
linesActions: PropTypes.object.isRequired,
|
|
307
|
+
projectActions: PropTypes.object.isRequired,
|
|
308
|
+
catalog: PropTypes.object
|
|
309
309
|
};
|