kitchen-simulator 1.1.1-test.60 → 1.1.1-test.61
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 +10 -2
- package/es/AppContext.js +10 -3
- package/es/KitchenConfigurator.js +92 -96
- package/es/KitchenConfiguratorApp.js +143 -136
- package/es/actions/area-actions.js +12 -5
- package/es/actions/export.js +29 -12
- package/es/actions/groups-actions.js +45 -27
- package/es/actions/holes-actions.js +55 -34
- package/es/actions/items-actions.js +145 -94
- package/es/actions/lines-actions.js +36 -21
- package/es/actions/project-actions.js +145 -94
- package/es/actions/scene-actions.js +21 -11
- package/es/actions/vertices-actions.js +15 -7
- package/es/actions/viewer2d-actions.js +36 -21
- package/es/actions/viewer3d-actions.js +18 -9
- package/es/catalog/areas/area/planner-element.js +9 -2
- package/es/catalog/catalog.js +21 -24
- package/es/catalog/factories/area-factory-3d.js +31 -22
- package/es/catalog/factories/area-factory.js +20 -14
- package/es/catalog/factories/export.js +24 -6
- package/es/catalog/factories/wall-factory-3d.js +41 -31
- package/es/catalog/factories/wall-factory.js +31 -21
- package/es/catalog/holes/door-closet/planner-element.js +24 -15
- package/es/catalog/holes/door-double/planner-element.js +24 -15
- package/es/catalog/holes/door-exterior/planner-element.js +25 -16
- package/es/catalog/holes/door-interior/planner-element.js +25 -16
- package/es/catalog/holes/door-panic/planner-element.js +16 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +24 -15
- package/es/catalog/holes/door-sliding/planner-element.js +25 -16
- package/es/catalog/holes/doorway-framed/planner-element.js +20 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +16 -7
- package/es/catalog/holes/export.js +97 -13
- package/es/catalog/holes/window-clear/planner-element.js +19 -10
- package/es/catalog/holes/window-cross/planner-element.js +19 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +19 -10
- package/es/catalog/holes/window-vertical/planner-element.js +19 -10
- package/es/catalog/lines/wall/planner-element.js +9 -2
- package/es/catalog/molding/molding-dcm/planner-element.js +14 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +14 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +14 -5
- package/es/catalog/properties/export.js +80 -20
- package/es/catalog/properties/property-checkbox.js +31 -27
- package/es/catalog/properties/property-color.js +23 -16
- package/es/catalog/properties/property-enum.js +31 -29
- package/es/catalog/properties/property-hidden.js +16 -9
- package/es/catalog/properties/property-lenght-measure.js +45 -39
- package/es/catalog/properties/property-length-measure.js +43 -42
- package/es/catalog/properties/property-length-measure_hole.js +45 -39
- package/es/catalog/properties/property-number.js +24 -17
- package/es/catalog/properties/property-read-only.js +23 -16
- package/es/catalog/properties/property-string.js +23 -16
- package/es/catalog/properties/property-toggle.js +23 -16
- package/es/catalog/properties/shared-property-style.js +7 -1
- package/es/catalog/utils/FuseUtils.js +15 -11
- package/es/catalog/utils/exporter.js +15 -11
- package/es/catalog/utils/geom-utils.js +29 -13
- package/es/catalog/utils/item-loader.js +97 -91
- package/es/catalog/utils/load-obj.js +28 -20
- package/es/catalog/utils/mtl-loader.js +8 -3
- package/es/catalog/utils/obj-loader.js +8 -3
- package/es/class/FuseUtils.js +15 -11
- package/es/class/area.js +28 -26
- package/es/class/export.js +95 -23
- package/es/class/group.js +59 -62
- package/es/class/guide.js +21 -19
- package/es/class/hole.js +89 -87
- package/es/class/item.js +147 -150
- package/es/class/layer.js +65 -63
- package/es/class/line.js +143 -144
- package/es/class/project.js +98 -94
- package/es/class/vertex.js +35 -33
- package/es/components/content.js +28 -19
- package/es/components/disclaimer/disclaimer.js +18 -10
- package/es/components/export.js +32 -8
- package/es/components/style/button.js +31 -30
- package/es/components/style/cancel-button.js +14 -8
- package/es/components/style/content-container.js +16 -12
- package/es/components/style/content-title.js +20 -15
- package/es/components/style/delete-button.js +17 -9
- package/es/components/style/export.js +120 -30
- package/es/components/style/form-block.js +15 -12
- package/es/components/style/form-color-input.js +14 -8
- package/es/components/style/form-label.js +15 -12
- package/es/components/style/form-number-input.js +49 -47
- package/es/components/style/form-number-input_2.js +44 -42
- package/es/components/style/form-select.js +24 -26
- package/es/components/style/form-slider.js +17 -11
- package/es/components/style/form-submit-button.js +17 -9
- package/es/components/style/form-text-input.js +34 -33
- package/es/components/viewer2d/area.js +24 -17
- package/es/components/viewer2d/export.js +120 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +17 -10
- package/es/components/viewer2d/grids/grid-streak.js +17 -10
- package/es/components/viewer2d/grids/grid-vertical-streak.js +17 -10
- package/es/components/viewer2d/grids/grids.js +19 -15
- package/es/components/viewer2d/group.js +24 -15
- package/es/components/viewer2d/item.js +70 -66
- package/es/components/viewer2d/layer.js +30 -23
- package/es/components/viewer2d/line.js +111 -101
- package/es/components/viewer2d/ruler.js +29 -22
- package/es/components/viewer2d/rulerDist.js +28 -21
- package/es/components/viewer2d/rulerX.js +47 -45
- package/es/components/viewer2d/rulerY.js +45 -43
- package/es/components/viewer2d/scene.js +41 -45
- package/es/components/viewer2d/snap.js +22 -13
- package/es/components/viewer2d/state.js +27 -23
- package/es/components/viewer2d/utils.js +37 -29
- package/es/components/viewer2d/vertex.js +17 -8
- package/es/components/viewer2d/viewer2d.js +163 -164
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +23 -24
- package/es/components/viewer3d/dcm.js +7 -1
- package/es/components/viewer3d/fbm.js +7 -1
- package/es/components/viewer3d/front3D.js +21 -17
- package/es/components/viewer3d/grid-creator.js +17 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +14 -6
- package/es/components/viewer3d/grids/grid-streak.js +13 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +14 -6
- package/es/components/viewer3d/libs/first-person-controls.js +9 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +7 -1
- package/es/components/viewer3d/libs/mtl-loader.js +7 -1
- package/es/components/viewer3d/libs/obj-loader.js +7 -1
- package/es/components/viewer3d/libs/orbit-controls.js +8 -2
- package/es/components/viewer3d/libs/pointer-lock-controls.js +8 -2
- package/es/components/viewer3d/lrm.js +7 -1
- package/es/components/viewer3d/model.js +7 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +10 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +25 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +66 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +46 -42
- package/es/components/viewer3d/ruler-utils/scene3D.js +17 -9
- package/es/components/viewer3d/ruler-utils/state3D.js +11 -4
- package/es/components/viewer3d/scene-creator.js +227 -198
- package/es/components/viewer3d/three-memory-cleaner.js +12 -3
- package/es/components/viewer3d/viewer3d-first-person.js +46 -46
- package/es/components/viewer3d/viewer3d.js +202 -202
- package/es/constants.js +358 -349
- package/es/index.js +13 -6
- package/es/models.js +184 -183
- package/es/plugins/SVGLoader.js +53 -48
- package/es/plugins/autosave.js +9 -3
- package/es/plugins/console-debugger.js +12 -8
- package/es/plugins/export.js +32 -8
- package/es/plugins/keyboard.js +35 -29
- package/es/reducers/areas-reducer.js +13 -7
- package/es/reducers/export.js +96 -24
- package/es/reducers/groups-reducer.js +37 -31
- package/es/reducers/holes-reducer.js +49 -43
- package/es/reducers/items-reducer.js +112 -106
- package/es/reducers/lines-reducer.js +34 -28
- package/es/reducers/project-reducer.js +111 -105
- package/es/reducers/reducer.js +23 -16
- package/es/reducers/scene-reducer.js +21 -15
- package/es/reducers/user-reducer.js +11 -5
- package/es/reducers/vertices-reducer.js +17 -11
- package/es/reducers/viewer2d-reducer.js +24 -18
- package/es/reducers/viewer3d-reducer.js +22 -16
- package/es/shared-style.js +16 -10
- package/es/styles/export.js +11 -3
- package/es/translator/en.js +7 -1
- package/es/translator/it.js +7 -1
- package/es/translator/ru.js +7 -1
- package/es/translator/translator.js +19 -17
- package/es/utils/browser.js +9 -2
- package/es/utils/convert-units-lite.js +7 -1
- package/es/utils/email-validator.js +7 -1
- package/es/utils/export.js +46 -15
- package/es/utils/geometry.js +278 -190
- package/es/utils/get-edges-of-subgraphs.js +9 -2
- package/es/utils/graph-cycles.js +11 -8
- package/es/utils/graph-inner-cycles.js +18 -10
- package/es/utils/graph.js +17 -13
- package/es/utils/helper.js +63 -41
- package/es/utils/history.js +15 -8
- package/es/utils/id-broker.js +15 -12
- package/es/utils/logger.js +7 -1
- package/es/utils/math.js +12 -5
- package/es/utils/molding.js +144 -125
- package/es/utils/name-generator.js +13 -11
- package/es/utils/objects-utils.js +19 -7
- package/es/utils/phone-validator.js +7 -1
- package/es/utils/process-black-list.js +10 -6
- package/es/utils/react-if.js +12 -6
- package/es/utils/snap-scene.js +34 -32
- package/es/utils/snap.js +59 -51
- package/es/utils/summarizeCart.js +7 -1
- package/es/utils/threeCSG.es6.js +22 -17
- package/es/version.js +7 -1
- package/lib/@history.js +1 -1
- package/lib/AppContext.js +1 -1
- package/lib/KitchenConfigurator.js +37 -49
- package/lib/KitchenConfiguratorApp.js +60 -61
- package/lib/actions/export.js +1 -1
- package/lib/catalog/areas/area/planner-element.js +1 -1
- package/lib/catalog/catalog.js +7 -15
- package/lib/catalog/factories/area-factory-3d.js +1 -1
- package/lib/catalog/factories/area-factory.js +4 -6
- package/lib/catalog/factories/export.js +1 -1
- package/lib/catalog/factories/wall-factory-3d.js +2 -2
- package/lib/catalog/factories/wall-factory.js +2 -2
- package/lib/catalog/holes/door-closet/planner-element.js +2 -2
- package/lib/catalog/holes/door-double/planner-element.js +2 -2
- package/lib/catalog/holes/door-exterior/planner-element.js +2 -2
- package/lib/catalog/holes/door-interior/planner-element.js +2 -2
- package/lib/catalog/holes/door-panic/planner-element.js +2 -2
- package/lib/catalog/holes/door-panic-double/planner-element.js +2 -2
- package/lib/catalog/holes/door-sliding/planner-element.js +2 -2
- package/lib/catalog/holes/doorway-framed/planner-element.js +2 -2
- package/lib/catalog/holes/doorway-frameless/planner-element.js +2 -2
- package/lib/catalog/holes/export.js +2 -2
- package/lib/catalog/holes/window-clear/planner-element.js +2 -2
- package/lib/catalog/holes/window-cross/planner-element.js +2 -2
- package/lib/catalog/holes/window-double-hung/planner-element.js +2 -2
- package/lib/catalog/holes/window-vertical/planner-element.js +2 -2
- package/lib/catalog/lines/wall/planner-element.js +1 -1
- package/lib/catalog/molding/molding-dcm/planner-element.js +2 -2
- package/lib/catalog/molding/molding-fbm/planner-element.js +2 -2
- package/lib/catalog/molding/molding-lrm/planner-element.js +2 -2
- package/lib/catalog/properties/export.js +1 -1
- package/lib/catalog/properties/property-checkbox.js +3 -6
- package/lib/catalog/properties/property-color.js +1 -1
- package/lib/catalog/properties/property-enum.js +4 -9
- package/lib/catalog/properties/property-hidden.js +1 -1
- package/lib/catalog/properties/property-lenght-measure.js +5 -6
- package/lib/catalog/properties/property-length-measure.js +7 -13
- package/lib/catalog/properties/property-length-measure_hole.js +5 -6
- package/lib/catalog/properties/property-number.js +1 -1
- package/lib/catalog/properties/property-read-only.js +1 -1
- package/lib/catalog/properties/property-string.js +1 -1
- package/lib/catalog/properties/property-toggle.js +1 -1
- package/lib/catalog/utils/FuseUtils.js +8 -10
- package/lib/catalog/utils/exporter.js +3 -5
- package/lib/catalog/utils/geom-utils.js +1 -1
- package/lib/catalog/utils/item-loader.js +9 -14
- package/lib/class/FuseUtils.js +8 -10
- package/lib/class/area.js +7 -10
- package/lib/class/export.js +1 -1
- package/lib/class/group.js +11 -19
- package/lib/class/guide.js +9 -12
- package/lib/class/hole.js +5 -8
- package/lib/class/item.js +10 -18
- package/lib/class/layer.js +5 -8
- package/lib/class/line.js +12 -19
- package/lib/class/project.js +8 -10
- package/lib/class/vertex.js +7 -10
- package/lib/components/content.js +2 -2
- package/lib/components/disclaimer/disclaimer.js +1 -1
- package/lib/components/export.js +1 -1
- package/lib/components/style/button.js +15 -21
- package/lib/components/style/cancel-button.js +5 -6
- package/lib/components/style/content-container.js +3 -6
- package/lib/components/style/content-title.js +8 -11
- package/lib/components/style/delete-button.js +6 -7
- package/lib/components/style/export.js +1 -1
- package/lib/components/style/form-block.js +7 -11
- package/lib/components/style/form-color-input.js +5 -6
- package/lib/components/style/form-label.js +7 -11
- package/lib/components/style/form-number-input.js +13 -18
- package/lib/components/style/form-number-input_2.js +13 -18
- package/lib/components/style/form-select.js +10 -19
- package/lib/components/style/form-slider.js +5 -6
- package/lib/components/style/form-submit-button.js +6 -7
- package/lib/components/style/form-text-input.js +17 -22
- package/lib/components/viewer2d/area.js +1 -1
- package/lib/components/viewer2d/export.js +1 -1
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +1 -1
- package/lib/components/viewer2d/grids/grid-streak.js +1 -1
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +1 -1
- package/lib/components/viewer2d/grids/grids.js +4 -9
- package/lib/components/viewer2d/group.js +2 -2
- package/lib/components/viewer2d/item.js +5 -10
- package/lib/components/viewer2d/layer.js +1 -1
- package/lib/components/viewer2d/line.js +2 -2
- package/lib/components/viewer2d/ruler.js +1 -1
- package/lib/components/viewer2d/rulerDist.js +1 -1
- package/lib/components/viewer2d/rulerX.js +13 -18
- package/lib/components/viewer2d/rulerY.js +13 -18
- package/lib/components/viewer2d/scene.js +21 -32
- package/lib/components/viewer2d/snap.js +2 -2
- package/lib/components/viewer2d/state.js +5 -10
- package/lib/components/viewer2d/utils.js +5 -9
- package/lib/components/viewer2d/vertex.js +2 -2
- package/lib/components/viewer2d/viewer2d.js +13 -23
- package/lib/components/viewer3d/camera-controls-module/camera-controls.module.js +14 -20
- package/lib/components/viewer3d/front3D.js +4 -9
- package/lib/components/viewer3d/grid-creator.js +2 -2
- package/lib/components/viewer3d/grids/grid-horizontal-streak.js +1 -1
- package/lib/components/viewer3d/grids/grid-streak.js +1 -1
- package/lib/components/viewer3d/grids/grid-vertical-streak.js +1 -1
- package/lib/components/viewer3d/pointer-lock-navigation.js +1 -1
- package/lib/components/viewer3d/ruler-utils/itemRect.js +1 -1
- package/lib/components/viewer3d/ruler-utils/layer3D.js +1 -1
- package/lib/components/viewer3d/ruler-utils/ruler3D.js +3 -6
- package/lib/components/viewer3d/ruler-utils/scene3D.js +1 -1
- package/lib/components/viewer3d/ruler-utils/state3D.js +1 -1
- package/lib/components/viewer3d/scene-creator.js +16 -21
- package/lib/components/viewer3d/three-memory-cleaner.js +1 -1
- package/lib/components/viewer3d/viewer3d-first-person.js +11 -16
- package/lib/components/viewer3d/viewer3d.js +15 -20
- package/lib/index.js +1 -1
- package/lib/models.js +51 -56
- package/lib/plugins/console-debugger.js +3 -6
- package/lib/plugins/export.js +1 -1
- package/lib/reducers/export.js +1 -1
- package/lib/styles/export.js +1 -1
- package/lib/translator/translator.js +5 -9
- package/lib/utils/export.js +2 -2
- package/lib/utils/geometry.js +11 -18
- package/lib/utils/graph-inner-cycles.js +1 -1
- package/lib/utils/graph.js +7 -10
- package/lib/utils/helper.js +7 -7
- package/lib/utils/history.js +1 -1
- package/lib/utils/id-broker.js +5 -8
- package/lib/utils/molding.js +14 -19
- package/lib/utils/name-generator.js +5 -8
- package/lib/utils/objects-utils.js +5 -3
- package/lib/utils/process-black-list.js +3 -5
- package/lib/utils/react-if.js +1 -1
- package/lib/utils/snap-scene.js +3 -7
- package/lib/utils/snap.js +22 -26
- package/lib/utils/threeCSG.es6.js +14 -14
- package/package.json +24 -18
|
@@ -1,11 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports["default"] = Layer3D;
|
|
8
|
+
var _react = _interopRequireDefault(require("react"));
|
|
9
|
+
var _ruler3D = _interopRequireDefault(require("./ruler3D"));
|
|
10
|
+
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
11
|
+
var _export = require("../../../utils/export");
|
|
12
|
+
var _utils = require("../../../components/viewer2d/utils");
|
|
13
|
+
var _constants = require("../../../constants");
|
|
14
|
+
var _math = require("../../../utils/math");
|
|
15
|
+
function Layer3D(_ref) {
|
|
9
16
|
var layer = _ref.layer,
|
|
10
17
|
frontRect = _ref.frontRect,
|
|
11
18
|
lineLength = _ref.lineLength,
|
|
@@ -65,8 +72,8 @@ export default function Layer3D(_ref) {
|
|
|
65
72
|
// determin if this line(vertex0, vertex1) is snapped into wall
|
|
66
73
|
var isSnapped = function isSnapped(vertex0, vertex1) {
|
|
67
74
|
var itemSnapped = false;
|
|
68
|
-
var delta = GeometryUtils.distancePointFromLineSegment(l0, l1, (vertex0.x + vertex1.x) / 2, (vertex0.y + vertex1.y) / 2);
|
|
69
|
-
if (delta < DISTANCE_EPSILON) {
|
|
75
|
+
var delta = _export.GeometryUtils.distancePointFromLineSegment(l0, l1, (vertex0.x + vertex1.x) / 2, (vertex0.y + vertex1.y) / 2);
|
|
76
|
+
if (delta < _constants.DISTANCE_EPSILON) {
|
|
70
77
|
itemSnapped = true;
|
|
71
78
|
}
|
|
72
79
|
return itemSnapped;
|
|
@@ -83,11 +90,11 @@ export default function Layer3D(_ref) {
|
|
|
83
90
|
};
|
|
84
91
|
var catid = item.type;
|
|
85
92
|
var cat = catalog.elements[catid];
|
|
86
|
-
if (!cat) cat = catalog.elements[returnReplaceableDeepSearchType(catid)];
|
|
87
|
-
var width = convert(item.properties.getIn(['width', '_length'])).from(item.properties.getIn(['width', '_unit'])).to(scene.unit);
|
|
88
|
-
var height = convert(item.properties.getIn(['height', '_length'])).from(item.properties.getIn(['height', '_unit'])).to(scene.unit);
|
|
89
|
-
var depth = convert(item.properties.getIn(['depth', '_length'])).from(item.properties.getIn(['depth', '_unit'])).to(scene.unit);
|
|
90
|
-
var altitude = convert(item.properties.getIn(['altitude', '_length'])).from(item.properties.getIn(['altitude', '_unit'])).to(scene.unit);
|
|
93
|
+
if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
|
|
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);
|
|
91
98
|
val.size = {
|
|
92
99
|
width: width,
|
|
93
100
|
height: height,
|
|
@@ -97,7 +104,7 @@ export default function Layer3D(_ref) {
|
|
|
97
104
|
val.layoutpos = cat && cat.info.layoutpos;
|
|
98
105
|
val.is_corner = cat && cat.info.is_corner;
|
|
99
106
|
val.item = item.toJS();
|
|
100
|
-
var calcrect = GeometryUtils.getCalcRectFromItem3D(val);
|
|
107
|
+
var calcrect = _export.GeometryUtils.getCalcRectFromItem3D(val);
|
|
101
108
|
if (isSnapped(calcrect.rect[3], calcrect.rect[2]) || isSnapped(calcrect.rect[2], calcrect.rect[1]) || isSnapped(calcrect.rect[0], calcrect.rect[3])) {
|
|
102
109
|
if (calcrect.itemInfo.properties.altitude.length) {
|
|
103
110
|
wallItems.push(calcrect);
|
|
@@ -121,29 +128,29 @@ export default function Layer3D(_ref) {
|
|
|
121
128
|
var vertex0, vertex1;
|
|
122
129
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
123
130
|
vertex0 = {
|
|
124
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
131
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
125
132
|
y: height / 2
|
|
126
133
|
};
|
|
127
134
|
vertex1 = {
|
|
128
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
135
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
129
136
|
y: height / 2
|
|
130
137
|
};
|
|
131
138
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
132
139
|
vertex0 = {
|
|
133
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
140
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
134
141
|
y: height / 2
|
|
135
142
|
};
|
|
136
143
|
vertex1 = {
|
|
137
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
144
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
138
145
|
y: height / 2
|
|
139
146
|
};
|
|
140
147
|
} else if (isSnapped(item.rect[0], item.rect[3])) {
|
|
141
148
|
vertex0 = {
|
|
142
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
149
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
143
150
|
y: height / 2
|
|
144
151
|
};
|
|
145
152
|
vertex1 = {
|
|
146
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
153
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
147
154
|
y: height / 2
|
|
148
155
|
};
|
|
149
156
|
}
|
|
@@ -170,29 +177,29 @@ export default function Layer3D(_ref) {
|
|
|
170
177
|
var vertex0, vertex1;
|
|
171
178
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
172
179
|
vertex0 = {
|
|
173
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
180
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
174
181
|
y: -height / 2
|
|
175
182
|
};
|
|
176
183
|
vertex1 = {
|
|
177
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
184
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
178
185
|
y: -height / 2
|
|
179
186
|
};
|
|
180
187
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
181
188
|
vertex0 = {
|
|
182
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
189
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
183
190
|
y: -height / 2
|
|
184
191
|
};
|
|
185
192
|
vertex1 = {
|
|
186
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
193
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
187
194
|
y: -height / 2
|
|
188
195
|
};
|
|
189
196
|
} else if (isSnapped(item.rect[0], item.rect[3])) {
|
|
190
197
|
vertex0 = {
|
|
191
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
198
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
192
199
|
y: -height / 2
|
|
193
200
|
};
|
|
194
201
|
vertex1 = {
|
|
195
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
202
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
196
203
|
y: -height / 2
|
|
197
204
|
};
|
|
198
205
|
}
|
|
@@ -225,7 +232,7 @@ export default function Layer3D(_ref) {
|
|
|
225
232
|
leftItems.forEach(function (item, idx) {
|
|
226
233
|
var forwardItems = [];
|
|
227
234
|
var distLine = 0;
|
|
228
|
-
var itemHeight = convert(item.size.height).from(scene.unit).to(layer.unit);
|
|
235
|
+
var itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
|
|
229
236
|
for (var i = 0; i < idx; i++) {
|
|
230
237
|
forwardItems.push(leftItems[i]);
|
|
231
238
|
}
|
|
@@ -234,12 +241,12 @@ export default function Layer3D(_ref) {
|
|
|
234
241
|
}).length) {
|
|
235
242
|
if (item.itemInfo.properties.altitude._length) {
|
|
236
243
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
237
|
-
distLine = convert(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
244
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
238
245
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
239
|
-
distLine = convert(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
246
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
240
247
|
}
|
|
241
|
-
var itemAltitude = convert(item.size.altitude).from(scene.unit).to(layer.unit);
|
|
242
|
-
if (ceilHeight - (itemAltitude + itemHeight) > convert(DELTA).from(toler_unit).to(layer.unit)) {
|
|
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)) {
|
|
243
250
|
rulerLines.push({
|
|
244
251
|
v0: {
|
|
245
252
|
x: width / 2,
|
|
@@ -249,7 +256,7 @@ export default function Layer3D(_ref) {
|
|
|
249
256
|
x: width / 2,
|
|
250
257
|
y: height / 2 - (itemHeight + itemAltitude) * scale
|
|
251
258
|
},
|
|
252
|
-
text: formatNumber(ceilHeight - (itemAltitude + itemHeight), DECIMAL_PLACES_2),
|
|
259
|
+
text: (0, _math.formatNumber)(ceilHeight - (itemAltitude + itemHeight), _constants.DECIMAL_PLACES_2),
|
|
253
260
|
space: rulerSpace + right_count * lineSpace
|
|
254
261
|
});
|
|
255
262
|
}
|
|
@@ -262,7 +269,7 @@ export default function Layer3D(_ref) {
|
|
|
262
269
|
x: width / 2 - distLine * scale,
|
|
263
270
|
y: height / 2 - itemAltitude * scale
|
|
264
271
|
},
|
|
265
|
-
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
272
|
+
text: (0, _math.formatNumber)(itemHeight, _constants.DECIMAL_PLACES_2),
|
|
266
273
|
space: rulerSpace + distLine * scale + right_count * lineSpace
|
|
267
274
|
});
|
|
268
275
|
rulerLines.push({
|
|
@@ -274,15 +281,15 @@ export default function Layer3D(_ref) {
|
|
|
274
281
|
x: width / 2,
|
|
275
282
|
y: height / 2
|
|
276
283
|
},
|
|
277
|
-
text: formatNumber(itemAltitude, DECIMAL_PLACES_2),
|
|
284
|
+
text: (0, _math.formatNumber)(itemAltitude, _constants.DECIMAL_PLACES_2),
|
|
278
285
|
space: rulerSpace + right_count * lineSpace
|
|
279
286
|
});
|
|
280
287
|
right_count++;
|
|
281
288
|
} else {
|
|
282
289
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
283
|
-
distLine = convert(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
290
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
284
291
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
285
|
-
distLine = convert(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
292
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
286
293
|
}
|
|
287
294
|
rulerLines.push({
|
|
288
295
|
v0: {
|
|
@@ -293,7 +300,7 @@ export default function Layer3D(_ref) {
|
|
|
293
300
|
x: -width / 2 + distLine * scale,
|
|
294
301
|
y: height / 2 - itemHeight * scale
|
|
295
302
|
},
|
|
296
|
-
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
303
|
+
text: (0, _math.formatNumber)(itemHeight, _constants.DECIMAL_PLACES_2),
|
|
297
304
|
space: rulerSpace + distLine * scale + left_count * lineSpace
|
|
298
305
|
});
|
|
299
306
|
rulerLines.push({
|
|
@@ -305,7 +312,7 @@ export default function Layer3D(_ref) {
|
|
|
305
312
|
x: -width / 2,
|
|
306
313
|
y: -height / 2
|
|
307
314
|
},
|
|
308
|
-
text: formatNumber(ceilHeight - itemHeight, DECIMAL_PLACES_2),
|
|
315
|
+
text: (0, _math.formatNumber)(ceilHeight - itemHeight, _constants.DECIMAL_PLACES_2),
|
|
309
316
|
space: rulerSpace + left_count * lineSpace
|
|
310
317
|
});
|
|
311
318
|
left_count++;
|
|
@@ -317,7 +324,7 @@ export default function Layer3D(_ref) {
|
|
|
317
324
|
rightItems.forEach(function (item, idx) {
|
|
318
325
|
var forwardItems = [];
|
|
319
326
|
var distLine = 0;
|
|
320
|
-
var itemHeight = convert(item.size.height).from(scene.unit).to(layer.unit);
|
|
327
|
+
var itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
|
|
321
328
|
for (var i = 0; i < idx; i++) {
|
|
322
329
|
forwardItems.push(rightItems[i]);
|
|
323
330
|
}
|
|
@@ -326,12 +333,12 @@ export default function Layer3D(_ref) {
|
|
|
326
333
|
}).length) {
|
|
327
334
|
if (item.itemInfo.properties.altitude._length) {
|
|
328
335
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
329
|
-
distLine = convert(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
336
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
330
337
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
331
|
-
distLine = convert(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
338
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
332
339
|
}
|
|
333
|
-
var _itemHeight = convert(item.size.height).from(scene.unit).to(layer.unit);
|
|
334
|
-
var itemAltitude = convert(item.size.altitude).from(scene.unit).to(layer.unit);
|
|
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);
|
|
335
342
|
rulerLines.push({
|
|
336
343
|
v0: {
|
|
337
344
|
x: -width / 2,
|
|
@@ -341,7 +348,7 @@ export default function Layer3D(_ref) {
|
|
|
341
348
|
x: -width / 2,
|
|
342
349
|
y: height / 2 - itemAltitude * scale
|
|
343
350
|
},
|
|
344
|
-
text: formatNumber(itemAltitude, DECIMAL_PLACES_2),
|
|
351
|
+
text: (0, _math.formatNumber)(itemAltitude, _constants.DECIMAL_PLACES_2),
|
|
345
352
|
space: rulerSpace + left_count * lineSpace
|
|
346
353
|
});
|
|
347
354
|
rulerLines.push({
|
|
@@ -353,10 +360,10 @@ export default function Layer3D(_ref) {
|
|
|
353
360
|
x: -width / 2 + distLine * scale,
|
|
354
361
|
y: height / 2 - (itemAltitude + _itemHeight) * scale
|
|
355
362
|
},
|
|
356
|
-
text: formatNumber(_itemHeight, DECIMAL_PLACES_2),
|
|
363
|
+
text: (0, _math.formatNumber)(_itemHeight, _constants.DECIMAL_PLACES_2),
|
|
357
364
|
space: rulerSpace + +distLine * scale + left_count * lineSpace
|
|
358
365
|
});
|
|
359
|
-
if (ceilHeight - (itemAltitude + _itemHeight) > convert(DELTA).from(toler_unit).to(layer.unit)) {
|
|
366
|
+
if (ceilHeight - (itemAltitude + _itemHeight) > (0, _convertUnitsLite.convert)(_constants.DELTA).from(toler_unit).to(layer.unit)) {
|
|
360
367
|
rulerLines.push({
|
|
361
368
|
v0: {
|
|
362
369
|
x: -width / 2,
|
|
@@ -366,16 +373,16 @@ export default function Layer3D(_ref) {
|
|
|
366
373
|
x: -width / 2,
|
|
367
374
|
y: -height / 2
|
|
368
375
|
},
|
|
369
|
-
text: formatNumber(ceilHeight - (itemAltitude + _itemHeight), DECIMAL_PLACES_2),
|
|
376
|
+
text: (0, _math.formatNumber)(ceilHeight - (itemAltitude + _itemHeight), _constants.DECIMAL_PLACES_2),
|
|
370
377
|
space: rulerSpace + left_count * lineSpace
|
|
371
378
|
});
|
|
372
379
|
}
|
|
373
380
|
left_count++;
|
|
374
381
|
} else {
|
|
375
382
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
376
|
-
distLine = convert(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
383
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
377
384
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
378
|
-
distLine = convert(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
385
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
379
386
|
}
|
|
380
387
|
rulerLines.push({
|
|
381
388
|
v0: {
|
|
@@ -386,7 +393,7 @@ export default function Layer3D(_ref) {
|
|
|
386
393
|
x: width / 2,
|
|
387
394
|
y: height / 2 - itemHeight * scale
|
|
388
395
|
},
|
|
389
|
-
text: formatNumber(ceilHeight - itemHeight, DECIMAL_PLACES_2),
|
|
396
|
+
text: (0, _math.formatNumber)(ceilHeight - itemHeight, _constants.DECIMAL_PLACES_2),
|
|
390
397
|
space: rulerSpace + right_count * lineSpace
|
|
391
398
|
});
|
|
392
399
|
rulerLines.push({
|
|
@@ -398,7 +405,7 @@ export default function Layer3D(_ref) {
|
|
|
398
405
|
x: width / 2 - distLine * scale,
|
|
399
406
|
y: height / 2
|
|
400
407
|
},
|
|
401
|
-
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
408
|
+
text: (0, _math.formatNumber)(itemHeight, _constants.DECIMAL_PLACES_2),
|
|
402
409
|
space: rulerSpace + distLine * scale + right_count * lineSpace
|
|
403
410
|
});
|
|
404
411
|
right_count++;
|
|
@@ -440,7 +447,7 @@ export default function Layer3D(_ref) {
|
|
|
440
447
|
x: -width / 2,
|
|
441
448
|
y: height / 2
|
|
442
449
|
},
|
|
443
|
-
text: formatNumber(lineLength, DECIMAL_PLACES_2),
|
|
450
|
+
text: (0, _math.formatNumber)(lineLength, _constants.DECIMAL_PLACES_2),
|
|
444
451
|
space: rulerSpace + (baseItems.length ? lineSpace : 0)
|
|
445
452
|
});
|
|
446
453
|
rulerLines.push({
|
|
@@ -452,7 +459,7 @@ export default function Layer3D(_ref) {
|
|
|
452
459
|
x: width / 2,
|
|
453
460
|
y: -height / 2
|
|
454
461
|
},
|
|
455
|
-
text: formatNumber(lineLength, DECIMAL_PLACES_2),
|
|
462
|
+
text: (0, _math.formatNumber)(lineLength, _constants.DECIMAL_PLACES_2),
|
|
456
463
|
space: rulerSpace + (wallItems.length ? lineSpace : 0)
|
|
457
464
|
});
|
|
458
465
|
|
|
@@ -464,7 +471,7 @@ export default function Layer3D(_ref) {
|
|
|
464
471
|
v0: wallPosArray[i],
|
|
465
472
|
v1: wallPosArray[i + 1],
|
|
466
473
|
space: rulerSpace,
|
|
467
|
-
text: formatNumber(dist, DECIMAL_PLACES_2)
|
|
474
|
+
text: (0, _math.formatNumber)(dist, _constants.DECIMAL_PLACES_2)
|
|
468
475
|
});
|
|
469
476
|
}
|
|
470
477
|
}
|
|
@@ -477,19 +484,19 @@ export default function Layer3D(_ref) {
|
|
|
477
484
|
v0: basePosArray[j],
|
|
478
485
|
v1: basePosArray[j + 1],
|
|
479
486
|
space: rulerSpace,
|
|
480
|
-
text: formatNumber(_dist, DECIMAL_PLACES_2)
|
|
487
|
+
text: (0, _math.formatNumber)(_dist, _constants.DECIMAL_PLACES_2)
|
|
481
488
|
});
|
|
482
489
|
}
|
|
483
490
|
}
|
|
484
491
|
rulerLines.forEach(function (line) {
|
|
485
|
-
if (isNonZeroText(line.text)) rulerData.push(/*#__PURE__*/
|
|
492
|
+
if ((0, _math.isNonZeroText)(line.text)) rulerData.push(/*#__PURE__*/_react["default"].createElement(_ruler3D["default"], {
|
|
486
493
|
line: line,
|
|
487
494
|
layer: layer,
|
|
488
495
|
viewScale: viewScale,
|
|
489
496
|
downloadFlag: downloadFlag
|
|
490
497
|
}));
|
|
491
498
|
});
|
|
492
|
-
return /*#__PURE__*/
|
|
499
|
+
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
493
500
|
opacity: layer.opacity
|
|
494
501
|
}, rulerData);
|
|
495
502
|
}
|
|
@@ -1,19 +1,23 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports["default"] = Ruler3D;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
+
var _react = _interopRequireDefault(require("react"));
|
|
10
|
+
var _constants = require("../../../constants");
|
|
2
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; }
|
|
3
|
-
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) {
|
|
4
|
-
function
|
|
5
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
6
|
-
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); }
|
|
7
|
-
import React from 'react';
|
|
8
|
-
import { TEXT_COLOR_NEUTRAL_0, TEXT_COLOR_NEUTRAL_6 } from "../../../constants";
|
|
9
|
-
export default function Ruler3D(_ref) {
|
|
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; }
|
|
13
|
+
function Ruler3D(_ref) {
|
|
10
14
|
var layer = _ref.layer,
|
|
11
15
|
line = _ref.line,
|
|
12
16
|
viewScale = _ref.viewScale,
|
|
13
17
|
downloadFlag = _ref.downloadFlag;
|
|
14
18
|
var diagonalPointValue = 5 * viewScale;
|
|
15
19
|
var STYLE = {
|
|
16
|
-
stroke: TEXT_COLOR_NEUTRAL_6,
|
|
20
|
+
stroke: _constants.TEXT_COLOR_NEUTRAL_6,
|
|
17
21
|
strokeWidth: viewScale,
|
|
18
22
|
opacity: '0.6'
|
|
19
23
|
};
|
|
@@ -22,7 +26,7 @@ export default function Ruler3D(_ref) {
|
|
|
22
26
|
fontSize: downloadFlag ? 32 * viewScale : 16 * viewScale,
|
|
23
27
|
// fontWeight: "bold",
|
|
24
28
|
pointerEvents: 'none',
|
|
25
|
-
fill: TEXT_COLOR_NEUTRAL_6,
|
|
29
|
+
fill: _constants.TEXT_COLOR_NEUTRAL_6,
|
|
26
30
|
//http://stackoverflow.com/questions/826782/how-to-disable-text-selection-highlighting-using-css
|
|
27
31
|
WebkitTouchCallout: 'none' /* iOS Safari */,
|
|
28
32
|
WebkitUserSelect: 'none' /* Chrome/Safari/Opera */,
|
|
@@ -41,43 +45,43 @@ export default function Ruler3D(_ref) {
|
|
|
41
45
|
var textLength = (text.length + layer.unit.length) * 18 * viewScale;
|
|
42
46
|
if (v0.y === v1.y) {
|
|
43
47
|
if (v0.x < v1.x) {
|
|
44
|
-
return /*#__PURE__*/
|
|
48
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
45
49
|
x1: v0.x,
|
|
46
50
|
y1: v0.y,
|
|
47
51
|
x2: v0.x,
|
|
48
52
|
y2: v0.y - space,
|
|
49
53
|
style: STYLE
|
|
50
|
-
}), /*#__PURE__*/
|
|
54
|
+
}), /*#__PURE__*/_react["default"].createElement("g", {
|
|
51
55
|
transform: "translate(".concat(v0.x, ", ").concat(v0.y - space, ")")
|
|
52
|
-
}, /*#__PURE__*/
|
|
56
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
53
57
|
x1: -diagonalPointValue,
|
|
54
58
|
y1: -diagonalPointValue,
|
|
55
59
|
x2: diagonalPointValue,
|
|
56
60
|
y2: diagonalPointValue,
|
|
57
61
|
style: STYLE
|
|
58
|
-
}), /*#__PURE__*/
|
|
62
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
59
63
|
x1: 0,
|
|
60
64
|
y1: 0,
|
|
61
65
|
x2: textLength > length ? 0 : (length - textLength) / 2,
|
|
62
66
|
y2: 0,
|
|
63
67
|
style: STYLE
|
|
64
|
-
}), /*#__PURE__*/
|
|
68
|
+
}), /*#__PURE__*/_react["default"].createElement("text", {
|
|
65
69
|
x: length / 2,
|
|
66
70
|
y: "3",
|
|
67
71
|
style: STYLE_TEXT
|
|
68
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
72
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/_react["default"].createElement("line", {
|
|
69
73
|
x1: length,
|
|
70
74
|
y1: 0,
|
|
71
75
|
x2: textLength > length ? length : (length + textLength) / 2,
|
|
72
76
|
y2: 0,
|
|
73
77
|
style: STYLE
|
|
74
|
-
}), /*#__PURE__*/
|
|
78
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
75
79
|
x1: length - diagonalPointValue,
|
|
76
80
|
y1: -diagonalPointValue,
|
|
77
81
|
x2: length + diagonalPointValue,
|
|
78
82
|
y2: diagonalPointValue,
|
|
79
83
|
style: STYLE
|
|
80
|
-
})), /*#__PURE__*/
|
|
84
|
+
})), /*#__PURE__*/_react["default"].createElement("line", {
|
|
81
85
|
x1: v1.x,
|
|
82
86
|
y1: v1.y,
|
|
83
87
|
x2: v1.x,
|
|
@@ -85,43 +89,43 @@ export default function Ruler3D(_ref) {
|
|
|
85
89
|
style: STYLE
|
|
86
90
|
}));
|
|
87
91
|
} else {
|
|
88
|
-
return /*#__PURE__*/
|
|
92
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
89
93
|
x1: v0.x,
|
|
90
94
|
y1: v0.y,
|
|
91
95
|
x2: v0.x,
|
|
92
96
|
y2: v0.y + space,
|
|
93
97
|
style: STYLE
|
|
94
|
-
}), /*#__PURE__*/
|
|
98
|
+
}), /*#__PURE__*/_react["default"].createElement("g", {
|
|
95
99
|
transform: "translate(".concat(v0.x, ", ").concat(v0.y + space, ")")
|
|
96
|
-
}, /*#__PURE__*/
|
|
100
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
97
101
|
x1: -diagonalPointValue,
|
|
98
102
|
y1: -diagonalPointValue,
|
|
99
103
|
x2: diagonalPointValue,
|
|
100
104
|
y2: diagonalPointValue,
|
|
101
105
|
style: STYLE
|
|
102
|
-
}), /*#__PURE__*/
|
|
106
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
103
107
|
x1: 0,
|
|
104
108
|
y1: 0,
|
|
105
109
|
x2: textLength > length ? 0 : -(length - textLength) / 2,
|
|
106
110
|
y2: 0,
|
|
107
111
|
style: STYLE
|
|
108
|
-
}), /*#__PURE__*/
|
|
112
|
+
}), /*#__PURE__*/_react["default"].createElement("text", {
|
|
109
113
|
x: -length / 2,
|
|
110
114
|
y: "3",
|
|
111
115
|
style: STYLE_TEXT
|
|
112
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
116
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/_react["default"].createElement("line", {
|
|
113
117
|
x1: -length,
|
|
114
118
|
y1: 0,
|
|
115
119
|
x2: textLength > length ? -length : -(length + textLength) / 2,
|
|
116
120
|
y2: 0,
|
|
117
121
|
style: STYLE
|
|
118
|
-
}), /*#__PURE__*/
|
|
122
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
119
123
|
x1: -length - diagonalPointValue,
|
|
120
124
|
y1: -diagonalPointValue,
|
|
121
125
|
x2: -length + diagonalPointValue,
|
|
122
126
|
y2: diagonalPointValue,
|
|
123
127
|
style: STYLE
|
|
124
|
-
})), /*#__PURE__*/
|
|
128
|
+
})), /*#__PURE__*/_react["default"].createElement("line", {
|
|
125
129
|
x1: v1.x,
|
|
126
130
|
y1: v1.y,
|
|
127
131
|
x2: v1.x,
|
|
@@ -131,45 +135,45 @@ export default function Ruler3D(_ref) {
|
|
|
131
135
|
}
|
|
132
136
|
} else if (v0.x = v1.x) {
|
|
133
137
|
if (v0.y < v1.y) {
|
|
134
|
-
return /*#__PURE__*/
|
|
138
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
135
139
|
x1: v0.x,
|
|
136
140
|
y1: v0.y,
|
|
137
141
|
x2: v0.x + space,
|
|
138
142
|
y2: v0.y,
|
|
139
143
|
style: STYLE
|
|
140
|
-
}), /*#__PURE__*/
|
|
144
|
+
}), /*#__PURE__*/_react["default"].createElement("g", {
|
|
141
145
|
transform: "translate(".concat(v0.x + space, ", ").concat(v0.y, ")")
|
|
142
|
-
}, /*#__PURE__*/
|
|
146
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
143
147
|
x1: -diagonalPointValue,
|
|
144
148
|
y1: -diagonalPointValue,
|
|
145
149
|
x2: diagonalPointValue,
|
|
146
150
|
y2: diagonalPointValue,
|
|
147
151
|
style: STYLE
|
|
148
|
-
}), /*#__PURE__*/
|
|
152
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
149
153
|
x1: 0,
|
|
150
154
|
y1: 0,
|
|
151
155
|
x2: 0,
|
|
152
156
|
y2: textLength > length ? 0 : (length - textLength) / 2,
|
|
153
157
|
style: STYLE
|
|
154
|
-
}), /*#__PURE__*/
|
|
158
|
+
}), /*#__PURE__*/_react["default"].createElement("text", {
|
|
155
159
|
x: length / 2,
|
|
156
160
|
y: 0,
|
|
157
161
|
style: _objectSpread(_objectSpread({}, STYLE_TEXT), {}, {
|
|
158
162
|
transform: 'rotate(90deg)'
|
|
159
163
|
})
|
|
160
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
164
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/_react["default"].createElement("line", {
|
|
161
165
|
x1: 0,
|
|
162
166
|
y1: length,
|
|
163
167
|
x2: 0,
|
|
164
168
|
y2: textLength > length ? length : (length + textLength) / 2,
|
|
165
169
|
style: STYLE
|
|
166
|
-
}), /*#__PURE__*/
|
|
170
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
167
171
|
x1: -diagonalPointValue,
|
|
168
172
|
y1: length - diagonalPointValue,
|
|
169
173
|
x2: diagonalPointValue,
|
|
170
174
|
y2: length + diagonalPointValue,
|
|
171
175
|
style: STYLE
|
|
172
|
-
})), /*#__PURE__*/
|
|
176
|
+
})), /*#__PURE__*/_react["default"].createElement("line", {
|
|
173
177
|
x1: v1.x,
|
|
174
178
|
y1: v1.y,
|
|
175
179
|
x2: v1.x + space,
|
|
@@ -177,45 +181,45 @@ export default function Ruler3D(_ref) {
|
|
|
177
181
|
style: STYLE
|
|
178
182
|
}));
|
|
179
183
|
} else {
|
|
180
|
-
return /*#__PURE__*/
|
|
184
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
181
185
|
x1: v0.x,
|
|
182
186
|
y1: v0.y,
|
|
183
187
|
x2: v0.x - space,
|
|
184
188
|
y2: v0.y,
|
|
185
189
|
style: STYLE
|
|
186
|
-
}), /*#__PURE__*/
|
|
190
|
+
}), /*#__PURE__*/_react["default"].createElement("g", {
|
|
187
191
|
transform: "translate(".concat(v0.x - space, ", ").concat(v0.y, ")")
|
|
188
|
-
}, /*#__PURE__*/
|
|
192
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
189
193
|
x1: -diagonalPointValue,
|
|
190
194
|
y1: -diagonalPointValue,
|
|
191
195
|
x2: diagonalPointValue,
|
|
192
196
|
y2: diagonalPointValue,
|
|
193
197
|
style: STYLE
|
|
194
|
-
}), /*#__PURE__*/
|
|
198
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
195
199
|
x1: 0,
|
|
196
200
|
y1: 0,
|
|
197
201
|
x2: 0,
|
|
198
202
|
y2: textLength > length ? 0 : -(length - textLength) / 2,
|
|
199
203
|
style: STYLE
|
|
200
|
-
}), /*#__PURE__*/
|
|
204
|
+
}), /*#__PURE__*/_react["default"].createElement("text", {
|
|
201
205
|
x: -length / 2,
|
|
202
206
|
y: 0,
|
|
203
207
|
style: _objectSpread(_objectSpread({}, STYLE_TEXT), {}, {
|
|
204
208
|
transform: 'rotate(90deg)'
|
|
205
209
|
})
|
|
206
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
210
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/_react["default"].createElement("line", {
|
|
207
211
|
x1: 0,
|
|
208
212
|
y1: -length,
|
|
209
213
|
x2: 0,
|
|
210
214
|
y2: textLength > length ? -length : -(length + textLength) / 2,
|
|
211
215
|
style: STYLE
|
|
212
|
-
}), /*#__PURE__*/
|
|
216
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
213
217
|
x1: -diagonalPointValue,
|
|
214
218
|
y1: -length - diagonalPointValue,
|
|
215
219
|
x2: diagonalPointValue,
|
|
216
220
|
y2: -length + diagonalPointValue,
|
|
217
221
|
style: STYLE
|
|
218
|
-
})), /*#__PURE__*/
|
|
222
|
+
})), /*#__PURE__*/_react["default"].createElement("line", {
|
|
219
223
|
x1: v1.x,
|
|
220
224
|
y1: v1.y,
|
|
221
225
|
x2: v1.x - space,
|
|
@@ -1,11 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.compareVertices = compareVertices;
|
|
8
|
+
exports["default"] = Scene3D;
|
|
9
|
+
var _react = _interopRequireDefault(require("react"));
|
|
10
|
+
var _geometry = require("../../../utils/geometry");
|
|
11
|
+
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
12
|
+
var _layer3D = _interopRequireDefault(require("./layer3D"));
|
|
13
|
+
function compareVertices(v0, v1) {
|
|
6
14
|
return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
|
|
7
15
|
}
|
|
8
|
-
|
|
16
|
+
function Scene3D(_ref) {
|
|
9
17
|
var scene = _ref.scene,
|
|
10
18
|
catalog = _ref.catalog,
|
|
11
19
|
width = _ref.width,
|
|
@@ -19,7 +27,7 @@ export default function Scene3D(_ref) {
|
|
|
19
27
|
var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
|
|
20
28
|
var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
|
|
21
29
|
var vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));
|
|
22
|
-
var lineLength = convert(verticesDistance(vertex0, vertex1)).from(scene.unit).to(selectedLayer.unit);
|
|
30
|
+
var lineLength = (0, _convertUnitsLite.convert)((0, _geometry.verticesDistance)(vertex0, vertex1)).from(scene.unit).to(selectedLayer.unit);
|
|
23
31
|
var multi = downloadFlag ? 0.85 : 0.6;
|
|
24
32
|
var scale = Math.min(width * multi / lineLength, height * multi / ceilHeight);
|
|
25
33
|
var frontRect = {
|
|
@@ -32,7 +40,7 @@ export default function Scene3D(_ref) {
|
|
|
32
40
|
for (var x = -width / 2; x <= width / 2; x = x + 30 * viewScale) {
|
|
33
41
|
for (var y = -height / 2; y <= height / 2; y = y + 30 * viewScale) {
|
|
34
42
|
if (Math.abs(x) > frontRect.width / 2 || Math.abs(y) > frontRect.height / 2) {
|
|
35
|
-
grids.push(/*#__PURE__*/
|
|
43
|
+
grids.push(/*#__PURE__*/_react["default"].createElement("circle", {
|
|
36
44
|
key: "grid_".concat(i),
|
|
37
45
|
cx: x,
|
|
38
46
|
cy: y,
|
|
@@ -43,7 +51,7 @@ export default function Scene3D(_ref) {
|
|
|
43
51
|
}
|
|
44
52
|
}
|
|
45
53
|
}
|
|
46
|
-
return /*#__PURE__*/
|
|
54
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, grids, /*#__PURE__*/_react["default"].createElement(_layer3D["default"], {
|
|
47
55
|
key: selectedLayer.id,
|
|
48
56
|
layer: selectedLayer,
|
|
49
57
|
frontRect: frontRect,
|