kitchen-simulator 1.1.1-test.7 → 1.1.1-test.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/KitchenConfigurator.js +34 -54
- package/es/KitchenConfiguratorApp.js +63 -81
- package/es/actions/holes-actions.js +1 -1
- package/es/actions/items-actions.js +1 -1
- package/es/actions/lines-actions.js +1 -1
- package/es/actions/project-actions.js +1 -1
- package/es/actions/scene-actions.js +1 -1
- package/es/actions/vertices-actions.js +1 -1
- package/es/actions/viewer2d-actions.js +1 -1
- package/es/actions/viewer3d-actions.js +1 -1
- package/es/catalog/areas/area/planner-element.js +10 -7
- package/es/catalog/catalog.js +3 -12
- package/es/catalog/factories/area-factory.js +1 -4
- package/es/catalog/factories/wall-factory-3d.js +1 -1
- package/es/catalog/holes/export.js +13 -13
- package/es/catalog/lines/wall/planner-element.js +13 -10
- package/es/catalog/properties/property-checkbox.js +64 -22
- package/es/catalog/properties/property-enum.js +52 -15
- package/es/catalog/properties/property-lenght-measure.js +4 -5
- package/es/catalog/properties/property-length-measure.js +55 -12
- package/es/catalog/properties/property-length-measure_hole.js +4 -5
- package/es/catalog/utils/FuseUtils.js +3 -6
- package/es/catalog/utils/exporter.js +2 -5
- package/es/catalog/utils/item-loader.js +4 -11
- package/es/catalog/utils/mtl-loader.js +3 -2
- package/es/catalog/utils/obj-loader.js +3 -2
- package/es/class/FuseUtils.js +3 -6
- package/es/class/area.js +4 -8
- package/es/class/group.js +6 -15
- package/es/class/guide.js +2 -6
- package/es/class/hole.js +7 -12
- package/es/class/item.js +12 -23
- package/es/class/layer.js +4 -8
- package/es/class/line.js +3 -12
- package/es/class/project.js +7 -11
- package/es/class/vertex.js +3 -7
- package/es/components/content.js +1 -0
- package/es/components/disclaimer/disclaimer.js +66 -86
- package/es/components/style/button.js +7 -14
- package/es/components/style/cancel-button.js +2 -3
- package/es/components/style/content-container.js +1 -4
- package/es/components/style/content-title.js +3 -7
- package/es/components/style/delete-button.js +2 -3
- package/es/components/style/form-block.js +3 -7
- package/es/components/style/form-color-input.js +2 -3
- package/es/components/style/form-label.js +3 -7
- package/es/components/style/form-number-input.js +36 -18
- package/es/components/style/form-number-input_2.js +6 -12
- package/es/components/style/form-select.js +50 -11
- package/es/components/style/form-slider.js +24 -9
- package/es/components/style/form-submit-button.js +2 -3
- package/es/components/style/form-text-input.js +38 -26
- package/es/components/viewer2d/area.js +4 -4
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +0 -1
- package/es/components/viewer2d/grids/grid-streak.js +0 -1
- package/es/components/viewer2d/grids/grid-vertical-streak.js +0 -1
- package/es/components/viewer2d/grids/grids.js +1 -6
- package/es/components/viewer2d/item.js +4 -11
- package/es/components/viewer2d/line.js +2 -5
- package/es/components/viewer2d/ruler.js +2 -3
- package/es/components/viewer2d/rulerDist.js +1 -1
- package/es/components/viewer2d/rulerX.js +6 -12
- package/es/components/viewer2d/rulerY.js +6 -12
- package/es/components/viewer2d/scene.js +15 -27
- package/es/components/viewer2d/state.js +1 -6
- package/es/components/viewer2d/utils.js +33 -2
- package/es/components/viewer2d/viewer2d.js +13 -18
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +6 -13
- package/es/components/viewer3d/front3D.js +1 -6
- package/es/components/viewer3d/libs/mtl-loader.js +2 -2
- package/es/components/viewer3d/libs/obj-loader.js +2 -2
- package/es/components/viewer3d/libs/orbit-controls.js +6 -5
- package/es/components/viewer3d/libs/pointer-lock-controls.js +5 -4
- package/es/components/viewer3d/ruler-utils/itemRect.js +1 -1
- package/es/components/viewer3d/ruler-utils/layer3D.js +2 -2
- package/es/components/viewer3d/ruler-utils/ruler3D.js +1 -4
- package/es/components/viewer3d/ruler-utils/scene3D.js +2 -3
- package/es/components/viewer3d/scene-creator.js +5 -11
- package/es/components/viewer3d/viewer3d-first-person.js +5 -11
- package/es/components/viewer3d/viewer3d.js +19 -26
- package/es/index.js +13 -14
- package/es/models.js +10 -15
- package/es/plugins/console-debugger.js +1 -4
- package/es/plugins/keyboard.js +2 -2
- package/es/reducers/holes-reducer.js +1 -1
- package/es/reducers/items-reducer.js +2 -5
- package/es/reducers/lines-reducer.js +1 -1
- package/es/reducers/project-reducer.js +1 -1
- package/es/reducers/reducer.js +2 -2
- package/es/reducers/scene-reducer.js +1 -1
- package/es/reducers/user-reducer.js +1 -2
- package/es/reducers/vertices-reducer.js +1 -1
- package/es/reducers/viewer2d-reducer.js +2 -2
- package/es/reducers/viewer3d-reducer.js +2 -2
- package/es/translator/translator.js +2 -6
- package/es/utils/convert-units-lite.js +29 -0
- package/es/utils/geometry.js +7 -16
- package/es/utils/get-edges-of-subgraphs.js +2 -1
- package/es/utils/graph-cycles.js +2 -3
- package/es/utils/graph.js +4 -7
- package/es/utils/helper.js +3 -73
- package/es/utils/id-broker.js +4 -8
- package/es/utils/molding.js +36 -42
- package/es/utils/name-generator.js +2 -6
- package/es/utils/objects-utils.js +1 -1
- package/es/utils/process-black-list.js +1 -4
- package/es/utils/snap-scene.js +1 -6
- package/es/utils/snap.js +6 -12
- package/es/utils/threeCSG.es6.js +2 -6
- package/lib/@history.js +3 -2
- package/lib/AppContext.js +3 -2
- package/lib/KitchenConfigurator.js +70 -88
- package/lib/KitchenConfiguratorApp.js +98 -113
- package/lib/actions/export.js +1 -1
- package/lib/catalog/areas/area/planner-element.js +13 -8
- package/lib/catalog/catalog.js +9 -16
- package/lib/catalog/factories/area-factory-3d.js +1 -1
- package/lib/catalog/factories/area-factory.js +6 -7
- package/lib/catalog/factories/export.js +1 -1
- package/lib/catalog/factories/wall-factory-3d.js +4 -4
- package/lib/catalog/factories/wall-factory.js +4 -3
- package/lib/catalog/holes/door-closet/planner-element.js +4 -3
- package/lib/catalog/holes/door-double/planner-element.js +4 -3
- package/lib/catalog/holes/door-exterior/planner-element.js +4 -3
- package/lib/catalog/holes/door-interior/planner-element.js +4 -3
- package/lib/catalog/holes/door-panic/planner-element.js +4 -3
- package/lib/catalog/holes/door-panic-double/planner-element.js +4 -3
- package/lib/catalog/holes/door-sliding/planner-element.js +4 -3
- package/lib/catalog/holes/doorway-framed/planner-element.js +4 -3
- package/lib/catalog/holes/doorway-frameless/planner-element.js +4 -3
- package/lib/catalog/holes/export.js +14 -14
- package/lib/catalog/holes/window-clear/planner-element.js +4 -3
- package/lib/catalog/holes/window-cross/planner-element.js +4 -3
- package/lib/catalog/holes/window-double-hung/planner-element.js +4 -3
- package/lib/catalog/holes/window-vertical/planner-element.js +4 -3
- package/lib/catalog/lines/wall/planner-element.js +16 -11
- package/lib/catalog/molding/molding-dcm/planner-element.js +4 -3
- package/lib/catalog/molding/molding-fbm/planner-element.js +4 -3
- package/lib/catalog/molding/molding-lrm/planner-element.js +4 -3
- package/lib/catalog/properties/export.js +1 -1
- package/lib/catalog/properties/property-checkbox.js +68 -25
- package/lib/catalog/properties/property-color.js +3 -2
- package/lib/catalog/properties/property-enum.js +54 -16
- package/lib/catalog/properties/property-hidden.js +3 -2
- package/lib/catalog/properties/property-lenght-measure.js +10 -10
- package/lib/catalog/properties/property-length-measure.js +61 -17
- package/lib/catalog/properties/property-length-measure_hole.js +10 -10
- package/lib/catalog/properties/property-number.js +3 -2
- package/lib/catalog/properties/property-read-only.js +3 -2
- package/lib/catalog/properties/property-string.js +3 -2
- package/lib/catalog/properties/property-toggle.js +3 -2
- package/lib/catalog/properties/shared-property-style.js +2 -1
- package/lib/catalog/utils/FuseUtils.js +10 -11
- package/lib/catalog/utils/exporter.js +10 -12
- package/lib/catalog/utils/geom-utils.js +1 -1
- package/lib/catalog/utils/item-loader.js +29 -35
- package/lib/catalog/utils/mtl-loader.js +7 -3
- package/lib/catalog/utils/obj-loader.js +7 -3
- package/lib/class/FuseUtils.js +10 -11
- package/lib/class/area.js +9 -11
- package/lib/class/export.js +1 -1
- package/lib/class/group.js +13 -20
- package/lib/class/guide.js +9 -12
- package/lib/class/hole.js +7 -9
- package/lib/class/item.js +25 -35
- package/lib/class/layer.js +7 -9
- package/lib/class/line.js +14 -20
- package/lib/class/project.js +10 -11
- package/lib/class/vertex.js +9 -11
- package/lib/components/content.js +5 -3
- package/lib/components/disclaimer/disclaimer.js +69 -88
- package/lib/components/export.js +1 -1
- package/lib/components/style/button.js +17 -22
- package/lib/components/style/cancel-button.js +7 -7
- package/lib/components/style/content-container.js +5 -7
- package/lib/components/style/content-title.js +10 -12
- package/lib/components/style/delete-button.js +8 -8
- package/lib/components/style/export.js +1 -1
- package/lib/components/style/form-block.js +9 -12
- package/lib/components/style/form-color-input.js +7 -7
- package/lib/components/style/form-label.js +9 -12
- package/lib/components/style/form-number-input.js +43 -23
- package/lib/components/style/form-number-input_2.js +15 -19
- package/lib/components/style/form-select.js +53 -15
- package/lib/components/style/form-slider.js +28 -12
- package/lib/components/style/form-submit-button.js +8 -8
- package/lib/components/style/form-text-input.js +46 -32
- package/lib/components/viewer2d/area.js +8 -7
- package/lib/components/viewer2d/export.js +1 -1
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +3 -3
- package/lib/components/viewer2d/grids/grid-streak.js +3 -3
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +3 -3
- package/lib/components/viewer2d/grids/grids.js +6 -10
- package/lib/components/viewer2d/group.js +4 -3
- package/lib/components/viewer2d/item.js +14 -19
- package/lib/components/viewer2d/layer.js +3 -2
- package/lib/components/viewer2d/line.js +4 -7
- package/lib/components/viewer2d/ruler.js +9 -9
- package/lib/components/viewer2d/rulerDist.js +7 -6
- package/lib/components/viewer2d/rulerX.js +15 -19
- package/lib/components/viewer2d/rulerY.js +15 -19
- package/lib/components/viewer2d/scene.js +24 -34
- package/lib/components/viewer2d/snap.js +4 -3
- package/lib/components/viewer2d/state.js +7 -11
- package/lib/components/viewer2d/utils.js +35 -2
- package/lib/components/viewer2d/vertex.js +4 -3
- package/lib/components/viewer2d/viewer2d.js +40 -41
- package/lib/components/viewer3d/camera-controls-module/camera-controls.module.js +14 -20
- package/lib/components/viewer3d/dcm.js +2 -1
- package/lib/components/viewer3d/fbm.js +2 -1
- package/lib/components/viewer3d/front3D.js +6 -10
- package/lib/components/viewer3d/grid-creator.js +4 -3
- package/lib/components/viewer3d/grids/grid-horizontal-streak.js +3 -2
- package/lib/components/viewer3d/grids/grid-streak.js +3 -2
- package/lib/components/viewer3d/grids/grid-vertical-streak.js +3 -2
- package/lib/components/viewer3d/libs/mtl-loader.js +7 -2
- package/lib/components/viewer3d/libs/obj-loader.js +7 -2
- package/lib/components/viewer3d/libs/orbit-controls.js +10 -5
- package/lib/components/viewer3d/libs/pointer-lock-controls.js +9 -4
- package/lib/components/viewer3d/lrm.js +2 -1
- package/lib/components/viewer3d/pointer-lock-navigation.js +1 -1
- package/lib/components/viewer3d/ruler-utils/itemRect.js +10 -9
- package/lib/components/viewer3d/ruler-utils/layer3D.js +35 -34
- package/lib/components/viewer3d/ruler-utils/ruler3D.js +5 -7
- package/lib/components/viewer3d/ruler-utils/scene3D.js +4 -5
- package/lib/components/viewer3d/ruler-utils/state3D.js +3 -2
- package/lib/components/viewer3d/scene-creator.js +40 -45
- package/lib/components/viewer3d/three-memory-cleaner.js +1 -1
- package/lib/components/viewer3d/viewer3d-first-person.js +13 -17
- package/lib/components/viewer3d/viewer3d.js +34 -38
- package/lib/index.js +16 -88
- package/lib/models.js +58 -63
- package/lib/plugins/autosave.js +2 -1
- package/lib/plugins/console-debugger.js +5 -7
- package/lib/plugins/export.js +1 -1
- package/lib/plugins/keyboard.js +2 -1
- package/lib/reducers/areas-reducer.js +2 -1
- package/lib/reducers/export.js +1 -1
- package/lib/reducers/groups-reducer.js +2 -1
- package/lib/reducers/holes-reducer.js +2 -1
- package/lib/reducers/items-reducer.js +2 -1
- package/lib/reducers/lines-reducer.js +2 -1
- package/lib/reducers/project-reducer.js +2 -1
- package/lib/reducers/scene-reducer.js +2 -1
- package/lib/reducers/user-reducer.js +2 -2
- package/lib/reducers/vertices-reducer.js +2 -1
- package/lib/reducers/viewer2d-reducer.js +5 -5
- package/lib/reducers/viewer3d-reducer.js +5 -5
- package/lib/styles/export.js +1 -1
- package/lib/translator/en.js +2 -1
- package/lib/translator/it.js +2 -1
- package/lib/translator/ru.js +2 -1
- package/lib/translator/translator.js +7 -10
- package/lib/utils/convert-units-lite.js +35 -0
- package/lib/utils/export.js +2 -2
- package/lib/utils/geometry.js +20 -28
- package/lib/utils/get-edges-of-subgraphs.js +7 -1
- package/lib/utils/graph-cycles.js +9 -9
- package/lib/utils/graph-inner-cycles.js +1 -1
- package/lib/utils/graph.js +15 -12
- package/lib/utils/helper.js +14 -83
- package/lib/utils/history.js +1 -1
- package/lib/utils/id-broker.js +7 -10
- package/lib/utils/molding.js +66 -71
- package/lib/utils/name-generator.js +7 -9
- package/lib/utils/objects-utils.js +5 -3
- package/lib/utils/process-black-list.js +3 -5
- package/lib/utils/react-if.js +3 -2
- package/lib/utils/snap-scene.js +3 -7
- package/lib/utils/snap.js +22 -26
- package/lib/utils/threeCSG.es6.js +16 -15
- package/package.json +26 -54
- package/es/analytics/ga4.js +0 -191
- package/es/analytics/posthog.js +0 -60
- package/lib/analytics/ga4.js +0 -197
- package/lib/analytics/posthog.js +0 -68
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
@@ -41,4 +41,5 @@ function _default(width, height, grid, font) {
|
|
|
41
41
|
counter++;
|
|
42
42
|
}
|
|
43
43
|
return streak;
|
|
44
|
-
}
|
|
44
|
+
}
|
|
45
|
+
module.exports = exports.default;
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports["default"] = void 0;
|
|
3
7
|
/**
|
|
4
8
|
* Loads a Wavefront .mtl file specifying materials
|
|
5
9
|
*
|
|
6
10
|
* @author angelxuanchang
|
|
7
11
|
*/
|
|
8
12
|
|
|
9
|
-
var THREE = window.THREE
|
|
13
|
+
var THREE = window.THREE;
|
|
10
14
|
var MTLLoader;
|
|
11
15
|
MTLLoader = function MTLLoader(manager) {
|
|
12
16
|
this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
|
|
@@ -356,4 +360,5 @@ MTLLoader.MaterialCreator.prototype = {
|
|
|
356
360
|
return texture;
|
|
357
361
|
}
|
|
358
362
|
};
|
|
359
|
-
|
|
363
|
+
var _default = exports["default"] = MTLLoader;
|
|
364
|
+
module.exports = exports.default;
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports["default"] = void 0;
|
|
3
7
|
/**
|
|
4
8
|
* @author mrdoob / http://mrdoob.com/
|
|
5
9
|
*/
|
|
6
10
|
|
|
7
|
-
var THREE = window.THREE
|
|
11
|
+
var THREE = window.THREE;
|
|
8
12
|
var OBJLoader;
|
|
9
13
|
OBJLoader = function OBJLoader(manager) {
|
|
10
14
|
this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
|
|
@@ -461,4 +465,5 @@ OBJLoader.prototype = {
|
|
|
461
465
|
return container;
|
|
462
466
|
}
|
|
463
467
|
};
|
|
464
|
-
|
|
468
|
+
var _default = exports["default"] = OBJLoader;
|
|
469
|
+
module.exports = exports.default;
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.OrbitControls = OrbitControls;
|
|
7
|
+
exports["default"] = void 0;
|
|
3
8
|
/**
|
|
4
9
|
* @author qiao / https://github.com/qiao
|
|
5
10
|
* @author mrdoob / http://mrdoob.com
|
|
@@ -15,9 +20,8 @@
|
|
|
15
20
|
// Zoom - middle mouse, or mousewheel / touch: two finger spread or squish
|
|
16
21
|
// Pan - right mouse, or arrow keys / touch: three finter swipe
|
|
17
22
|
|
|
18
|
-
var THREE = window.THREE
|
|
19
|
-
|
|
20
|
-
module.exports = OrbitControls = function OrbitControls(object, domElement) {
|
|
23
|
+
var THREE = window.THREE;
|
|
24
|
+
function OrbitControls(object, domElement) {
|
|
21
25
|
this.object = object;
|
|
22
26
|
this.domElement = domElement !== undefined ? domElement : document;
|
|
23
27
|
|
|
@@ -625,7 +629,7 @@ module.exports = OrbitControls = function OrbitControls(object, domElement) {
|
|
|
625
629
|
// force an update at start
|
|
626
630
|
|
|
627
631
|
this.update();
|
|
628
|
-
}
|
|
632
|
+
}
|
|
629
633
|
OrbitControls.prototype = Object.create(THREE.EventDispatcher.prototype);
|
|
630
634
|
OrbitControls.prototype.constructor = OrbitControls;
|
|
631
635
|
Object.defineProperties(OrbitControls.prototype, {
|
|
@@ -697,4 +701,5 @@ Object.defineProperties(OrbitControls.prototype, {
|
|
|
697
701
|
this.dampingFactor = value;
|
|
698
702
|
}
|
|
699
703
|
}
|
|
700
|
-
});
|
|
704
|
+
});
|
|
705
|
+
var _default = exports["default"] = OrbitControls;
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.PointerLockControls = PointerLockControls;
|
|
7
|
+
exports["default"] = void 0;
|
|
3
8
|
/**
|
|
4
9
|
* @author mrdoob / http://mrdoob.com/
|
|
5
10
|
*/
|
|
6
11
|
|
|
7
|
-
var THREE = window.THREE
|
|
8
|
-
|
|
9
|
-
module.exports = PointerLockControls = function PointerLockControls(camera) {
|
|
12
|
+
var THREE = window.THREE;
|
|
13
|
+
function PointerLockControls(camera) {
|
|
10
14
|
var scope = this;
|
|
11
15
|
camera.rotation.set(0, 0, 0);
|
|
12
16
|
var pitchObject = new THREE.Object3D();
|
|
@@ -44,4 +48,5 @@ module.exports = PointerLockControls = function PointerLockControls(camera) {
|
|
|
44
48
|
return v;
|
|
45
49
|
};
|
|
46
50
|
}();
|
|
47
|
-
}
|
|
51
|
+
}
|
|
52
|
+
var _default = exports["default"] = PointerLockControls;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports.initPointerLock = initPointerLock;
|
|
7
8
|
var _pointerLockControls = _interopRequireDefault(require("./libs/pointer-lock-controls"));
|
|
8
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
9
9
|
function initPointerLock(camera, rendererElement) {
|
|
10
10
|
var havePointerLock = 'pointerLockElement' in document || 'mozPointerLockElement' in document || 'webkitPointerLockElement' in document;
|
|
11
11
|
var pointerlockchange = function pointerlockchange(event) {
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports["default"] = ItemRect;
|
|
7
8
|
var _react = _interopRequireDefault(require("react"));
|
|
8
9
|
var _constants = require("../../../constants");
|
|
9
|
-
var
|
|
10
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
10
|
+
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
11
11
|
function ItemRect(_ref) {
|
|
12
12
|
var scene = _ref.scene,
|
|
13
13
|
layer = _ref.layer,
|
|
@@ -23,19 +23,19 @@ function ItemRect(_ref) {
|
|
|
23
23
|
y0 = v0.y;
|
|
24
24
|
var x1 = v1.x,
|
|
25
25
|
y1 = v1.y;
|
|
26
|
-
var translateY = frontRect.height / 2 - (0,
|
|
26
|
+
var translateY = frontRect.height / 2 - (0, _convertUnitsLite.convert)(Math.abs(calcrect.itemInfo.properties.altitude._length)).from(calcrect.itemInfo.properties.altitude._unit).to(layer.unit) * scale;
|
|
27
27
|
var translateX = -frontRect.width / 2;
|
|
28
|
-
var itemWidth = (0,
|
|
29
|
-
var itemDepth = (0,
|
|
30
|
-
var itemHeight = (0,
|
|
28
|
+
var itemWidth = (0, _convertUnitsLite.convert)(calcrect.size.width).from(scene.unit).to(layer.unit) * scale;
|
|
29
|
+
var itemDepth = (0, _convertUnitsLite.convert)(calcrect.size.depth).from(scene.unit).to(layer.unit) * scale;
|
|
30
|
+
var itemHeight = (0, _convertUnitsLite.convert)(calcrect.size.height).from(scene.unit).to(layer.unit) * scale;
|
|
31
31
|
switch (mode) {
|
|
32
32
|
case _constants.MODE_FRONT_ELEVATION_VIEW:
|
|
33
33
|
case _constants.MODE_BACK_ELEVATION_VIEW:
|
|
34
|
-
translateX += (0,
|
|
34
|
+
translateX += (0, _convertUnitsLite.convert)(Math.abs(rect[3].x - x0)).from(scene.unit).to(layer.unit) * scale;
|
|
35
35
|
break;
|
|
36
36
|
case _constants.MODE_RIGHT_ELEVATION_VIEW:
|
|
37
37
|
case _constants.MODE_LEFT_ELEVATION_VIEW:
|
|
38
|
-
translateX += (0,
|
|
38
|
+
translateX += (0, _convertUnitsLite.convert)(Math.abs(rect[3].y - y1)).from(scene.unit).to(layer.unit) * scale;
|
|
39
39
|
break;
|
|
40
40
|
}
|
|
41
41
|
var dimension;
|
|
@@ -65,4 +65,5 @@ function ItemRect(_ref) {
|
|
|
65
65
|
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
66
66
|
transform: "translate(".concat(translateX, ", ").concat(translateY, ")")
|
|
67
67
|
}, dimension);
|
|
68
|
-
}
|
|
68
|
+
}
|
|
69
|
+
module.exports = exports.default;
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports["default"] = Layer3D;
|
|
7
8
|
var _react = _interopRequireDefault(require("react"));
|
|
8
9
|
var _ruler3D = _interopRequireDefault(require("./ruler3D"));
|
|
9
|
-
var
|
|
10
|
+
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
10
11
|
var _export = require("../../../utils/export");
|
|
11
12
|
var _utils = require("../../../components/viewer2d/utils");
|
|
12
13
|
var _constants = require("../../../constants");
|
|
13
14
|
var _math = require("../../../utils/math");
|
|
14
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
15
15
|
function Layer3D(_ref) {
|
|
16
16
|
var layer = _ref.layer,
|
|
17
17
|
frontRect = _ref.frontRect,
|
|
@@ -91,10 +91,10 @@ function Layer3D(_ref) {
|
|
|
91
91
|
var catid = item.type;
|
|
92
92
|
var cat = catalog.elements[catid];
|
|
93
93
|
if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
|
|
94
|
-
var width = (0,
|
|
95
|
-
var height = (0,
|
|
96
|
-
var depth = (0,
|
|
97
|
-
var altitude = (0,
|
|
94
|
+
var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from(item.properties.getIn(['width', '_unit'])).to(scene.unit);
|
|
95
|
+
var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from(item.properties.getIn(['height', '_unit'])).to(scene.unit);
|
|
96
|
+
var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from(item.properties.getIn(['depth', '_unit'])).to(scene.unit);
|
|
97
|
+
var altitude = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from(item.properties.getIn(['altitude', '_unit'])).to(scene.unit);
|
|
98
98
|
val.size = {
|
|
99
99
|
width: width,
|
|
100
100
|
height: height,
|
|
@@ -128,29 +128,29 @@ function Layer3D(_ref) {
|
|
|
128
128
|
var vertex0, vertex1;
|
|
129
129
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
130
130
|
vertex0 = {
|
|
131
|
-
x: -frontRect.width / 2 + (0,
|
|
131
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
132
132
|
y: height / 2
|
|
133
133
|
};
|
|
134
134
|
vertex1 = {
|
|
135
|
-
x: -frontRect.width / 2 + (0,
|
|
135
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
136
136
|
y: height / 2
|
|
137
137
|
};
|
|
138
138
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
139
139
|
vertex0 = {
|
|
140
|
-
x: -frontRect.width / 2 + (0,
|
|
140
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
141
141
|
y: height / 2
|
|
142
142
|
};
|
|
143
143
|
vertex1 = {
|
|
144
|
-
x: -frontRect.width / 2 + (0,
|
|
144
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
145
145
|
y: height / 2
|
|
146
146
|
};
|
|
147
147
|
} else if (isSnapped(item.rect[0], item.rect[3])) {
|
|
148
148
|
vertex0 = {
|
|
149
|
-
x: -frontRect.width / 2 + (0,
|
|
149
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
150
150
|
y: height / 2
|
|
151
151
|
};
|
|
152
152
|
vertex1 = {
|
|
153
|
-
x: -frontRect.width / 2 + (0,
|
|
153
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
154
154
|
y: height / 2
|
|
155
155
|
};
|
|
156
156
|
}
|
|
@@ -177,29 +177,29 @@ function Layer3D(_ref) {
|
|
|
177
177
|
var vertex0, vertex1;
|
|
178
178
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
179
179
|
vertex0 = {
|
|
180
|
-
x: -frontRect.width / 2 + (0,
|
|
180
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
181
181
|
y: -height / 2
|
|
182
182
|
};
|
|
183
183
|
vertex1 = {
|
|
184
|
-
x: -frontRect.width / 2 + (0,
|
|
184
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
185
185
|
y: -height / 2
|
|
186
186
|
};
|
|
187
187
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
188
188
|
vertex0 = {
|
|
189
|
-
x: -frontRect.width / 2 + (0,
|
|
189
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
190
190
|
y: -height / 2
|
|
191
191
|
};
|
|
192
192
|
vertex1 = {
|
|
193
|
-
x: -frontRect.width / 2 + (0,
|
|
193
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
194
194
|
y: -height / 2
|
|
195
195
|
};
|
|
196
196
|
} else if (isSnapped(item.rect[0], item.rect[3])) {
|
|
197
197
|
vertex0 = {
|
|
198
|
-
x: -frontRect.width / 2 + (0,
|
|
198
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
199
199
|
y: -height / 2
|
|
200
200
|
};
|
|
201
201
|
vertex1 = {
|
|
202
|
-
x: -frontRect.width / 2 + (0,
|
|
202
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
203
203
|
y: -height / 2
|
|
204
204
|
};
|
|
205
205
|
}
|
|
@@ -232,7 +232,7 @@ function Layer3D(_ref) {
|
|
|
232
232
|
leftItems.forEach(function (item, idx) {
|
|
233
233
|
var forwardItems = [];
|
|
234
234
|
var distLine = 0;
|
|
235
|
-
var itemHeight = (0,
|
|
235
|
+
var itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
|
|
236
236
|
for (var i = 0; i < idx; i++) {
|
|
237
237
|
forwardItems.push(leftItems[i]);
|
|
238
238
|
}
|
|
@@ -241,12 +241,12 @@ function Layer3D(_ref) {
|
|
|
241
241
|
}).length) {
|
|
242
242
|
if (item.itemInfo.properties.altitude._length) {
|
|
243
243
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
244
|
-
distLine = (0,
|
|
244
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
245
245
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
246
|
-
distLine = (0,
|
|
246
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
247
247
|
}
|
|
248
|
-
var itemAltitude = (0,
|
|
249
|
-
if (ceilHeight - (itemAltitude + itemHeight) > (0,
|
|
248
|
+
var itemAltitude = (0, _convertUnitsLite.convert)(item.size.altitude).from(scene.unit).to(layer.unit);
|
|
249
|
+
if (ceilHeight - (itemAltitude + itemHeight) > (0, _convertUnitsLite.convert)(_constants.DELTA).from(toler_unit).to(layer.unit)) {
|
|
250
250
|
rulerLines.push({
|
|
251
251
|
v0: {
|
|
252
252
|
x: width / 2,
|
|
@@ -287,9 +287,9 @@ function Layer3D(_ref) {
|
|
|
287
287
|
right_count++;
|
|
288
288
|
} else {
|
|
289
289
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
290
|
-
distLine = (0,
|
|
290
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
291
291
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
292
|
-
distLine = (0,
|
|
292
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
293
293
|
}
|
|
294
294
|
rulerLines.push({
|
|
295
295
|
v0: {
|
|
@@ -324,7 +324,7 @@ function Layer3D(_ref) {
|
|
|
324
324
|
rightItems.forEach(function (item, idx) {
|
|
325
325
|
var forwardItems = [];
|
|
326
326
|
var distLine = 0;
|
|
327
|
-
var itemHeight = (0,
|
|
327
|
+
var itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
|
|
328
328
|
for (var i = 0; i < idx; i++) {
|
|
329
329
|
forwardItems.push(rightItems[i]);
|
|
330
330
|
}
|
|
@@ -333,12 +333,12 @@ function Layer3D(_ref) {
|
|
|
333
333
|
}).length) {
|
|
334
334
|
if (item.itemInfo.properties.altitude._length) {
|
|
335
335
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
336
|
-
distLine = (0,
|
|
336
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
337
337
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
338
|
-
distLine = (0,
|
|
338
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
339
339
|
}
|
|
340
|
-
var _itemHeight = (0,
|
|
341
|
-
var itemAltitude = (0,
|
|
340
|
+
var _itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
|
|
341
|
+
var itemAltitude = (0, _convertUnitsLite.convert)(item.size.altitude).from(scene.unit).to(layer.unit);
|
|
342
342
|
rulerLines.push({
|
|
343
343
|
v0: {
|
|
344
344
|
x: -width / 2,
|
|
@@ -363,7 +363,7 @@ function Layer3D(_ref) {
|
|
|
363
363
|
text: (0, _math.formatNumber)(_itemHeight, _constants.DECIMAL_PLACES_2),
|
|
364
364
|
space: rulerSpace + +distLine * scale + left_count * lineSpace
|
|
365
365
|
});
|
|
366
|
-
if (ceilHeight - (itemAltitude + _itemHeight) > (0,
|
|
366
|
+
if (ceilHeight - (itemAltitude + _itemHeight) > (0, _convertUnitsLite.convert)(_constants.DELTA).from(toler_unit).to(layer.unit)) {
|
|
367
367
|
rulerLines.push({
|
|
368
368
|
v0: {
|
|
369
369
|
x: -width / 2,
|
|
@@ -380,9 +380,9 @@ function Layer3D(_ref) {
|
|
|
380
380
|
left_count++;
|
|
381
381
|
} else {
|
|
382
382
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
383
|
-
distLine = (0,
|
|
383
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
384
384
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
385
|
-
distLine = (0,
|
|
385
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
386
386
|
}
|
|
387
387
|
rulerLines.push({
|
|
388
388
|
v0: {
|
|
@@ -499,4 +499,5 @@ function Layer3D(_ref) {
|
|
|
499
499
|
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
500
500
|
opacity: layer.opacity
|
|
501
501
|
}, rulerData);
|
|
502
|
-
}
|
|
502
|
+
}
|
|
503
|
+
module.exports = exports.default;
|
|
@@ -1,18 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports["default"] = Ruler3D;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
9
|
var _react = _interopRequireDefault(require("react"));
|
|
8
10
|
var _constants = require("../../../constants");
|
|
9
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
10
|
-
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
11
11
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
12
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
|
|
13
|
-
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
14
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
15
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
12
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
16
13
|
function Ruler3D(_ref) {
|
|
17
14
|
var layer = _ref.layer,
|
|
18
15
|
line = _ref.line,
|
|
@@ -231,4 +228,5 @@ function Ruler3D(_ref) {
|
|
|
231
228
|
}));
|
|
232
229
|
}
|
|
233
230
|
} else return null;
|
|
234
|
-
}
|
|
231
|
+
}
|
|
232
|
+
module.exports = exports.default;
|
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports.compareVertices = compareVertices;
|
|
7
8
|
exports["default"] = Scene3D;
|
|
8
9
|
var _react = _interopRequireDefault(require("react"));
|
|
9
|
-
var _export = require("../../../utils/export");
|
|
10
|
-
var _helper = require("../../..//utils/helper");
|
|
11
10
|
var _geometry = require("../../../utils/geometry");
|
|
12
|
-
var
|
|
11
|
+
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
13
12
|
var _layer3D = _interopRequireDefault(require("./layer3D"));
|
|
14
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
15
13
|
function compareVertices(v0, v1) {
|
|
16
14
|
return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
|
|
17
15
|
}
|
|
@@ -23,12 +21,13 @@ function Scene3D(_ref) {
|
|
|
23
21
|
mode = _ref.mode,
|
|
24
22
|
downloadFlag = _ref.downloadFlag;
|
|
25
23
|
var layers = scene.layers;
|
|
24
|
+
console.log(layers.toJS());
|
|
26
25
|
var selectedLayer = layers.get(scene.selectedLayer);
|
|
27
26
|
var ceilHeight = selectedLayer.ceilHeight;
|
|
28
27
|
var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
|
|
29
28
|
var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
|
|
30
29
|
var vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));
|
|
31
|
-
var lineLength = (0,
|
|
30
|
+
var lineLength = (0, _convertUnitsLite.convert)((0, _geometry.verticesDistance)(vertex0, vertex1)).from(scene.unit).to(selectedLayer.unit);
|
|
32
31
|
var multi = downloadFlag ? 0.85 : 0.6;
|
|
33
32
|
var scale = Math.min(width * multi / lineLength, height * multi / ceilHeight);
|
|
34
33
|
var frontRect = {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports["default"] = State3D;
|
|
7
8
|
var _react = _interopRequireDefault(require("react"));
|
|
8
9
|
var _scene3D = _interopRequireDefault(require("./scene3D"));
|
|
9
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
10
10
|
function State3D(_ref) {
|
|
11
11
|
var state = _ref.state,
|
|
12
12
|
catalog = _ref.catalog,
|
|
@@ -22,4 +22,5 @@ function State3D(_ref) {
|
|
|
22
22
|
mode: state.get('mode'),
|
|
23
23
|
downloadFlag: downloadFlag
|
|
24
24
|
}));
|
|
25
|
-
}
|
|
25
|
+
}
|
|
26
|
+
module.exports = exports.default;
|