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