Game updates

src/display/display.c

@@ -10,9 +10,8 @@
 #include "display/framebuffer/framebuffer.h"
 #include "display/scene/scenemanager.h"
 #include "display/spritebatch/spritebatch.h"
-#include "display/ui/ui.h"
 #include "display/mesh/quad.h"
-#include "display/screen.h"
+#include "game/game.h"
 
 display_t DISPLAY;
 
@@ -67,9 +66,7 @@ errorret_t displayInit(void) {
   quadInit();
   frameBufferInitBackbuffer();
   spriteBatchInit();
-  errorChain(uiInit());
   errorChain(sceneManagerInit());
-  screenInit();
 
   errorOk();
 }
@@ -107,15 +104,14 @@ errorret_t displayUpdate(void) {
   #endif
   
   spriteBatchClear();
-  screenBind();
+  frameBufferBind(NULL);
+  frameBufferClear(
+    FRAMEBUFFER_CLEAR_COLOR | FRAMEBUFFER_CLEAR_DEPTH,
+    COLOR_CORNFLOWER_BLUE
+  );
   
-  sceneManagerUpdate();
-  uiUpdate();
-
-  sceneManagerRender();
-  uiRender();
-
-  screenUnbindAndRender();
+  gameRender();
+  spriteBatchFlush();
 
   #if DISPLAY_SDL2
     SDL_GL_SwapWindow(DISPLAY.window);
@@ -131,9 +127,7 @@ errorret_t displayUpdate(void) {
 }
 
 errorret_t displayDispose(void) {
-  screenDispose();
   sceneManagerDispose();
-  uiDispose();
   spriteBatchDispose();
 
   #if DISPLAY_SDL2