diff options
Diffstat (limited to 'src/core/application.cpp')
| -rw-r--r-- | src/core/application.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/application.cpp b/src/core/application.cpp index f2284cd..0698ce3 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -2,8 +2,8 @@ #include "rendering/renderer.h" -#include "states/config_state.h" #include "states/simulation_state.h" +#include "states/config_state.h" #include <GLFW/glfw3.h> @@ -86,12 +86,6 @@ namespace Donut event.handled = true; return true; } - else if (e.get_key_code() == GLFW_KEY_3) - { - m_state_manager->switch_to_state("Menu"); - event.handled = true; - return true; - } return true; }); @@ -105,12 +99,13 @@ namespace Donut RendererAPI::set_api(RendererAPI::API::OpenGL); Renderer::init(); + m_window->init_im_gui(); Renderer::on_window_resize(1280, 720); RenderCommand::set_face_culling(false); m_state_manager = create_scope<StateManager>(); - m_state_manager->register_state("Config", create_scope<ConfigState>()); + m_state_manager->register_state("Config", create_scope<ConfigState>()); m_state_manager->register_state("Simulation", create_scope<SimulationState>()); m_state_manager->switch_to_state("Config"); } @@ -136,5 +131,9 @@ namespace Donut void Application::on_render() { m_state_manager->render(); + + m_window->begin_im_gui_frame(); + m_state_manager->on_im_ui_render(); + m_window->end_im_gui_frame(); } }; |