diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/app.hpp | 2 | ||||
-rw-r--r-- | main/draw.cpp | 2 | ||||
-rw-r--r-- | main/imgui-raii.hpp | 2 | ||||
-rw-r--r-- | main/imgui.cpp | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/main/app.hpp b/main/app.hpp index 96400cda..a4da922c 100644 --- a/main/app.hpp +++ b/main/app.hpp @@ -70,7 +70,7 @@ private: void draw_editor_pane(tile_type& type, float main_menu_height); void draw_fps(); void draw_cursor_coord(); - void display_menu(); + void render_menu(); void debug_callback(GL::DebugOutput::Source src, GL::DebugOutput::Type type, UnsignedInt id, GL::DebugOutput::Severity severity, const std::string& str) const; diff --git a/main/draw.cpp b/main/draw.cpp index ddeccc23..5eeb413c 100644 --- a/main/draw.cpp +++ b/main/draw.cpp @@ -37,7 +37,7 @@ void app::drawEvent() draw_cursor_tile(); } - display_menu(); + render_menu(); swapBuffers(); redraw(); diff --git a/main/imgui-raii.hpp b/main/imgui-raii.hpp index 85512b2d..9f446bf2 100644 --- a/main/imgui-raii.hpp +++ b/main/imgui-raii.hpp @@ -2,7 +2,9 @@ #include <Corrade/Containers/StringView.h> #include <Magnum/Math/Color.h> +#ifndef __CLION_IDE__ #include <imgui.h> +#endif namespace floormat::imgui { diff --git a/main/imgui.cpp b/main/imgui.cpp index e1790968..0a70149b 100644 --- a/main/imgui.cpp +++ b/main/imgui.cpp @@ -1,7 +1,7 @@ #include "app.hpp" #include <Magnum/GL/Renderer.h> -#ifndef __CLION_IDE__ #include "imgui-raii.hpp" +#ifndef __CLION_IDE__ #include <Magnum/ImGuiIntegration/Integration.h> #endif @@ -9,7 +9,7 @@ namespace floormat { using namespace floormat::imgui; -void app::display_menu() +void app::render_menu() { GL::Renderer::setBlendEquation(GL::Renderer::BlendEquation::Add, GL::Renderer::BlendEquation::Add); GL::Renderer::setBlendFunction(GL::Renderer::BlendFunction::SourceAlpha, GL::Renderer::BlendFunction::OneMinusSourceAlpha); |