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

fix tool hole lines render

Browse Source
This commit is contained in:
T1ti
2023-07-20 00:40:46 +02:00
parent fd4384ae44
commit 9038d9af4c
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/noggit/MapView.cpp
View File

@@ -232,10 +232,23 @@ void MapView::set_editing_mode(editing_mode mode)
_viewport_overlay_ui->gizmoBar->hide();
}
auto previous_mode = _left_sec_toolbar->getCurrentMode();
_left_sec_toolbar->setCurrentMode(this, mode);
if (context() && context()->isValid())
{
if (mode == editing_mode::holes && previous_mode != editing_mode::holes)
{
_world->renderer()->getTerrainParamsUniformBlock()->draw_lines = true;
_world->renderer()->getTerrainParamsUniformBlock()->draw_hole_lines = true;
}
else if (previous_mode == editing_mode::holes && mode != editing_mode::holes)
{
_world->renderer()->getTerrainParamsUniformBlock()->draw_lines = _draw_lines.get();
_world->renderer()->getTerrainParamsUniformBlock()->draw_hole_lines = _draw_hole_lines.get();
}
_world->renderer()->getTerrainParamsUniformBlock()->draw_areaid_overlay = false;
_world->renderer()->getTerrainParamsUniformBlock()->draw_impass_overlay = false;
_world->renderer()->getTerrainParamsUniformBlock()->draw_paintability_overlay = false;

7
src/noggit/rendering/WorldRender.cpp
View File

@@ -93,13 +93,6 @@ void WorldRender::draw (glm::mat4x4 const& model_view
_need_terrain_params_ubo_update = true;
}
if (terrainMode == editing_mode::holes)
{
_terrain_params_ubo_data.draw_lines = true;
_terrain_params_ubo_data.draw_hole_lines = true;
_need_terrain_params_ubo_update = true;
}
if (_need_terrain_params_ubo_update)
updateTerrainParamsUniformBlock();

2
src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.hpp
View File

@@ -26,6 +26,8 @@ namespace Noggit
void setCurrentMode(MapView* mapView, editing_mode mode);
editing_mode getCurrentMode() const { return current_mode; }
/*secondary top tool*/
QVector<QWidgetAction*> _climb_secondary_tool;
QVector<QWidgetAction*> _time_secondary_tool;