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,41 +1,40 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
CameraControls.install({
|
|
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 _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/readOnlyError"));
|
|
8
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
9
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
10
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
11
|
+
var _callSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/callSuper"));
|
|
12
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
|
|
13
|
+
var _react = _interopRequireDefault(require("react"));
|
|
14
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
15
|
+
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
16
|
+
var Three = _interopRequireWildcard(require("three"));
|
|
17
|
+
var _sceneCreator = require("./scene-creator");
|
|
18
|
+
var _threeMemoryCleaner = require("./three-memory-cleaner");
|
|
19
|
+
var _immutablediff = _interopRequireDefault(require("immutablediff"));
|
|
20
|
+
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
21
|
+
var _constants = require("../../constants");
|
|
22
|
+
var _geometry = require("../../utils/geometry");
|
|
23
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
24
|
+
var _export = require("../../utils/export");
|
|
25
|
+
var _helper = require("../../utils/helper");
|
|
26
|
+
var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
|
|
27
|
+
var _cameraControls = _interopRequireDefault(require("camera-controls"));
|
|
28
|
+
var _utils = require("../viewer2d/utils");
|
|
29
|
+
var _objectsUtils = require("../../utils/objects-utils");
|
|
30
|
+
_cameraControls["default"].install({
|
|
32
31
|
THREE: Three
|
|
33
32
|
});
|
|
34
|
-
var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
33
|
+
var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component) {
|
|
35
34
|
function Scene3DViewer(props) {
|
|
36
35
|
var _this;
|
|
37
|
-
|
|
38
|
-
_this =
|
|
36
|
+
(0, _classCallCheck2["default"])(this, Scene3DViewer);
|
|
37
|
+
_this = (0, _callSuper2["default"])(this, Scene3DViewer, [props]);
|
|
39
38
|
_this.state = {
|
|
40
39
|
isLoading: false,
|
|
41
40
|
showflag: true,
|
|
@@ -54,14 +53,14 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
54
53
|
window.__elevationRendererDownload = {};
|
|
55
54
|
}
|
|
56
55
|
switch (mode) {
|
|
57
|
-
case MODE_IDLE_3D:
|
|
56
|
+
case _constants.MODE_IDLE_3D:
|
|
58
57
|
_this.renderer = window.__threeRenderer || new Three.WebGLRenderer({
|
|
59
58
|
preserveDrawingBuffer: true,
|
|
60
59
|
alpha: true,
|
|
61
60
|
antialias: true
|
|
62
61
|
});
|
|
63
62
|
break;
|
|
64
|
-
case MODE_3D_VIEW:
|
|
63
|
+
case _constants.MODE_3D_VIEW:
|
|
65
64
|
_this.renderer = window.__threeRendererDownload || new Three.WebGLRenderer({
|
|
66
65
|
preserveDrawingBuffer: true,
|
|
67
66
|
alpha: true,
|
|
@@ -96,8 +95,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
96
95
|
_this.renderer.domElement.style.display = 'none';
|
|
97
96
|
return _this;
|
|
98
97
|
}
|
|
99
|
-
|
|
100
|
-
return
|
|
98
|
+
(0, _inherits2["default"])(Scene3DViewer, _React$Component);
|
|
99
|
+
return (0, _createClass2["default"])(Scene3DViewer, [{
|
|
101
100
|
key: "componentDidMount",
|
|
102
101
|
value: function componentDidMount(nextProps) {
|
|
103
102
|
var _this2 = this;
|
|
@@ -117,7 +116,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
117
116
|
var mode = state.mode,
|
|
118
117
|
scene = state.scene;
|
|
119
118
|
function setupLight(scene, inbBox) {
|
|
120
|
-
if (isElevationView(mode)) {
|
|
119
|
+
if ((0, _helper.isElevationView)(mode)) {
|
|
121
120
|
var ambilight = new Three.AmbientLight('0xffffff', 3);
|
|
122
121
|
scene.add(ambilight);
|
|
123
122
|
} else {
|
|
@@ -176,10 +175,10 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
176
175
|
var spotlightDis = 1.5 * Math.abs(inbBox.min.y - inbBox.max.y);
|
|
177
176
|
|
|
178
177
|
// check if spotlight is inside the room
|
|
179
|
-
vectorIntersectWithMesh(spot1, scene3D.getObjectByName('floor')) && addSpotLight('0xffffff', 0.8, spot1, spot1, spotlightDis);
|
|
180
|
-
vectorIntersectWithMesh(spot2, scene3D.getObjectByName('floor')) && addSpotLight('0xffffff', 0.8, spot2, spot2, spotlightDis);
|
|
181
|
-
vectorIntersectWithMesh(spot3, scene3D.getObjectByName('floor')) && addSpotLight('0xffffff', 0.8, spot3, spot3, spotlightDis);
|
|
182
|
-
vectorIntersectWithMesh(spot4, scene3D.getObjectByName('floor')) && addSpotLight('0xffffff', 0.8, spot4, spot4, spotlightDis);
|
|
178
|
+
(0, _objectsUtils.vectorIntersectWithMesh)(spot1, scene3D.getObjectByName('floor')) && addSpotLight('0xffffff', 0.8, spot1, spot1, spotlightDis);
|
|
179
|
+
(0, _objectsUtils.vectorIntersectWithMesh)(spot2, scene3D.getObjectByName('floor')) && addSpotLight('0xffffff', 0.8, spot2, spot2, spotlightDis);
|
|
180
|
+
(0, _objectsUtils.vectorIntersectWithMesh)(spot3, scene3D.getObjectByName('floor')) && addSpotLight('0xffffff', 0.8, spot3, spot3, spotlightDis);
|
|
181
|
+
(0, _objectsUtils.vectorIntersectWithMesh)(spot4, scene3D.getObjectByName('floor')) && addSpotLight('0xffffff', 0.8, spot4, spot4, spotlightDis);
|
|
183
182
|
}
|
|
184
183
|
}
|
|
185
184
|
}
|
|
@@ -195,15 +194,15 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
195
194
|
|
|
196
195
|
// set loading bar
|
|
197
196
|
switch (self.props.state.mode) {
|
|
198
|
-
case MODE_ELEVATION_VIEW:
|
|
197
|
+
case _constants.MODE_ELEVATION_VIEW:
|
|
199
198
|
self.props.setIsLoadingElevation('front', true);
|
|
200
199
|
break;
|
|
201
|
-
case MODE_3D_VIEW:
|
|
200
|
+
case _constants.MODE_3D_VIEW:
|
|
202
201
|
self.props.setIsLoading3D(true);
|
|
203
202
|
break;
|
|
204
203
|
}
|
|
205
204
|
}
|
|
206
|
-
var _parseData = parseData(scene, actions, this.context.catalog, camera, this.renderer, state.mode),
|
|
205
|
+
var _parseData = (0, _sceneCreator.parseData)(scene, actions, this.context.catalog, camera, this.renderer, state.mode),
|
|
207
206
|
promise = _parseData.promise,
|
|
208
207
|
planData = _parseData.planData;
|
|
209
208
|
promise.then(function () {
|
|
@@ -217,7 +216,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
217
216
|
obj.removeFromParent();
|
|
218
217
|
});
|
|
219
218
|
var bbox = new Three.Box3().setFromObject(planData.plan);
|
|
220
|
-
if (!isElevationView(state.mode)) {
|
|
219
|
+
if (!(0, _helper.isElevationView)(state.mode)) {
|
|
221
220
|
cameraControls.fitToBox(bbox);
|
|
222
221
|
}
|
|
223
222
|
setupLight(scene3D, planData.boundingBox);
|
|
@@ -276,7 +275,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
276
275
|
realVec.push(vec);
|
|
277
276
|
});
|
|
278
277
|
if (aVertices.includes(realVec[0]) && aVertices.includes(realVec[1])) {
|
|
279
|
-
height = convert(layer.ceilHeight).from(layer.unit).to(UNIT_CENTIMETER);
|
|
278
|
+
height = (0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER);
|
|
280
279
|
// height = data.properties.getIn(['height', 'length']);
|
|
281
280
|
return 1; // break
|
|
282
281
|
}
|
|
@@ -374,11 +373,11 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
374
373
|
|
|
375
374
|
// end snap function variable///////////////////////
|
|
376
375
|
var backsplashVisible = false;
|
|
377
|
-
var holeItems = GeometryUtils.getHoleItems(layer);
|
|
376
|
+
var holeItems = _export.GeometryUtils.getHoleItems(layer);
|
|
378
377
|
var removeSnapBox = function removeSnapBox() {
|
|
379
378
|
if (snapBox != null) {
|
|
380
379
|
planData.plan.remove(snapBox);
|
|
381
|
-
disposeObject(snapBox);
|
|
380
|
+
(0, _threeMemoryCleaner.disposeObject)(snapBox);
|
|
382
381
|
snapBox = null;
|
|
383
382
|
targetObj = null;
|
|
384
383
|
snapFlag = false;
|
|
@@ -449,7 +448,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
449
448
|
x: shape2[j + 1].x,
|
|
450
449
|
y: shape2[j + 1].y
|
|
451
450
|
};
|
|
452
|
-
var flag = GeometryUtils.getLineInterSect(sl1.x, sl1.y, sl2.x, sl2.y, el1.x, el1.y, el2.x, el2.y);
|
|
451
|
+
var flag = _export.GeometryUtils.getLineInterSect(sl1.x, sl1.y, sl2.x, sl2.y, el1.x, el1.y, el2.x, el2.y);
|
|
453
452
|
if (flag) {
|
|
454
453
|
count++;
|
|
455
454
|
if (count > 1) return true;
|
|
@@ -496,20 +495,20 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
496
495
|
return vertices;
|
|
497
496
|
};
|
|
498
497
|
var prepareSnap = function prepareSnap(layer) {
|
|
499
|
-
allLines = GeometryUtils.getAllLines(layer);
|
|
500
|
-
allLineRects = GeometryUtils.buildRectFromLines(layer, allLines);
|
|
501
|
-
allItemRect = GeometryUtils.getAllItems(_this2.props.state.scene, actions.catalog, allLineRects);
|
|
502
|
-
allItemSnap = GeometryUtils.getAllItemSnap(allItemRect);
|
|
503
|
-
allLineSnap = GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
498
|
+
allLines = _export.GeometryUtils.getAllLines(layer);
|
|
499
|
+
allLineRects = _export.GeometryUtils.buildRectFromLines(layer, allLines);
|
|
500
|
+
allItemRect = _export.GeometryUtils.getAllItems(_this2.props.state.scene, actions.catalog, allLineRects);
|
|
501
|
+
allItemSnap = _export.GeometryUtils.getAllItemSnap(allItemRect);
|
|
502
|
+
allLineSnap = _export.GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
504
503
|
allRect = allItemRect.others.concat(allLineRects);
|
|
505
|
-
allItemSnap = GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
506
|
-
allLineSnap = GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
507
|
-
allArea = GeometryUtils.getAllArea(layer);
|
|
504
|
+
allItemSnap = _export.GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
505
|
+
allLineSnap = _export.GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
506
|
+
allArea = _export.GeometryUtils.getAllArea(layer);
|
|
508
507
|
};
|
|
509
508
|
var prepareSnapSpec = function prepareSnapSpec(layer) {
|
|
510
|
-
allLines = GeometryUtils.getAllLines(layer);
|
|
511
|
-
allLineRects = GeometryUtils.buildRectFromLines(layer, allLines);
|
|
512
|
-
allItemRect = GeometryUtils.getAllItemSpecified(_this2.props.state.scene, actions.catalog, WALL_CABINET_LAYOUTPOS);
|
|
509
|
+
allLines = _export.GeometryUtils.getAllLines(layer);
|
|
510
|
+
allLineRects = _export.GeometryUtils.buildRectFromLines(layer, allLines);
|
|
511
|
+
allItemRect = _export.GeometryUtils.getAllItemSpecified(_this2.props.state.scene, actions.catalog, _constants.WALL_CABINET_LAYOUTPOS);
|
|
513
512
|
// allItemSnap = GeometryUtils.getAllItemSnap(allItemRect);
|
|
514
513
|
};
|
|
515
514
|
|
|
@@ -562,7 +561,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
562
561
|
var ocatid = _item.type;
|
|
563
562
|
var ocat = catalog.elements[ocatid];
|
|
564
563
|
var olayoutpos = ocat.info.layoutpos;
|
|
565
|
-
if (!(layoutpos === BASE_CABINET_LAYOUTPOS && olayoutpos === WALL_CABINET_LAYOUTPOS || layoutpos === WALL_CABINET_LAYOUTPOS && olayoutpos === BASE_CABINET_LAYOUTPOS)) {
|
|
564
|
+
if (!(layoutpos === _constants.BASE_CABINET_LAYOUTPOS && olayoutpos === _constants.WALL_CABINET_LAYOUTPOS || layoutpos === _constants.WALL_CABINET_LAYOUTPOS && olayoutpos === _constants.BASE_CABINET_LAYOUTPOS)) {
|
|
566
565
|
var tRot = _item.rotation;
|
|
567
566
|
var tPos = new Three.Vector2(_item.x, _item.y);
|
|
568
567
|
var tBounding = target.children[0].userData;
|
|
@@ -644,13 +643,13 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
644
643
|
var _item2 = layer.items.getIn([data.id]);
|
|
645
644
|
var ocatid = _item2.type;
|
|
646
645
|
var ocat = catalog.elements[ocatid];
|
|
647
|
-
if (!ocat) ocat = catalog.elements[returnReplaceableDeepSearchType(ocatid)];
|
|
646
|
+
if (!ocat) ocat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(ocatid)];
|
|
648
647
|
var otherItem = {
|
|
649
648
|
item: _item2,
|
|
650
649
|
cat: ocat
|
|
651
650
|
};
|
|
652
651
|
console.log('currentItem =>', currentItem);
|
|
653
|
-
if (GeometryUtils.needSnap(currentItem, otherItem) && otherItem.cat.type != 'cabinet') {
|
|
652
|
+
if (_export.GeometryUtils.needSnap(currentItem, otherItem) && otherItem.cat.type != 'cabinet') {
|
|
654
653
|
var tRot = _item2.rotation;
|
|
655
654
|
var tPos = new Three.Vector2(_item2.x, _item2.y);
|
|
656
655
|
var tBounding = target.children[0].userData;
|
|
@@ -704,7 +703,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
704
703
|
// sort from distance
|
|
705
704
|
for (var _i5 = 0; _i5 < items.length - 1; _i5++) {
|
|
706
705
|
for (var j = _i5 + 1; j < items.length; j++) {
|
|
707
|
-
if (verticesDistance(oPos, new Three.Vector2(items[_i5].x, items[_i5].y)) > verticesDistance(oPos, new Three.Vector2(items[j].x, items[j].y))) {
|
|
706
|
+
if ((0, _geometry.verticesDistance)(oPos, new Three.Vector2(items[_i5].x, items[_i5].y)) > (0, _geometry.verticesDistance)(oPos, new Three.Vector2(items[j].x, items[j].y))) {
|
|
708
707
|
var exchange = items[j];
|
|
709
708
|
items[j] = items[_i5];
|
|
710
709
|
items[_i5] = exchange;
|
|
@@ -822,7 +821,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
822
821
|
var tRot = layer.getIn(['items', target.userData.itemId]) ? layer.getIn(['items', target.userData.itemId]).rotation : 0;
|
|
823
822
|
var item = layer.getIn(['items', source.userData.itemId]);
|
|
824
823
|
var layoutType = item.layoutpos;
|
|
825
|
-
var altitudeLength = convert(item.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
824
|
+
var altitudeLength = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
826
825
|
var sBounding = source.children[0].userData;
|
|
827
826
|
var tBounding = target.children[0].userData;
|
|
828
827
|
var tPos = target.position.clone();
|
|
@@ -839,7 +838,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
839
838
|
var removeSnapBoxObj = function removeSnapBoxObj() {
|
|
840
839
|
if (snapBoxObj) {
|
|
841
840
|
planData.plan.remove(snapBoxObj);
|
|
842
|
-
disposeObject(snapBoxObj);
|
|
841
|
+
(0, _threeMemoryCleaner.disposeObject)(snapBoxObj);
|
|
843
842
|
}
|
|
844
843
|
snapFlag = false;
|
|
845
844
|
};
|
|
@@ -848,7 +847,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
848
847
|
box.material.depthTest = false;
|
|
849
848
|
box.renderOrder = 200;
|
|
850
849
|
snapBoxObj.add(box);
|
|
851
|
-
snapBoxObj.position.set(source.position.x, layoutType === WALL_CABINET_LAYOUTPOS ? altitudeLength + source.position.y + height / 2 : source.position.y + height / 2, source.position.z);
|
|
850
|
+
snapBoxObj.position.set(source.position.x, layoutType === _constants.WALL_CABINET_LAYOUTPOS ? altitudeLength + source.position.y + height / 2 : source.position.y + height / 2, source.position.z);
|
|
852
851
|
snapBoxObj.rotation.set(source.rotation.x, source.rotation.y, source.rotation.z);
|
|
853
852
|
snapBoxObj.name = 'TransformBox';
|
|
854
853
|
planData.plan.add(snapBoxObj);
|
|
@@ -923,7 +922,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
923
922
|
return;
|
|
924
923
|
} else {
|
|
925
924
|
var _layoutType = _item3.layoutpos;
|
|
926
|
-
var _altitudeLength = convert(_item3.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
925
|
+
var _altitudeLength = (0, _convertUnitsLite.convert)(_item3.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
927
926
|
var _sBounding = source.children[0].userData;
|
|
928
927
|
var _width = _sBounding.max.x - _sBounding.min.x;
|
|
929
928
|
var _height = _sBounding.max.y - _sBounding.min.y;
|
|
@@ -938,7 +937,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
938
937
|
var _removeSnapBoxObj = function _removeSnapBoxObj() {
|
|
939
938
|
if (_snapBoxObj) {
|
|
940
939
|
planData.plan.remove(_snapBoxObj);
|
|
941
|
-
disposeObject(_snapBoxObj);
|
|
940
|
+
(0, _threeMemoryCleaner.disposeObject)(_snapBoxObj);
|
|
942
941
|
}
|
|
943
942
|
snapFlag = false;
|
|
944
943
|
};
|
|
@@ -947,7 +946,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
947
946
|
_box.material.depthTest = false;
|
|
948
947
|
_box.renderOrder = 100;
|
|
949
948
|
_snapBoxObj.add(_box);
|
|
950
|
-
_snapBoxObj.position.set(source.position.x, _layoutType === WALL_CABINET_LAYOUTPOS ? _altitudeLength + source.position.y + _height / 2 : source.position.y + _height / 2, source.position.z);
|
|
949
|
+
_snapBoxObj.position.set(source.position.x, _layoutType === _constants.WALL_CABINET_LAYOUTPOS ? _altitudeLength + source.position.y + _height / 2 : source.position.y + _height / 2, source.position.z);
|
|
951
950
|
_snapBoxObj.rotation.set(source.rotation.x, source.rotation.y, source.rotation.z);
|
|
952
951
|
_snapBoxObj.name = 'TransformBox';
|
|
953
952
|
planData.plan.add(_snapBoxObj);
|
|
@@ -1084,7 +1083,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1084
1083
|
ctx.beginPath();
|
|
1085
1084
|
ctx.arc(50, 50, 45, 0, 2 * Math.PI);
|
|
1086
1085
|
ctx.stroke();
|
|
1087
|
-
ctx.strokeStyle = SECONDARY_PURPLE_COLOR;
|
|
1086
|
+
ctx.strokeStyle = _constants.SECONDARY_PURPLE_COLOR;
|
|
1088
1087
|
ctx.lineWidth = 6;
|
|
1089
1088
|
ctx.beginPath();
|
|
1090
1089
|
if (lastAngle < 15 && lastAngle > -15) {
|
|
@@ -1188,7 +1187,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1188
1187
|
var properties = allItemRect.cur.itemInfo.properties;
|
|
1189
1188
|
altitude = properties.getIn(['altitude', '_length']);
|
|
1190
1189
|
var unit = properties.getIn(['altitude', '_unit']) || 'in';
|
|
1191
|
-
altitude = convert(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1190
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1192
1191
|
}
|
|
1193
1192
|
getPoint(event, altitude);
|
|
1194
1193
|
var state = _this2.props.state;
|
|
@@ -1253,7 +1252,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1253
1252
|
console.log('intersects[i] is undefined in viewer3d/viewer3d.js');
|
|
1254
1253
|
}
|
|
1255
1254
|
}
|
|
1256
|
-
if (_this2.props.state.mode == MODE_DRAWING_ITEM_3D) return;
|
|
1255
|
+
if (_this2.props.state.mode == _constants.MODE_DRAWING_ITEM_3D) return;
|
|
1257
1256
|
if (isSelected) {
|
|
1258
1257
|
!_this2.props.downloadFlag && _this2.props.setToolbar('');
|
|
1259
1258
|
if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
|
|
@@ -1280,7 +1279,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1280
1279
|
var _properties = allItemRect.cur.itemInfo.properties;
|
|
1281
1280
|
alti = _properties.getIn(['altitude', '_length']);
|
|
1282
1281
|
var _unit = _properties.getIn(['altitude', '_unit']) || 'in';
|
|
1283
|
-
alti = convert(alti).from(_unit).to(_this2.props.state.scene.unit);
|
|
1282
|
+
alti = (0, _convertUnitsLite.convert)(alti).from(_unit).to(_this2.props.state.scene.unit);
|
|
1284
1283
|
}
|
|
1285
1284
|
getPoint({
|
|
1286
1285
|
offsetX: event.offsetX - 50,
|
|
@@ -1317,8 +1316,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1317
1316
|
for (_i1 = 0; _i1 < intersects.length; _i1++) {
|
|
1318
1317
|
if (selectedItem != undefined && intersects[_i1].object.parent && intersects[_i1].object.parent.parent.userData.itemId === selectedItem.userData.itemId) selectedFlag = true;
|
|
1319
1318
|
}
|
|
1320
|
-
if (selectedFlag || toolIntersects.length > 0 && !isElevationView(mode)) {
|
|
1321
|
-
cameraControls.mouseButtons.left =
|
|
1319
|
+
if (selectedFlag || toolIntersects.length > 0 && !(0, _helper.isElevationView)(mode)) {
|
|
1320
|
+
cameraControls.mouseButtons.left = _cameraControls["default"].ACTION.NONE;
|
|
1322
1321
|
selectedFlag = false;
|
|
1323
1322
|
} else {
|
|
1324
1323
|
isSelected = false;
|
|
@@ -1344,7 +1343,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1344
1343
|
var properties = allItemRect.cur.itemInfo.properties;
|
|
1345
1344
|
altitude = properties.getIn(['altitude', '_length']);
|
|
1346
1345
|
var unit = properties.getIn(['altitude', '_unit']) || 'in';
|
|
1347
|
-
altitude = convert(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1346
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1348
1347
|
}
|
|
1349
1348
|
scene3D.remove(angleObj);
|
|
1350
1349
|
scene3D.remove(toolObj);
|
|
@@ -1352,7 +1351,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1352
1351
|
_this2.props.setToolbar('');
|
|
1353
1352
|
}
|
|
1354
1353
|
getPoint(event, altitude);
|
|
1355
|
-
if (_this2.props.state.mode == MODE_DRAWING_ITEM_3D) {
|
|
1354
|
+
if (_this2.props.state.mode == _constants.MODE_DRAWING_ITEM_3D) {
|
|
1356
1355
|
if (Point.x > _this2.props.state.scene.width) Point.x = _this2.props.state.width;
|
|
1357
1356
|
if (Point.y > _this2.props.state.scene.height) Point.y = _this2.props.state.height;
|
|
1358
1357
|
if (Point.x < 0) Point.x = 0;
|
|
@@ -1363,7 +1362,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1363
1362
|
removeSnapBox();
|
|
1364
1363
|
var polygon = lineRect(layer);
|
|
1365
1364
|
// if cursor is outside of room
|
|
1366
|
-
if (!GeometryUtils.ContainsPoint(polygon, Point.x, Point.y)) {
|
|
1365
|
+
if (!_export.GeometryUtils.ContainsPoint(polygon, Point.x, Point.y)) {
|
|
1367
1366
|
actions.itemsActions.endDrawingItem(_this2.props.state.scene.selectedLayer, sPoint.x, sPoint.y);
|
|
1368
1367
|
} else {
|
|
1369
1368
|
actions.itemsActions.updateDraggingItemChanged(targetPoint.x, -targetPoint.z, selectedObject.layerID, selectedObject.itemID);
|
|
@@ -1374,13 +1373,13 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1374
1373
|
bMove = false;
|
|
1375
1374
|
return;
|
|
1376
1375
|
}
|
|
1377
|
-
if (_this2.props.state.mode == MODE_DRAGGING_ITEM_3D) {
|
|
1376
|
+
if (_this2.props.state.mode == _constants.MODE_DRAGGING_ITEM_3D) {
|
|
1378
1377
|
_this2.context.itemsActions.endDraggingItem3D();
|
|
1379
1378
|
}
|
|
1380
|
-
if (_this2.props.state.mode == MODE_ROTATING_ITEM_3D) {
|
|
1379
|
+
if (_this2.props.state.mode == _constants.MODE_ROTATING_ITEM_3D) {
|
|
1381
1380
|
_this2.context.itemsActions.endRotatingItem3D(sPoint.x, sPoint.y);
|
|
1382
1381
|
}
|
|
1383
|
-
if (_this2.props.state.mode == MODE_DRAWING_HOLE_3D) {
|
|
1382
|
+
if (_this2.props.state.mode == _constants.MODE_DRAWING_HOLE_3D) {
|
|
1384
1383
|
gridPlanOrigin = gridPlane.position;
|
|
1385
1384
|
gridMatrix.copy(gridPlane.matrixWorld).invert();
|
|
1386
1385
|
camPos = camera.position;
|
|
@@ -1391,7 +1390,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1391
1390
|
}
|
|
1392
1391
|
event.preventDefault();
|
|
1393
1392
|
if (event.button === 0) {
|
|
1394
|
-
cameraControls.mouseButtons.left =
|
|
1393
|
+
cameraControls.mouseButtons.left = _cameraControls["default"].ACTION.ROTATE;
|
|
1395
1394
|
mouse.x = event.offsetX / _this2.width * 2 - 1;
|
|
1396
1395
|
mouse.y = -(event.offsetY / _this2.height) * 2 + 1;
|
|
1397
1396
|
raycaster.setFromCamera(mouse, camera);
|
|
@@ -1455,7 +1454,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1455
1454
|
}
|
|
1456
1455
|
isSelected = true;
|
|
1457
1456
|
setTimeout(function () {
|
|
1458
|
-
getDistances(layer);
|
|
1457
|
+
(0, _sceneCreator.getDistances)(layer);
|
|
1459
1458
|
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1460
1459
|
if (!selectedItem) return;
|
|
1461
1460
|
var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
@@ -1472,10 +1471,10 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1472
1471
|
// showItemButtons(layer.getIn(['items', selectedObject.itemID]), currentObject, event, camera, this.renderer);
|
|
1473
1472
|
var pointArray = [],
|
|
1474
1473
|
cnt = 0;
|
|
1475
|
-
pointArray.push([fVLine[0].userData.distance, 90]);
|
|
1476
|
-
pointArray.push([fVLine[1].userData.distance, -90]);
|
|
1477
|
-
pointArray.push([fVLine[2].userData.distance, 180]);
|
|
1478
|
-
pointArray.push([fVLine[3].userData.distance, 0]);
|
|
1474
|
+
pointArray.push([_sceneCreator.fVLine[0].userData.distance, 90]);
|
|
1475
|
+
pointArray.push([_sceneCreator.fVLine[1].userData.distance, -90]);
|
|
1476
|
+
pointArray.push([_sceneCreator.fVLine[2].userData.distance, 180]);
|
|
1477
|
+
pointArray.push([_sceneCreator.fVLine[3].userData.distance, 0]);
|
|
1479
1478
|
pointArray.forEach(function (pointElement, index) {
|
|
1480
1479
|
if (pointElement[0] == undefined) pointArray[index][0] = 0;
|
|
1481
1480
|
});
|
|
@@ -1527,13 +1526,13 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1527
1526
|
selectedObj = allItemRect.cur;
|
|
1528
1527
|
}
|
|
1529
1528
|
} else {
|
|
1530
|
-
visibleTransformBox(false);
|
|
1529
|
+
(0, _sceneCreator.visibleTransformBox)(false);
|
|
1531
1530
|
var alti = 0;
|
|
1532
1531
|
if (allItemRect && allItemRect.cur && allItemRect.cur.itemInfo !== undefined) {
|
|
1533
1532
|
var _properties2 = allItemRect.cur.itemInfo.properties;
|
|
1534
1533
|
alti = _properties2.getIn(['altitude', '_length']);
|
|
1535
1534
|
var _unit2 = _properties2.getIn(['altitude', '_unit']) || 'in';
|
|
1536
|
-
alti = convert(alti).from(_unit2).to(_this2.props.state.scene.unit);
|
|
1535
|
+
alti = (0, _convertUnitsLite.convert)(alti).from(_unit2).to(_this2.props.state.scene.unit);
|
|
1537
1536
|
}
|
|
1538
1537
|
getPoint(event, alti);
|
|
1539
1538
|
if (bRotate) {
|
|
@@ -1606,9 +1605,9 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1606
1605
|
var properties = allItemRect.cur.itemInfo.properties;
|
|
1607
1606
|
altitude = properties.getIn(['altitude', '_length']);
|
|
1608
1607
|
var unit = properties.getIn(['altitude', '_unit']) || 'in';
|
|
1609
|
-
altitude = convert(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1608
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1610
1609
|
}
|
|
1611
|
-
if (_this2.props.state.mode === MODE_DRAWING_HOLE_3D) {
|
|
1610
|
+
if (_this2.props.state.mode === _constants.MODE_DRAWING_HOLE_3D) {
|
|
1612
1611
|
gridPlanOrigin = gridPlane.position;
|
|
1613
1612
|
gridMatrix.copy(gridPlane.matrixWorld).invert();
|
|
1614
1613
|
camPos = camera.position;
|
|
@@ -1620,7 +1619,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1620
1619
|
} else {
|
|
1621
1620
|
var layerID = _this2.props.state.scene.selectedLayer;
|
|
1622
1621
|
var holeID = _this2.props.state.drawingSupport.get('currentID');
|
|
1623
|
-
deleteSpecifiedMeshObjects('WarningBox' + holeID);
|
|
1622
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('WarningBox' + holeID);
|
|
1624
1623
|
prepareSnap(layer);
|
|
1625
1624
|
|
|
1626
1625
|
// let {nx, ny, rot} = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, allArea);
|
|
@@ -1630,7 +1629,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1630
1629
|
sPoint.set(nx, ny);
|
|
1631
1630
|
}
|
|
1632
1631
|
}
|
|
1633
|
-
if (_this2.props.state.mode === MODE_DRAWING_ITEM_3D) {
|
|
1632
|
+
if (_this2.props.state.mode === _constants.MODE_DRAWING_ITEM_3D) {
|
|
1634
1633
|
// We need to set cam position since when MODE_DRAWING_ITEM_3D mouse down event
|
|
1635
1634
|
// is not emited so cam position is not valid
|
|
1636
1635
|
gridPlanOrigin = gridPlane.position;
|
|
@@ -1644,7 +1643,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1644
1643
|
};
|
|
1645
1644
|
var _layer = _this2.props.state.scene.getIn(['layers', selectedObject.layerID]);
|
|
1646
1645
|
var polygon = lineRect(_layer);
|
|
1647
|
-
var isCursorInArea = GeometryUtils.ContainsPoint(polygon, Point.x, Point.y);
|
|
1646
|
+
var isCursorInArea = _export.GeometryUtils.ContainsPoint(polygon, Point.x, Point.y);
|
|
1648
1647
|
var _drawingSupport = _this2.props.state.drawingSupport;
|
|
1649
1648
|
if (!_drawingSupport.has('currentID')) {
|
|
1650
1649
|
var initialX = Point.x,
|
|
@@ -1663,7 +1662,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1663
1662
|
point = [];
|
|
1664
1663
|
}
|
|
1665
1664
|
});
|
|
1666
|
-
var centroid = GeometryUtils.getCentroidOfPolygon(points);
|
|
1665
|
+
var centroid = _export.GeometryUtils.getCentroidOfPolygon(points);
|
|
1667
1666
|
initialX = centroid[0];
|
|
1668
1667
|
initialY = centroid[1];
|
|
1669
1668
|
}
|
|
@@ -1675,8 +1674,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1675
1674
|
var mX = Point.x - sPoint.x;
|
|
1676
1675
|
var mY = Point.y - sPoint.y;
|
|
1677
1676
|
var item3D = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1678
|
-
deleteSpecifiedMeshObjects('TransformBox');
|
|
1679
|
-
deleteSpecifiedMeshObjects('WarningBox' + itemID);
|
|
1677
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('TransformBox');
|
|
1678
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('WarningBox' + itemID);
|
|
1680
1679
|
var item = _layer.items.getIn([selectedObject.itemID]);
|
|
1681
1680
|
if (item.counterTop.uri == '') item.counterTop.uri = _layer.counterTop.uri;
|
|
1682
1681
|
var sRot = item.rotation;
|
|
@@ -1688,7 +1687,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1688
1687
|
var sdepth = sBounding.max.z - sBounding.min.z;
|
|
1689
1688
|
var sVertices = _this2.getRectPoints(swidth, sdepth, tPos.clone(), sRot % 360 / 180 * Math.PI);
|
|
1690
1689
|
prepareSnap(_layer);
|
|
1691
|
-
var _GeometryUtils$calcSn = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, allArea),
|
|
1690
|
+
var _GeometryUtils$calcSn = _export.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, allArea),
|
|
1692
1691
|
_nx = _GeometryUtils$calcSn.nx,
|
|
1693
1692
|
_ny = _GeometryUtils$calcSn.ny,
|
|
1694
1693
|
rot = _GeometryUtils$calcSn.rot;
|
|
@@ -1702,9 +1701,9 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1702
1701
|
//return;
|
|
1703
1702
|
}
|
|
1704
1703
|
if (polygon.length > 0) {
|
|
1705
|
-
var PolygonSect = GeometryUtils.ContainsPoint(polygon, _nx, _ny);
|
|
1704
|
+
var PolygonSect = _export.GeometryUtils.ContainsPoint(polygon, _nx, _ny);
|
|
1706
1705
|
if (!PolygonSect) {
|
|
1707
|
-
var _GeometryUtils$calcCr = GeometryUtils.calcCreateSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, polygon),
|
|
1706
|
+
var _GeometryUtils$calcCr = _export.GeometryUtils.calcCreateSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, polygon),
|
|
1708
1707
|
cx = _GeometryUtils$calcCr.cx,
|
|
1709
1708
|
cy = _GeometryUtils$calcCr.cy,
|
|
1710
1709
|
crot = _GeometryUtils$calcCr.crot;
|
|
@@ -1714,19 +1713,19 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1714
1713
|
}
|
|
1715
1714
|
}
|
|
1716
1715
|
if (polygon.length > 0) {
|
|
1717
|
-
var isSnapInArea = GeometryUtils.ContainsPoint(polygon, _nx, _ny);
|
|
1716
|
+
var isSnapInArea = _export.GeometryUtils.ContainsPoint(polygon, _nx, _ny);
|
|
1718
1717
|
if (!isSnapInArea) return;
|
|
1719
1718
|
}
|
|
1720
1719
|
actions.itemsActions.updateDraggingItemChanged(_nx, _ny, selectedObject.layerID, selectedObject.itemID);
|
|
1721
1720
|
actions.itemsActions.updateRotatingItemChanged(rot, selectedObject.layerID, selectedObject.itemID);
|
|
1722
1721
|
sPoint.set(_nx, _ny);
|
|
1723
|
-
getDistances(_layer);
|
|
1722
|
+
(0, _sceneCreator.getDistances)(_layer);
|
|
1724
1723
|
var pointArray = [],
|
|
1725
1724
|
cnt = 0;
|
|
1726
|
-
pointArray.push([fVLine[0].userData.distance, 90]);
|
|
1727
|
-
pointArray.push([fVLine[1].userData.distance, -90]);
|
|
1728
|
-
pointArray.push([fVLine[2].userData.distance, 180]);
|
|
1729
|
-
pointArray.push([fVLine[3].userData.distance, 0]);
|
|
1725
|
+
pointArray.push([_sceneCreator.fVLine[0].userData.distance, 90]);
|
|
1726
|
+
pointArray.push([_sceneCreator.fVLine[1].userData.distance, -90]);
|
|
1727
|
+
pointArray.push([_sceneCreator.fVLine[2].userData.distance, 180]);
|
|
1728
|
+
pointArray.push([_sceneCreator.fVLine[3].userData.distance, 0]);
|
|
1730
1729
|
pointArray.forEach(function (pointElement, index) {
|
|
1731
1730
|
if (pointElement[0] == undefined) pointArray[index][0] = 0;
|
|
1732
1731
|
});
|
|
@@ -1738,8 +1737,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1738
1737
|
pointArray[1][0] = 100;
|
|
1739
1738
|
}
|
|
1740
1739
|
actions.itemsActions.storeDistArray(_layer.id, item.id, pointArray);
|
|
1741
|
-
var minDis = fVLine[0].userData.distance;
|
|
1742
|
-
var snapObj = fVLine[0];
|
|
1740
|
+
var minDis = _sceneCreator.fVLine[0].userData.distance;
|
|
1741
|
+
var snapObj = _sceneCreator.fVLine[0];
|
|
1743
1742
|
var iPos = item3D.position.clone();
|
|
1744
1743
|
var snapDis = Math.sqrt((iPos.x - targetPoint.x) * (iPos.x - targetPoint.x) + (iPos.z - targetPoint.z) * (iPos.z - targetPoint.z));
|
|
1745
1744
|
if (snapDis >= 100 && snapObj != null) {
|
|
@@ -1747,10 +1746,10 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1747
1746
|
backsplashVisible = false;
|
|
1748
1747
|
//console.log('1 snap no');
|
|
1749
1748
|
}
|
|
1750
|
-
for (var _i11 = 1; _i11 < fVLine.length; _i11++) {
|
|
1751
|
-
if (minDis > fVLine[_i11].userData.distance) {
|
|
1752
|
-
minDis = fVLine[_i11].userData.distance;
|
|
1753
|
-
snapObj = fVLine[_i11];
|
|
1749
|
+
for (var _i11 = 1; _i11 < _sceneCreator.fVLine.length; _i11++) {
|
|
1750
|
+
if (minDis > _sceneCreator.fVLine[_i11].userData.distance) {
|
|
1751
|
+
minDis = _sceneCreator.fVLine[_i11].userData.distance;
|
|
1752
|
+
snapObj = _sceneCreator.fVLine[_i11];
|
|
1754
1753
|
}
|
|
1755
1754
|
}
|
|
1756
1755
|
if (snapBox == null) {
|
|
@@ -1761,14 +1760,14 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1761
1760
|
_this2.snap(snapObj, _layer);
|
|
1762
1761
|
snapFlag = true;
|
|
1763
1762
|
//console.log('1 snap Yes')
|
|
1764
|
-
getDistances(_layer, true);
|
|
1763
|
+
(0, _sceneCreator.getDistances)(_layer, true);
|
|
1765
1764
|
var _i12 = 0;
|
|
1766
|
-
for (_i12 = 0; _i12 < fVLine.length; _i12++) {
|
|
1767
|
-
if (fVLine[_i12].userData.distance < snapDelta) {
|
|
1765
|
+
for (_i12 = 0; _i12 < _sceneCreator.fVLine.length; _i12++) {
|
|
1766
|
+
if (_sceneCreator.fVLine[_i12].userData.distance < snapDelta) {
|
|
1768
1767
|
break;
|
|
1769
1768
|
}
|
|
1770
1769
|
}
|
|
1771
|
-
if (_i12 === fVLine.length) backsplashVisible = false;else backsplashVisible = true;
|
|
1770
|
+
if (_i12 === _sceneCreator.fVLine.length) backsplashVisible = false;else backsplashVisible = true;
|
|
1772
1771
|
}
|
|
1773
1772
|
actions.itemsActions.setBacksplashVisible(selectedObject.itemID, backsplashVisible);
|
|
1774
1773
|
}
|
|
@@ -1781,8 +1780,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1781
1780
|
var orginRot = _this2.props.state.rotatingSupport.get('originRotation');
|
|
1782
1781
|
angleTexture.image = createAngleObject((orginRot < 0 ? 360 - orginRot : orginRot) - _item4.rotation);
|
|
1783
1782
|
angleTexture.needsUpdate = true;
|
|
1784
|
-
deleteSpecifiedMeshObjects('WarningBox' + selectedObject.itemID);
|
|
1785
|
-
deleteSpecifiedMeshObjects('backsplash' + selectedObject.itemID);
|
|
1783
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('WarningBox' + selectedObject.itemID);
|
|
1784
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('backsplash' + selectedObject.itemID);
|
|
1786
1785
|
actions.sceneActions.updateMovingState(false);
|
|
1787
1786
|
}
|
|
1788
1787
|
if (bMoveUP) {
|
|
@@ -1800,7 +1799,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1800
1799
|
sPoint.set(Point.x, Point.y);
|
|
1801
1800
|
} else {
|
|
1802
1801
|
var _holeID = _this2.props.state.draggingSupport.get('currentID');
|
|
1803
|
-
deleteSpecifiedMeshObjects('WarningBox' + _holeID);
|
|
1802
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('WarningBox' + _holeID);
|
|
1804
1803
|
var _nx2 = Point.x;
|
|
1805
1804
|
var _ny2 = Point.y;
|
|
1806
1805
|
actions.holesActions.updateDraggingHole(_nx2, _ny2);
|
|
@@ -1815,8 +1814,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1815
1814
|
var _sRot2 = _item5.rotation;
|
|
1816
1815
|
var _mX = Point.x - sPoint.x;
|
|
1817
1816
|
var _mY = Point.y - sPoint.y;
|
|
1818
|
-
deleteSpecifiedMeshObjects('WarningBox' + selectedObject.itemID);
|
|
1819
|
-
deleteSpecifiedMeshObjects('backsplash' + selectedObject.itemID);
|
|
1817
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('WarningBox' + selectedObject.itemID);
|
|
1818
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('backsplash' + selectedObject.itemID);
|
|
1820
1819
|
prepareSnap(_layer3);
|
|
1821
1820
|
getPoint(event, altitude);
|
|
1822
1821
|
var _originPos = _item3D2.position.clone();
|
|
@@ -1825,7 +1824,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1825
1824
|
var _swidth = _sBounding2.max.x - _sBounding2.min.x;
|
|
1826
1825
|
var _sdepth = _sBounding2.max.z - _sBounding2.min.z;
|
|
1827
1826
|
var _sVertices = _this2.getRectPoints(_swidth, _sdepth, _tPos4.clone(), _sRot2 % 360 / 180 * Math.PI);
|
|
1828
|
-
var _GeometryUtils$calcSn2 = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, allArea),
|
|
1827
|
+
var _GeometryUtils$calcSn2 = _export.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, allArea),
|
|
1829
1828
|
_nx3 = _GeometryUtils$calcSn2.nx,
|
|
1830
1829
|
_ny3 = _GeometryUtils$calcSn2.ny,
|
|
1831
1830
|
_rot = _GeometryUtils$calcSn2.rot;
|
|
@@ -1840,9 +1839,9 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1840
1839
|
}
|
|
1841
1840
|
var polygonPoint = lineRect(_layer3);
|
|
1842
1841
|
if (polygonPoint.length > 0) {
|
|
1843
|
-
var _PolygonSect = GeometryUtils.ContainsPoint(polygonPoint, _nx3, _ny3);
|
|
1842
|
+
var _PolygonSect = _export.GeometryUtils.ContainsPoint(polygonPoint, _nx3, _ny3);
|
|
1844
1843
|
if (!_PolygonSect) {
|
|
1845
|
-
var _GeometryUtils$calcCr2 = GeometryUtils.calcCreateSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, polygonPoint),
|
|
1844
|
+
var _GeometryUtils$calcCr2 = _export.GeometryUtils.calcCreateSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, Point.x, Point.y, polygonPoint),
|
|
1846
1845
|
_cx3 = _GeometryUtils$calcCr2.cx,
|
|
1847
1846
|
_cy = _GeometryUtils$calcCr2.cy,
|
|
1848
1847
|
_crot = _GeometryUtils$calcCr2.crot;
|
|
@@ -1853,19 +1852,19 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1853
1852
|
}
|
|
1854
1853
|
var _polygon = lineRect(_layer3);
|
|
1855
1854
|
if (_polygon.length > 0) {
|
|
1856
|
-
var Sect = GeometryUtils.ContainsPoint(_polygon, _nx3, _ny3);
|
|
1855
|
+
var Sect = _export.GeometryUtils.ContainsPoint(_polygon, _nx3, _ny3);
|
|
1857
1856
|
if (!Sect) return;
|
|
1858
1857
|
}
|
|
1859
1858
|
actions.itemsActions.updateDraggingItemChanged(_nx3, _ny3, selectedObject.layerID, selectedObject.itemID);
|
|
1860
1859
|
actions.itemsActions.updateRotatingItemChanged(_rot, selectedObject.layerID, selectedObject.itemID);
|
|
1861
1860
|
sPoint.set(_nx3, _ny3);
|
|
1862
|
-
getDistances(_layer3);
|
|
1861
|
+
(0, _sceneCreator.getDistances)(_layer3);
|
|
1863
1862
|
var _pointArray = [],
|
|
1864
1863
|
_cnt = 0;
|
|
1865
|
-
_pointArray.push([fVLine[0].userData.distance, 90]);
|
|
1866
|
-
_pointArray.push([fVLine[1].userData.distance, -90]);
|
|
1867
|
-
_pointArray.push([fVLine[2].userData.distance, 180]);
|
|
1868
|
-
_pointArray.push([fVLine[3].userData.distance, 0]);
|
|
1864
|
+
_pointArray.push([_sceneCreator.fVLine[0].userData.distance, 90]);
|
|
1865
|
+
_pointArray.push([_sceneCreator.fVLine[1].userData.distance, -90]);
|
|
1866
|
+
_pointArray.push([_sceneCreator.fVLine[2].userData.distance, 180]);
|
|
1867
|
+
_pointArray.push([_sceneCreator.fVLine[3].userData.distance, 0]);
|
|
1869
1868
|
_pointArray.forEach(function (pointElement, index) {
|
|
1870
1869
|
if (pointElement[0] == undefined) _pointArray[index][0] = 0;
|
|
1871
1870
|
});
|
|
@@ -1877,8 +1876,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1877
1876
|
_pointArray[1][0] = 100;
|
|
1878
1877
|
}
|
|
1879
1878
|
actions.itemsActions.storeDistArray(_layer3.id, _item5.id, _pointArray);
|
|
1880
|
-
var _minDis = fVLine[0].userData.distance;
|
|
1881
|
-
var _snapObj = fVLine[0];
|
|
1879
|
+
var _minDis = _sceneCreator.fVLine[0].userData.distance;
|
|
1880
|
+
var _snapObj = _sceneCreator.fVLine[0];
|
|
1882
1881
|
var _iPos = _item3D2.position.clone();
|
|
1883
1882
|
var _snapDis = Math.sqrt((_iPos.x - targetPoint.x) * (_iPos.x - targetPoint.x) + (_iPos.z - targetPoint.z) * (_iPos.z - targetPoint.z));
|
|
1884
1883
|
if (_snapDis >= 100 && _snapObj != null) {
|
|
@@ -1886,10 +1885,10 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1886
1885
|
backsplashVisible = false;
|
|
1887
1886
|
//console.log('1 snap no');
|
|
1888
1887
|
}
|
|
1889
|
-
for (var _i13 = 1; _i13 < fVLine.length; _i13++) {
|
|
1890
|
-
if (_minDis > fVLine[_i13].userData.distance) {
|
|
1891
|
-
_minDis = fVLine[_i13].userData.distance;
|
|
1892
|
-
_snapObj = fVLine[_i13];
|
|
1888
|
+
for (var _i13 = 1; _i13 < _sceneCreator.fVLine.length; _i13++) {
|
|
1889
|
+
if (_minDis > _sceneCreator.fVLine[_i13].userData.distance) {
|
|
1890
|
+
_minDis = _sceneCreator.fVLine[_i13].userData.distance;
|
|
1891
|
+
_snapObj = _sceneCreator.fVLine[_i13];
|
|
1893
1892
|
}
|
|
1894
1893
|
}
|
|
1895
1894
|
if (snapBox == null) {
|
|
@@ -1900,14 +1899,14 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1900
1899
|
_this2.snap(_snapObj, _layer3);
|
|
1901
1900
|
snapFlag = true;
|
|
1902
1901
|
//console.log('1 snap Yes')
|
|
1903
|
-
getDistances(_layer3, true);
|
|
1902
|
+
(0, _sceneCreator.getDistances)(_layer3, true);
|
|
1904
1903
|
var _i14 = 0;
|
|
1905
|
-
for (_i14 = 0; _i14 < fVLine.length; _i14++) {
|
|
1906
|
-
if (fVLine[_i14].userData.distance < snapDelta) {
|
|
1904
|
+
for (_i14 = 0; _i14 < _sceneCreator.fVLine.length; _i14++) {
|
|
1905
|
+
if (_sceneCreator.fVLine[_i14].userData.distance < snapDelta) {
|
|
1907
1906
|
break;
|
|
1908
1907
|
}
|
|
1909
1908
|
}
|
|
1910
|
-
if (_i14 === fVLine.length) backsplashVisible = false;else backsplashVisible = true;
|
|
1909
|
+
if (_i14 === _sceneCreator.fVLine.length) backsplashVisible = false;else backsplashVisible = true;
|
|
1911
1910
|
}
|
|
1912
1911
|
actions.itemsActions.setBacksplashVisible(selectedObject.itemID, backsplashVisible);
|
|
1913
1912
|
}
|
|
@@ -1920,7 +1919,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1920
1919
|
raycaster.setFromCamera(curPos, camera);
|
|
1921
1920
|
rayDirection = raycaster.ray.direction;
|
|
1922
1921
|
rayDirection = rayDirection.normalize();
|
|
1923
|
-
var meshes = getAllMeshes(toIntersect);
|
|
1922
|
+
var meshes = (0, _objectsUtils.getAllMeshes)(toIntersect);
|
|
1924
1923
|
var intersects = raycaster.intersectObjects(meshes, true);
|
|
1925
1924
|
var _i15;
|
|
1926
1925
|
if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
|
|
@@ -1955,7 +1954,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1955
1954
|
document.getElementById('warning_box_2d').style.display = 'none';
|
|
1956
1955
|
};
|
|
1957
1956
|
this.onkeydown = function (event) {
|
|
1958
|
-
if (_this2.props.keyDownEnable && !isElevationView(state.mode)) {
|
|
1957
|
+
if (_this2.props.keyDownEnable && !(0, _helper.isElevationView)(state.mode)) {
|
|
1959
1958
|
switch (event.keyCode) {
|
|
1960
1959
|
case 27:
|
|
1961
1960
|
// escape key
|
|
@@ -2024,7 +2023,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2024
2023
|
}
|
|
2025
2024
|
|
|
2026
2025
|
// Add the output of the renderer to the html element
|
|
2027
|
-
var canvasWrapper =
|
|
2026
|
+
var canvasWrapper = _reactDom["default"].findDOMNode(this.refs.canvasWrapper);
|
|
2028
2027
|
canvasWrapper && canvasWrapper.appendChild(this.renderer.domElement);
|
|
2029
2028
|
|
|
2030
2029
|
//
|
|
@@ -2056,17 +2055,17 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2056
2055
|
function init() {
|
|
2057
2056
|
clock = new Three.Clock();
|
|
2058
2057
|
scene3D = new Three.Scene();
|
|
2059
|
-
if (isElevationView(state.mode)) scene3D.background = new Three.Color(0xffffff);
|
|
2058
|
+
if ((0, _helper.isElevationView)(state.mode)) scene3D.background = new Three.Color(0xffffff);
|
|
2060
2059
|
// change color about v1: 0x8791AB, v2: 0xC2C2C2, v3: 0xC3CADC
|
|
2061
2060
|
else scene3D.background = new Three.Color(0xc3cadc); // change color about v1: 0x8791AB, v2: 0xC2C2C2, v3: 0xC3CADC
|
|
2062
2061
|
// scene3D.fog = new Three.Fog(0xC3CADC, 2000, 3500);
|
|
2063
2062
|
window.scene3D = scene3D;
|
|
2064
2063
|
// Camera
|
|
2065
|
-
if (isElevationView(state.mode)) {
|
|
2064
|
+
if ((0, _helper.isElevationView)(state.mode)) {
|
|
2066
2065
|
// In elevation view, set Orthographic camera's position, angle and rotation about selected line
|
|
2067
2066
|
var layers = scene.layers;
|
|
2068
2067
|
var selectedLayer = layers.get(scene.selectedLayer);
|
|
2069
|
-
var ceilHeight = convert(selectedLayer.ceilHeight).from(selectedLayer.unit).to(scene.unit);
|
|
2068
|
+
var ceilHeight = (0, _convertUnitsLite.convert)(selectedLayer.ceilHeight).from(selectedLayer.unit).to(scene.unit);
|
|
2070
2069
|
var lines = [];
|
|
2071
2070
|
var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
|
|
2072
2071
|
var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
|
|
@@ -2075,7 +2074,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2075
2074
|
y1 = vertex0.y;
|
|
2076
2075
|
var x2 = vertex1.x,
|
|
2077
2076
|
y2 = vertex1.y;
|
|
2078
|
-
if (GeometryUtils.compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
|
|
2077
|
+
if (_export.GeometryUtils.compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
|
|
2079
2078
|
x1 = vertex1.x;
|
|
2080
2079
|
y1 = vertex1.y;
|
|
2081
2080
|
x2 = vertex0.x;
|
|
@@ -2084,7 +2083,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2084
2083
|
selectedLayer.lines.toArray().forEach(function (line) {
|
|
2085
2084
|
if (line.id === selectedLine) {
|
|
2086
2085
|
var data = line.toJS();
|
|
2087
|
-
data =
|
|
2086
|
+
data = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {
|
|
2088
2087
|
l0: {
|
|
2089
2088
|
x: x1,
|
|
2090
2089
|
y: y1
|
|
@@ -2097,11 +2096,11 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2097
2096
|
lines.push(data);
|
|
2098
2097
|
}
|
|
2099
2098
|
});
|
|
2100
|
-
var lineLength = GeometryUtils.pointsDistance(x1, y1, x2, y2);
|
|
2099
|
+
var lineLength = _export.GeometryUtils.pointsDistance(x1, y1, x2, y2);
|
|
2101
2100
|
self.setState({
|
|
2102
2101
|
lineLength: lineLength
|
|
2103
2102
|
});
|
|
2104
|
-
var cameraRect = handleCamRect(self.width, self.height, ceilHeight, lineLength);
|
|
2103
|
+
var cameraRect = (0, _helper.handleCamRect)(self.width, self.height, ceilHeight, lineLength);
|
|
2105
2104
|
camera = new Three.OrthographicCamera(-cameraRect.width / 2, cameraRect.width / 2, cameraRect.height / 2, -cameraRect.height / 2, 1, 1000);
|
|
2106
2105
|
var angle = Math.atan((y1 - y2) / (x1 - x2));
|
|
2107
2106
|
var r = 300;
|
|
@@ -2122,15 +2121,15 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2122
2121
|
}
|
|
2123
2122
|
camera.layers.enable(1);
|
|
2124
2123
|
function loadENV() {
|
|
2125
|
-
new RGBELoader().load('/assets/brown_photostudio_02_1k.hdr', function (texture) {
|
|
2124
|
+
new _RGBELoader.RGBELoader().load('/assets/brown_photostudio_02_1k.hdr', function (texture) {
|
|
2126
2125
|
texture.mapping = Three.EquirectangularReflectionMapping;
|
|
2127
2126
|
scene3D.environment = texture;
|
|
2128
2127
|
texture.dispose();
|
|
2129
2128
|
});
|
|
2130
2129
|
}
|
|
2131
2130
|
// Camera Controls
|
|
2132
|
-
if (!isElevationView(state.mode)) {
|
|
2133
|
-
cameraControls = new
|
|
2131
|
+
if (!(0, _helper.isElevationView)(state.mode)) {
|
|
2132
|
+
cameraControls = new _cameraControls["default"](camera, self.renderer.domElement);
|
|
2134
2133
|
cameraControls.dollyToCursor = true;
|
|
2135
2134
|
cameraControls.infinityDolly = true;
|
|
2136
2135
|
cameraControls.minDistance = 50;
|
|
@@ -2141,7 +2140,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2141
2140
|
scene3D.add(planData.plan);
|
|
2142
2141
|
scene3D.add(planData.grid);
|
|
2143
2142
|
scene3D.add(camera);
|
|
2144
|
-
if (isElevationView(state.mode)) {
|
|
2143
|
+
if ((0, _helper.isElevationView)(state.mode)) {
|
|
2145
2144
|
planData.cam.add(camera);
|
|
2146
2145
|
scene3D.add(planData.cam);
|
|
2147
2146
|
} else {
|
|
@@ -2156,7 +2155,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2156
2155
|
}
|
|
2157
2156
|
function render() {
|
|
2158
2157
|
var delta = clock.getDelta(); // Get time delta for smooth updates
|
|
2159
|
-
if (!isElevationView(state.mode)) cameraControls.update(delta);
|
|
2158
|
+
if (!(0, _helper.isElevationView)(state.mode)) cameraControls.update(delta);
|
|
2160
2159
|
for (var _i16 = 0; _i16 < lights.length; _i16++) {
|
|
2161
2160
|
lights[_i16].light.position.set(planData.plan.position.x + lights[_i16].x, planData.plan.position.y + lights[_i16].height - 10, planData.plan.position.z - lights[_i16].y);
|
|
2162
2161
|
lights[_i16].target.position.set(planData.plan.position.x + lights[_i16].x, planData.plan.position.y, planData.plan.position.z - lights[_i16].y);
|
|
@@ -2203,7 +2202,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2203
2202
|
var indexAttribute = line.geometry.getIndex();
|
|
2204
2203
|
var firstFaceIndices = undefined;
|
|
2205
2204
|
if (indexAttribute && indexAttribute.length > 0) {
|
|
2206
|
-
[indexAttribute.getX(0), indexAttribute.getX(1), indexAttribute.getX(2)],
|
|
2205
|
+
[indexAttribute.getX(0), indexAttribute.getX(1), indexAttribute.getX(2)], (0, _readOnlyError2["default"])("firstFaceIndices");
|
|
2207
2206
|
}
|
|
2208
2207
|
if (firstFaceIndices == undefined) return;
|
|
2209
2208
|
// normal vector of the line
|
|
@@ -2252,7 +2251,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2252
2251
|
isLoading: false,
|
|
2253
2252
|
waitForRender: 0
|
|
2254
2253
|
});
|
|
2255
|
-
if (isElevationView(self.props.state.mode)) {
|
|
2254
|
+
if ((0, _helper.isElevationView)(self.props.state.mode)) {
|
|
2256
2255
|
setTimeout(function () {
|
|
2257
2256
|
self.props.setIsLoadingElevation('front', false);
|
|
2258
2257
|
}, 100);
|
|
@@ -2276,14 +2275,14 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2276
2275
|
key: "componentWillUnmount",
|
|
2277
2276
|
value: function componentWillUnmount() {
|
|
2278
2277
|
cancelAnimationFrame(this.renderingID);
|
|
2279
|
-
if (!isElevationView(this.props.state.mode)) {
|
|
2278
|
+
if (!(0, _helper.isElevationView)(this.props.state.mode)) {
|
|
2280
2279
|
if (this.cameraControls !== undefined) this.cameraControls.dispose();
|
|
2281
2280
|
}
|
|
2282
2281
|
if (!this.props.downloadFlag) {
|
|
2283
2282
|
this.renderer.domElement.removeEventListener('mousedown', this.mouseDownEvent);
|
|
2284
2283
|
this.renderer.domElement.removeEventListener('mouseup', this.mouseUpEvent);
|
|
2285
2284
|
}
|
|
2286
|
-
disposeScene(this.scene3D);
|
|
2285
|
+
(0, _threeMemoryCleaner.disposeScene)(this.scene3D);
|
|
2287
2286
|
this.scene3D.remove(this.planData.plan);
|
|
2288
2287
|
this.scene3D.remove(this.planData.grid);
|
|
2289
2288
|
this.scene3D = null;
|
|
@@ -2296,11 +2295,11 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2296
2295
|
key: "componentWillReceiveProps",
|
|
2297
2296
|
value: function componentWillReceiveProps(nextProps) {
|
|
2298
2297
|
var _this4 = this;
|
|
2299
|
-
if (this.props.downloadFlag &&
|
|
2298
|
+
if (this.props.downloadFlag && (0, _immutablediff["default"])(this.props.state, nextProps.state).toJS().length == 0 || (0, _helper.isEmpty)(nextProps.state.scene)) return;
|
|
2300
2299
|
var width = nextProps.width,
|
|
2301
2300
|
height = nextProps.height;
|
|
2302
2301
|
var selectedLayer = nextProps.state.getIn(['scene', 'layers', nextProps.state.scene.selectedLayer]);
|
|
2303
|
-
var ceilHeight = convert(selectedLayer.ceilHeight).from(selectedLayer.unit).to(nextProps.state.scene.unit);
|
|
2302
|
+
var ceilHeight = (0, _convertUnitsLite.convert)(selectedLayer.ceilHeight).from(selectedLayer.unit).to(nextProps.state.scene.unit);
|
|
2304
2303
|
var actions = {
|
|
2305
2304
|
areaActions: this.context.areaActions,
|
|
2306
2305
|
holesActions: this.context.holesActions,
|
|
@@ -2322,9 +2321,9 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2322
2321
|
|
|
2323
2322
|
// handle camera setting
|
|
2324
2323
|
switch (this.props.state.mode) {
|
|
2325
|
-
case MODE_ELEVATION_VIEW:
|
|
2324
|
+
case _constants.MODE_ELEVATION_VIEW:
|
|
2326
2325
|
// when Elevation mode (camera: Orthographic)
|
|
2327
|
-
var cameraRect = handleCamRect(width, height, ceilHeight, this.state.lineLength);
|
|
2326
|
+
var cameraRect = (0, _helper.handleCamRect)(width, height, ceilHeight, this.state.lineLength);
|
|
2328
2327
|
// camera size
|
|
2329
2328
|
this.camera.left = -cameraRect.width / 2;
|
|
2330
2329
|
this.camera.right = cameraRect.width / 2;
|
|
@@ -2333,7 +2332,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2333
2332
|
//camera position
|
|
2334
2333
|
this.camera.position.y = ceilHeight / 2;
|
|
2335
2334
|
break;
|
|
2336
|
-
case MODE_3D_VIEW:
|
|
2335
|
+
case _constants.MODE_3D_VIEW:
|
|
2337
2336
|
// when 3D mode (camera: Perspective)
|
|
2338
2337
|
this.camera.aspect = width / height;
|
|
2339
2338
|
break;
|
|
@@ -2343,34 +2342,34 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2343
2342
|
var layer = data.getIn(['layers', data.selectedLayer]);
|
|
2344
2343
|
var self = this;
|
|
2345
2344
|
function implementBacksplash() {
|
|
2346
|
-
if (isElevationView(self.props.state.mode)) return; // apply backsplash when just 3D_mode, not elevation_mode
|
|
2347
|
-
var allItems = GeometryUtils.getAllItemSpecified(nextProps.state.scene, actions.catalog, BASE_CABINET_LAYOUTPOS);
|
|
2345
|
+
if ((0, _helper.isElevationView)(self.props.state.mode)) return; // apply backsplash when just 3D_mode, not elevation_mode
|
|
2346
|
+
var allItems = _export.GeometryUtils.getAllItemSpecified(nextProps.state.scene, actions.catalog, _constants.BASE_CABINET_LAYOUTPOS);
|
|
2348
2347
|
var i,
|
|
2349
2348
|
items = [];
|
|
2350
2349
|
for (i = 0; i < allItems.others.length; i++) items.push(allItems.others[i]);
|
|
2351
2350
|
if (allItems.cur) items.push(allItems.cur);
|
|
2352
2351
|
for (i = 0; i < items.length; i++) {
|
|
2353
|
-
var calcRect = GeometryUtils.getCalcRectFromItem3D(items[i]);
|
|
2354
|
-
var visible = GeometryUtils.isSnappedLine(calcRect, allLineRects);
|
|
2352
|
+
var calcRect = _export.GeometryUtils.getCalcRectFromItem3D(items[i]);
|
|
2353
|
+
var visible = _export.GeometryUtils.isSnappedLine(calcRect, allLineRects);
|
|
2355
2354
|
actions.itemsActions.setBacksplashVisible(items[i].itemInfo.id, visible);
|
|
2356
|
-
createBacksplash(items[i], nextProps.state.scene.getIn(['layers', nextProps.state.scene.selectedLayer]), planData, nextProps.state.scene);
|
|
2355
|
+
(0, _sceneCreator.createBacksplash)(items[i], nextProps.state.scene.getIn(['layers', nextProps.state.scene.selectedLayer]), planData, nextProps.state.scene);
|
|
2357
2356
|
}
|
|
2358
2357
|
}
|
|
2359
2358
|
function implementWarningBox() {
|
|
2360
|
-
var holeItems = GeometryUtils.getHoleItems(layer);
|
|
2359
|
+
var holeItems = _export.GeometryUtils.getHoleItems(layer);
|
|
2361
2360
|
var i,
|
|
2362
2361
|
items = [];
|
|
2363
2362
|
for (i = 0; i < allItemRect.others.length; i++) items.push(allItemRect.others[i]);
|
|
2364
2363
|
if (allItemRect.cur) items.push(allItemRect.cur);
|
|
2365
|
-
for (i = 0; i < items.length; i++) checkCabinetOverlap({
|
|
2364
|
+
for (i = 0; i < items.length; i++) (0, _sceneCreator.checkCabinetOverlap)({
|
|
2366
2365
|
x: items[i].pos.x,
|
|
2367
2366
|
y: items[i].pos.y
|
|
2368
2367
|
}, items[i], holeItems, planData);
|
|
2369
2368
|
}
|
|
2370
2369
|
var prepareSnapSpec = function prepareSnapSpec(layer) {
|
|
2371
|
-
allLines = GeometryUtils.getAllLines(layer);
|
|
2372
|
-
allLineRects = GeometryUtils.buildRectFromLines(layer, allLines);
|
|
2373
|
-
allItemRect = GeometryUtils.getAllItemSpecified(_this4.props.state.scene, actions.catalog, [WALL_CABINET_LAYOUTPOS, TALL_CABINET_LAYOUTPOS]);
|
|
2370
|
+
allLines = _export.GeometryUtils.getAllLines(layer);
|
|
2371
|
+
allLineRects = _export.GeometryUtils.buildRectFromLines(layer, allLines);
|
|
2372
|
+
allItemRect = _export.GeometryUtils.getAllItemSpecified(_this4.props.state.scene, actions.catalog, [_constants.WALL_CABINET_LAYOUTPOS, _constants.TALL_CABINET_LAYOUTPOS]);
|
|
2374
2373
|
};
|
|
2375
2374
|
var layer1 = this.props.state.scene.getIn(['layers', data.selectedLayer]);
|
|
2376
2375
|
if (this.state.showflag) {
|
|
@@ -2382,7 +2381,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2382
2381
|
});
|
|
2383
2382
|
}
|
|
2384
2383
|
if (nextProps.state.scene !== this.props.state.scene || nextProps.state.doorStyle && nextProps.state.doorStyle.get('name') !== this.props.state.doorStyle.get('name')) {
|
|
2385
|
-
var changedValues =
|
|
2384
|
+
var changedValues = (0, _immutablediff["default"])(this.props.state.scene, nextProps.state.scene);
|
|
2386
2385
|
prepareSnapSpec(layer);
|
|
2387
2386
|
if (nextProps.state.doorStyle && nextProps.state.doorStyle.get('name') === this.props.state.doorStyle.get('name')) {
|
|
2388
2387
|
self.setState({
|
|
@@ -2393,10 +2392,10 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2393
2392
|
waitForRender: 0
|
|
2394
2393
|
});
|
|
2395
2394
|
switch (self.props.state.mode) {
|
|
2396
|
-
case MODE_ELEVATION_VIEW:
|
|
2395
|
+
case _constants.MODE_ELEVATION_VIEW:
|
|
2397
2396
|
self.props.setIsLoadingElevation('front', true);
|
|
2398
2397
|
break;
|
|
2399
|
-
case MODE_3D_VIEW:
|
|
2398
|
+
case _constants.MODE_3D_VIEW:
|
|
2400
2399
|
self.props.setIsLoading3D(true);
|
|
2401
2400
|
break;
|
|
2402
2401
|
}
|
|
@@ -2407,12 +2406,12 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2407
2406
|
implementBacksplash();
|
|
2408
2407
|
implementWarningBox();
|
|
2409
2408
|
} else {
|
|
2410
|
-
deleteSpecifiedMeshObjects('TransformBox');
|
|
2409
|
+
(0, _sceneCreator.deleteSpecifiedMeshObjects)('TransformBox');
|
|
2411
2410
|
}
|
|
2412
2411
|
var _this$state = this.state,
|
|
2413
2412
|
toolObj = _this$state.toolObj,
|
|
2414
2413
|
angleObj = _this$state.angleObj;
|
|
2415
|
-
var _updateScene = updateScene(this.planData, nextProps.state.scene, this.props.state.scene, changedValues.toJS(), actions, this.context.catalog, nextProps.state.mode, toolObj, angleObj, nextProps.state.draggingSupport),
|
|
2414
|
+
var _updateScene = (0, _sceneCreator.updateScene)(this.planData, nextProps.state.scene, this.props.state.scene, changedValues.toJS(), actions, this.context.catalog, nextProps.state.mode, toolObj, angleObj, nextProps.state.draggingSupport),
|
|
2416
2415
|
promise = _updateScene.promise;
|
|
2417
2416
|
self.setState();
|
|
2418
2417
|
promise.then(function (p1Value) {
|
|
@@ -2439,7 +2438,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2439
2438
|
if (isLoading) {
|
|
2440
2439
|
if (this.props.downloadFlag) {
|
|
2441
2440
|
this.renderer.domElement.style.display = 'none';
|
|
2442
|
-
return /*#__PURE__*/
|
|
2441
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
2443
2442
|
style: {
|
|
2444
2443
|
alignItems: ' center',
|
|
2445
2444
|
width: this.props.width,
|
|
@@ -2447,7 +2446,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2447
2446
|
display: 'inline-flex',
|
|
2448
2447
|
justifyContent: 'center'
|
|
2449
2448
|
}
|
|
2450
|
-
}, /*#__PURE__*/
|
|
2449
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
2451
2450
|
style: {
|
|
2452
2451
|
width: '70px',
|
|
2453
2452
|
height: '70px',
|
|
@@ -2460,12 +2459,12 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2460
2459
|
document.getElementById('front') && (document.getElementById('front').style.display = 'none');
|
|
2461
2460
|
document.getElementById('error').style.display = 'none';
|
|
2462
2461
|
this.renderer.domElement.style.display = 'none';
|
|
2463
|
-
return /*#__PURE__*/
|
|
2462
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
2464
2463
|
style: {
|
|
2465
2464
|
textAlign: 'center',
|
|
2466
2465
|
width: '100%'
|
|
2467
2466
|
}
|
|
2468
|
-
}, /*#__PURE__*/
|
|
2467
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
2469
2468
|
style: {
|
|
2470
2469
|
animation: 'spin 2s linear infinite',
|
|
2471
2470
|
marginTop: "22%"
|
|
@@ -2478,12 +2477,12 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2478
2477
|
this.renderer.domElement.style.pointerEvents = 'none';
|
|
2479
2478
|
document.getElementById('front') && (document.getElementById('front').style.display = 'none');
|
|
2480
2479
|
this.renderer.domElement.style.opacity = '0.4';
|
|
2481
|
-
return /*#__PURE__*/
|
|
2480
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
2482
2481
|
style: {
|
|
2483
2482
|
textAlign: 'center',
|
|
2484
2483
|
width: '100%'
|
|
2485
2484
|
}
|
|
2486
|
-
}, /*#__PURE__*/
|
|
2485
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
2487
2486
|
style: {
|
|
2488
2487
|
animation: 'spin 2s linear infinite',
|
|
2489
2488
|
position: "absolute",
|
|
@@ -2497,26 +2496,25 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2497
2496
|
this.renderer.domElement.style.pointerEvents = 'auto';
|
|
2498
2497
|
this.renderer.domElement.style.opacity = '1';
|
|
2499
2498
|
!this.props.downloadFlag && document.getElementById('front') && (document.getElementById('front').style.display = 'block');
|
|
2500
|
-
return /*#__PURE__*/
|
|
2499
|
+
return /*#__PURE__*/_react["default"].createElement('div', {
|
|
2501
2500
|
ref: 'canvasWrapper'
|
|
2502
2501
|
});
|
|
2503
2502
|
}
|
|
2504
2503
|
}
|
|
2505
2504
|
}]);
|
|
2506
|
-
}(
|
|
2507
|
-
export { Scene3DViewer as default };
|
|
2505
|
+
}(_react["default"].Component);
|
|
2508
2506
|
Scene3DViewer.propTypes = {
|
|
2509
|
-
state:
|
|
2510
|
-
width:
|
|
2511
|
-
height:
|
|
2512
|
-
replaceCabinet:
|
|
2507
|
+
state: _propTypes["default"].object.isRequired,
|
|
2508
|
+
width: _propTypes["default"].number.isRequired,
|
|
2509
|
+
height: _propTypes["default"].number.isRequired,
|
|
2510
|
+
replaceCabinet: _propTypes["default"].func.isRequired
|
|
2513
2511
|
};
|
|
2514
2512
|
Scene3DViewer.contextTypes = {
|
|
2515
|
-
areaActions:
|
|
2516
|
-
holesActions:
|
|
2517
|
-
itemsActions:
|
|
2518
|
-
linesActions:
|
|
2519
|
-
sceneActions:
|
|
2520
|
-
projectActions:
|
|
2521
|
-
catalog:
|
|
2513
|
+
areaActions: _propTypes["default"].object.isRequired,
|
|
2514
|
+
holesActions: _propTypes["default"].object.isRequired,
|
|
2515
|
+
itemsActions: _propTypes["default"].object.isRequired,
|
|
2516
|
+
linesActions: _propTypes["default"].object.isRequired,
|
|
2517
|
+
sceneActions: _propTypes["default"].object.isRequired,
|
|
2518
|
+
projectActions: _propTypes["default"].object.isRequired,
|
|
2519
|
+
catalog: _propTypes["default"].object
|
|
2522
2520
|
};
|