mirror of
https://github.com/leozide/leocad
synced 2025-01-29 20:34:50 +01:00
Scoped lcTrackTool.
This commit is contained in:
Leonardo
parent
366018ee8c
commit
7b320edc7a
4 changed files with 336 additions and 331 deletions
|
|
@ -84,7 +84,7 @@ lcPreviewWidget::lcPreviewWidget()
|
|||
mViewSphere(this/*Preview*/)
|
||||
{
|
||||
mTool = lcTool::Select;
|
||||
mTrackTool = LC_TRACKTOOL_NONE;
|
||||
mTrackTool = lcTrackTool::None;
|
||||
mTrackButton = lcTrackButton::None;
|
||||
|
||||
mLoader->SetActiveModel(0);
|
||||
|
|
@ -226,7 +226,7 @@ void lcPreviewWidget::ZoomExtents()
|
|||
|
||||
void lcPreviewWidget::StartOrbitTracking() // called by viewSphere
|
||||
{
|
||||
mTrackTool = LC_TRACKTOOL_ORBIT_XY;
|
||||
mTrackTool = lcTrackTool::OrbitXY;
|
||||
|
||||
OnUpdateCursor();
|
||||
|
||||
|
|
@ -278,12 +278,12 @@ lcTool lcPreviewWidget::GetCurrentTool() const
|
|||
{
|
||||
const lcTool ToolFromTrackTool[] =
|
||||
{
|
||||
lcTool::Select, // LC_TRACKTOOL_NONE
|
||||
lcTool::Pan, // LC_TRACKTOOL_PAN
|
||||
lcTool::RotateView, // LC_TRACKTOOL_ORBIT_XY
|
||||
lcTool::Select, // lcTrackTool::None
|
||||
lcTool::Pan, // lcTrackTool::Pan
|
||||
lcTool::RotateView, // lcTrackTool::OrbitXY
|
||||
};
|
||||
|
||||
return ToolFromTrackTool[mTrackTool];
|
||||
return ToolFromTrackTool[static_cast<int>(mTrackTool)];
|
||||
}
|
||||
|
||||
void lcPreviewWidget::StartTracking(lcTrackButton TrackButton)
|
||||
|
|
@ -292,7 +292,7 @@ void lcPreviewWidget::StartTracking(lcTrackButton TrackButton)
|
|||
mTrackUpdated = false;
|
||||
mMouseDownX = mInputState.x;
|
||||
mMouseDownY = mInputState.y;
|
||||
lcTool Tool = GetCurrentTool(); // Either LC_TRACKTOOL_NONE (LC_TOOL_SELECT) or LC_TRACKTOOL_ORBIT_XY (LC_TOOL_ROTATE_VIEW)
|
||||
lcTool Tool = GetCurrentTool(); // Either lcTrackTool::None (LC_TOOL_SELECT) or lcTrackTool::OrbitXY (LC_TOOL_ROTATE_VIEW)
|
||||
lcModel* ActiveModel = GetActiveModel();
|
||||
|
||||
switch (Tool)
|
||||
|
|
@ -318,7 +318,7 @@ void lcPreviewWidget::StopTracking(bool Accept)
|
|||
if (mTrackButton == lcTrackButton::None)
|
||||
return;
|
||||
|
||||
lcTool Tool = GetCurrentTool(); // Either LC_TRACKTOOL_NONE (LC_TOOL_SELECT) or LC_TRACKTOOL_ORBIT_XY (LC_TOOL_ROTATE_VIEW)
|
||||
lcTool Tool = GetCurrentTool(); // Either lcTrackTool::None (LC_TOOL_SELECT) or lcTrackTool::OrbitXY (LC_TOOL_ROTATE_VIEW)
|
||||
lcModel* ActiveModel = GetActiveModel();
|
||||
|
||||
switch (Tool)
|
||||
|
|
@ -338,7 +338,7 @@ void lcPreviewWidget::StopTracking(bool Accept)
|
|||
|
||||
mTrackButton = lcTrackButton::None;
|
||||
|
||||
mTrackTool = LC_TRACKTOOL_NONE;
|
||||
mTrackTool = lcTrackTool::None;
|
||||
|
||||
OnUpdateCursor();
|
||||
}
|
||||
|
|
@ -347,18 +347,18 @@ void lcPreviewWidget::OnButtonDown(lcTrackButton TrackButton)
|
|||
{
|
||||
switch (mTrackTool)
|
||||
{
|
||||
case LC_TRACKTOOL_NONE:
|
||||
case lcTrackTool::None:
|
||||
break;
|
||||
|
||||
case LC_TRACKTOOL_PAN:
|
||||
case lcTrackTool::Pan:
|
||||
StartTracking(TrackButton);
|
||||
break;
|
||||
|
||||
case LC_TRACKTOOL_ORBIT_XY:
|
||||
case lcTrackTool::OrbitXY:
|
||||
StartTracking(TrackButton);
|
||||
break;
|
||||
|
||||
case LC_TRACKTOOL_COUNT:
|
||||
case lcTrackTool::Count:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -367,15 +367,15 @@ lcCursor lcPreviewWidget::GetCursor() const
|
|||
{
|
||||
const lcCursor CursorFromTrackTool[] =
|
||||
{
|
||||
lcCursor::Select, // LC_TRACKTOOL_NONE
|
||||
lcCursor::Pan, // LC_TRACKTOOL_PAN
|
||||
lcCursor::RotateView, // LC_TRACKTOOL_ORBIT_XY
|
||||
lcCursor::Select, // lcTrackTool::None
|
||||
lcCursor::Pan, // lcTrackTool::Pan
|
||||
lcCursor::RotateView, // lcTrackTool::OrbitXY
|
||||
};
|
||||
|
||||
static_assert(LC_ARRAY_COUNT(CursorFromTrackTool) == LC_TRACKTOOL_COUNT, "Tracktool array size mismatch.");
|
||||
static_assert(LC_ARRAY_COUNT(CursorFromTrackTool) == static_cast<int>(lcTrackTool::Count), "Tracktool array size mismatch.");
|
||||
|
||||
if (mTrackTool >= 0 && mTrackTool < LC_ARRAY_COUNT(CursorFromTrackTool))
|
||||
return CursorFromTrackTool[mTrackTool];
|
||||
if (mTrackTool < lcTrackTool::Count)
|
||||
return CursorFromTrackTool[static_cast<int>(mTrackTool)];
|
||||
|
||||
return lcCursor::Select;
|
||||
}
|
||||
|
|
@ -449,9 +449,9 @@ void lcPreviewWidget::OnLeftButtonDown()
|
|||
if (mViewSphere.OnLeftButtonDown())
|
||||
return;
|
||||
|
||||
lcTrackTool OverrideTool = LC_TRACKTOOL_ORBIT_XY;
|
||||
lcTrackTool OverrideTool = lcTrackTool::OrbitXY;
|
||||
|
||||
if (OverrideTool != LC_TRACKTOOL_NONE)
|
||||
if (OverrideTool != lcTrackTool::None)
|
||||
{
|
||||
mTrackTool = OverrideTool;
|
||||
OnUpdateCursor();
|
||||
|
|
@ -479,9 +479,9 @@ void lcPreviewWidget::OnMiddleButtonDown()
|
|||
}
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0))
|
||||
lcTrackTool OverrideTool = LC_TRACKTOOL_NONE;
|
||||
lcTrackTool OverrideTool = lcTrackTool::None;
|
||||
|
||||
if (OverrideTool != LC_TRACKTOOL_NONE)
|
||||
if (OverrideTool != lcTrackTool::None)
|
||||
{
|
||||
mTrackTool = OverrideTool;
|
||||
OnUpdateCursor();
|
||||
|
|
@ -509,9 +509,9 @@ void lcPreviewWidget::OnRightButtonDown()
|
|||
return;
|
||||
}
|
||||
|
||||
lcTrackTool OverrideTool = LC_TRACKTOOL_PAN;
|
||||
lcTrackTool OverrideTool = lcTrackTool::Pan;
|
||||
|
||||
if (OverrideTool != LC_TRACKTOOL_NONE)
|
||||
if (OverrideTool != lcTrackTool::None)
|
||||
{
|
||||
mTrackTool = OverrideTool;
|
||||
OnUpdateCursor();
|
||||
|
|
@ -537,7 +537,7 @@ void lcPreviewWidget::OnMouseMove()
|
|||
{
|
||||
if (mViewSphere.OnMouseMove())
|
||||
{
|
||||
lcTrackTool NewTrackTool = mViewSphere.IsDragging() ? LC_TRACKTOOL_ORBIT_XY : LC_TRACKTOOL_NONE;
|
||||
lcTrackTool NewTrackTool = mViewSphere.IsDragging() ? lcTrackTool::OrbitXY : lcTrackTool::None;
|
||||
|
||||
if (NewTrackTool != mTrackTool)
|
||||
{
|
||||
|
|
@ -556,10 +556,10 @@ void lcPreviewWidget::OnMouseMove()
|
|||
|
||||
switch (mTrackTool)
|
||||
{
|
||||
case LC_TRACKTOOL_NONE:
|
||||
case lcTrackTool::None:
|
||||
break;
|
||||
|
||||
case LC_TRACKTOOL_PAN:
|
||||
case lcTrackTool::Pan:
|
||||
{
|
||||
lcVector3 Points[4] =
|
||||
{
|
||||
|
|
@ -595,12 +595,12 @@ void lcPreviewWidget::OnMouseMove()
|
|||
}
|
||||
break;
|
||||
|
||||
case LC_TRACKTOOL_ORBIT_XY:
|
||||
case lcTrackTool::OrbitXY:
|
||||
ActiveModel->UpdateOrbitTool(mCamera, 0.1f * MouseSensitivity * (mInputState.x - mMouseDownX), 0.1f * MouseSensitivity * (mInputState.y - mMouseDownY));
|
||||
Redraw();
|
||||
break;
|
||||
|
||||
case LC_TRACKTOOL_COUNT:
|
||||
case lcTrackTool::Count:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,12 +40,12 @@ public:
|
|||
Right
|
||||
};
|
||||
|
||||
enum lcTrackTool
|
||||
enum class lcTrackTool
|
||||
{
|
||||
LC_TRACKTOOL_NONE,
|
||||
LC_TRACKTOOL_PAN,
|
||||
LC_TRACKTOOL_ORBIT_XY,
|
||||
LC_TRACKTOOL_COUNT
|
||||
None,
|
||||
Pan,
|
||||
OrbitXY,
|
||||
Count
|
||||
};
|
||||
|
||||
lcPreviewWidget();
|
||||
|
|
|
|||
533
common/view.cpp
533
common/view.cpp
File diff suppressed because it is too large
Load diff
|
|
@ -14,39 +14,39 @@ enum class lcTrackButton
|
|||
Right
|
||||
};
|
||||
|
||||
enum lcTrackTool
|
||||
enum class lcTrackTool
|
||||
{
|
||||
LC_TRACKTOOL_NONE,
|
||||
LC_TRACKTOOL_INSERT,
|
||||
LC_TRACKTOOL_POINTLIGHT,
|
||||
LC_TRACKTOOL_SPOTLIGHT,
|
||||
LC_TRACKTOOL_CAMERA,
|
||||
LC_TRACKTOOL_SELECT,
|
||||
LC_TRACKTOOL_MOVE_X,
|
||||
LC_TRACKTOOL_MOVE_Y,
|
||||
LC_TRACKTOOL_MOVE_Z,
|
||||
LC_TRACKTOOL_MOVE_XY,
|
||||
LC_TRACKTOOL_MOVE_XZ,
|
||||
LC_TRACKTOOL_MOVE_YZ,
|
||||
LC_TRACKTOOL_MOVE_XYZ,
|
||||
LC_TRACKTOOL_ROTATE_X,
|
||||
LC_TRACKTOOL_ROTATE_Y,
|
||||
LC_TRACKTOOL_ROTATE_Z,
|
||||
LC_TRACKTOOL_ROTATE_XY,
|
||||
LC_TRACKTOOL_ROTATE_XYZ,
|
||||
LC_TRACKTOOL_SCALE_PLUS,
|
||||
LC_TRACKTOOL_SCALE_MINUS,
|
||||
LC_TRACKTOOL_ERASER,
|
||||
LC_TRACKTOOL_PAINT,
|
||||
LC_TRACKTOOL_COLOR_PICKER,
|
||||
LC_TRACKTOOL_ZOOM,
|
||||
LC_TRACKTOOL_PAN,
|
||||
LC_TRACKTOOL_ORBIT_X,
|
||||
LC_TRACKTOOL_ORBIT_Y,
|
||||
LC_TRACKTOOL_ORBIT_XY,
|
||||
LC_TRACKTOOL_ROLL,
|
||||
LC_TRACKTOOL_ZOOM_REGION,
|
||||
LC_TRACKTOOL_COUNT
|
||||
None,
|
||||
Insert,
|
||||
PointLight,
|
||||
SpotLight,
|
||||
Camera,
|
||||
Select,
|
||||
MoveX,
|
||||
MoveY,
|
||||
MoveZ,
|
||||
MoveXY,
|
||||
MoveXZ,
|
||||
MoveYZ,
|
||||
MoveXYZ,
|
||||
RotateX,
|
||||
RotateY,
|
||||
RotateZ,
|
||||
RotateXY,
|
||||
RotateXYZ,
|
||||
ScalePlus,
|
||||
ScaleMinus,
|
||||
Eraser,
|
||||
Paint,
|
||||
ColorPicker,
|
||||
Zoom,
|
||||
Pan,
|
||||
OrbitX,
|
||||
OrbitY,
|
||||
OrbitXY,
|
||||
Roll,
|
||||
ZoomRegion,
|
||||
Count
|
||||
};
|
||||
|
||||
class View : public lcGLWidget
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue