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,11 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
2
|
+
exports.__esModule = true;
|
|
3
|
+
exports["default"] = Layer3D;
|
|
4
|
+
var _react = _interopRequireDefault(require("react"));
|
|
5
|
+
var _ruler3D = _interopRequireDefault(require("./ruler3D"));
|
|
6
|
+
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
7
|
+
var _export = require("../../../utils/export");
|
|
8
|
+
var _utils = require("../../../components/viewer2d/utils");
|
|
9
|
+
var _constants = require("../../../constants");
|
|
10
|
+
var _math = require("../../../utils/math");
|
|
11
|
+
function Layer3D(_ref) {
|
|
9
12
|
var layer = _ref.layer,
|
|
10
13
|
frontRect = _ref.frontRect,
|
|
11
14
|
lineLength = _ref.lineLength,
|
|
@@ -65,8 +68,8 @@ export default function Layer3D(_ref) {
|
|
|
65
68
|
// determin if this line(vertex0, vertex1) is snapped into wall
|
|
66
69
|
var isSnapped = function isSnapped(vertex0, vertex1) {
|
|
67
70
|
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) {
|
|
71
|
+
var delta = _export.GeometryUtils.distancePointFromLineSegment(l0, l1, (vertex0.x + vertex1.x) / 2, (vertex0.y + vertex1.y) / 2);
|
|
72
|
+
if (delta < _constants.DISTANCE_EPSILON) {
|
|
70
73
|
itemSnapped = true;
|
|
71
74
|
}
|
|
72
75
|
return itemSnapped;
|
|
@@ -83,11 +86,11 @@ export default function Layer3D(_ref) {
|
|
|
83
86
|
};
|
|
84
87
|
var catid = item.type;
|
|
85
88
|
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);
|
|
89
|
+
if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
|
|
90
|
+
var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from(item.properties.getIn(['width', '_unit'])).to(scene.unit);
|
|
91
|
+
var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from(item.properties.getIn(['height', '_unit'])).to(scene.unit);
|
|
92
|
+
var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from(item.properties.getIn(['depth', '_unit'])).to(scene.unit);
|
|
93
|
+
var altitude = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from(item.properties.getIn(['altitude', '_unit'])).to(scene.unit);
|
|
91
94
|
val.size = {
|
|
92
95
|
width: width,
|
|
93
96
|
height: height,
|
|
@@ -97,7 +100,7 @@ export default function Layer3D(_ref) {
|
|
|
97
100
|
val.layoutpos = cat && cat.info.layoutpos;
|
|
98
101
|
val.is_corner = cat && cat.info.is_corner;
|
|
99
102
|
val.item = item.toJS();
|
|
100
|
-
var calcrect = GeometryUtils.getCalcRectFromItem3D(val);
|
|
103
|
+
var calcrect = _export.GeometryUtils.getCalcRectFromItem3D(val);
|
|
101
104
|
if (isSnapped(calcrect.rect[3], calcrect.rect[2]) || isSnapped(calcrect.rect[2], calcrect.rect[1]) || isSnapped(calcrect.rect[0], calcrect.rect[3])) {
|
|
102
105
|
if (calcrect.itemInfo.properties.altitude.length) {
|
|
103
106
|
wallItems.push(calcrect);
|
|
@@ -121,29 +124,29 @@ export default function Layer3D(_ref) {
|
|
|
121
124
|
var vertex0, vertex1;
|
|
122
125
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
123
126
|
vertex0 = {
|
|
124
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
127
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
125
128
|
y: height / 2
|
|
126
129
|
};
|
|
127
130
|
vertex1 = {
|
|
128
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
131
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
129
132
|
y: height / 2
|
|
130
133
|
};
|
|
131
134
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
132
135
|
vertex0 = {
|
|
133
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
136
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
134
137
|
y: height / 2
|
|
135
138
|
};
|
|
136
139
|
vertex1 = {
|
|
137
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
140
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
138
141
|
y: height / 2
|
|
139
142
|
};
|
|
140
143
|
} else if (isSnapped(item.rect[0], item.rect[3])) {
|
|
141
144
|
vertex0 = {
|
|
142
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
145
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
143
146
|
y: height / 2
|
|
144
147
|
};
|
|
145
148
|
vertex1 = {
|
|
146
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
149
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
147
150
|
y: height / 2
|
|
148
151
|
};
|
|
149
152
|
}
|
|
@@ -170,29 +173,29 @@ export default function Layer3D(_ref) {
|
|
|
170
173
|
var vertex0, vertex1;
|
|
171
174
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
172
175
|
vertex0 = {
|
|
173
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
176
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
174
177
|
y: -height / 2
|
|
175
178
|
};
|
|
176
179
|
vertex1 = {
|
|
177
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
180
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
178
181
|
y: -height / 2
|
|
179
182
|
};
|
|
180
183
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
181
184
|
vertex0 = {
|
|
182
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
185
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
183
186
|
y: -height / 2
|
|
184
187
|
};
|
|
185
188
|
vertex1 = {
|
|
186
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
189
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
187
190
|
y: -height / 2
|
|
188
191
|
};
|
|
189
192
|
} else if (isSnapped(item.rect[0], item.rect[3])) {
|
|
190
193
|
vertex0 = {
|
|
191
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
194
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
192
195
|
y: -height / 2
|
|
193
196
|
};
|
|
194
197
|
vertex1 = {
|
|
195
|
-
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
198
|
+
x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
196
199
|
y: -height / 2
|
|
197
200
|
};
|
|
198
201
|
}
|
|
@@ -225,7 +228,7 @@ export default function Layer3D(_ref) {
|
|
|
225
228
|
leftItems.forEach(function (item, idx) {
|
|
226
229
|
var forwardItems = [];
|
|
227
230
|
var distLine = 0;
|
|
228
|
-
var itemHeight = convert(item.size.height).from(scene.unit).to(layer.unit);
|
|
231
|
+
var itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
|
|
229
232
|
for (var i = 0; i < idx; i++) {
|
|
230
233
|
forwardItems.push(leftItems[i]);
|
|
231
234
|
}
|
|
@@ -234,12 +237,12 @@ export default function Layer3D(_ref) {
|
|
|
234
237
|
}).length) {
|
|
235
238
|
if (item.itemInfo.properties.altitude._length) {
|
|
236
239
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
237
|
-
distLine = convert(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
240
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
238
241
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
239
|
-
distLine = convert(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
242
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
240
243
|
}
|
|
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)) {
|
|
244
|
+
var itemAltitude = (0, _convertUnitsLite.convert)(item.size.altitude).from(scene.unit).to(layer.unit);
|
|
245
|
+
if (ceilHeight - (itemAltitude + itemHeight) > (0, _convertUnitsLite.convert)(_constants.DELTA).from(toler_unit).to(layer.unit)) {
|
|
243
246
|
rulerLines.push({
|
|
244
247
|
v0: {
|
|
245
248
|
x: width / 2,
|
|
@@ -249,7 +252,7 @@ export default function Layer3D(_ref) {
|
|
|
249
252
|
x: width / 2,
|
|
250
253
|
y: height / 2 - (itemHeight + itemAltitude) * scale
|
|
251
254
|
},
|
|
252
|
-
text: formatNumber(ceilHeight - (itemAltitude + itemHeight), DECIMAL_PLACES_2),
|
|
255
|
+
text: (0, _math.formatNumber)(ceilHeight - (itemAltitude + itemHeight), _constants.DECIMAL_PLACES_2),
|
|
253
256
|
space: rulerSpace + right_count * lineSpace
|
|
254
257
|
});
|
|
255
258
|
}
|
|
@@ -262,7 +265,7 @@ export default function Layer3D(_ref) {
|
|
|
262
265
|
x: width / 2 - distLine * scale,
|
|
263
266
|
y: height / 2 - itemAltitude * scale
|
|
264
267
|
},
|
|
265
|
-
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
268
|
+
text: (0, _math.formatNumber)(itemHeight, _constants.DECIMAL_PLACES_2),
|
|
266
269
|
space: rulerSpace + distLine * scale + right_count * lineSpace
|
|
267
270
|
});
|
|
268
271
|
rulerLines.push({
|
|
@@ -274,15 +277,15 @@ export default function Layer3D(_ref) {
|
|
|
274
277
|
x: width / 2,
|
|
275
278
|
y: height / 2
|
|
276
279
|
},
|
|
277
|
-
text: formatNumber(itemAltitude, DECIMAL_PLACES_2),
|
|
280
|
+
text: (0, _math.formatNumber)(itemAltitude, _constants.DECIMAL_PLACES_2),
|
|
278
281
|
space: rulerSpace + right_count * lineSpace
|
|
279
282
|
});
|
|
280
283
|
right_count++;
|
|
281
284
|
} else {
|
|
282
285
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
283
|
-
distLine = convert(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
286
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
284
287
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
285
|
-
distLine = convert(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
288
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
286
289
|
}
|
|
287
290
|
rulerLines.push({
|
|
288
291
|
v0: {
|
|
@@ -293,7 +296,7 @@ export default function Layer3D(_ref) {
|
|
|
293
296
|
x: -width / 2 + distLine * scale,
|
|
294
297
|
y: height / 2 - itemHeight * scale
|
|
295
298
|
},
|
|
296
|
-
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
299
|
+
text: (0, _math.formatNumber)(itemHeight, _constants.DECIMAL_PLACES_2),
|
|
297
300
|
space: rulerSpace + distLine * scale + left_count * lineSpace
|
|
298
301
|
});
|
|
299
302
|
rulerLines.push({
|
|
@@ -305,7 +308,7 @@ export default function Layer3D(_ref) {
|
|
|
305
308
|
x: -width / 2,
|
|
306
309
|
y: -height / 2
|
|
307
310
|
},
|
|
308
|
-
text: formatNumber(ceilHeight - itemHeight, DECIMAL_PLACES_2),
|
|
311
|
+
text: (0, _math.formatNumber)(ceilHeight - itemHeight, _constants.DECIMAL_PLACES_2),
|
|
309
312
|
space: rulerSpace + left_count * lineSpace
|
|
310
313
|
});
|
|
311
314
|
left_count++;
|
|
@@ -317,7 +320,7 @@ export default function Layer3D(_ref) {
|
|
|
317
320
|
rightItems.forEach(function (item, idx) {
|
|
318
321
|
var forwardItems = [];
|
|
319
322
|
var distLine = 0;
|
|
320
|
-
var itemHeight = convert(item.size.height).from(scene.unit).to(layer.unit);
|
|
323
|
+
var itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
|
|
321
324
|
for (var i = 0; i < idx; i++) {
|
|
322
325
|
forwardItems.push(rightItems[i]);
|
|
323
326
|
}
|
|
@@ -326,12 +329,12 @@ export default function Layer3D(_ref) {
|
|
|
326
329
|
}).length) {
|
|
327
330
|
if (item.itemInfo.properties.altitude._length) {
|
|
328
331
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
329
|
-
distLine = convert(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
332
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
330
333
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
331
|
-
distLine = convert(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
334
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
332
335
|
}
|
|
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);
|
|
336
|
+
var _itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
|
|
337
|
+
var itemAltitude = (0, _convertUnitsLite.convert)(item.size.altitude).from(scene.unit).to(layer.unit);
|
|
335
338
|
rulerLines.push({
|
|
336
339
|
v0: {
|
|
337
340
|
x: -width / 2,
|
|
@@ -341,7 +344,7 @@ export default function Layer3D(_ref) {
|
|
|
341
344
|
x: -width / 2,
|
|
342
345
|
y: height / 2 - itemAltitude * scale
|
|
343
346
|
},
|
|
344
|
-
text: formatNumber(itemAltitude, DECIMAL_PLACES_2),
|
|
347
|
+
text: (0, _math.formatNumber)(itemAltitude, _constants.DECIMAL_PLACES_2),
|
|
345
348
|
space: rulerSpace + left_count * lineSpace
|
|
346
349
|
});
|
|
347
350
|
rulerLines.push({
|
|
@@ -353,10 +356,10 @@ export default function Layer3D(_ref) {
|
|
|
353
356
|
x: -width / 2 + distLine * scale,
|
|
354
357
|
y: height / 2 - (itemAltitude + _itemHeight) * scale
|
|
355
358
|
},
|
|
356
|
-
text: formatNumber(_itemHeight, DECIMAL_PLACES_2),
|
|
359
|
+
text: (0, _math.formatNumber)(_itemHeight, _constants.DECIMAL_PLACES_2),
|
|
357
360
|
space: rulerSpace + +distLine * scale + left_count * lineSpace
|
|
358
361
|
});
|
|
359
|
-
if (ceilHeight - (itemAltitude + _itemHeight) > convert(DELTA).from(toler_unit).to(layer.unit)) {
|
|
362
|
+
if (ceilHeight - (itemAltitude + _itemHeight) > (0, _convertUnitsLite.convert)(_constants.DELTA).from(toler_unit).to(layer.unit)) {
|
|
360
363
|
rulerLines.push({
|
|
361
364
|
v0: {
|
|
362
365
|
x: -width / 2,
|
|
@@ -366,16 +369,16 @@ export default function Layer3D(_ref) {
|
|
|
366
369
|
x: -width / 2,
|
|
367
370
|
y: -height / 2
|
|
368
371
|
},
|
|
369
|
-
text: formatNumber(ceilHeight - (itemAltitude + _itemHeight), DECIMAL_PLACES_2),
|
|
372
|
+
text: (0, _math.formatNumber)(ceilHeight - (itemAltitude + _itemHeight), _constants.DECIMAL_PLACES_2),
|
|
370
373
|
space: rulerSpace + left_count * lineSpace
|
|
371
374
|
});
|
|
372
375
|
}
|
|
373
376
|
left_count++;
|
|
374
377
|
} else {
|
|
375
378
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
376
|
-
distLine = convert(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
379
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
377
380
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
378
|
-
distLine = convert(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
381
|
+
distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
379
382
|
}
|
|
380
383
|
rulerLines.push({
|
|
381
384
|
v0: {
|
|
@@ -386,7 +389,7 @@ export default function Layer3D(_ref) {
|
|
|
386
389
|
x: width / 2,
|
|
387
390
|
y: height / 2 - itemHeight * scale
|
|
388
391
|
},
|
|
389
|
-
text: formatNumber(ceilHeight - itemHeight, DECIMAL_PLACES_2),
|
|
392
|
+
text: (0, _math.formatNumber)(ceilHeight - itemHeight, _constants.DECIMAL_PLACES_2),
|
|
390
393
|
space: rulerSpace + right_count * lineSpace
|
|
391
394
|
});
|
|
392
395
|
rulerLines.push({
|
|
@@ -398,7 +401,7 @@ export default function Layer3D(_ref) {
|
|
|
398
401
|
x: width / 2 - distLine * scale,
|
|
399
402
|
y: height / 2
|
|
400
403
|
},
|
|
401
|
-
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
404
|
+
text: (0, _math.formatNumber)(itemHeight, _constants.DECIMAL_PLACES_2),
|
|
402
405
|
space: rulerSpace + distLine * scale + right_count * lineSpace
|
|
403
406
|
});
|
|
404
407
|
right_count++;
|
|
@@ -440,7 +443,7 @@ export default function Layer3D(_ref) {
|
|
|
440
443
|
x: -width / 2,
|
|
441
444
|
y: height / 2
|
|
442
445
|
},
|
|
443
|
-
text: formatNumber(lineLength, DECIMAL_PLACES_2),
|
|
446
|
+
text: (0, _math.formatNumber)(lineLength, _constants.DECIMAL_PLACES_2),
|
|
444
447
|
space: rulerSpace + (baseItems.length ? lineSpace : 0)
|
|
445
448
|
});
|
|
446
449
|
rulerLines.push({
|
|
@@ -452,7 +455,7 @@ export default function Layer3D(_ref) {
|
|
|
452
455
|
x: width / 2,
|
|
453
456
|
y: -height / 2
|
|
454
457
|
},
|
|
455
|
-
text: formatNumber(lineLength, DECIMAL_PLACES_2),
|
|
458
|
+
text: (0, _math.formatNumber)(lineLength, _constants.DECIMAL_PLACES_2),
|
|
456
459
|
space: rulerSpace + (wallItems.length ? lineSpace : 0)
|
|
457
460
|
});
|
|
458
461
|
|
|
@@ -464,7 +467,7 @@ export default function Layer3D(_ref) {
|
|
|
464
467
|
v0: wallPosArray[i],
|
|
465
468
|
v1: wallPosArray[i + 1],
|
|
466
469
|
space: rulerSpace,
|
|
467
|
-
text: formatNumber(dist, DECIMAL_PLACES_2)
|
|
470
|
+
text: (0, _math.formatNumber)(dist, _constants.DECIMAL_PLACES_2)
|
|
468
471
|
});
|
|
469
472
|
}
|
|
470
473
|
}
|
|
@@ -477,19 +480,19 @@ export default function Layer3D(_ref) {
|
|
|
477
480
|
v0: basePosArray[j],
|
|
478
481
|
v1: basePosArray[j + 1],
|
|
479
482
|
space: rulerSpace,
|
|
480
|
-
text: formatNumber(_dist, DECIMAL_PLACES_2)
|
|
483
|
+
text: (0, _math.formatNumber)(_dist, _constants.DECIMAL_PLACES_2)
|
|
481
484
|
});
|
|
482
485
|
}
|
|
483
486
|
}
|
|
484
487
|
rulerLines.forEach(function (line) {
|
|
485
|
-
if (isNonZeroText(line.text)) rulerData.push(/*#__PURE__*/
|
|
488
|
+
if ((0, _math.isNonZeroText)(line.text)) rulerData.push(/*#__PURE__*/_react["default"].createElement(_ruler3D["default"], {
|
|
486
489
|
line: line,
|
|
487
490
|
layer: layer,
|
|
488
491
|
viewScale: viewScale,
|
|
489
492
|
downloadFlag: downloadFlag
|
|
490
493
|
}));
|
|
491
494
|
});
|
|
492
|
-
return /*#__PURE__*/
|
|
495
|
+
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
493
496
|
opacity: layer.opacity
|
|
494
497
|
}, rulerData);
|
|
495
498
|
}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
2
|
+
exports.__esModule = true;
|
|
3
|
+
exports["default"] = Ruler3D;
|
|
4
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
5
|
+
var _react = _interopRequireDefault(require("react"));
|
|
6
|
+
var _constants = require("../../../constants");
|
|
7
|
+
function Ruler3D(_ref) {
|
|
7
8
|
var layer = _ref.layer,
|
|
8
9
|
line = _ref.line,
|
|
9
10
|
viewScale = _ref.viewScale,
|
|
10
11
|
downloadFlag = _ref.downloadFlag;
|
|
11
12
|
var diagonalPointValue = 5 * viewScale;
|
|
12
13
|
var STYLE = {
|
|
13
|
-
stroke: TEXT_COLOR_NEUTRAL_6,
|
|
14
|
+
stroke: _constants.TEXT_COLOR_NEUTRAL_6,
|
|
14
15
|
strokeWidth: viewScale,
|
|
15
16
|
opacity: '0.6'
|
|
16
17
|
};
|
|
@@ -19,7 +20,7 @@ export default function Ruler3D(_ref) {
|
|
|
19
20
|
fontSize: downloadFlag ? 32 * viewScale : 16 * viewScale,
|
|
20
21
|
// fontWeight: "bold",
|
|
21
22
|
pointerEvents: 'none',
|
|
22
|
-
fill: TEXT_COLOR_NEUTRAL_6,
|
|
23
|
+
fill: _constants.TEXT_COLOR_NEUTRAL_6,
|
|
23
24
|
//http://stackoverflow.com/questions/826782/how-to-disable-text-selection-highlighting-using-css
|
|
24
25
|
WebkitTouchCallout: 'none' /* iOS Safari */,
|
|
25
26
|
WebkitUserSelect: 'none' /* Chrome/Safari/Opera */,
|
|
@@ -38,43 +39,43 @@ export default function Ruler3D(_ref) {
|
|
|
38
39
|
var textLength = (text.length + layer.unit.length) * 18 * viewScale;
|
|
39
40
|
if (v0.y === v1.y) {
|
|
40
41
|
if (v0.x < v1.x) {
|
|
41
|
-
return /*#__PURE__*/
|
|
42
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
42
43
|
x1: v0.x,
|
|
43
44
|
y1: v0.y,
|
|
44
45
|
x2: v0.x,
|
|
45
46
|
y2: v0.y - space,
|
|
46
47
|
style: STYLE
|
|
47
|
-
}), /*#__PURE__*/
|
|
48
|
+
}), /*#__PURE__*/_react["default"].createElement("g", {
|
|
48
49
|
transform: "translate(".concat(v0.x, ", ").concat(v0.y - space, ")")
|
|
49
|
-
}, /*#__PURE__*/
|
|
50
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
50
51
|
x1: -diagonalPointValue,
|
|
51
52
|
y1: -diagonalPointValue,
|
|
52
53
|
x2: diagonalPointValue,
|
|
53
54
|
y2: diagonalPointValue,
|
|
54
55
|
style: STYLE
|
|
55
|
-
}), /*#__PURE__*/
|
|
56
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
56
57
|
x1: 0,
|
|
57
58
|
y1: 0,
|
|
58
59
|
x2: textLength > length ? 0 : (length - textLength) / 2,
|
|
59
60
|
y2: 0,
|
|
60
61
|
style: STYLE
|
|
61
|
-
}), /*#__PURE__*/
|
|
62
|
+
}), /*#__PURE__*/_react["default"].createElement("text", {
|
|
62
63
|
x: length / 2,
|
|
63
64
|
y: "3",
|
|
64
65
|
style: STYLE_TEXT
|
|
65
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
66
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/_react["default"].createElement("line", {
|
|
66
67
|
x1: length,
|
|
67
68
|
y1: 0,
|
|
68
69
|
x2: textLength > length ? length : (length + textLength) / 2,
|
|
69
70
|
y2: 0,
|
|
70
71
|
style: STYLE
|
|
71
|
-
}), /*#__PURE__*/
|
|
72
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
72
73
|
x1: length - diagonalPointValue,
|
|
73
74
|
y1: -diagonalPointValue,
|
|
74
75
|
x2: length + diagonalPointValue,
|
|
75
76
|
y2: diagonalPointValue,
|
|
76
77
|
style: STYLE
|
|
77
|
-
})), /*#__PURE__*/
|
|
78
|
+
})), /*#__PURE__*/_react["default"].createElement("line", {
|
|
78
79
|
x1: v1.x,
|
|
79
80
|
y1: v1.y,
|
|
80
81
|
x2: v1.x,
|
|
@@ -82,43 +83,43 @@ export default function Ruler3D(_ref) {
|
|
|
82
83
|
style: STYLE
|
|
83
84
|
}));
|
|
84
85
|
} else {
|
|
85
|
-
return /*#__PURE__*/
|
|
86
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
86
87
|
x1: v0.x,
|
|
87
88
|
y1: v0.y,
|
|
88
89
|
x2: v0.x,
|
|
89
90
|
y2: v0.y + space,
|
|
90
91
|
style: STYLE
|
|
91
|
-
}), /*#__PURE__*/
|
|
92
|
+
}), /*#__PURE__*/_react["default"].createElement("g", {
|
|
92
93
|
transform: "translate(".concat(v0.x, ", ").concat(v0.y + space, ")")
|
|
93
|
-
}, /*#__PURE__*/
|
|
94
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
94
95
|
x1: -diagonalPointValue,
|
|
95
96
|
y1: -diagonalPointValue,
|
|
96
97
|
x2: diagonalPointValue,
|
|
97
98
|
y2: diagonalPointValue,
|
|
98
99
|
style: STYLE
|
|
99
|
-
}), /*#__PURE__*/
|
|
100
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
100
101
|
x1: 0,
|
|
101
102
|
y1: 0,
|
|
102
103
|
x2: textLength > length ? 0 : -(length - textLength) / 2,
|
|
103
104
|
y2: 0,
|
|
104
105
|
style: STYLE
|
|
105
|
-
}), /*#__PURE__*/
|
|
106
|
+
}), /*#__PURE__*/_react["default"].createElement("text", {
|
|
106
107
|
x: -length / 2,
|
|
107
108
|
y: "3",
|
|
108
109
|
style: STYLE_TEXT
|
|
109
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
110
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/_react["default"].createElement("line", {
|
|
110
111
|
x1: -length,
|
|
111
112
|
y1: 0,
|
|
112
113
|
x2: textLength > length ? -length : -(length + textLength) / 2,
|
|
113
114
|
y2: 0,
|
|
114
115
|
style: STYLE
|
|
115
|
-
}), /*#__PURE__*/
|
|
116
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
116
117
|
x1: -length - diagonalPointValue,
|
|
117
118
|
y1: -diagonalPointValue,
|
|
118
119
|
x2: -length + diagonalPointValue,
|
|
119
120
|
y2: diagonalPointValue,
|
|
120
121
|
style: STYLE
|
|
121
|
-
})), /*#__PURE__*/
|
|
122
|
+
})), /*#__PURE__*/_react["default"].createElement("line", {
|
|
122
123
|
x1: v1.x,
|
|
123
124
|
y1: v1.y,
|
|
124
125
|
x2: v1.x,
|
|
@@ -128,45 +129,45 @@ export default function Ruler3D(_ref) {
|
|
|
128
129
|
}
|
|
129
130
|
} else if (v0.x = v1.x) {
|
|
130
131
|
if (v0.y < v1.y) {
|
|
131
|
-
return /*#__PURE__*/
|
|
132
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
132
133
|
x1: v0.x,
|
|
133
134
|
y1: v0.y,
|
|
134
135
|
x2: v0.x + space,
|
|
135
136
|
y2: v0.y,
|
|
136
137
|
style: STYLE
|
|
137
|
-
}), /*#__PURE__*/
|
|
138
|
+
}), /*#__PURE__*/_react["default"].createElement("g", {
|
|
138
139
|
transform: "translate(".concat(v0.x + space, ", ").concat(v0.y, ")")
|
|
139
|
-
}, /*#__PURE__*/
|
|
140
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
140
141
|
x1: -diagonalPointValue,
|
|
141
142
|
y1: -diagonalPointValue,
|
|
142
143
|
x2: diagonalPointValue,
|
|
143
144
|
y2: diagonalPointValue,
|
|
144
145
|
style: STYLE
|
|
145
|
-
}), /*#__PURE__*/
|
|
146
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
146
147
|
x1: 0,
|
|
147
148
|
y1: 0,
|
|
148
149
|
x2: 0,
|
|
149
150
|
y2: textLength > length ? 0 : (length - textLength) / 2,
|
|
150
151
|
style: STYLE
|
|
151
|
-
}), /*#__PURE__*/
|
|
152
|
+
}), /*#__PURE__*/_react["default"].createElement("text", {
|
|
152
153
|
x: length / 2,
|
|
153
154
|
y: 0,
|
|
154
|
-
style:
|
|
155
|
+
style: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, STYLE_TEXT), {}, {
|
|
155
156
|
transform: 'rotate(90deg)'
|
|
156
157
|
})
|
|
157
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
158
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/_react["default"].createElement("line", {
|
|
158
159
|
x1: 0,
|
|
159
160
|
y1: length,
|
|
160
161
|
x2: 0,
|
|
161
162
|
y2: textLength > length ? length : (length + textLength) / 2,
|
|
162
163
|
style: STYLE
|
|
163
|
-
}), /*#__PURE__*/
|
|
164
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
164
165
|
x1: -diagonalPointValue,
|
|
165
166
|
y1: length - diagonalPointValue,
|
|
166
167
|
x2: diagonalPointValue,
|
|
167
168
|
y2: length + diagonalPointValue,
|
|
168
169
|
style: STYLE
|
|
169
|
-
})), /*#__PURE__*/
|
|
170
|
+
})), /*#__PURE__*/_react["default"].createElement("line", {
|
|
170
171
|
x1: v1.x,
|
|
171
172
|
y1: v1.y,
|
|
172
173
|
x2: v1.x + space,
|
|
@@ -174,45 +175,45 @@ export default function Ruler3D(_ref) {
|
|
|
174
175
|
style: STYLE
|
|
175
176
|
}));
|
|
176
177
|
} else {
|
|
177
|
-
return /*#__PURE__*/
|
|
178
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
178
179
|
x1: v0.x,
|
|
179
180
|
y1: v0.y,
|
|
180
181
|
x2: v0.x - space,
|
|
181
182
|
y2: v0.y,
|
|
182
183
|
style: STYLE
|
|
183
|
-
}), /*#__PURE__*/
|
|
184
|
+
}), /*#__PURE__*/_react["default"].createElement("g", {
|
|
184
185
|
transform: "translate(".concat(v0.x - space, ", ").concat(v0.y, ")")
|
|
185
|
-
}, /*#__PURE__*/
|
|
186
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
186
187
|
x1: -diagonalPointValue,
|
|
187
188
|
y1: -diagonalPointValue,
|
|
188
189
|
x2: diagonalPointValue,
|
|
189
190
|
y2: diagonalPointValue,
|
|
190
191
|
style: STYLE
|
|
191
|
-
}), /*#__PURE__*/
|
|
192
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
192
193
|
x1: 0,
|
|
193
194
|
y1: 0,
|
|
194
195
|
x2: 0,
|
|
195
196
|
y2: textLength > length ? 0 : -(length - textLength) / 2,
|
|
196
197
|
style: STYLE
|
|
197
|
-
}), /*#__PURE__*/
|
|
198
|
+
}), /*#__PURE__*/_react["default"].createElement("text", {
|
|
198
199
|
x: -length / 2,
|
|
199
200
|
y: 0,
|
|
200
|
-
style:
|
|
201
|
+
style: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, STYLE_TEXT), {}, {
|
|
201
202
|
transform: 'rotate(90deg)'
|
|
202
203
|
})
|
|
203
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
204
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/_react["default"].createElement("line", {
|
|
204
205
|
x1: 0,
|
|
205
206
|
y1: -length,
|
|
206
207
|
x2: 0,
|
|
207
208
|
y2: textLength > length ? -length : -(length + textLength) / 2,
|
|
208
209
|
style: STYLE
|
|
209
|
-
}), /*#__PURE__*/
|
|
210
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
210
211
|
x1: -diagonalPointValue,
|
|
211
212
|
y1: -length - diagonalPointValue,
|
|
212
213
|
x2: diagonalPointValue,
|
|
213
214
|
y2: -length + diagonalPointValue,
|
|
214
215
|
style: STYLE
|
|
215
|
-
})), /*#__PURE__*/
|
|
216
|
+
})), /*#__PURE__*/_react["default"].createElement("line", {
|
|
216
217
|
x1: v1.x,
|
|
217
218
|
y1: v1.y,
|
|
218
219
|
x2: v1.x - space,
|
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
2
|
+
exports.__esModule = true;
|
|
3
|
+
exports.compareVertices = compareVertices;
|
|
4
|
+
exports["default"] = Scene3D;
|
|
5
|
+
var _react = _interopRequireDefault(require("react"));
|
|
6
|
+
var _geometry = require("../../../utils/geometry");
|
|
7
|
+
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
8
|
+
var _layer3D = _interopRequireDefault(require("./layer3D"));
|
|
9
|
+
function compareVertices(v0, v1) {
|
|
6
10
|
return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
|
|
7
11
|
}
|
|
8
|
-
|
|
12
|
+
function Scene3D(_ref) {
|
|
9
13
|
var scene = _ref.scene,
|
|
10
14
|
catalog = _ref.catalog,
|
|
11
15
|
width = _ref.width,
|
|
@@ -19,7 +23,7 @@ export default function Scene3D(_ref) {
|
|
|
19
23
|
var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
|
|
20
24
|
var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
|
|
21
25
|
var vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));
|
|
22
|
-
var lineLength = convert(verticesDistance(vertex0, vertex1)).from(scene.unit).to(selectedLayer.unit);
|
|
26
|
+
var lineLength = (0, _convertUnitsLite.convert)((0, _geometry.verticesDistance)(vertex0, vertex1)).from(scene.unit).to(selectedLayer.unit);
|
|
23
27
|
var multi = downloadFlag ? 0.85 : 0.6;
|
|
24
28
|
var scale = Math.min(width * multi / lineLength, height * multi / ceilHeight);
|
|
25
29
|
var frontRect = {
|
|
@@ -32,7 +36,7 @@ export default function Scene3D(_ref) {
|
|
|
32
36
|
for (var x = -width / 2; x <= width / 2; x = x + 30 * viewScale) {
|
|
33
37
|
for (var y = -height / 2; y <= height / 2; y = y + 30 * viewScale) {
|
|
34
38
|
if (Math.abs(x) > frontRect.width / 2 || Math.abs(y) > frontRect.height / 2) {
|
|
35
|
-
grids.push(/*#__PURE__*/
|
|
39
|
+
grids.push(/*#__PURE__*/_react["default"].createElement("circle", {
|
|
36
40
|
key: "grid_".concat(i),
|
|
37
41
|
cx: x,
|
|
38
42
|
cy: y,
|
|
@@ -43,7 +47,7 @@ export default function Scene3D(_ref) {
|
|
|
43
47
|
}
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
|
-
return /*#__PURE__*/
|
|
50
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, grids, /*#__PURE__*/_react["default"].createElement(_layer3D["default"], {
|
|
47
51
|
key: selectedLayer.id,
|
|
48
52
|
layer: selectedLayer,
|
|
49
53
|
frontRect: frontRect,
|