natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Gizmo selector tools

Browse Source
This commit is contained in:
Intemporel
2022-03-02 19:17:30 +01:00
parent 8f5b39487c
commit c8775843f0
2 changed files with 78 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/noggit/MapView.cpp
View File

@@ -438,10 +438,9 @@ void MapView::setupViewportOverlay()
}
);
connect(_viewport_overlay_ui->gizmoModeButton, &QPushButton::clicked
,[this]()
connect(_viewport_overlay_ui->gizmoModeButton, &QPushButton::clicked, [this]()
{
if (_viewport_overlay_ui->gizmoVisibleButton->isChecked())
if (_viewport_overlay_ui->gizmoModeButton->isChecked())
{
_gizmo_mode = ImGuizmo::MODE::WORLD;
}
@@ -449,29 +448,51 @@ void MapView::setupViewportOverlay()
{
_gizmo_mode = ImGuizmo::MODE::LOCAL;
}
}
);
});
connect(_viewport_overlay_ui->gizmoTranslateButton, &QPushButton::clicked
,[this]()
{
_gizmo_operation = ImGuizmo::OPERATION::TRANSLATE;
}
);
connect(_viewport_overlay_ui->gizmoTranslateButton, &QPushButton::clicked, [this]() {
updateGizmoOverlay(ImGuizmo::OPERATION::TRANSLATE);
});
connect(_viewport_overlay_ui->gizmoRotateButton, &QPushButton::clicked
,[this]()
{
_gizmo_operation = ImGuizmo::OPERATION::ROTATE;
}
);
connect(_viewport_overlay_ui->gizmoRotateButton, &QPushButton::clicked, [this]() {
updateGizmoOverlay(ImGuizmo::OPERATION::ROTATE);
});
connect(_viewport_overlay_ui->gizmoScaleButton, &QPushButton::clicked
,[this]()
connect(_viewport_overlay_ui->gizmoScaleButton, &QPushButton::clicked, [this]() {
updateGizmoOverlay(ImGuizmo::OPERATION::SCALE);
});
}
void MapView::updateGizmoOverlay(ImGuizmo::OPERATION operation)
{
if (operation == ImGuizmo::OPERATION::TRANSLATE)
{
_gizmo_operation = ImGuizmo::OPERATION::SCALE;
_viewport_overlay_ui->gizmoRotateButton->setChecked(false);
_viewport_overlay_ui->gizmoScaleButton->setChecked(false);
if (!_viewport_overlay_ui->gizmoTranslateButton->isChecked())
_viewport_overlay_ui->gizmoTranslateButton->setChecked(true);
}
);
if (operation == ImGuizmo::OPERATION::ROTATE)
{
_viewport_overlay_ui->gizmoTranslateButton->setChecked(false);
_viewport_overlay_ui->gizmoScaleButton->setChecked(false);
if (!_viewport_overlay_ui->gizmoRotateButton->isChecked())
_viewport_overlay_ui->gizmoRotateButton->setChecked(true);
}
if (operation == ImGuizmo::OPERATION::SCALE)
{
_viewport_overlay_ui->gizmoTranslateButton->setChecked(false);
_viewport_overlay_ui->gizmoRotateButton->setChecked(false);
if (!_viewport_overlay_ui->gizmoScaleButton->isChecked())
_viewport_overlay_ui->gizmoScaleButton->setChecked(true);
}
_gizmo_operation = operation;
}
void MapView::setupRaiseLowerUi()
@@ -4453,6 +4474,26 @@ void MapView::keyPressEvent (QKeyEvent *event)
}
if (_gizmo_on.get())
{
if (!_change_operation_mode && event->key() == Qt::Key_Space)
{
if (_gizmo_operation == ImGuizmo::OPERATION::TRANSLATE)
{
updateGizmoOverlay(ImGuizmo::OPERATION::ROTATE);
}
else if (_gizmo_operation == ImGuizmo::OPERATION::ROTATE)
{
updateGizmoOverlay(ImGuizmo::OPERATION::SCALE);
}
else
{
updateGizmoOverlay(ImGuizmo::OPERATION::TRANSLATE);
}
_change_operation_mode = true;
}
}
}
void MapView::keyReleaseEvent (QKeyEvent* event)
@@ -4460,6 +4501,9 @@ void MapView::keyReleaseEvent (QKeyEvent* event)
if (event->key() == Qt::Key_Space)
_mod_space_down = false;
if (_change_operation_mode && event->key() == Qt::Key_Space)
_change_operation_mode = false;
checkInputsSettings();
// movement

3
src/noggit/MapView.h
View File

@@ -421,6 +421,9 @@ private:
ImGuizmo::OPERATION _gizmo_operation = ImGuizmo::OPERATION::TRANSLATE;
Noggit::BoolToggleProperty _gizmo_on = {true};
bool _change_operation_mode = false;
void updateGizmoOverlay(ImGuizmo::OPERATION operation);
bool _gl_initialized = false;
bool _destroying = false;
bool _needs_redraw = false;