make include headers only

modules/WindowModule/src/WindowModule.cpp

@@ -7,11 +7,18 @@ WindowModule::WindowModule(void* h, Archimedes::App* a) : Module(h, a) {
 WindowModule::~WindowModule() {
     if(window)
         delete window;
+    if(renderer)
+        delete renderer;
 }
 
 void WindowModule::onLoad() {
 
     window = new Archimedes::Window();
+    renderer = new Archimedes::Renderer();
+
+    window->setRenderer(renderer);
+
+    renderer->init();
 }
 
 void WindowModule::run() {
@@ -22,3 +29,4 @@ void WindowModule::run() {
 
     window->doFrame();
 }
+        

modules/WindowModule/src/WindowModule.h

@@ -13,9 +13,21 @@ class WindowModule : public Archimedes::Module {
 
         void onLoad();
 
+        //interface for other modules
+        std::list<Archimedes::Renderer::renderCmd*>::iterator addRenderCmd(Archimedes::Renderer::renderCmd* cmd) {
+            renderer->addRenderCmd(cmd);
+        }
+
+        void removeRenderCmd(std::list<Archimedes::Renderer::renderCmd*>::iterator cmd) {
+            renderer->removeRenderCmd(cmd);
+        }
+
+        auto getWindowImpl() { return window->getWindowImpl(); }
+
     private:
 
         Archimedes::Window* window;
+        Archimedes::Renderer* renderer;
 };
 
 

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

@@ -12,7 +12,7 @@ TestImgui::TestImgui(void* h, Archimedes::App* a) : Archimedes::GuiModule(h, a)
 }
 
 TestImgui::~TestImgui() {
-    window->getRenderer().removeRenderCmd(rcmd);
+    windowModule->removeRenderCmd(rcmd);
     ImGui_ImplOpenGL3_Shutdown();
     ImGui_ImplGlfw_Shutdown();
     ImGui::DestroyContext();
@@ -20,10 +20,6 @@ TestImgui::~TestImgui() {
 
 void TestImgui::onLoad() {
     
-    createWindow();
-
-    window->getRenderer().init();
-
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
     ImGuiIO& io = ImGui::GetIO(); (void)io;
@@ -38,10 +34,10 @@ void TestImgui::onLoad() {
     //ImGui::StyleColorsLight();
 
     // Setup Platform/Renderer backends
-    ImGui_ImplGlfw_InitForOpenGL(window->getWindowImpl().getWindow(), true);
-    ImGui_ImplOpenGL3_Init("#version 130");
+    ImGui_ImplGlfw_InitForOpenGL(windowModule->getWindowImpl().getWindow(), true);
+    ImGui_ImplOpenGL3_Init("#version 330");
  
-    rcmd = window->getRenderer().addRenderCmd([](){
+    rcmd = windowModule->addRenderCmd([](){
         ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
 
         /*if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
@@ -51,7 +47,6 @@ void TestImgui::onLoad() {
         }*/
     });
 
-    //cmdlist.push_back(it);
 }
 
 void TestImgui::run() {
@@ -66,9 +61,4 @@ void TestImgui::run() {
 
     ImGui::Render();
 
-
-    if(window->shouldClose())
-        app->end();
-    window->doFrame();
-
 }