From ab2a101777f1b9566b246321d59a6c140d710a38 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 10 Apr 2025 13:16:54 -0500 Subject: [PATCH] remove unnecessary includes --- modules/MainGUI/src/MainGUI.cpp | 54 ++++++++++++++++++++ modules/MainGUI/src/{gui.h => MainGUI.h} | 8 +-- modules/MainGUI/src/gui.cpp | 0 modules/examples/TestImgui/src/TestImgui.cpp | 7 --- 4 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 modules/MainGUI/src/MainGUI.cpp rename modules/MainGUI/src/{gui.h => MainGUI.h} (67%) delete mode 100644 modules/MainGUI/src/gui.cpp diff --git a/modules/MainGUI/src/MainGUI.cpp b/modules/MainGUI/src/MainGUI.cpp new file mode 100644 index 0000000..e5f52b7 --- /dev/null +++ b/modules/MainGUI/src/MainGUI.cpp @@ -0,0 +1,54 @@ +#include "TestImgui.h" +#include "modules/ImguiModule/src/ImguiModule.h" + +TestImgui::TestImgui(Archimedes::App* a, void* h) : Archimedes::Module(a, h) { + + name = "TestImgui"; + + ImguiModule* im = new ImguiModule(a, nullptr); + deps[im->getName()] = im; +} + +TestImgui::~TestImgui() { + +} + +void TestImgui::onLoad() { + + ImguiModule* im = (ImguiModule*) moduleInstances["ImguiModule"]; + + if(!im) { + std::cout << "No ImguiModule for TestImgui!\n"; + std::abort(); + } + + ImGui::SetCurrentContext(im->getContext()); + +} + +void TestImgui::run() { + if(demo) + ImGui::ShowDemoWindow(&this->demo); + else + app->end(); + + { + ImGuiIO& io = ImGui::GetIO(); + static float f = 0.0f; + static int counter = 0; + + ImGui::Begin("TestImgui Module"); // Create a window called "Hello, world!" and append into it. + + ImGui::Text("This is some useful text."); // Display some text (you can use a format strings too) + + ImGui::SliderFloat("float", &f, 0.0f, 1.0f); // Edit 1 float using a slider from 0.0f to 1.0f + + if (ImGui::Button("Button")) // Buttons return true when clicked (most widgets return true when edited/activated) + counter++; + ImGui::SameLine(); + ImGui::Text("counter = %d", counter); + + ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate); + ImGui::End(); + } +} diff --git a/modules/MainGUI/src/gui.h b/modules/MainGUI/src/MainGUI.h similarity index 67% rename from modules/MainGUI/src/gui.h rename to modules/MainGUI/src/MainGUI.h index 034f239..b3512de 100644 --- a/modules/MainGUI/src/gui.h +++ b/modules/MainGUI/src/MainGUI.h @@ -1,12 +1,8 @@ -#ifndef GUIMODULE -#define GUIMODULE -#endif - #include "Archimedes.h" #include "utils/Window/Window.h" -class MainGUI : public Archimedes::GuiModule { +class MainGUI : public Archimedes::Module { public: MainGUI(Archimedes::App*, void*); @@ -18,7 +14,7 @@ class MainGUI : public Archimedes::GuiModule { void run(); }; -#ifdef TESTIMGUI_DYNAMIC +#ifdef MAINGUI_DYNAMIC #define MODULE_TYPE MainGUI #include "endModule.h" #endif diff --git a/modules/MainGUI/src/gui.cpp b/modules/MainGUI/src/gui.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/modules/examples/TestImgui/src/TestImgui.cpp b/modules/examples/TestImgui/src/TestImgui.cpp index 6383703..e5f52b7 100644 --- a/modules/examples/TestImgui/src/TestImgui.cpp +++ b/modules/examples/TestImgui/src/TestImgui.cpp @@ -1,11 +1,4 @@ #include "TestImgui.h" - -#include "imgui.h" -#include "backends/imgui_impl_glfw.h" -#include "backends/imgui_impl_opengl3.h" - -#include - #include "modules/ImguiModule/src/ImguiModule.h" TestImgui::TestImgui(Archimedes::App* a, void* h) : Archimedes::Module(a, h) {