the gui problem^TM

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;
     };