From 935a514fb5ca6bae326fc00bffdbe89fd15ae82a Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Sun, 14 Nov 2021 10:34:00 +0100 Subject: [PATCH] refactor: change demo window declaration --- include/render/gui/FrameMenu.h | 1 + include/render/gui/TowerGui.h | 2 -- src/render/gui/FrameMenu.cpp | 6 +++++- src/render/gui/TowerGui.cpp | 3 --- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/render/gui/FrameMenu.h b/include/render/gui/FrameMenu.h index 7ce6edf..ecbe4b6 100644 --- a/include/render/gui/FrameMenu.h +++ b/include/render/gui/FrameMenu.h @@ -9,6 +9,7 @@ class FrameMenu : public GuiWidget { private: bool m_VSync; bool m_IsometricView; + bool m_ShowDemoWindow; public: FrameMenu(client::Client* client); diff --git a/include/render/gui/TowerGui.h b/include/render/gui/TowerGui.h index 79d5d09..e4c7448 100644 --- a/include/render/gui/TowerGui.h +++ b/include/render/gui/TowerGui.h @@ -43,8 +43,6 @@ private: std::unique_ptr m_GameMenu; std::unique_ptr m_FrameMenu; std::unique_ptr m_UpdateMenu; - - bool m_DemoOpened = true; public: TowerGui(SDL_Window* wndow, SDL_GLContext glContext, td::render::Renderer* renderer); ~TowerGui(); diff --git a/src/render/gui/FrameMenu.cpp b/src/render/gui/FrameMenu.cpp index 7d72681..cab0299 100644 --- a/src/render/gui/FrameMenu.cpp +++ b/src/render/gui/FrameMenu.cpp @@ -8,7 +8,7 @@ namespace td { namespace gui { -FrameMenu::FrameMenu(client::Client* client) : GuiWidget(client), m_VSync(true), m_IsometricView(true){ +FrameMenu::FrameMenu(client::Client* client) : GuiWidget(client), m_VSync(true), m_IsometricView(true), m_ShowDemoWindow(false){ } @@ -21,7 +21,11 @@ void FrameMenu::render() { if (ImGui::Checkbox("Vue Isometrique ?", &m_IsometricView)) { getClient()->getRenderer()->setIsometricView(m_IsometricView); } + ImGui::Checkbox("Demo Window", &m_ShowDemoWindow); ImGui::End(); + + if(m_ShowDemoWindow) + ImGui::ShowDemoWindow(&m_ShowDemoWindow); } } // namespace gui diff --git a/src/render/gui/TowerGui.cpp b/src/render/gui/TowerGui.cpp index 9bbf294..ce4f45a 100644 --- a/src/render/gui/TowerGui.cpp +++ b/src/render/gui/TowerGui.cpp @@ -74,9 +74,6 @@ void TowerGui::render() { else m_MainMenu->render(); - if (m_DemoOpened) - ImGui::ShowDemoWindow(&m_DemoOpened); - m_FrameMenu->render(); m_UpdateMenu->render();