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