kitchen-simulator 4.0.6 → 4.0.7-measurement-unit-payload
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/actions/project-actions.js +2 -1
- package/es/catalog/factories/wall-factory.js +1 -1
- package/es/catalog/utils/exporter.js +23 -11
- package/es/catalog/utils/item-loader.js +4 -9
- package/es/class/item.js +3 -0
- package/es/class/layer.js +1 -1
- package/es/class/project.js +9 -7
- package/es/components/viewer2d/line.js +5 -5
- package/es/components/viewer2d/ruler.js +16 -13
- package/es/components/viewer2d/rulerDist.js +38 -52
- package/es/components/viewer2d/viewer2d.js +10 -5
- package/es/components/viewer3d/scene-creator.js +213 -53
- package/es/components/viewer3d/viewer3d.js +21 -14
- package/es/constants.js +1 -0
- package/es/index.js +26 -5
- package/es/models.js +10 -6
- package/es/reducers/project-reducer.js +1 -1
- package/es/reducers/viewer2d-reducer.js +3 -1
- package/es/reducers/viewer3d-reducer.js +3 -1
- package/es/utils/geometry.js +7 -7
- package/es/utils/isolate-event-handler.js +8 -8
- package/es/utils/molding.js +4 -2
- package/es/utils/ruler.js +58 -0
- package/lib/actions/project-actions.js +2 -1
- package/lib/catalog/factories/wall-factory.js +1 -1
- package/lib/catalog/utils/exporter.js +23 -11
- package/lib/catalog/utils/item-loader.js +4 -9
- package/lib/class/item.js +3 -0
- package/lib/class/layer.js +1 -1
- package/lib/class/project.js +9 -7
- package/lib/components/viewer2d/line.js +5 -5
- package/lib/components/viewer2d/ruler.js +15 -12
- package/lib/components/viewer2d/rulerDist.js +38 -52
- package/lib/components/viewer2d/viewer2d.js +10 -5
- package/lib/components/viewer3d/scene-creator.js +212 -52
- package/lib/components/viewer3d/viewer3d.js +21 -14
- package/lib/constants.js +5 -4
- package/lib/index.js +28 -5
- package/lib/models.js +10 -6
- package/lib/reducers/project-reducer.js +1 -1
- package/lib/reducers/viewer2d-reducer.js +3 -1
- package/lib/reducers/viewer3d-reducer.js +3 -1
- package/lib/utils/geometry.js +7 -7
- package/lib/utils/isolate-event-handler.js +8 -8
- package/lib/utils/molding.js +4 -2
- package/lib/utils/ruler.js +63 -0
- package/package.json +1 -1
|
@@ -823,17 +823,19 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
823
823
|
this.snap = function (obj, layer) {
|
|
824
824
|
// snap operation
|
|
825
825
|
var target = obj.userData.target;
|
|
826
|
+
if ((0, _helper.isEmpty)(target)) return;
|
|
826
827
|
for (; target.parent != null;) {
|
|
827
828
|
if (target.name == 'pivot') break;
|
|
828
829
|
target = target.parent;
|
|
829
830
|
}
|
|
830
831
|
var source = obj.parent.parent.parent;
|
|
831
832
|
if (target.userData.type == 'item') {
|
|
833
|
+
var _item$properties$getI;
|
|
832
834
|
var sRot = layer.getIn(['items', source.userData.itemId]).rotation;
|
|
833
835
|
var tRot = layer.getIn(['items', target.userData.itemId]) ? layer.getIn(['items', target.userData.itemId]).rotation : 0;
|
|
834
836
|
var item = layer.getIn(['items', source.userData.itemId]);
|
|
835
837
|
var layoutType = item.layoutpos;
|
|
836
|
-
var altitudeLength = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
838
|
+
var altitudeLength = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from((_item$properties$getI = item.properties.getIn(['altitude', '_unit'])) !== null && _item$properties$getI !== void 0 ? _item$properties$getI : 'in').to('cm');
|
|
837
839
|
var sBounding = source.children[0].userData;
|
|
838
840
|
var tBounding = target.children[0].userData;
|
|
839
841
|
var tPos = target.position.clone();
|
|
@@ -933,8 +935,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
933
935
|
snapFlag = false;
|
|
934
936
|
return;
|
|
935
937
|
} else {
|
|
938
|
+
var _item3$properties$get;
|
|
936
939
|
var _layoutType = _item3.layoutpos;
|
|
937
|
-
var _altitudeLength = (0, _convertUnitsLite.convert)(_item3.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
940
|
+
var _altitudeLength = (0, _convertUnitsLite.convert)(_item3.properties.getIn(['altitude', '_length'])).from((_item3$properties$get = _item3.properties.getIn(['altitude', '_unit'])) !== null && _item3$properties$get !== void 0 ? _item3$properties$get : 'in').to('cm');
|
|
938
941
|
var _sBounding = source.children[0].userData;
|
|
939
942
|
var _width = _sBounding.max.x - _sBounding.min.x;
|
|
940
943
|
var _height = _sBounding.max.y - _sBounding.min.y;
|
|
@@ -1366,10 +1369,12 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1366
1369
|
}
|
|
1367
1370
|
};
|
|
1368
1371
|
this.mouseUpEvent = function (event) {
|
|
1372
|
+
var _selectedObject;
|
|
1369
1373
|
var internalType = ''; // internalEvent type - select/drag/draw
|
|
1370
1374
|
var selectedElement; // internalEvent data
|
|
1371
1375
|
firstMove = 0;
|
|
1372
1376
|
var altitude = 0;
|
|
1377
|
+
var curLayer = _this2.props.state.scene.getIn(['layers', (_selectedObject = selectedObject) === null || _selectedObject === void 0 ? void 0 : _selectedObject.layerID]);
|
|
1373
1378
|
if (allItemRect && allItemRect.cur && allItemRect.cur.itemInfo !== undefined) {
|
|
1374
1379
|
var properties = allItemRect.cur.itemInfo.properties;
|
|
1375
1380
|
altitude = properties.getIn(['altitude', '_length']);
|
|
@@ -1390,7 +1395,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1390
1395
|
actions.itemsActions.endDrawingItem(_this2.props.state.scene.selectedLayer, sPoint.x, sPoint.y);
|
|
1391
1396
|
} else {
|
|
1392
1397
|
removeSnapBox();
|
|
1393
|
-
var polygon = _export.GeometryUtils.getPoylgonPoints(layer);
|
|
1398
|
+
var polygon = _export.GeometryUtils.getPoylgonPoints(curLayer !== null && curLayer !== void 0 ? curLayer : layer);
|
|
1394
1399
|
// if cursor is outside of room
|
|
1395
1400
|
if (polygon.length > 0 && !_export.GeometryUtils.ContainsPoint(polygon, Point.x, Point.y)) {
|
|
1396
1401
|
actions.itemsActions.endDrawingItem(_this2.props.state.scene.selectedLayer, sPoint.x, sPoint.y);
|
|
@@ -1484,8 +1489,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1484
1489
|
}
|
|
1485
1490
|
gridMatrix.copy(gridPlane.matrixWorld).invert();
|
|
1486
1491
|
var addItemToolObj = function addItemToolObj() {
|
|
1487
|
-
var _planData$sceneGraph,
|
|
1488
|
-
var selectedItem = (_planData$sceneGraph = planData.sceneGraph) === null || _planData$sceneGraph === void 0 || (_planData$sceneGraph = _planData$sceneGraph.layers[selectedObject.layerID]) === null || _planData$sceneGraph === void 0 ? void 0 : _planData$sceneGraph.items[(
|
|
1492
|
+
var _planData$sceneGraph, _selectedObject2, _intersects$_i;
|
|
1493
|
+
var selectedItem = (_planData$sceneGraph = planData.sceneGraph) === null || _planData$sceneGraph === void 0 || (_planData$sceneGraph = _planData$sceneGraph.layers[selectedObject.layerID]) === null || _planData$sceneGraph === void 0 ? void 0 : _planData$sceneGraph.items[(_selectedObject2 = selectedObject) === null || _selectedObject2 === void 0 ? void 0 : _selectedObject2.itemID];
|
|
1489
1494
|
if ((0, _util.isUndefined)(selectedItem)) return;
|
|
1490
1495
|
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1491
1496
|
var itemPos = selectedItem.position.clone();
|
|
@@ -1518,8 +1523,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1518
1523
|
}
|
|
1519
1524
|
isSelected = true;
|
|
1520
1525
|
setTimeout(function () {
|
|
1521
|
-
|
|
1526
|
+
var _curLayer$id;
|
|
1522
1527
|
addItemToolObj();
|
|
1528
|
+
(0, _sceneCreator.getDistances)(curLayer !== null && curLayer !== void 0 ? curLayer : layer, selectedElement);
|
|
1523
1529
|
_this2.setState({
|
|
1524
1530
|
toolObj: toolObj
|
|
1525
1531
|
});
|
|
@@ -1529,8 +1535,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1529
1535
|
// pointArray.push([fVLine[1].userData.distance, -90]);
|
|
1530
1536
|
// pointArray.push([fVLine[2].userData.distance, 180]);
|
|
1531
1537
|
// pointArray.push([fVLine[3].userData.distance, 0]);
|
|
1532
|
-
pointArray = _export.GeometryUtils.calcDistancesFromItemToWalls(selectedElement, layer).PointArray;
|
|
1533
|
-
actions.itemsActions.storeDistArray(layer.id, selectedObject.itemID, pointArray);
|
|
1538
|
+
pointArray = _export.GeometryUtils.calcDistancesFromItemToWalls(selectedElement, curLayer !== null && curLayer !== void 0 ? curLayer : layer).PointArray;
|
|
1539
|
+
actions.itemsActions.storeDistArray((_curLayer$id = curLayer === null || curLayer === void 0 ? void 0 : curLayer.id) !== null && _curLayer$id !== void 0 ? _curLayer$id : layer.id, selectedObject.itemID, pointArray);
|
|
1534
1540
|
internalType = internalType ? internalType : _constants.INTERNAL_EVENT_SELECT_ELEMENT;
|
|
1535
1541
|
sendInternalEvent(internalType, selectedElement, pointArray);
|
|
1536
1542
|
});
|
|
@@ -1582,11 +1588,11 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1582
1588
|
bRotate = false;
|
|
1583
1589
|
bMoveUP = false;
|
|
1584
1590
|
if (isSelected) {
|
|
1585
|
-
prepareSnap(layer);
|
|
1591
|
+
prepareSnap(curLayer !== null && curLayer !== void 0 ? curLayer : layer);
|
|
1586
1592
|
selectedObj = allItemRect.cur;
|
|
1587
1593
|
}
|
|
1588
1594
|
} else {
|
|
1589
|
-
var _planData$sceneGraph2,
|
|
1595
|
+
var _planData$sceneGraph2, _selectedObject3, _selectedObject4;
|
|
1590
1596
|
(0, _sceneCreator.visibleTransformBox)(false);
|
|
1591
1597
|
var alti = 0;
|
|
1592
1598
|
if (allItemRect && allItemRect.cur && allItemRect.cur.itemInfo !== undefined) {
|
|
@@ -1596,7 +1602,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1596
1602
|
alti = (0, _convertUnitsLite.convert)(alti).from(_unit2).to(_this2.props.state.scene.unit);
|
|
1597
1603
|
}
|
|
1598
1604
|
getPoint(event, alti);
|
|
1599
|
-
var _selectedItem = planData === null || planData === void 0 || (_planData$sceneGraph2 = planData.sceneGraph) === null || _planData$sceneGraph2 === void 0 || (_planData$sceneGraph2 = _planData$sceneGraph2.layers[(
|
|
1605
|
+
var _selectedItem = planData === null || planData === void 0 || (_planData$sceneGraph2 = planData.sceneGraph) === null || _planData$sceneGraph2 === void 0 || (_planData$sceneGraph2 = _planData$sceneGraph2.layers[(_selectedObject3 = selectedObject) === null || _selectedObject3 === void 0 ? void 0 : _selectedObject3.layerID]) === null || _planData$sceneGraph2 === void 0 ? void 0 : _planData$sceneGraph2.items[(_selectedObject4 = selectedObject) === null || _selectedObject4 === void 0 ? void 0 : _selectedObject4.itemID];
|
|
1600
1606
|
if (isSelected && !(0, _helper.isEmpty)(_selectedItem)) addItemToolObj();
|
|
1601
1607
|
if (bRotate) {
|
|
1602
1608
|
_this2.setState({
|
|
@@ -1634,7 +1640,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1634
1640
|
removeSnapBox();
|
|
1635
1641
|
actions.sceneActions.updateMovingState(true);
|
|
1636
1642
|
if (isSelected === true) {
|
|
1637
|
-
prepareSnap(layer);
|
|
1643
|
+
prepareSnap(curLayer !== null && curLayer !== void 0 ? curLayer : layer);
|
|
1638
1644
|
selectedObj = allItemRect.cur;
|
|
1639
1645
|
}
|
|
1640
1646
|
}
|
|
@@ -2033,8 +2039,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
2033
2039
|
// handle snapBox, distArray, backsplash
|
|
2034
2040
|
this.handleAfterMovingItem = function () {
|
|
2035
2041
|
var layer = _this2.props.state.scene.getIn(['layers', selectedObject.layerID]);
|
|
2042
|
+
var item = layer.getIn(['items', selectedObject.itemID]);
|
|
2036
2043
|
var item3D = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
2037
|
-
(0, _sceneCreator.getDistances)(layer);
|
|
2044
|
+
(0, _sceneCreator.getDistances)(layer, item);
|
|
2038
2045
|
var pointArray = [],
|
|
2039
2046
|
cnt = 0;
|
|
2040
2047
|
pointArray.push([_sceneCreator.fVLine[0].userData.distance, 90]);
|
|
@@ -2073,7 +2080,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
2073
2080
|
if (minDis < snapDelta && !snapFlag) {
|
|
2074
2081
|
_this2.snap(snapObj, layer);
|
|
2075
2082
|
snapFlag = true;
|
|
2076
|
-
(0, _sceneCreator.getDistances)(layer);
|
|
2083
|
+
(0, _sceneCreator.getDistances)(layer, item);
|
|
2077
2084
|
var _i13 = 0;
|
|
2078
2085
|
for (_i13 = 0; _i13 < _sceneCreator.fVLine.length; _i13++) {
|
|
2079
2086
|
if (_sceneCreator.fVLine[_i13].userData.distance < snapDelta) {
|
package/lib/constants.js
CHANGED
|
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.END_ROTATING_ITEM = exports.END_LOADING = exports.END_FITTING_IMAGE = exports.END_DRAWING_LINE = exports.END_DRAWING_ITEM = exports.END_DRAWING_HOLE_3D = exports.END_DRAWING_HOLE = exports.END_DRAGGING_VERTEX = exports.END_DRAGGING_LINE = exports.END_DRAGGING_ITEM_3D = exports.END_DRAGGING_ITEM = exports.END_DRAGGING_HOLE_3D = exports.END_DRAGGING_HOLE = exports.END_CREATING_HOLE = exports.END_CREATING_CABINET = exports.ELEVATION_VIEW_TITLE = exports.ELEVATION_VIEW_RIGHT = exports.ELEVATION_VIEW_LEFT = exports.ELEVATION_VIEW_KEYWORD = exports.ELEVATION_VIEW_FRONT = exports.ELEVATION_VIEW_BACK = exports.ELEVATION_VIEW = exports.ELEMENT_VERTEX = exports.ELEMENT_LINE = exports.ELEMENT_ITEM = exports.ELEMENT_HOLE = exports.ELEMENT_AREA = exports.EDIT_WIDTH = exports.EDIT = exports.DUPLICATE_SELECTED = exports.DISTANCE_MEASUREMENT_LINE_COLOR = exports.DISTANCE_EPSILON = exports.DIFFERENT_VALUES_PATH_LENGTH = exports.DELTA = exports.DEFAULT_FONT_FAMILY = exports.DECIMAL_PLACES_3 = exports.DECIMAL_PLACES_2 = exports.DASH_LINE_COLOR = exports.CREATE_ROOM_WITH_SHAPE = exports.COPY_PROPERTIES = exports.CLIENTS_NAME = exports.CHANGE_WINDOW_DOOR_MEASURE = exports.CHANGE_WALL_LENGTH_MEASURE = exports.CHANGE_WALL_CABINET_MEASURE = exports.CHANGE_MEASUREMENT_UNIT = exports.CHANGE_CATALOG_PAGE = exports.CHANGE_BASE_CABINET_MEASURE = exports.CEIL_UNITS_LENGTH = exports.BROWN_COLOR = exports.BOTTOM_MOLDING_LOCATION = exports.BOTTOM = exports.BG_COLOR_OVERLAY = exports.BG_COLOR_HOVER = exports.BG_COLOR_1 = exports.BG_COLOR_0 = exports.BEGIN_UPLOADING_IMAGE = exports.BEGIN_ROTATING_ITEM_3D = exports.BEGIN_ROTATING_ITEM = exports.BEGIN_FITTING_IMAGE = exports.BEGIN_DRAWING_LINE = exports.BEGIN_DRAGGING_VERTEX = exports.BEGIN_DRAGGING_LINE = exports.BEGIN_DRAGGING_ITEM_3D = exports.BEGIN_DRAGGING_ITEM = exports.BEGIN_DRAGGING_HOLE_3D = exports.BEGIN_DRAGGING_HOLE = exports.BASE_ITEM_MEASUREMENT_LINE_COLOR = exports.BASE_CABINET_LAYOUTPOS = exports.BACK_DIST_ANG = exports.ATT_VERTEXT_TWO = exports.ATT_VERTEXT_ONE = exports.ATT_LINE_LENGTH = exports.ATT_ITEM_ROTATION = exports.ATT_ITEM_POS = exports.ATT_HOLE_OFFSET_B = exports.ATT_HOLE_OFFSET_A = exports.ARROW_TEXT_FORECOLOR = exports.ARROW_TEXT_FONTFACE = exports.ARROW_TEXT_BACKCOLOR = exports.ARROW_COLOR = exports.ARRAY_ELEVATION_VIEW_MODES = exports.ARRAY_3D_MODES = exports.AREA_ACTIONS = exports.API_SERVER_URL = exports.ANIMATE_STEP_MIN = exports.ANIMATE_STEP_MAX = exports.ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT = exports.ANIMATE_OBJECT = exports.ALTERATE_STATE = exports.ADD_VERTICAL_GUIDE = exports.ADD_TO_GROUP = exports.ADD_LAYER = exports.ADD_HORIZONTAL_GUIDE = exports.ADD_GROUP_FROM_SELECTED = exports.ADD_GROUP = exports.ADD_ELEMENT_TO_CATALOG = exports.ADD_CIRCULAR_GUIDE = exports.ADD_CABINETS = exports.ADD_APPLIANCES = exports.ACCENT_COLOR = void 0;
|
|
7
|
-
exports.
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
10
|
-
exports.ZOOM_VARIABLE = exports.WARRANTY_VIEW = exports.WARRANTY_SUPPORT = exports.WARNING_MESSAGE = exports.WALL_ITEM_MEASUREMENT_LINE_COLOR = exports.WALL_CABINET_LAYOUTPOS = exports.VIEWER3D_ACTIONS = exports.VIEWER2D_ACTIONS = exports.VERTEX_ACTIONS = exports.VALIDATE_ITEM_POSTIONS = exports.USER_ACTIONS = exports.UPDATE_ZOOM_SCALE = exports.UPDATE_ROTATING_ITEM_CHANGED = exports.UPDATE_ROTATING_ITEM = exports.UPDATE_ROTATING = exports.UPDATE_POPUP_OPEN = exports.UPDATE_MOVING_STATE = exports.UPDATE_MOUSE_COORDS = exports.UPDATE_MOLDING = exports.UPDATE_ITEM_POSITION = exports.UPDATE_DRAWING_LINE = exports.UPDATE_DRAWING_ITEM = exports.UPDATE_DRAWING_HOLE_3D = exports.UPDATE_DRAWING_HOLE = exports.UPDATE_DRAGGING_VERTEX = void 0;
|
|
7
|
+
exports.MODE_DRAWING_ITEM = exports.MODE_DRAWING_HOLE_3D = exports.MODE_DRAWING_HOLE = exports.MODE_DRAGGING_VERTEX = exports.MODE_DRAGGING_LINE = exports.MODE_DRAGGING_ITEM_3D = exports.MODE_DRAGGING_ITEM = exports.MODE_DRAGGING_HOLE_3D = exports.MODE_DRAGGING_HOLE = exports.MODE_CONFIGURING_PROJECT = exports.MODE_BACK_ELEVATION_VIEW = exports.MODE_3D_VIEW = exports.MODE_3D_FIRST_PERSON = exports.MODE_2D_ZOOM_OUT = exports.MODE_2D_ZOOM_IN = exports.MODE_2D_PAN = exports.MODE = exports.MIN_ANGLE_DISALLOW_DRAW_WALL = exports.MIDDLE_MOLDING_LOCATION = exports.MEPSILON = exports.MAX_ZOOM_IN_SCALE = exports.MAX_ANGLE_SCALE = exports.MAKE_FLOOR_PLAN = exports.LOGOUT = exports.LOGIN_SUCCESS = exports.LOGIN_ERROR = exports.LOCAL_STORAGE_TOKEN_VALUE = exports.LOCAL_STORAGE_TOKEN_NAME = exports.LOCAL_STORAGE_ORIGINAL_TOKEN = exports.LOCAL_STORAGE_CUSTOMER_INFO = exports.LOCAL_STORAGE_CART_ACTION = exports.LOAD_PROJECT = exports.LIST_QUANTITIES = exports.LIST_PARTS = exports.LINE_THICKNESS = exports.LINE_ACTIONS = exports.LEFT_DIST_ANG = exports.LEFT = exports.LABEL_COLOR = exports.KITCHEN_KONFIGURATOR = exports.KEYBOARD_BUTTON_CODE = exports.ITEM_TYPE = exports.ITEM_MOVE_UP = exports.ITEMS_ACTIONS = exports.INVERT = exports.INTERNAL_EVENT_UNSELECT_ALL = exports.INTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.INTERNAL_EVENT_SYNC_SCENE = exports.INTERNAL_EVENT_START_DRAW_WALL = exports.INTERNAL_EVENT_SELECT_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_ITEMS_CATALOG = exports.INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAG_ELEMENT = exports.INSTALLATION_TYPE_SKU_SUFFIX = exports.INSTALLATION_TYPE_NAME = exports.INSTALLATION_SUFFIX_TYPE = exports.INIT_CATALOG = exports.HOLE_NAMES = exports.HOLE_ACTIONS = exports.HDR_URLS = exports.HAS_LOADINGBAR = exports.GROUP_TRANSLATE = exports.GROUP_ROTATE = exports.GROUP_ACTIONS = exports.GO_BACK_TO_CATALOG_PAGE = exports.FRONT_DIST_ANG = exports.FINISHING_TYPE = exports.FINISHING_TOUCH = exports.EXTERNAL_EVENT_ZOOM_OUT = exports.EXTERNAL_EVENT_ZOOM_IN = exports.EXTERNAL_EVENT_UPDATE_PROPERTY = exports.EXTERNAL_EVENT_UPDATE_ATTRIBUTE = exports.EXTERNAL_EVENT_UNDO = exports.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.EXTERNAL_EVENT_TOGGLE_TO_3D = exports.EXTERNAL_EVENT_TOGGLE_TO_2D = exports.EXTERNAL_EVENT_SYNC_SCENE = exports.EXTERNAL_EVENT_SET_MOLDING = exports.EXTERNAL_EVENT_SET_FINISHING = exports.EXTERNAL_EVENT_ROTATE_PAN = exports.EXTERNAL_EVENT_REPLACE_CABINET = exports.EXTERNAL_EVENT_REDO = exports.EXTERNAL_EVENT_PROJECT_SETTING = exports.EXTERNAL_EVENT_NEW_PROJECT = exports.EXTERNAL_EVENT_MOVE_PAN = exports.EXTERNAL_EVENT_LOAD_PROJECT = exports.EXTERNAL_EVENT_DUPLICATE_ELEMENT = exports.EXTERNAL_EVENT_DELETE_ELEMENT = exports.EXTERNAL_EVENT_CHANGE_DOORSTYLE = exports.EXTERNAL_EVENT_CENTERING_2D = exports.EXTERNAL_EVENT_ADD_WALL = exports.EXTERNAL_EVENT_ADD_ROOM_SHAPE = exports.EXTERNAL_EVENT_ADD_ITEM = exports.EXTERNAL_EVENT_ADD_HOLE = exports.ERROR_DATABASE = exports.EPSILON = exports.END_UPLOADING_IMAGE = exports.END_ROTATING_ITEM_3D = void 0;
|
|
8
|
+
exports.SET_DOOR_HANDLE = exports.SET_DISTANT = exports.SET_COUNTER_TOP = exports.SET_BACKSPLASH_VISIBLE = exports.SET_BACKSPLASH = exports.SET_APPLIANCE_MATERIAL = exports.SELECT_TOOL_ZOOM_OUT = exports.SELECT_TOOL_ZOOM_IN = exports.SELECT_TOOL_UPLOAD_IMAGE = exports.SELECT_TOOL_PAN = exports.SELECT_TOOL_EDIT = exports.SELECT_TOOL_DRAWING_LINE = exports.SELECT_TOOL_DRAWING_ITEM_3D = exports.SELECT_TOOL_DRAWING_ITEM = exports.SELECT_TOOL_DRAWING_HOLE_3D = exports.SELECT_TOOL_DRAWING_HOLE = exports.SELECT_TOOL_3D_VIEW = exports.SELECT_TOOL_3D_FIRST_PERSON = exports.SELECT_LINE = exports.SELECT_LAYER = exports.SELECT_ITEM = exports.SELECT_HOLE = exports.SELECT_GROUP = exports.SELECT_DOOR_STYLE = exports.SELECT_AREA = exports.SELECT_ALL = exports.SELECTALL = exports.SECONDARY_PURPLE_COLOR = exports.SECONDARY_BLUE_COLOR = exports.SCENE_ACTIONS = exports.SAVE_PROJECT = exports.SAVE_DESIGN = exports.ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_MEASUREMENT_LINE_COLOR = exports.ROOM_ELEMENT_MEASUREMENT_LINE_COLOR = exports.ROLLBACK = exports.RIGHT_DIST_ANG = exports.RIGHT = exports.REVIEW_AND_QUOTE = exports.REQUEST_ASSISTANCE = exports.REPLACE_SUBMODULE = exports.REPLACE_ITEM = exports.REMOVE_VERTICAL_GUIDE = exports.REMOVE_REPLACE_SUBMODULE = exports.REMOVE_LINEAR = exports.REMOVE_LAYER = exports.REMOVE_HORIZONTAL_GUIDE = exports.REMOVE_GROUP_AND_DELETE_ELEMENTS = exports.REMOVE_GROUP = exports.REMOVE_FROM_GROUP = exports.REMOVE_DRAWING_SUPPORT = exports.REMOVE_CIRCULAR_GUIDE = exports.REMOVE = exports.REDO = exports.RECREATE = exports.PUSH_LAST_SELECTED_CATALOG_ELEMENT_TO_HISTORY = exports.PROP_RESIZE_WIDTH = exports.PROP_RESIZE_HEIGHT = exports.PROP_RESIZE_DEPTH = exports.PROP_OPEN_DOORS = exports.PROP_FLIP_DOOR_HANDLE = exports.PROP_ALTITUDE = exports.PROJECT_SETTING_OPTION = exports.PROJECT_RE_NAME = exports.PROJECT_NAME_LENGTH_LIMIT = exports.PROJECT_ACTIONS = exports.PRODUCT = exports.PRIMARY_GREEN_COLOR = exports.PASTE_PROPERTIES = exports.OVERLAP_SOME = exports.OVERLAP_SAME = exports.OVERLAP_NONE = exports.OVERLAP_LINK = exports.OVERLAP_INCLUDED = exports.OPEN_PROJECT_CONFIGURATOR = exports.OPEN_CATALOG = exports.OBJTYPE_MESH = exports.OBJTYPE_GROUP = exports.NO_DATA_DATABASE = exports.NEW_PROJECT_BTN = exports.NEW_PROJECT = exports.NEW_DESIGN = exports.MOVE_COMPONENT = exports.MOLDING_LOCATIONS = exports.MODE_WAITING_DRAWING_LINE = exports.MODE_VIEWING_CATALOG = exports.MODE_UPLOADING_IMAGE = exports.MODE_SNAPPING = exports.MODE_ROTATING_ITEM_3D = exports.MODE_ROTATING_ITEM = exports.MODE_RIGHT_ELEVATION_VIEW = exports.MODE_LEFT_ELEVATION_VIEW = exports.MODE_IDLE_3D = exports.MODE_IDLE = exports.MODE_FRONT_VIEW = exports.MODE_FRONT_ELEVATION_VIEW = exports.MODE_FITTING_IMAGE = exports.MODE_ELEVATION_VIEW = exports.MODE_DRAWING_LINE = exports.MODE_DRAWING_ITEM_3D = void 0;
|
|
9
|
+
exports.UPDATE_DRAGGING_ITEM_CHANGED = exports.UPDATE_DRAGGING_ITEM_3DY = exports.UPDATE_DRAGGING_ITEM_3DX = exports.UPDATE_DRAGGING_ITEM = exports.UPDATE_DRAGGING_HOLE_RULER_CHANGED = exports.UPDATE_DRAGGING_HOLE_CHANGED = exports.UPDATE_DRAGGING_HOLE_3D = exports.UPDATE_DRAGGING_HOLE = exports.UPDATE_CEIL_HEIGHT_UNIT = exports.UPDATE_CEIL_HEIGHT = exports.UPDATE_3D_CEIL_HEIGHT_UNIT = exports.UPDATE_3D_CEIL_HEIGHT = exports.UPDATE_2D_CAMERA = exports.UNSELECT_GROUP = exports.UNSELECT_ALL = exports.UNIT_MILLIMETER = exports.UNIT_MILE = exports.UNIT_METER = exports.UNIT_INCH = exports.UNIT_FOOT = exports.UNIT_CENTIMETER = exports.UNIT_ANGLE = exports.UNITS_LENGTH = exports.UNDO = exports.UNCREATE = exports.TWO_D_FLOOR_PLAN = exports.TOP_MOLDING_LOCATION = exports.TOP = exports.TOGGLE_SNAP = exports.TOGGLE_LOADING_CABINET = exports.TOE_KICK_MOLDING = exports.TITLE_SMALL_COLOR = exports.TITLE_COLOR = exports.THROW_WARNING = exports.THROW_ERROR = exports.TEXT_COLOR_NEUTRAL_7 = exports.TEXT_COLOR_NEUTRAL_6 = exports.TEXT_COLOR_NEUTRAL_5 = exports.TEXT_COLOR_NEUTRAL_4 = exports.TEXT_COLOR_NEUTRAL_3 = exports.TEXT_COLOR_NEUTRAL_2 = exports.TEXT_COLOR_NEUTRAL_1 = exports.TEXT_COLOR_NEUTRAL_0 = exports.TEXT_COLOR = exports.TECHNICAL_VIEW = exports.TALL_CABINET_LAYOUTPOS = exports.TAKE_PICTURE = exports.SUBTOTAL = exports.SUBMIT_REQUEST_ASSIST = exports.SUBMIT_DESIGN = exports.SUBMIT_ADD_CART = exports.STORE_DIST_ARRAY = exports.STOP_DRAWING_LINE = exports.STEP_CABINET_CHOOSE_PRODUCT = exports.STATUS_WARNING_LIGHT_COLOR = exports.STATUS_WARNING_COLOR = exports.STATUS_POSITIVE_LIGHT_COLOR = exports.STATUS_POSITIVE_COLOR = exports.STATUS_OVERDUE_LIGHT_COLOR = exports.STATUS_OVERDUE_COLOR = exports.STATUS_NEGATIVE_LIGHT_COLOR = exports.STATUS_NEGATIVE_COLOR = exports.STATUS_INFO_LIGHT_COLOR = exports.STATUS_INFO_COLOR = exports.SHIFT2DON = exports.SHIFT2DOFF = exports.SHAPE_SVG_WIDTH = exports.SHAPE_SVG_PADDING = exports.SHAPE_SVG_DEPTH = exports.SHADE_LIGHT_PURPLE_COLOR = exports.SHADE_LIGHT_GREEN_COLOR = exports.SHADE_LIGHT_BLUE_COLOR = exports.SHADE_DARK_PURPLE_COLOR = exports.SHADE_DARK_GREEN_COLOR = exports.SHADE_DARK_BLUE_COLOR = exports.SET_WALL_COLOR = exports.SET_USER_DATA = exports.SET_STATE_PROPERTIES = exports.SET_ROTATE_STATUS = exports.SET_RELATED_LINE = exports.SET_PROPERTIES = exports.SET_PROJECT_PROPERTIES = exports.SET_PROJECT_ID = exports.SET_MOVE_STATUS = exports.SET_MOLDING = exports.SET_MODELLING = exports.SET_MODE = exports.SET_LINES_ATTRIBUTES = exports.SET_LAYER_PROPERTIES = exports.SET_ITEMS_ATTRIBUTES = exports.SET_IS_HELP = exports.SET_IS_CABINET_DRAWING = exports.SET_INITIAL_DOOR_STYLE = exports.SET_HOLES_ATTRIBUTES = exports.SET_HANDLE_MATERIAL = exports.SET_GROUP_PROPERTIES = exports.SET_GROUP_BARYCENTER = exports.SET_GROUP_ATTRIBUTES = exports.SET_FLOOR_STYLES = exports.SET_DOOR_STYLE = void 0;
|
|
10
|
+
exports.ZOOM_VARIABLE = exports.WARRANTY_VIEW = exports.WARRANTY_SUPPORT = exports.WARNING_MESSAGE = exports.WALL_ITEM_MEASUREMENT_LINE_COLOR = exports.WALL_CABINET_LAYOUTPOS = exports.VIEWER3D_ACTIONS = exports.VIEWER2D_ACTIONS = exports.VERTEX_ACTIONS = exports.VALIDATE_ITEM_POSTIONS = exports.USER_ACTIONS = exports.UPDATE_ZOOM_SCALE = exports.UPDATE_ROTATING_ITEM_CHANGED = exports.UPDATE_ROTATING_ITEM = exports.UPDATE_ROTATING = exports.UPDATE_POPUP_OPEN = exports.UPDATE_MOVING_STATE = exports.UPDATE_MOUSE_COORDS = exports.UPDATE_MOLDING = exports.UPDATE_ITEM_POSITION = exports.UPDATE_DRAWING_LINE = exports.UPDATE_DRAWING_ITEM = exports.UPDATE_DRAWING_HOLE_3D = exports.UPDATE_DRAWING_HOLE = exports.UPDATE_DRAGGING_VERTEX = exports.UPDATE_DRAGGING_LINE = void 0;
|
|
11
11
|
//API server
|
|
12
12
|
// export const API_SERVER = 'http://localhost:3000/';
|
|
13
13
|
// ACTIONS project
|
|
@@ -761,6 +761,7 @@ var INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAW_ELEMENT = 'INTERNA
|
|
|
761
761
|
var INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = 'INTERNAL_EVENT_ROTATE_ELEMENT';
|
|
762
762
|
var INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_REPLACE_CABINET = 'INTERNAL_EVENT_REPLACE_CABINET';
|
|
763
763
|
var INTERNAL_EVENT_START_DRAW_WALL = exports.INTERNAL_EVENT_START_DRAW_WALL = 'INTERNAL_EVENT_START_DRAW_WALL';
|
|
764
|
+
var INTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.INTERNAL_EVENT_TOGGLE_TO_ELEVATION = 'INTERNAL_EVENT_TOGGLE_TO_ELEVATION';
|
|
764
765
|
|
|
765
766
|
// room shape type
|
|
766
767
|
var ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_TYPE = {
|
package/lib/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
@@ -15,8 +16,10 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
15
16
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
16
17
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
17
18
|
var _react = _interopRequireDefault(require("react"));
|
|
19
|
+
var Three = _interopRequireWildcard(require("three"));
|
|
18
20
|
var _LiteRenderer = _interopRequireDefault(require("./LiteRenderer"));
|
|
19
21
|
var _client = require("react-dom/client");
|
|
22
|
+
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
23
|
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)); }
|
|
21
24
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
22
25
|
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
|
|
@@ -30,6 +33,18 @@ function nextFrame() {
|
|
|
30
33
|
});
|
|
31
34
|
}
|
|
32
35
|
|
|
36
|
+
// DIY-714 [Temp Fix] Rewrite API URLs
|
|
37
|
+
var API_HOST_REGEX = /(https?:\/\/)?(api\.diydesignspace\.com|api\.addovisuals\.com|127\.0\.0\.1:4002)/;
|
|
38
|
+
var API_HOST_REPLACEMENT = 'https://api-old.diydesignspace.com';
|
|
39
|
+
function rewriteApiUrl(url) {
|
|
40
|
+
return typeof url === 'string' ? url.replace(API_HOST_REGEX, API_HOST_REPLACEMENT) : url;
|
|
41
|
+
}
|
|
42
|
+
var originalTextureLoad = Three.TextureLoader.prototype.load;
|
|
43
|
+
Three.TextureLoader.prototype.load = function (url, onLoad, onProgress, onError) {
|
|
44
|
+
var newUrl = rewriteApiUrl(url);
|
|
45
|
+
return originalTextureLoad.call(this, newUrl, onLoad, onProgress, onError);
|
|
46
|
+
};
|
|
47
|
+
|
|
33
48
|
/**
|
|
34
49
|
* Track 3D asset network activity (gltf/glb/bin/textures/hdr/etc)
|
|
35
50
|
* Ref-counted global install so multiple instances don't clobber each other.
|
|
@@ -152,7 +167,9 @@ function installGltfTracker() {
|
|
|
152
167
|
var _len3,
|
|
153
168
|
args,
|
|
154
169
|
_key3,
|
|
155
|
-
|
|
170
|
+
input,
|
|
171
|
+
init,
|
|
172
|
+
newUrl,
|
|
156
173
|
track,
|
|
157
174
|
_args2 = arguments;
|
|
158
175
|
return _regenerator["default"].wrap(function (_context2) {
|
|
@@ -161,19 +178,25 @@ function installGltfTracker() {
|
|
|
161
178
|
for (_len3 = _args2.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
|
|
162
179
|
args[_key3] = _args2[_key3];
|
|
163
180
|
}
|
|
164
|
-
|
|
165
|
-
|
|
181
|
+
input = args[0], init = args[1]; // DIY-714 [Temp Fix] Rewrite API URLs
|
|
182
|
+
if (typeof input === 'string') {
|
|
183
|
+
input = rewriteApiUrl(input);
|
|
184
|
+
} else if (input instanceof Request) {
|
|
185
|
+
newUrl = rewriteApiUrl(input.url);
|
|
186
|
+
input = new Request(newUrl, input);
|
|
187
|
+
}
|
|
188
|
+
track = is3dAssetUrl(input);
|
|
166
189
|
if (track) {
|
|
167
190
|
_context2.next = 1;
|
|
168
191
|
break;
|
|
169
192
|
}
|
|
170
|
-
return _context2.abrupt("return", g.originalFetch.
|
|
193
|
+
return _context2.abrupt("return", g.originalFetch.call(this, input, init));
|
|
171
194
|
case 1:
|
|
172
195
|
g.inFlight += 1;
|
|
173
196
|
notify();
|
|
174
197
|
_context2.prev = 2;
|
|
175
198
|
_context2.next = 3;
|
|
176
|
-
return g.originalFetch.
|
|
199
|
+
return g.originalFetch.call(this, input, init);
|
|
177
200
|
case 3:
|
|
178
201
|
return _context2.abrupt("return", _context2.sent);
|
|
179
202
|
case 4:
|
package/lib/models.js
CHANGED
|
@@ -365,6 +365,7 @@ var Catalog = exports.Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
365
365
|
return (0, _createClass2["default"])(Catalog, [{
|
|
366
366
|
key: "factoryElement",
|
|
367
367
|
value: function factoryElement(type, options, initialProperties, state) {
|
|
368
|
+
var _element$structure_js, _element$structure_js2, _element$structure_js3, _element$structure_js4, _element$structure_js5, _element$structure_js6;
|
|
368
369
|
if (!this.elements.has(type)) {
|
|
369
370
|
var catList = this.elements.map(function (element) {
|
|
370
371
|
return element.name;
|
|
@@ -372,6 +373,9 @@ var Catalog = exports.Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
372
373
|
throw new Error("Element ".concat(type, " does not exist in catalog ").concat(catList));
|
|
373
374
|
}
|
|
374
375
|
var element = this.elements.get(type);
|
|
376
|
+
var widthUnit = (_element$structure_js = element === null || element === void 0 || (_element$structure_js2 = element.structure_json) === null || _element$structure_js2 === void 0 ? void 0 : _element$structure_js2.width_unit) !== null && _element$structure_js !== void 0 ? _element$structure_js : 'in';
|
|
377
|
+
var heightUnit = (_element$structure_js3 = element === null || element === void 0 || (_element$structure_js4 = element.structure_json) === null || _element$structure_js4 === void 0 ? void 0 : _element$structure_js4.height_unit) !== null && _element$structure_js3 !== void 0 ? _element$structure_js3 : 'in';
|
|
378
|
+
var lengthUnit = (_element$structure_js5 = element === null || element === void 0 || (_element$structure_js6 = element.structure_json) === null || _element$structure_js6 === void 0 ? void 0 : _element$structure_js6.length_unit) !== null && _element$structure_js5 !== void 0 ? _element$structure_js5 : 'in';
|
|
375
379
|
var properties = element.properties.map(function (value, key) {
|
|
376
380
|
return initialProperties && initialProperties.has(key) ? initialProperties.get(key) : value.get('defaultValue');
|
|
377
381
|
});
|
|
@@ -398,18 +402,18 @@ var Catalog = exports.Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
398
402
|
var _sizeinfo = {
|
|
399
403
|
width: new _immutable.Map({
|
|
400
404
|
_length: temp.width,
|
|
401
|
-
_unit:
|
|
402
|
-
length: (0, _convertUnitsLite.convert)(temp.width).from(
|
|
405
|
+
_unit: widthUnit,
|
|
406
|
+
length: (0, _convertUnitsLite.convert)(temp.width).from(widthUnit).to('cm') // unit of size in dataBundle is inch
|
|
403
407
|
}),
|
|
404
408
|
height: new _immutable.Map({
|
|
405
409
|
_length: temp.height,
|
|
406
|
-
_unit:
|
|
407
|
-
length: (0, _convertUnitsLite.convert)(temp.height).from(
|
|
410
|
+
_unit: heightUnit,
|
|
411
|
+
length: (0, _convertUnitsLite.convert)(temp.height).from(heightUnit).to('cm')
|
|
408
412
|
}),
|
|
409
413
|
depth: new _immutable.Map({
|
|
410
414
|
_length: temp.depth,
|
|
411
|
-
_unit:
|
|
412
|
-
length: (0, _convertUnitsLite.convert)(temp.depth).from(
|
|
415
|
+
_unit: lengthUnit,
|
|
416
|
+
length: (0, _convertUnitsLite.convert)(temp.depth).from(lengthUnit).to('cm')
|
|
413
417
|
})
|
|
414
418
|
};
|
|
415
419
|
properties = properties.set('width', _sizeinfo.width).set('height', _sizeinfo.height).set('depth', _sizeinfo.depth);
|
|
@@ -135,7 +135,7 @@ function _default(state, action) {
|
|
|
135
135
|
state = state.merge({
|
|
136
136
|
sceneHistory: _export.history.historyPush(state.sceneHistory, state.scene)
|
|
137
137
|
});
|
|
138
|
-
return _export2.Project.createRoomWithShape(state, action.roomShapeType, action.width, action.height, action.doorStyle).updatedState;
|
|
138
|
+
return _export2.Project.createRoomWithShape(state, action.roomShapeType, action.width, action.height, action.measurementUnit, action.doorStyle).updatedState;
|
|
139
139
|
default:
|
|
140
140
|
return state;
|
|
141
141
|
}
|
|
@@ -35,8 +35,10 @@ function _default(state, action) {
|
|
|
35
35
|
if (item.type.includes('Light')) {
|
|
36
36
|
var height = item.properties.getIn(['height', '_length']);
|
|
37
37
|
var heightUnit = item.properties.getIn(['height', '_unit']);
|
|
38
|
-
var newAltitude = action.value - (0, _convertUnitsLite.convert)(height).from(heightUnit).to('in');
|
|
38
|
+
var newAltitude = (0, _convertUnitsLite.convert)(action.value).from(_layer.unit).to('in') - (0, _convertUnitsLite.convert)(height).from(heightUnit).to('in');
|
|
39
39
|
item = item.setIn(['properties', 'altitude', '_length'], (0, _convertUnitsLite.convert)(newAltitude).from('in').to(_layer.unit));
|
|
40
|
+
item = item.setIn(['properties', 'altitude', '_unit'], _layer.unit);
|
|
41
|
+
item = item.setIn(['properties', 'altitude', 'length'], (0, _convertUnitsLite.convert)(newAltitude).from('in').to('cm'));
|
|
40
42
|
}
|
|
41
43
|
return item;
|
|
42
44
|
});
|
|
@@ -40,8 +40,10 @@ function _default(state, action) {
|
|
|
40
40
|
if (item.type.includes('Light')) {
|
|
41
41
|
var height = item.properties.getIn(['height', '_length']);
|
|
42
42
|
var heightUnit = item.properties.getIn(['height', '_unit']);
|
|
43
|
-
var newAltitude = action.value - (0, _convertUnitsLite.convert)(height).from(heightUnit).to('in');
|
|
43
|
+
var newAltitude = (0, _convertUnitsLite.convert)(action.value).from(_layer.unit).to('in') - (0, _convertUnitsLite.convert)(height).from(heightUnit).to('in');
|
|
44
44
|
item = item.setIn(['properties', 'altitude', '_length'], (0, _convertUnitsLite.convert)(newAltitude).from('in').to(_layer.unit));
|
|
45
|
+
item = item.setIn(['properties', 'altitude', '_unit'], _layer.unit);
|
|
46
|
+
item = item.setIn(['properties', 'altitude', 'length'], (0, _convertUnitsLite.convert)(newAltitude).from('in').to('cm'));
|
|
45
47
|
}
|
|
46
48
|
return item;
|
|
47
49
|
});
|
package/lib/utils/geometry.js
CHANGED
|
@@ -841,9 +841,9 @@ function getAllItemSpecified(scene, catalog, filter) {
|
|
|
841
841
|
var info = cat === null || cat === void 0 ? void 0 : cat.info;
|
|
842
842
|
var props = item.properties;
|
|
843
843
|
var getSize = function getSize(key) {
|
|
844
|
-
var _props$getIn;
|
|
844
|
+
var _props$getIn, _props$getIn2, _props$getIn3;
|
|
845
845
|
var length = props === null || props === void 0 || (_props$getIn = props.getIn) === null || _props$getIn === void 0 ? void 0 : _props$getIn.call(props, [key, '_length']);
|
|
846
|
-
return length != null ? (0, _convertUnitsLite.convert)(length).from('in').to(scene.unit) : 0;
|
|
846
|
+
return length != null ? (0, _convertUnitsLite.convert)(length).from((_props$getIn2 = props === null || props === void 0 || (_props$getIn3 = props.getIn) === null || _props$getIn3 === void 0 ? void 0 : _props$getIn3.call(props, [key, '_unit'])) !== null && _props$getIn2 !== void 0 ? _props$getIn2 : 'in').to(scene.unit) : 0;
|
|
847
847
|
};
|
|
848
848
|
val.size = {
|
|
849
849
|
width: getSize('width'),
|
|
@@ -2586,7 +2586,7 @@ function getAllItems2(curItem, layer) {
|
|
|
2586
2586
|
var itemTall = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from(item.get('properties').get('height').get('_unit')).to('cm');
|
|
2587
2587
|
var zMinItem = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from(item.get('properties').get('altitude').get('_unit')).to('cm');
|
|
2588
2588
|
var zMaxItem = zMinItem + itemTall;
|
|
2589
|
-
if (zMinItem
|
|
2589
|
+
if (zMinItem - zMinCurItem >= 0 && zMaxCurItem - zMinItem > _constants.EPSILON || zMinCurItem - zMinItem >= 0 && zMaxItem - zMinCurItem > _constants.EPSILON) detectObjectsAtSameAltitudeFlag = true;
|
|
2590
2590
|
if (detectObjectsAtSameAltitudeFlag) {
|
|
2591
2591
|
var x = val.pos.x;
|
|
2592
2592
|
var y = val.pos.y;
|
|
@@ -2650,10 +2650,10 @@ function calcDistancesFromItemToWalls(curItem, layer) {
|
|
|
2650
2650
|
height: height
|
|
2651
2651
|
};
|
|
2652
2652
|
var curiteminfo = getCalcRectFromItem2(itemInfo);
|
|
2653
|
-
var allItemRect = getAllItems2(curItem, layer);
|
|
2654
|
-
var allLines = getAllLines(layer);
|
|
2655
|
-
var allLineRects = buildRectFromLines(layer, allLines);
|
|
2656
|
-
var allRect = allLineRects.concat(allItemRect.others);
|
|
2653
|
+
var allItemRect = getAllItems2(curItem, layer); // get all item edge rects
|
|
2654
|
+
var allLines = getAllLines(layer); // get all wall lines
|
|
2655
|
+
var allLineRects = buildRectFromLines(layer, allLines); // make line rects from wall lines
|
|
2656
|
+
var allRect = allLineRects.concat(allItemRect.others); // item edges + wall lines
|
|
2657
2657
|
var _loop = function _loop(i) {
|
|
2658
2658
|
// [rectCenterPoint] has four middle points of cabinet rect edges
|
|
2659
2659
|
var centerpoint = curiteminfo.rectCenterPoint[i];
|
|
@@ -1242,7 +1242,7 @@ function handleExternalEvent(_x10) {
|
|
|
1242
1242
|
function _handleExternalEvent() {
|
|
1243
1243
|
_handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee0(props) {
|
|
1244
1244
|
var _evt$payload3, _evt$payload4;
|
|
1245
|
-
var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop6, i, newScene, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop7, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5, _t6;
|
|
1245
|
+
var evt, state, layerId, layer, _evt$payload, _state$catalog, cdsItems, itemKeys, _loop6, i, newScene, tempState, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop7, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, measurementUnit, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5, _t6;
|
|
1246
1246
|
return _regenerator["default"].wrap(function (_context11) {
|
|
1247
1247
|
while (1) switch (_context11.prev = _context11.next) {
|
|
1248
1248
|
case 0:
|
|
@@ -1310,10 +1310,10 @@ function _handleExternalEvent() {
|
|
|
1310
1310
|
break;
|
|
1311
1311
|
case 5:
|
|
1312
1312
|
newScene = new _models.Scene(evt === null || evt === void 0 ? void 0 : evt.payload);
|
|
1313
|
-
|
|
1314
|
-
scene: newScene.toJS()
|
|
1315
|
-
|
|
1316
|
-
// request item catalog data to host app
|
|
1313
|
+
tempState = new _models.State({
|
|
1314
|
+
scene: newScene.toJS(),
|
|
1315
|
+
catalog: (_state$catalog = state.catalog) === null || _state$catalog === void 0 ? void 0 : _state$catalog.toJS()
|
|
1316
|
+
}); // request item catalog data to host app
|
|
1317
1317
|
if (cdsItems.length > 0) {
|
|
1318
1318
|
(_props$onInternalEven = props.onInternalEvent) === null || _props$onInternalEven === void 0 || _props$onInternalEven.call(props, {
|
|
1319
1319
|
type: _constants.INTERNAL_EVENT_ITEMS_CATALOG,
|
|
@@ -1334,7 +1334,7 @@ function _handleExternalEvent() {
|
|
|
1334
1334
|
break;
|
|
1335
1335
|
}
|
|
1336
1336
|
_context9.next = 2;
|
|
1337
|
-
return addItemToCatalog(rt[_i],
|
|
1337
|
+
return addItemToCatalog(rt[_i], tempState, props.catalog, props.projectActions);
|
|
1338
1338
|
case 2:
|
|
1339
1339
|
_i++;
|
|
1340
1340
|
_context9.next = 1;
|
|
@@ -1500,8 +1500,8 @@ function _handleExternalEvent() {
|
|
|
1500
1500
|
} else props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
1501
1501
|
return _context11.abrupt("continue", 45);
|
|
1502
1502
|
case 21:
|
|
1503
|
-
_evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle;
|
|
1504
|
-
props.projectActions.createRoomWithShape(roomShapeType, width, height, _doorStyle);
|
|
1503
|
+
_evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, measurementUnit = _evt$payload6.measurementUnit, _doorStyle = _evt$payload6.doorStyle;
|
|
1504
|
+
props.projectActions.createRoomWithShape(roomShapeType, width, height, measurementUnit, _doorStyle);
|
|
1505
1505
|
return _context11.abrupt("continue", 45);
|
|
1506
1506
|
case 22:
|
|
1507
1507
|
value = state.getIn(['viewer2D']).toJS();
|
package/lib/utils/molding.js
CHANGED
|
@@ -334,6 +334,7 @@ function getLinesOfItem(item, allLineRects, catalog) {
|
|
|
334
334
|
return lines;
|
|
335
335
|
}
|
|
336
336
|
function getLinesOfItem2(item, allLineRects, catalog) {
|
|
337
|
+
var _lines;
|
|
337
338
|
var lines = [];
|
|
338
339
|
var outline = null;
|
|
339
340
|
var element = catalog.elements[item.get('type')];
|
|
@@ -346,8 +347,9 @@ function getLinesOfItem2(item, allLineRects, catalog) {
|
|
|
346
347
|
var hUnit = item.properties.get('depth').get('_unit') || 'cm';
|
|
347
348
|
newDepth = (0, _convertUnitsLite.convert)(newDepth).from(hUnit).to('cm');
|
|
348
349
|
if (item) {
|
|
350
|
+
var _element;
|
|
349
351
|
// Get Outline Data of Selected Item
|
|
350
|
-
outline = element.info.outline;
|
|
352
|
+
outline = (_element = element) === null || _element === void 0 ? void 0 : _element.info.outline;
|
|
351
353
|
if (outline) {
|
|
352
354
|
// Extract Points from `outline`
|
|
353
355
|
var outlinePaths = outline.paths;
|
|
@@ -388,7 +390,7 @@ function getLinesOfItem2(item, allLineRects, catalog) {
|
|
|
388
390
|
}
|
|
389
391
|
}
|
|
390
392
|
}
|
|
391
|
-
lines = lines.filter(function (line) {
|
|
393
|
+
lines = (_lines = lines) === null || _lines === void 0 ? void 0 : _lines.filter(function (line) {
|
|
392
394
|
return !_export.GeometryUtils.isSnappedLine({
|
|
393
395
|
rect: [{
|
|
394
396
|
x: 0,
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.getRulerDisplayData = getRulerDisplayData;
|
|
7
|
+
var _convertUnitsLite = require("../utils/convert-units-lite.js");
|
|
8
|
+
var _constants = require("../constants");
|
|
9
|
+
// Below this length, the measurement LINE is hidden
|
|
10
|
+
var MIN_LENGTH_TO_SHOW_RULER_LINE_INCH = 13;
|
|
11
|
+
|
|
12
|
+
// Below this length, the measurement VALUE (text) is hidden
|
|
13
|
+
var MIN_LENGTH_TO_SHOW_RULER_VALUE_INCH = 5;
|
|
14
|
+
function formatDistance(value, fixed) {
|
|
15
|
+
// format with fixed decimals first
|
|
16
|
+
var text = value.toFixed(fixed);
|
|
17
|
+
|
|
18
|
+
// remove trailing zeros AFTER decimal, then remove trailing dot if needed
|
|
19
|
+
// examples:
|
|
20
|
+
// 2.00 -> 2
|
|
21
|
+
// 2.50 -> 2.5
|
|
22
|
+
// 200.00 -> 200
|
|
23
|
+
text = text.replace(/\.?0+$/, '');
|
|
24
|
+
return text;
|
|
25
|
+
}
|
|
26
|
+
function getUnitString(unit) {
|
|
27
|
+
if (unit === 'cm' || unit === 'mm') return '';
|
|
28
|
+
if (unit === 'in') return '"';
|
|
29
|
+
return unit;
|
|
30
|
+
}
|
|
31
|
+
function getRulerDisplayData(_ref) {
|
|
32
|
+
var length = _ref.length,
|
|
33
|
+
unit = _ref.unit,
|
|
34
|
+
rulerUnit = _ref.rulerUnit,
|
|
35
|
+
layerUnit = _ref.layerUnit,
|
|
36
|
+
_ref$charWidth = _ref.charWidth,
|
|
37
|
+
charWidth = _ref$charWidth === void 0 ? 8 : _ref$charWidth;
|
|
38
|
+
// 7.62 cm -> ruLength 2.99 in
|
|
39
|
+
var ruLength = (0, _convertUnitsLite.convert)(length).from(unit).to(rulerUnit);
|
|
40
|
+
var fixedLength = layerUnit === _constants.UNIT_MILLIMETER ? 0 : layerUnit === _constants.UNIT_CENTIMETER ? 1 : 2;
|
|
41
|
+
|
|
42
|
+
// 2.99 in -> valueInLayerUnit 2.99 in
|
|
43
|
+
var valueInLayerUnit = (0, _convertUnitsLite.convert)(ruLength).from(rulerUnit).to(layerUnit);
|
|
44
|
+
|
|
45
|
+
// 2.99 -> "3"
|
|
46
|
+
var distanceText = formatDistance(valueInLayerUnit, fixedLength);
|
|
47
|
+
var unitStr = getUnitString(layerUnit);
|
|
48
|
+
var textCount = distanceText.length + unitStr.length;
|
|
49
|
+
// textLength = (3 + ") * 8 = 16
|
|
50
|
+
var textLength = textCount * charWidth;
|
|
51
|
+
|
|
52
|
+
// lengthInInch = 7.62 cm -> 2.99 inch
|
|
53
|
+
var lengthInInch = (0, _convertUnitsLite.convert)(length).from(unit).to(_constants.UNIT_INCH);
|
|
54
|
+
var bShowText = lengthInInch > MIN_LENGTH_TO_SHOW_RULER_VALUE_INCH && length - textLength + 24 > 0;
|
|
55
|
+
var bShowLine = lengthInInch > MIN_LENGTH_TO_SHOW_RULER_LINE_INCH && length - textLength - 8 > 0;
|
|
56
|
+
return {
|
|
57
|
+
distanceText: distanceText,
|
|
58
|
+
unitStr: unitStr,
|
|
59
|
+
textLength: textLength,
|
|
60
|
+
bShowText: bShowText,
|
|
61
|
+
bShowLine: bShowLine
|
|
62
|
+
};
|
|
63
|
+
}
|