heavy refactoring

modules/WindowModule/src/WindowModule.cpp

@@ -1,9 +1,5 @@
 #include "WindowModule.h"
 
-WindowModule::WindowModule(void* h, Archimedes::App* a) : Module(h, a) { 
-    name = "Window"; 
-}
-
 WindowModule::~WindowModule() {
     if(window)
         delete window;
@@ -14,11 +10,21 @@ WindowModule::~WindowModule() {
 void WindowModule::onLoad() {
 
     window = new Archimedes::Window();
-    renderer = new Archimedes::Renderer();
+    //renderer = new Archimedes::Renderer();
 
-    window->setRenderer(renderer);
+    //window->setRenderer(renderer);
+    
+    renderer = window->getRenderer();
 
-    renderer->init();
+    if(!renderer->init()) {
+        std::cout << "Renderer init failed!\n";
+        std::abort();
+    }
+
+    data["window"] = window->getWindowImpl().getWindow();
+    data["renderCmdList"] = &renderer->getCmdList();
+
+    std::cout << "WindowModule GLFWwindow*: " << std::any_cast<decltype(window->getWindowImpl().getWindow())>(data["window"]) << std::endl;
 }
 
 void WindowModule::run() {

modules/WindowModule/src/WindowModule.h

@@ -1,36 +1,37 @@
 #ifndef WINDOWMODULE_H
 #define WINDOWMODULE_H
 
+#ifdef GUIMODULE
+#undef GUIMODULE
 #include "Archimedes.h"
+#define GUIMODULE
+#else
+#include "Archimedes.h"
+#endif
+
 #include "utils/Window/Window.h"
 #include "utils/Renderer/Renderer.h"
 
 class WindowModule : public Archimedes::Module {
 
     public:
-        WindowModule(void*, Archimedes::App*);
+        WindowModule(void* h, Archimedes::App* a) : Archimedes::Module(h, a) {
+            name = "WindowModule";
+        }
+
 
         ~WindowModule();
 
         void run();
 
         void onLoad();
-
+        
         //interface for other modules
-        std::list<Archimedes::Renderer::renderCmd*>::iterator addRenderCmd(Archimedes::Renderer::renderCmd* cmd) {
-            return 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;
+    private:
+
 };