restructure modules. make GuiModules depend on WindowModule

modules/examples/GuiModules/TestClay/src/TestClay.cpp

@@ -0,0 +1,35 @@
+#include "TestClay.h"
+
+#define CLAY_IMPLIMENTATION
+#include "clay.h"
+
+#include <GLFW/glfw3.h>
+
+TestClay::TestClay(void* h, Archimedes::App& a) : Archimedes::GuiModule(h, a) {
+
+    name = "TestClay";
+}
+
+TestClay::~TestClay() {
+}
+
+void TestClay::onLoad() {
+    
+    createWindow();
+
+    window->getRenderer().init();
+
+    
+}
+
+void TestClay::run() {
+
+    window->getRenderer().addRenderCmd([](){
+
+    });
+
+    if(window->shouldClose())
+        app.end();
+    window->doFrame();
+
+}

modules/examples/GuiModules/TestClay/src/TestClay.h

@@ -0,0 +1,25 @@
+#include "Archimedes.h"
+
+
+class TestClay : public Archimedes::GuiModule {
+
+    public:
+        TestClay(void*, Archimedes::App&);
+
+        ~TestClay();
+
+        void onLoad();
+
+        void run();
+
+    private:
+};
+
+
+extern "C" {
+    Archimedes::Module* create(void* handle, Archimedes::App& app) {
+        return new TestClay(handle, app);
+    }
+}
+
+

modules/examples/GuiModules/TestImgui/src/TestImgui.cpp

@@ -0,0 +1,74 @@
+#include "TestImgui.h"
+
+#include "imgui.h"
+#include "backends/imgui_impl_glfw.h"
+#include "backends/imgui_impl_opengl3.h"
+
+#include <GLFW/glfw3.h>
+
+TestImgui::TestImgui(void* h, Archimedes::App* a) : Archimedes::GuiModule(h, a) {
+
+    name = "TestImgui";
+}
+
+TestImgui::~TestImgui() {
+    window->getRenderer().removeRenderCmd(rcmd);
+    ImGui_ImplOpenGL3_Shutdown();
+    ImGui_ImplGlfw_Shutdown();
+    ImGui::DestroyContext();
+}
+
+void TestImgui::onLoad() {
+    
+    createWindow();
+
+    window->getRenderer().init();
+
+    IMGUI_CHECKVERSION();
+    ImGui::CreateContext();
+    ImGuiIO& io = ImGui::GetIO(); (void)io;
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;     // Enable Keyboard Controls
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
+
+    io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;         // Enable Docking
+    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;       // Enable Multi-Viewport / Platform Windows
+
+    // Setup Dear ImGui style
+    ImGui::StyleColorsDark();
+    //ImGui::StyleColorsLight();
+
+    // Setup Platform/Renderer backends
+    ImGui_ImplGlfw_InitForOpenGL(window->getWindowImpl().getWindow(), true);
+    ImGui_ImplOpenGL3_Init("#version 130");
+ 
+    rcmd = window->getRenderer().addRenderCmd([](){
+        ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
+
+        /*if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
+        {
+            ImGui::UpdatePlatformWindows();
+            ImGui::RenderPlatformWindowsDefault();
+        }*/
+    });
+
+    //cmdlist.push_back(it);
+}
+
+void TestImgui::run() {
+    ImGui_ImplOpenGL3_NewFrame();
+    ImGui_ImplGlfw_NewFrame();
+    ImGui::NewFrame();
+
+    if(demo)
+        ImGui::ShowDemoWindow(&this->demo);
+    else
+        app->end();
+
+    ImGui::Render();
+
+
+    if(window->shouldClose())
+        app->end();
+    window->doFrame();
+
+}

modules/examples/GuiModules/TestImgui/src/TestImgui.h

@@ -0,0 +1,27 @@
+#ifndef GUIMODULE
+#define GUIMODULE
+#endif
+
+#include "Archimedes.h"
+
+
+class TestImgui : public Archimedes::GuiModule {
+
+    public:
+        TestImgui(void*, Archimedes::App*);
+
+        ~TestImgui();
+
+        void onLoad();
+
+        void run();
+
+    private:
+        bool demo = true;
+        std::list<Archimedes::Renderer::renderCmd*>::iterator rcmd;
+};
+
+#ifndef TESTIMGUI_STATIC
+#define MODULE_TYPE TestImgui
+#include "endModule.h"
+#endif