kitchen-simulator 4.1.3-react-18 → 4.1.5-react-18
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/components/style/form-number-input.js +3 -1
- package/es/components/viewer2d/rulerX.js +1 -1
- package/es/components/viewer2d/viewer2d.js +38 -27
- package/es/components/viewer3d/front3D.js +1 -2
- package/es/components/viewer3d/viewer3d-first-person.js +3 -0
- package/es/components/viewer3d/viewer3d.js +3 -1
- package/lib/components/style/form-number-input.js +3 -1
- package/lib/components/viewer2d/rulerX.js +1 -1
- package/lib/components/viewer2d/viewer2d.js +38 -27
- package/lib/components/viewer3d/front3D.js +1 -2
- package/lib/components/viewer3d/viewer3d-first-person.js +3 -0
- package/lib/components/viewer3d/viewer3d.js +3 -1
- package/package.json +1 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
1
|
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
2
|
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
3
|
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
5
4
|
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
6
5
|
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
6
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
7
7
|
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; }
|
|
8
8
|
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; }
|
|
9
9
|
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
@@ -12,6 +12,7 @@ import React, { Component } from 'react';
|
|
|
12
12
|
import PropTypes from 'prop-types';
|
|
13
13
|
import { KEYBOARD_BUTTON_CODE, TEXT_COLOR_NEUTRAL_0, SECONDARY_PURPLE_COLOR, DEFAULT_FONT_FAMILY } from "../../constants";
|
|
14
14
|
import { isValidNumber } from "../../utils/helper";
|
|
15
|
+
import AppContext from "../../AppContext";
|
|
15
16
|
var FormNumberInput = /*#__PURE__*/function (_Component) {
|
|
16
17
|
function FormNumberInput(props, context) {
|
|
17
18
|
var _this;
|
|
@@ -156,6 +157,7 @@ var FormNumberInput = /*#__PURE__*/function (_Component) {
|
|
|
156
157
|
}
|
|
157
158
|
}]);
|
|
158
159
|
}(Component);
|
|
160
|
+
_defineProperty(FormNumberInput, "contextType", AppContext);
|
|
159
161
|
export { FormNumberInput as default };
|
|
160
162
|
FormNumberInput.propTypes = {
|
|
161
163
|
value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
|
|
@@ -46,7 +46,7 @@ var RulerX = /*#__PURE__*/function (_Component) {
|
|
|
46
46
|
var left = Number.isFinite(this.props.zeroLeftPosition) && Number.isFinite(this.props.mouseX) && Number.isFinite(this.props.zoom) ? this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5 : 0;
|
|
47
47
|
var markerStyle = {
|
|
48
48
|
position: 'absolute',
|
|
49
|
-
left: left,
|
|
49
|
+
left: Number.isFinite(left) ? left : 0,
|
|
50
50
|
top: 8,
|
|
51
51
|
width: 0,
|
|
52
52
|
height: 0,
|
|
@@ -123,6 +123,7 @@ function extractElementData(node) {
|
|
|
123
123
|
};
|
|
124
124
|
}
|
|
125
125
|
export default function Viewer2D(_ref) {
|
|
126
|
+
var _state$get;
|
|
126
127
|
var state = _ref.state,
|
|
127
128
|
width = _ref.width,
|
|
128
129
|
height = _ref.height,
|
|
@@ -230,10 +231,11 @@ export default function Viewer2D(_ref) {
|
|
|
230
231
|
allArea = GeometryUtils.getAllArea(layer);
|
|
231
232
|
};
|
|
232
233
|
var updateRulerDistAttribute = function updateRulerDistAttribute(elementData, value) {
|
|
234
|
+
var _scene$getIn;
|
|
233
235
|
var newVal = value.get('length');
|
|
234
236
|
var oldVal = elementData.length;
|
|
235
237
|
var direct = elementData.direct;
|
|
236
|
-
var thisItem = scene.getIn(['layers', elementData.layer, 'items', elementData.id]).toJS();
|
|
238
|
+
var thisItem = (_scene$getIn = scene.getIn(['layers', elementData.layer, 'items', elementData.id])) === null || _scene$getIn === void 0 ? void 0 : _scene$getIn.toJS();
|
|
237
239
|
var oldX = thisItem.x;
|
|
238
240
|
var oldY = thisItem.y;
|
|
239
241
|
var oldRotRad = thisItem.rotation / 180 * Math.PI;
|
|
@@ -267,7 +269,8 @@ export default function Viewer2D(_ref) {
|
|
|
267
269
|
verticesActions.endDraggingVertex(x, y, state.snapMask);
|
|
268
270
|
};
|
|
269
271
|
var updateRulerAttribute = function updateRulerAttribute(elementData, value) {
|
|
270
|
-
var
|
|
272
|
+
var _scene$getIn2;
|
|
273
|
+
var selectedLine = (_scene$getIn2 = scene.getIn(['layers', elementData.layer, 'lines', elementData.id])) === null || _scene$getIn2 === void 0 ? void 0 : _scene$getIn2.toJS();
|
|
271
274
|
var v_0 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[0]]);
|
|
272
275
|
var v_1 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[1]]);
|
|
273
276
|
var _GeometryUtils$orderV = GeometryUtils.orderVertices([v_0, v_1]),
|
|
@@ -327,9 +330,10 @@ export default function Viewer2D(_ref) {
|
|
|
327
330
|
updateRightHoleRulerAttribute(elementData, value);
|
|
328
331
|
};
|
|
329
332
|
var updateLeftHoleRulerAttribute = function updateLeftHoleRulerAttribute(elementData, value) {
|
|
333
|
+
var _scene$getIn3;
|
|
330
334
|
var newVal = value.get('length');
|
|
331
335
|
var oldVal = elementData.length;
|
|
332
|
-
var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
|
|
336
|
+
var thisItem = (_scene$getIn3 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn3 === void 0 ? void 0 : _scene$getIn3.toJS();
|
|
333
337
|
var oldX = thisItem.x;
|
|
334
338
|
var oldY = thisItem.y;
|
|
335
339
|
var oldRotRad = thisItem.rotation;
|
|
@@ -342,8 +346,9 @@ export default function Viewer2D(_ref) {
|
|
|
342
346
|
setRulerEdit(null);
|
|
343
347
|
};
|
|
344
348
|
var updateHoleRulerAttribute = function updateHoleRulerAttribute(elementData, value) {
|
|
349
|
+
var _scene$getIn4;
|
|
345
350
|
var newVal = value.get('length');
|
|
346
|
-
var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
|
|
351
|
+
var thisItem = (_scene$getIn4 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn4 === void 0 ? void 0 : _scene$getIn4.toJS();
|
|
347
352
|
var oldX = thisItem.x;
|
|
348
353
|
var oldY = thisItem.y;
|
|
349
354
|
holesActions.beginDraggingHole(elementData.layer, elementData.id, oldX, oldY);
|
|
@@ -352,9 +357,10 @@ export default function Viewer2D(_ref) {
|
|
|
352
357
|
setRulerEdit(null);
|
|
353
358
|
};
|
|
354
359
|
var updateRightHoleRulerAttribute = function updateRightHoleRulerAttribute(elementData, value) {
|
|
360
|
+
var _scene$getIn5;
|
|
355
361
|
var newVal = value.get('length');
|
|
356
362
|
var oldVal = elementData.length;
|
|
357
|
-
var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
|
|
363
|
+
var thisItem = (_scene$getIn5 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn5 === void 0 ? void 0 : _scene$getIn5.toJS();
|
|
358
364
|
var oldX = thisItem.x;
|
|
359
365
|
var oldY = thisItem.y;
|
|
360
366
|
var oldRotRad = thisItem.rotation;
|
|
@@ -389,6 +395,7 @@ export default function Viewer2D(_ref) {
|
|
|
389
395
|
// }
|
|
390
396
|
};
|
|
391
397
|
var getEndPoint = function getEndPoint(vertices, x, y, mode) {
|
|
398
|
+
var _state$getIn, _state$getIn2;
|
|
392
399
|
var selLineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
393
400
|
if (isEmpty(selLineID)) {
|
|
394
401
|
return {
|
|
@@ -397,8 +404,8 @@ export default function Viewer2D(_ref) {
|
|
|
397
404
|
y: y
|
|
398
405
|
};
|
|
399
406
|
}
|
|
400
|
-
var draggingLine = state.getIn(['scene', 'layers', layerID, 'lines', selLineID]).toJS();
|
|
401
|
-
var allLines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
407
|
+
var draggingLine = (_state$getIn = state.getIn(['scene', 'layers', layerID, 'lines', selLineID])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.toJS();
|
|
408
|
+
var allLines = (_state$getIn2 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn2 === void 0 ? void 0 : _state$getIn2.toJS();
|
|
402
409
|
var dragVertexId = state.getIn(['draggingSupport', 'vertexID']);
|
|
403
410
|
dragVertexId = !isEmpty(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
|
|
404
411
|
var vtx, vty;
|
|
@@ -573,11 +580,11 @@ export default function Viewer2D(_ref) {
|
|
|
573
580
|
};
|
|
574
581
|
};
|
|
575
582
|
var getConnectedLines = function getConnectedLines() {
|
|
576
|
-
var _state$
|
|
577
|
-
var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
|
|
578
|
-
var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
583
|
+
var _state$getIn3, _state$getIn4, _state$getIn5;
|
|
584
|
+
var vertices = (_state$getIn3 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn3 === void 0 ? void 0 : _state$getIn3.toJS();
|
|
585
|
+
var lines = (_state$getIn4 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn4 === void 0 ? void 0 : _state$getIn4.toJS();
|
|
579
586
|
var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
580
|
-
var drawingLine = (_state$
|
|
587
|
+
var drawingLine = (_state$getIn5 = state.getIn(['scene', 'layers', layerID, 'lines', lineID])) === null || _state$getIn5 === void 0 ? void 0 : _state$getIn5.toJS();
|
|
581
588
|
// get the lines that have same points with drawing line.
|
|
582
589
|
if (!isEmpty(drawingLine)) {
|
|
583
590
|
var tlines = [];
|
|
@@ -586,6 +593,7 @@ export default function Viewer2D(_ref) {
|
|
|
586
593
|
}
|
|
587
594
|
};
|
|
588
595
|
var onMouseMove = function onMouseMove(viewerEvent) {
|
|
596
|
+
var _state$getIn6, _state$getIn7, _state$getIn9;
|
|
589
597
|
//workaround that allow imageful component to work
|
|
590
598
|
|
|
591
599
|
// let evt = new Event('mousemove-planner-event');
|
|
@@ -609,11 +617,12 @@ export default function Viewer2D(_ref) {
|
|
|
609
617
|
case constants.MODE_DRAWING_LINE:
|
|
610
618
|
// check whether the drawing line is started.
|
|
611
619
|
var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
612
|
-
var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
613
|
-
var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', lineID]).toJS();
|
|
620
|
+
var lines = (_state$getIn6 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn6 === void 0 ? void 0 : _state$getIn6.toJS();
|
|
621
|
+
var drawingLine = (_state$getIn7 = state.getIn(['scene', 'layers', layerID, 'lines', lineID])) === null || _state$getIn7 === void 0 ? void 0 : _state$getIn7.toJS();
|
|
614
622
|
var tlines = [];
|
|
615
623
|
if (drawStart || state.getIn(['scene', 'setLineAttributes'])) {
|
|
616
|
-
var
|
|
624
|
+
var _state$getIn8;
|
|
625
|
+
var _vertices = (_state$getIn8 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn8 === void 0 ? void 0 : _state$getIn8.toJS();
|
|
617
626
|
setdrawStart(false);
|
|
618
627
|
// get the lines that have same points with drawing line.
|
|
619
628
|
getRelatedLines(tlines, drawingLine, _vertices, lines);
|
|
@@ -719,7 +728,7 @@ export default function Viewer2D(_ref) {
|
|
|
719
728
|
linesActions.updateDraggingLine(x, y, relatedLines, state.snapMask);
|
|
720
729
|
break;
|
|
721
730
|
case constants.MODE_DRAGGING_VERTEX:
|
|
722
|
-
var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
|
|
731
|
+
var vertices = (_state$getIn9 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn9 === void 0 ? void 0 : _state$getIn9.toJS();
|
|
723
732
|
getConnectedLines();
|
|
724
733
|
var result = getEndPoint(vertices, x, y, 'DRAGGING_VERTEX');
|
|
725
734
|
verticesActions.updateDraggingVertex(result.x, result.y, state.snapMask);
|
|
@@ -853,6 +862,7 @@ export default function Viewer2D(_ref) {
|
|
|
853
862
|
event.stopPropagation();
|
|
854
863
|
};
|
|
855
864
|
var onMouseUp = function onMouseUp(viewerEvent) {
|
|
865
|
+
var _state$getIn0, _state$getIn1;
|
|
856
866
|
//set move all flag false
|
|
857
867
|
sFlag = false;
|
|
858
868
|
// //////////////////////
|
|
@@ -878,8 +888,8 @@ export default function Viewer2D(_ref) {
|
|
|
878
888
|
x = _mapCursorPosition3.x,
|
|
879
889
|
y = _mapCursorPosition3.y;
|
|
880
890
|
var draggingDistance = Math.sqrt((x - mouseDownPoint.x) * (x - mouseDownPoint.x) + (y - mouseDownPoint.y) * (y - mouseDownPoint.y));
|
|
881
|
-
var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
|
|
882
|
-
var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
891
|
+
var vertices = (_state$getIn0 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn0 === void 0 ? void 0 : _state$getIn0.toJS();
|
|
892
|
+
var lines = (_state$getIn1 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn1 === void 0 ? void 0 : _state$getIn1.toJS();
|
|
883
893
|
var elementData = extractElementData(event.target);
|
|
884
894
|
var selectedLayer = scene.getIn(['layers', layerID]);
|
|
885
895
|
var elementPrototype = null;
|
|
@@ -954,8 +964,9 @@ export default function Viewer2D(_ref) {
|
|
|
954
964
|
projectActions.setMode(_mode);
|
|
955
965
|
break;
|
|
956
966
|
} else {
|
|
967
|
+
var _state$getIn10;
|
|
957
968
|
var tlines = [];
|
|
958
|
-
var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', elementData.id]).toJS();
|
|
969
|
+
var drawingLine = (_state$getIn10 = state.getIn(['scene', 'layers', layerID, 'lines', elementData.id])) === null || _state$getIn10 === void 0 ? void 0 : _state$getIn10.toJS();
|
|
959
970
|
getRelatedLines(tlines, drawingLine, vertices, lines);
|
|
960
971
|
setRelatedLines(tlines);
|
|
961
972
|
linesActions.selectLine(elementData.layer, elementData.id);
|
|
@@ -995,7 +1006,7 @@ export default function Viewer2D(_ref) {
|
|
|
995
1006
|
id: "ruler_numberInput",
|
|
996
1007
|
style: {
|
|
997
1008
|
position: 'absolute',
|
|
998
|
-
left: bbox.left - (
|
|
1009
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
999
1010
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1000
1011
|
zIndex: 1000
|
|
1001
1012
|
}
|
|
@@ -1027,7 +1038,7 @@ export default function Viewer2D(_ref) {
|
|
|
1027
1038
|
id: "ruler_numberInput",
|
|
1028
1039
|
style: {
|
|
1029
1040
|
position: 'absolute',
|
|
1030
|
-
left: bbox.left - (
|
|
1041
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1031
1042
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1032
1043
|
zIndex: 1000
|
|
1033
1044
|
}
|
|
@@ -1060,7 +1071,7 @@ export default function Viewer2D(_ref) {
|
|
|
1060
1071
|
id: "ruler_numberInput",
|
|
1061
1072
|
style: {
|
|
1062
1073
|
position: 'absolute',
|
|
1063
|
-
left: bbox.left - (
|
|
1074
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1064
1075
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1065
1076
|
zIndex: 1000
|
|
1066
1077
|
}
|
|
@@ -1093,7 +1104,7 @@ export default function Viewer2D(_ref) {
|
|
|
1093
1104
|
id: "ruler_numberInput",
|
|
1094
1105
|
style: {
|
|
1095
1106
|
position: 'absolute',
|
|
1096
|
-
left: bbox.left - (
|
|
1107
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1097
1108
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1098
1109
|
zIndex: 1000
|
|
1099
1110
|
}
|
|
@@ -1126,7 +1137,7 @@ export default function Viewer2D(_ref) {
|
|
|
1126
1137
|
id: "ruler_numberInput",
|
|
1127
1138
|
style: {
|
|
1128
1139
|
position: 'absolute',
|
|
1129
|
-
left: bbox.left - (
|
|
1140
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1130
1141
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1131
1142
|
zIndex: 1000
|
|
1132
1143
|
}
|
|
@@ -1159,7 +1170,7 @@ export default function Viewer2D(_ref) {
|
|
|
1159
1170
|
id: "ruler_numberInput",
|
|
1160
1171
|
style: {
|
|
1161
1172
|
position: 'absolute',
|
|
1162
|
-
left: bbox.left - (
|
|
1173
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1163
1174
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1164
1175
|
zIndex: 1000
|
|
1165
1176
|
}
|
|
@@ -1191,7 +1202,7 @@ export default function Viewer2D(_ref) {
|
|
|
1191
1202
|
id: "ruler_numberInput",
|
|
1192
1203
|
style: {
|
|
1193
1204
|
position: 'absolute',
|
|
1194
|
-
left: bbox.left - (
|
|
1205
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1195
1206
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1196
1207
|
zIndex: 1000
|
|
1197
1208
|
}
|
|
@@ -1358,12 +1369,12 @@ export default function Viewer2D(_ref) {
|
|
|
1358
1369
|
}
|
|
1359
1370
|
};
|
|
1360
1371
|
var onZoom = function onZoom(value) {
|
|
1361
|
-
// var nextValue = viewer2D
|
|
1372
|
+
// var nextValue = viewer2D?.toJS();
|
|
1362
1373
|
// nextValue = zoom(nextValue, 0, 0, value.a / nextValue.a)
|
|
1363
1374
|
// projectActions.updateZoomScale(nextValue.a);
|
|
1364
1375
|
// return viewer2DActions.updateCameraView(nextValue)
|
|
1365
1376
|
};
|
|
1366
|
-
var _state$get$toJS = state.get('viewer2D').toJS(),
|
|
1377
|
+
var _state$get$toJS = (_state$get = state.get('viewer2D')) === null || _state$get === void 0 ? void 0 : _state$get.toJS(),
|
|
1367
1378
|
e = _state$get$toJS.e,
|
|
1368
1379
|
f = _state$get$toJS.f,
|
|
1369
1380
|
SVGWidth = _state$get$toJS.SVGWidth,
|
|
@@ -4,7 +4,7 @@ import Viewer3D from "./viewer3d";
|
|
|
4
4
|
import State3D from "./ruler-utils/state3D";
|
|
5
5
|
import { isEmpty } from "../viewer2d/utils";
|
|
6
6
|
var k = 0;
|
|
7
|
-
export default function Front3D(_ref
|
|
7
|
+
export default function Front3D(_ref) {
|
|
8
8
|
var width = _ref.width,
|
|
9
9
|
height = _ref.height,
|
|
10
10
|
state = _ref.state,
|
|
@@ -12,7 +12,6 @@ export default function Front3D(_ref, _ref2) {
|
|
|
12
12
|
replaceCabinet = _ref.replaceCabinet,
|
|
13
13
|
keyDownEnable = _ref.keyDownEnable,
|
|
14
14
|
catalog = _ref.catalog;
|
|
15
|
-
var viewer2DActions = _ref2.viewer2DActions;
|
|
16
15
|
var _useState = useState(''),
|
|
17
16
|
_useState2 = _slicedToArray(_useState, 2),
|
|
18
17
|
mode = _useState2[0],
|
|
@@ -5,6 +5,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
|
5
5
|
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
6
6
|
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
7
7
|
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
8
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
8
9
|
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
9
10
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
10
11
|
import React from 'react';
|
|
@@ -17,6 +18,7 @@ import diff from 'immutablediff';
|
|
|
17
18
|
import { initPointerLock } from "./pointer-lock-navigation";
|
|
18
19
|
import { firstPersonOnKeyDown, firstPersonOnKeyUp } from "./libs/first-person-controls";
|
|
19
20
|
import * as SharedStyle from "../../shared-style";
|
|
21
|
+
import AppContext from "../../AppContext";
|
|
20
22
|
var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
21
23
|
function Viewer3DFirstPerson(props) {
|
|
22
24
|
var _this;
|
|
@@ -303,6 +305,7 @@ var Viewer3DFirstPerson = /*#__PURE__*/function (_React$Component) {
|
|
|
303
305
|
}
|
|
304
306
|
}]);
|
|
305
307
|
}(React.Component);
|
|
308
|
+
_defineProperty(Viewer3DFirstPerson, "contextType", AppContext);
|
|
306
309
|
export { Viewer3DFirstPerson as default };
|
|
307
310
|
Viewer3DFirstPerson.propTypes = {
|
|
308
311
|
state: PropTypes.object.isRequired,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
import _readOnlyError from "@babel/runtime/helpers/esm/readOnlyError";
|
|
4
|
-
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
5
4
|
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
6
5
|
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
7
6
|
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
8
7
|
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
9
8
|
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
9
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
10
10
|
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; }
|
|
11
11
|
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; }
|
|
12
12
|
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
@@ -30,6 +30,7 @@ import CameraControls from 'camera-controls';
|
|
|
30
30
|
import { getAllMeshes, vectorIntersectWithMesh } from "../../utils/objects-utils";
|
|
31
31
|
import { isWarningItem, returnReplaceableDeepSearchType } from "../viewer2d/utils";
|
|
32
32
|
import { MoldingUtils } from "../../utils/export";
|
|
33
|
+
import AppContext from "../../AppContext";
|
|
33
34
|
CameraControls.install({
|
|
34
35
|
THREE: Three
|
|
35
36
|
});
|
|
@@ -2679,6 +2680,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
2679
2680
|
}
|
|
2680
2681
|
}]);
|
|
2681
2682
|
}(React.Component);
|
|
2683
|
+
_defineProperty(Scene3DViewer, "contextType", AppContext);
|
|
2682
2684
|
export { Scene3DViewer as default };
|
|
2683
2685
|
Scene3DViewer.propTypes = {
|
|
2684
2686
|
state: PropTypes.object.isRequired,
|
|
@@ -6,16 +6,17 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports["default"] = void 0;
|
|
9
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
9
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
10
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
12
11
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
13
12
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
14
13
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
14
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
15
|
var _react = _interopRequireWildcard(require("react"));
|
|
16
16
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
17
17
|
var _constants = require("../../constants");
|
|
18
18
|
var _helper = require("../../utils/helper");
|
|
19
|
+
var _AppContext = _interopRequireDefault(require("../../AppContext"));
|
|
19
20
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
20
21
|
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; }
|
|
21
22
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -165,6 +166,7 @@ var FormNumberInput = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
|
165
166
|
}
|
|
166
167
|
}]);
|
|
167
168
|
}(_react.Component);
|
|
169
|
+
(0, _defineProperty2["default"])(FormNumberInput, "contextType", _AppContext["default"]);
|
|
168
170
|
FormNumberInput.propTypes = {
|
|
169
171
|
value: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
|
|
170
172
|
style: _propTypes["default"].object,
|
|
@@ -55,7 +55,7 @@ var RulerX = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
|
55
55
|
var left = Number.isFinite(this.props.zeroLeftPosition) && Number.isFinite(this.props.mouseX) && Number.isFinite(this.props.zoom) ? this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5 : 0;
|
|
56
56
|
var markerStyle = {
|
|
57
57
|
position: 'absolute',
|
|
58
|
-
left: left,
|
|
58
|
+
left: Number.isFinite(left) ? left : 0,
|
|
59
59
|
top: 8,
|
|
60
60
|
width: 0,
|
|
61
61
|
height: 0,
|
|
@@ -131,6 +131,7 @@ function extractElementData(node) {
|
|
|
131
131
|
};
|
|
132
132
|
}
|
|
133
133
|
function Viewer2D(_ref) {
|
|
134
|
+
var _state$get;
|
|
134
135
|
var state = _ref.state,
|
|
135
136
|
width = _ref.width,
|
|
136
137
|
height = _ref.height,
|
|
@@ -238,10 +239,11 @@ function Viewer2D(_ref) {
|
|
|
238
239
|
allArea = _export2.GeometryUtils.getAllArea(layer);
|
|
239
240
|
};
|
|
240
241
|
var updateRulerDistAttribute = function updateRulerDistAttribute(elementData, value) {
|
|
242
|
+
var _scene$getIn;
|
|
241
243
|
var newVal = value.get('length');
|
|
242
244
|
var oldVal = elementData.length;
|
|
243
245
|
var direct = elementData.direct;
|
|
244
|
-
var thisItem = scene.getIn(['layers', elementData.layer, 'items', elementData.id]).toJS();
|
|
246
|
+
var thisItem = (_scene$getIn = scene.getIn(['layers', elementData.layer, 'items', elementData.id])) === null || _scene$getIn === void 0 ? void 0 : _scene$getIn.toJS();
|
|
245
247
|
var oldX = thisItem.x;
|
|
246
248
|
var oldY = thisItem.y;
|
|
247
249
|
var oldRotRad = thisItem.rotation / 180 * Math.PI;
|
|
@@ -275,7 +277,8 @@ function Viewer2D(_ref) {
|
|
|
275
277
|
verticesActions.endDraggingVertex(x, y, state.snapMask);
|
|
276
278
|
};
|
|
277
279
|
var updateRulerAttribute = function updateRulerAttribute(elementData, value) {
|
|
278
|
-
var
|
|
280
|
+
var _scene$getIn2;
|
|
281
|
+
var selectedLine = (_scene$getIn2 = scene.getIn(['layers', elementData.layer, 'lines', elementData.id])) === null || _scene$getIn2 === void 0 ? void 0 : _scene$getIn2.toJS();
|
|
279
282
|
var v_0 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[0]]);
|
|
280
283
|
var v_1 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[1]]);
|
|
281
284
|
var _GeometryUtils$orderV = _export2.GeometryUtils.orderVertices([v_0, v_1]),
|
|
@@ -335,9 +338,10 @@ function Viewer2D(_ref) {
|
|
|
335
338
|
updateRightHoleRulerAttribute(elementData, value);
|
|
336
339
|
};
|
|
337
340
|
var updateLeftHoleRulerAttribute = function updateLeftHoleRulerAttribute(elementData, value) {
|
|
341
|
+
var _scene$getIn3;
|
|
338
342
|
var newVal = value.get('length');
|
|
339
343
|
var oldVal = elementData.length;
|
|
340
|
-
var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
|
|
344
|
+
var thisItem = (_scene$getIn3 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn3 === void 0 ? void 0 : _scene$getIn3.toJS();
|
|
341
345
|
var oldX = thisItem.x;
|
|
342
346
|
var oldY = thisItem.y;
|
|
343
347
|
var oldRotRad = thisItem.rotation;
|
|
@@ -350,8 +354,9 @@ function Viewer2D(_ref) {
|
|
|
350
354
|
setRulerEdit(null);
|
|
351
355
|
};
|
|
352
356
|
var updateHoleRulerAttribute = function updateHoleRulerAttribute(elementData, value) {
|
|
357
|
+
var _scene$getIn4;
|
|
353
358
|
var newVal = value.get('length');
|
|
354
|
-
var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
|
|
359
|
+
var thisItem = (_scene$getIn4 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn4 === void 0 ? void 0 : _scene$getIn4.toJS();
|
|
355
360
|
var oldX = thisItem.x;
|
|
356
361
|
var oldY = thisItem.y;
|
|
357
362
|
holesActions.beginDraggingHole(elementData.layer, elementData.id, oldX, oldY);
|
|
@@ -360,9 +365,10 @@ function Viewer2D(_ref) {
|
|
|
360
365
|
setRulerEdit(null);
|
|
361
366
|
};
|
|
362
367
|
var updateRightHoleRulerAttribute = function updateRightHoleRulerAttribute(elementData, value) {
|
|
368
|
+
var _scene$getIn5;
|
|
363
369
|
var newVal = value.get('length');
|
|
364
370
|
var oldVal = elementData.length;
|
|
365
|
-
var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
|
|
371
|
+
var thisItem = (_scene$getIn5 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn5 === void 0 ? void 0 : _scene$getIn5.toJS();
|
|
366
372
|
var oldX = thisItem.x;
|
|
367
373
|
var oldY = thisItem.y;
|
|
368
374
|
var oldRotRad = thisItem.rotation;
|
|
@@ -397,6 +403,7 @@ function Viewer2D(_ref) {
|
|
|
397
403
|
// }
|
|
398
404
|
};
|
|
399
405
|
var getEndPoint = function getEndPoint(vertices, x, y, mode) {
|
|
406
|
+
var _state$getIn, _state$getIn2;
|
|
400
407
|
var selLineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
401
408
|
if ((0, _helper.isEmpty)(selLineID)) {
|
|
402
409
|
return {
|
|
@@ -405,8 +412,8 @@ function Viewer2D(_ref) {
|
|
|
405
412
|
y: y
|
|
406
413
|
};
|
|
407
414
|
}
|
|
408
|
-
var draggingLine = state.getIn(['scene', 'layers', layerID, 'lines', selLineID]).toJS();
|
|
409
|
-
var allLines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
415
|
+
var draggingLine = (_state$getIn = state.getIn(['scene', 'layers', layerID, 'lines', selLineID])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.toJS();
|
|
416
|
+
var allLines = (_state$getIn2 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn2 === void 0 ? void 0 : _state$getIn2.toJS();
|
|
410
417
|
var dragVertexId = state.getIn(['draggingSupport', 'vertexID']);
|
|
411
418
|
dragVertexId = !(0, _helper.isEmpty)(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
|
|
412
419
|
var vtx, vty;
|
|
@@ -581,11 +588,11 @@ function Viewer2D(_ref) {
|
|
|
581
588
|
};
|
|
582
589
|
};
|
|
583
590
|
var getConnectedLines = function getConnectedLines() {
|
|
584
|
-
var _state$
|
|
585
|
-
var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
|
|
586
|
-
var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
591
|
+
var _state$getIn3, _state$getIn4, _state$getIn5;
|
|
592
|
+
var vertices = (_state$getIn3 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn3 === void 0 ? void 0 : _state$getIn3.toJS();
|
|
593
|
+
var lines = (_state$getIn4 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn4 === void 0 ? void 0 : _state$getIn4.toJS();
|
|
587
594
|
var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
588
|
-
var drawingLine = (_state$
|
|
595
|
+
var drawingLine = (_state$getIn5 = state.getIn(['scene', 'layers', layerID, 'lines', lineID])) === null || _state$getIn5 === void 0 ? void 0 : _state$getIn5.toJS();
|
|
589
596
|
// get the lines that have same points with drawing line.
|
|
590
597
|
if (!(0, _helper.isEmpty)(drawingLine)) {
|
|
591
598
|
var tlines = [];
|
|
@@ -594,6 +601,7 @@ function Viewer2D(_ref) {
|
|
|
594
601
|
}
|
|
595
602
|
};
|
|
596
603
|
var onMouseMove = function onMouseMove(viewerEvent) {
|
|
604
|
+
var _state$getIn6, _state$getIn7, _state$getIn9;
|
|
597
605
|
//workaround that allow imageful component to work
|
|
598
606
|
|
|
599
607
|
// let evt = new Event('mousemove-planner-event');
|
|
@@ -617,11 +625,12 @@ function Viewer2D(_ref) {
|
|
|
617
625
|
case constants.MODE_DRAWING_LINE:
|
|
618
626
|
// check whether the drawing line is started.
|
|
619
627
|
var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
620
|
-
var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
621
|
-
var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', lineID]).toJS();
|
|
628
|
+
var lines = (_state$getIn6 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn6 === void 0 ? void 0 : _state$getIn6.toJS();
|
|
629
|
+
var drawingLine = (_state$getIn7 = state.getIn(['scene', 'layers', layerID, 'lines', lineID])) === null || _state$getIn7 === void 0 ? void 0 : _state$getIn7.toJS();
|
|
622
630
|
var tlines = [];
|
|
623
631
|
if (drawStart || state.getIn(['scene', 'setLineAttributes'])) {
|
|
624
|
-
var
|
|
632
|
+
var _state$getIn8;
|
|
633
|
+
var _vertices = (_state$getIn8 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn8 === void 0 ? void 0 : _state$getIn8.toJS();
|
|
625
634
|
setdrawStart(false);
|
|
626
635
|
// get the lines that have same points with drawing line.
|
|
627
636
|
getRelatedLines(tlines, drawingLine, _vertices, lines);
|
|
@@ -727,7 +736,7 @@ function Viewer2D(_ref) {
|
|
|
727
736
|
linesActions.updateDraggingLine(x, y, relatedLines, state.snapMask);
|
|
728
737
|
break;
|
|
729
738
|
case constants.MODE_DRAGGING_VERTEX:
|
|
730
|
-
var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
|
|
739
|
+
var vertices = (_state$getIn9 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn9 === void 0 ? void 0 : _state$getIn9.toJS();
|
|
731
740
|
getConnectedLines();
|
|
732
741
|
var result = getEndPoint(vertices, x, y, 'DRAGGING_VERTEX');
|
|
733
742
|
verticesActions.updateDraggingVertex(result.x, result.y, state.snapMask);
|
|
@@ -861,6 +870,7 @@ function Viewer2D(_ref) {
|
|
|
861
870
|
event.stopPropagation();
|
|
862
871
|
};
|
|
863
872
|
var onMouseUp = function onMouseUp(viewerEvent) {
|
|
873
|
+
var _state$getIn0, _state$getIn1;
|
|
864
874
|
//set move all flag false
|
|
865
875
|
sFlag = false;
|
|
866
876
|
// //////////////////////
|
|
@@ -886,8 +896,8 @@ function Viewer2D(_ref) {
|
|
|
886
896
|
x = _mapCursorPosition3.x,
|
|
887
897
|
y = _mapCursorPosition3.y;
|
|
888
898
|
var draggingDistance = Math.sqrt((x - mouseDownPoint.x) * (x - mouseDownPoint.x) + (y - mouseDownPoint.y) * (y - mouseDownPoint.y));
|
|
889
|
-
var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
|
|
890
|
-
var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
899
|
+
var vertices = (_state$getIn0 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn0 === void 0 ? void 0 : _state$getIn0.toJS();
|
|
900
|
+
var lines = (_state$getIn1 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn1 === void 0 ? void 0 : _state$getIn1.toJS();
|
|
891
901
|
var elementData = extractElementData(event.target);
|
|
892
902
|
var selectedLayer = scene.getIn(['layers', layerID]);
|
|
893
903
|
var elementPrototype = null;
|
|
@@ -962,8 +972,9 @@ function Viewer2D(_ref) {
|
|
|
962
972
|
projectActions.setMode(_mode);
|
|
963
973
|
break;
|
|
964
974
|
} else {
|
|
975
|
+
var _state$getIn10;
|
|
965
976
|
var tlines = [];
|
|
966
|
-
var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', elementData.id]).toJS();
|
|
977
|
+
var drawingLine = (_state$getIn10 = state.getIn(['scene', 'layers', layerID, 'lines', elementData.id])) === null || _state$getIn10 === void 0 ? void 0 : _state$getIn10.toJS();
|
|
967
978
|
getRelatedLines(tlines, drawingLine, vertices, lines);
|
|
968
979
|
setRelatedLines(tlines);
|
|
969
980
|
linesActions.selectLine(elementData.layer, elementData.id);
|
|
@@ -1003,7 +1014,7 @@ function Viewer2D(_ref) {
|
|
|
1003
1014
|
id: "ruler_numberInput",
|
|
1004
1015
|
style: {
|
|
1005
1016
|
position: 'absolute',
|
|
1006
|
-
left: bbox.left - (
|
|
1017
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1007
1018
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1008
1019
|
zIndex: 1000
|
|
1009
1020
|
}
|
|
@@ -1035,7 +1046,7 @@ function Viewer2D(_ref) {
|
|
|
1035
1046
|
id: "ruler_numberInput",
|
|
1036
1047
|
style: {
|
|
1037
1048
|
position: 'absolute',
|
|
1038
|
-
left: bbox.left - (
|
|
1049
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1039
1050
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1040
1051
|
zIndex: 1000
|
|
1041
1052
|
}
|
|
@@ -1068,7 +1079,7 @@ function Viewer2D(_ref) {
|
|
|
1068
1079
|
id: "ruler_numberInput",
|
|
1069
1080
|
style: {
|
|
1070
1081
|
position: 'absolute',
|
|
1071
|
-
left: bbox.left - (
|
|
1082
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1072
1083
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1073
1084
|
zIndex: 1000
|
|
1074
1085
|
}
|
|
@@ -1101,7 +1112,7 @@ function Viewer2D(_ref) {
|
|
|
1101
1112
|
id: "ruler_numberInput",
|
|
1102
1113
|
style: {
|
|
1103
1114
|
position: 'absolute',
|
|
1104
|
-
left: bbox.left - (
|
|
1115
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1105
1116
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1106
1117
|
zIndex: 1000
|
|
1107
1118
|
}
|
|
@@ -1134,7 +1145,7 @@ function Viewer2D(_ref) {
|
|
|
1134
1145
|
id: "ruler_numberInput",
|
|
1135
1146
|
style: {
|
|
1136
1147
|
position: 'absolute',
|
|
1137
|
-
left: bbox.left - (
|
|
1148
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1138
1149
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1139
1150
|
zIndex: 1000
|
|
1140
1151
|
}
|
|
@@ -1167,7 +1178,7 @@ function Viewer2D(_ref) {
|
|
|
1167
1178
|
id: "ruler_numberInput",
|
|
1168
1179
|
style: {
|
|
1169
1180
|
position: 'absolute',
|
|
1170
|
-
left: bbox.left - (
|
|
1181
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1171
1182
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1172
1183
|
zIndex: 1000
|
|
1173
1184
|
}
|
|
@@ -1199,7 +1210,7 @@ function Viewer2D(_ref) {
|
|
|
1199
1210
|
id: "ruler_numberInput",
|
|
1200
1211
|
style: {
|
|
1201
1212
|
position: 'absolute',
|
|
1202
|
-
left: bbox.left - (
|
|
1213
|
+
left: bbox.left - (150 - bbox.width) / 2,
|
|
1203
1214
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1204
1215
|
zIndex: 1000
|
|
1205
1216
|
}
|
|
@@ -1366,12 +1377,12 @@ function Viewer2D(_ref) {
|
|
|
1366
1377
|
}
|
|
1367
1378
|
};
|
|
1368
1379
|
var onZoom = function onZoom(value) {
|
|
1369
|
-
// var nextValue = viewer2D
|
|
1380
|
+
// var nextValue = viewer2D?.toJS();
|
|
1370
1381
|
// nextValue = zoom(nextValue, 0, 0, value.a / nextValue.a)
|
|
1371
1382
|
// projectActions.updateZoomScale(nextValue.a);
|
|
1372
1383
|
// return viewer2DActions.updateCameraView(nextValue)
|
|
1373
1384
|
};
|
|
1374
|
-
var _state$get$toJS = state.get('viewer2D').toJS(),
|
|
1385
|
+
var _state$get$toJS = (_state$get = state.get('viewer2D')) === null || _state$get === void 0 ? void 0 : _state$get.toJS(),
|
|
1375
1386
|
e = _state$get$toJS.e,
|
|
1376
1387
|
f = _state$get$toJS.f,
|
|
1377
1388
|
SVGWidth = _state$get$toJS.SVGWidth,
|
|
@@ -13,7 +13,7 @@ var _state3D = _interopRequireDefault(require("./ruler-utils/state3D"));
|
|
|
13
13
|
var _utils = require("../viewer2d/utils");
|
|
14
14
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
15
15
|
var k = 0;
|
|
16
|
-
function Front3D(_ref
|
|
16
|
+
function Front3D(_ref) {
|
|
17
17
|
var width = _ref.width,
|
|
18
18
|
height = _ref.height,
|
|
19
19
|
state = _ref.state,
|
|
@@ -21,7 +21,6 @@ function Front3D(_ref, _ref2) {
|
|
|
21
21
|
replaceCabinet = _ref.replaceCabinet,
|
|
22
22
|
keyDownEnable = _ref.keyDownEnable,
|
|
23
23
|
catalog = _ref.catalog;
|
|
24
|
-
var viewer2DActions = _ref2.viewer2DActions;
|
|
25
24
|
var _useState = (0, _react.useState)(''),
|
|
26
25
|
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
27
26
|
mode = _useState2[0],
|
|
@@ -11,6 +11,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
11
11
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
12
12
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
13
13
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
14
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
15
|
var _react = _interopRequireDefault(require("react"));
|
|
15
16
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
16
17
|
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
@@ -21,6 +22,7 @@ var _immutablediff = _interopRequireDefault(require("immutablediff"));
|
|
|
21
22
|
var _pointerLockNavigation = require("./pointer-lock-navigation");
|
|
22
23
|
var _firstPersonControls = require("./libs/first-person-controls");
|
|
23
24
|
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
25
|
+
var _AppContext = _interopRequireDefault(require("../../AppContext"));
|
|
24
26
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
25
27
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
|
|
26
28
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
@@ -310,6 +312,7 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
310
312
|
}
|
|
311
313
|
}]);
|
|
312
314
|
}(_react["default"].Component);
|
|
315
|
+
(0, _defineProperty2["default"])(Viewer3DFirstPerson, "contextType", _AppContext["default"]);
|
|
313
316
|
Viewer3DFirstPerson.propTypes = {
|
|
314
317
|
state: _propTypes["default"].object.isRequired,
|
|
315
318
|
width: _propTypes["default"].number.isRequired,
|
|
@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports["default"] = void 0;
|
|
9
9
|
var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
|
|
10
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
12
11
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
12
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
14
13
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
15
14
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
15
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
16
16
|
var _react = _interopRequireDefault(require("react"));
|
|
17
17
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
18
18
|
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
@@ -31,6 +31,7 @@ var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
|
|
|
31
31
|
var _cameraControls = _interopRequireDefault(require("camera-controls"));
|
|
32
32
|
var _objectsUtils = require("../../utils/objects-utils");
|
|
33
33
|
var _utils = require("../viewer2d/utils");
|
|
34
|
+
var _AppContext = _interopRequireDefault(require("../../AppContext"));
|
|
34
35
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
35
36
|
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; }
|
|
36
37
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -2685,6 +2686,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
2685
2686
|
}
|
|
2686
2687
|
}]);
|
|
2687
2688
|
}(_react["default"].Component);
|
|
2689
|
+
(0, _defineProperty2["default"])(Scene3DViewer, "contextType", _AppContext["default"]);
|
|
2688
2690
|
Scene3DViewer.propTypes = {
|
|
2689
2691
|
state: _propTypes["default"].object.isRequired,
|
|
2690
2692
|
width: _propTypes["default"].number.isRequired,
|