the gui problem^TM

modules/GUImodules/TestImgui/src/TestImgui.cpp

@@ -1,5 +1,49 @@
 #include "TestImgui.h"
 
-void TestImgui::load() {}
+#include "imgui/imgui.h"
+#include "imgui/backends/imgui_impl_glfw.h"
+#include "imgui/backends/imgui_impl_opengl3.h"
 
-void TestImgui::run() {}
+#include <GLFW/glfw3.h>
+
+TestImgui::TestImgui(void* h, Archimedes::App& a) : Archimedes::GuiModule(h, a) {
+    name = "TestImgui";
+
+    IMGUI_CHECKVERSION();
+    ImGui::CreateContext();
+    ImGuiIO& io = ImGui::GetIO(); (void)io;
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;     // Enable Keyboard Controls
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
+
+    // Setup Dear ImGui style
+    ImGui::StyleColorsDark();
+    //ImGui::StyleColorsLight();
+
+    // Setup Platform/Renderer backends
+    ImGui_ImplGlfw_InitForOpenGL(getWindow()->getWindowImpl().getWindow(), true);
+    ImGui_ImplOpenGL3_Init("#version 130");
+}
+
+TestImgui::~TestImgui() {
+    ImGui_ImplOpenGL3_Shutdown();
+    ImGui_ImplGlfw_Shutdown();
+    ImGui::DestroyContext();
+}
+
+void TestImgui::onLoad() {}
+
+void TestImgui::run() {
+    
+    ImGui_ImplOpenGL3_NewFrame();
+    ImGui_ImplGlfw_NewFrame();
+    ImGui::NewFrame();
+
+    ImGui::ShowDemoWindow(&this->demo);
+
+    ImGui::Render();
+
+    getWindow()->getRenderer().addRenderCmd([](){
+        ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
+    });
+
+}

modules/GUImodules/TestImgui/src/TestImgui.h

@@ -1,38 +1,24 @@
 #include "Archimedes.h"
 
-#include <imgui.h>
-#include <backends/imgui_impl_glfw.h>
-#include <backends/imgui_impl_opengl3.h>
 
-#include <GLFW/glfw3.h>
-
-class TestImgui : public Module {
+class TestImgui : public Archimedes::GuiModule {
 
     public:
-        TestImgui(void* h, App& a) : Module(h, a) {
+        TestImgui(void*, Archimedes::App&);
 
-            std::cout << "Enter path to Window library: ";
-            std::string path;
-            std::cin.ignore();
-            std::getline(std::cin, path);
+        ~TestImgui();
 
-            deps["Window"] = path;
-            name = "TestImgui";
-        }
-
-        ~TestImgui() {}
-
-        void load();
+        void onLoad();
 
         void run();
 
     private:
-
+        bool demo = true;
 };
 
 
 extern "C" {
-    Module* create(void* handle, App& app) {
+    Archimedes::Module* create(void* handle, Archimedes::App& app) {
         return new TestImgui(handle, app);
     }
 }

src/App.cpp

@@ -1,8 +1,11 @@
 #include "App.h"
 
-App* App::instance = nullptr;
+Archimedes::App* Archimedes::App::instance = nullptr;
 
-App::App(const int& argc, char* argv[]) {
+namespace Archimedes {
+
+
+    App::App(const int& argc, char* argv[]) {
 
         if(instance != nullptr) {
             std::cout << "App already exists\nThere can only be one!\n";
@@ -15,9 +18,9 @@ App::App(const int& argc, char* argv[]) {
 
         handleArgs(argc, argv);
 
-}
+    }
 
-App::~App() {
+    App::~App() {
 
         std::cout << "\nExiting...\n";
         for(auto it = modules.begin(); it != modules.end(); it++) {
@@ -26,10 +29,10 @@ App::~App() {
             dlclose(handle);
             it = modules.erase(it);
         }
-}
+    }
 
 
-bool App::load(std::string lib, std::list<std::string> blacklist = {}) {
+    bool App::load(std::string lib, std::list<std::string> blacklist = {}) {
 
 
         std::cout << "print twice!\n";
@@ -79,9 +82,9 @@ bool App::load(std::string lib, std::list<std::string> blacklist = {}) {
         modules.end()++;
 
         return true;
-}
+    }
 
-void App::unload(std::list<Module*>::iterator it) {
+    void App::unload(std::list<Module*>::iterator it) {
 
         Module* m = *it;
         void* h = m->getHandle();
@@ -91,17 +94,17 @@ void App::unload(std::list<Module*>::iterator it) {
 
         dlclose(h);
 
-}
+    }
 
-void App::stopModule(std::list<Module*>::iterator it) {
+    void App::stopModule(std::list<Module*>::iterator it) {
         toClose.push_back(*it);
-}
+    }
 
-void App::startModule(std::string lib) {
+    void App::startModule(std::string lib) {
         toOpen.push_back(lib);
-}
+    }
 
-void App::handleArgs(const int& argc, char* argv[]) {
+    void App::handleArgs(const int& argc, char* argv[]) {
 
         int i = 1;
 
@@ -126,14 +129,14 @@ void App::handleArgs(const int& argc, char* argv[]) {
 
             i++;
         }
-}
+    }
 
-void App::printHelp() {
+    void App::printHelp() {
         std::cout << "archimedes [ -h | --help ] /path/to/some/library.so\n";
-}
+    }
 
 
-void App::run() {
+    void App::run() {
         std::cout << "\nTesting...\n";
 
         for(auto* m : modules)
@@ -157,4 +160,5 @@ void App::run() {
             toOpen.clear();
         }
 
+    }
 }

src/App.h

@@ -5,7 +5,9 @@
 #include "Module.h"
 #include "GuiModule.h"
 
-class App {
+namespace Archimedes {
+    
+    class App {
 
         private:
             static App* instance;
@@ -43,6 +45,8 @@ class App {
             void startModule(std::string);
 
             void end() { done = true; }
-};
+    };
+
+}
 
 #endif

src/GuiModule.h

@@ -4,21 +4,24 @@
 #include "Module.h"
 #include "Window/Window.h"
 
-class GuiModule : Module {
+namespace Archimedes {
+
+    class GuiModule : public Module {
 
         public:
-        typedef GuiModule* create_t();
+            typedef GuiModule* create_t(void*, App&);
 
-        GuiModule(void* h, App& a) : Module(h, a) {
-            deps["Window"] = "";
-        }
+            GuiModule(void* h, App& a) : Module(h, a) {}
             virtual ~GuiModule() {}
-        virtual void load() = 0;
+            virtual void onLoad() = 0;
             virtual void run() = 0;
 
+            Window* getWindow() { return window; }
+
         private:
-        Window window;
-};
+            Window* window;
+    };
+}
 
 
 #endif

src/Module.h

@@ -3,9 +3,11 @@
 
 #include "pch.hpp"
 
-class App;
+namespace Archimedes {
 
-class Module {
+    class App;
+
+    class Module {
 
         friend class App;
 
@@ -30,6 +32,7 @@ class Module {
         App& app;
 
         std::unordered_map<std::string, std::string> deps;
-};
+    };
+}
 
 #endif

src/main.cpp

@@ -2,6 +2,6 @@
 #include "App.h"
 
 int main(int argc, char* argv[]) {
-    App app(argc, argv);
+    Archimedes::App app(argc, argv);
     app.run();
 }

utils/Renderer/Renderer.cpp

@@ -0,0 +1,8 @@
+#include "Renderer.h"
+
+namespace Archimedes {
+
+    void Renderer::render() {
+        r.render(rc, w, h);
+    }
+}

utils/Renderer/Renderer.h

@@ -1,9 +1,16 @@
+#ifndef RENDERER
+#define RENDERER
+
 #include "Archimedes.h"
 
+#define RENDERER_OPENGL
+#include "RendererOpenGL/RendererOpenGL.h"
+
 namespace Archimedes {
     class Renderer {
 
         public:
+            int w, h;
             typedef void renderCmd();
 
             ~Renderer() {}
@@ -14,6 +21,8 @@ namespace Archimedes {
 
         private:
             std::list<renderCmd*> rc;
+            RendererImpl r;
     };
 }
 
+#endif

utils/Renderer/RendererOpenGL/RendererOpenGL.cpp

@@ -0,0 +1,23 @@
+#define RENDERER_OPENGL
+#include "RendererOpenGL.h"
+
+#define GLEW_STATIC
+#include <GL/glew.h>
+
+namespace Archimedes {
+
+    RendererOpenGL::RendererOpenGL() {}
+    
+    RendererOpenGL::~RendererOpenGL() {}
+
+    void RendererOpenGL::render(std::list<renderCmd*> cmdList, int& w, int& h) {
+
+        glViewport(0, 0, &w, &h);
+
+        glClear(GL_COLOR_BUFFER_BIT);
+        
+        for(auto* f : cmdList)
+            f();
+        cmdList.clear();
+    }
+}

utils/Renderer/RendererOpenGL/RendererOpenGL.h

@@ -1,15 +1,22 @@
-#include "Renderer/Renderer.h"
+#ifdef RENDERER_OPENGL
+#undef RENDERER_OPENGL
+
+#include "Archimedes.h"
 
 namespace Archimedes {
 
     class RendererOpenGL {
     
         public:
+            typedef void renderCmd();
+
             RendererOpenGL();
             ~RendererOpenGL();
 
-            void render();
+            void render(std::list<renderCmd*>, int&, int&);
     };
 
     typedef RendererOpenGL RendererImpl;
 }
+
+#endif

utils/Window/Window.cpp

@@ -1 +1,13 @@
 #include "Window.h"
+
+namespace Archimedes {
+    
+    void Window::doFrame() {
+        window.getSize(renderer.w, renderer.h);
+
+        renderer.render();
+
+        window.doFrame();
+    }
+
+}

utils/Window/Window.h

@@ -1,6 +1,6 @@
 #include "Archimedes.h"
 #include "Renderer/Renderer.h"
-#include "GLFW/WindowGLFW.h"
+#include "WindowGLFW/WindowGLFW.h"
 
 namespace Archimedes {
 
@@ -10,13 +10,16 @@ namespace Archimedes {
 
             ~Window() {};
 
-            bool shouldClose();
+            bool shouldClose() { return window.shouldClose(); }
 
             void doFrame();
 
+            Renderer& getRenderer() { return renderer; }
+            WindowImpl& getWindowImpl() { return window; }
+
         private:
             Renderer renderer;
 
-            WindowImpl w;
+            WindowImpl window;
     };
 }

utils/Window/WindowGLFW/WindowGLFW.cpp

@@ -19,6 +19,7 @@ namespace Archimedes {
         }
 
         glfwMakeContextCurrent(w);
+        glfwSwapInterval(1);
     }
 
     bool WindowGLFW::shouldClose() {
@@ -26,9 +27,8 @@ namespace Archimedes {
     }
 
     void WindowGLFW::doFrame() {
-        glClear(GL_COLOR_BUFFER_BIT);
-        glfwSwapBuffers(w);
         glfwPollEvents();
+        glfwSwapBuffers(w);
     }
 
     WindowGLFW::~WindowGLFW() {

utils/Window/WindowGLFW/WindowGLFW.h

@@ -15,6 +15,10 @@ namespace Archimedes {
 
             void doFrame();
 
+            void getSize(int&, int&);
+
+            auto getWindow() { return w; }
+
         private:
             GLFWwindow* w;
     };