3 files changed, 8 insertions, 36 deletions
diff --git a/src/rendering/include/engine/rendering/rendering.h b/src/rendering/include/engine/rendering/rendering.h
index 5ac03ae..cbdce83 100644
--- a/src/rendering/include/engine/rendering/rendering.h
+++ b/src/rendering/include/engine/rendering/rendering.h
@@ -1,8 +1,9 @@
-#ifndef RENDERING_H
-#define RENDERING_H
+#ifndef ENGINE_RENDERING_RENDERING_H
+#define ENGINE_RENDERING_RENDERING_H
 
 #include <engine/core/types.h>
 #include <engine/utils/vector.h>
+#include <engine/rendering/window.h>
 
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
@@ -45,9 +46,6 @@ typedef struct {
   u32 mvp;
 } RenderObject;
 
-#include <engine/engine.h>
-#include <engine/ui.h>
-
 /* Rendering functions */
 void render_begin(Window w);
 void render_present(Window w);
@@ -59,28 +57,13 @@ void render(Window w);
 //void engine_window_resize_pointers(i32* w, i32* h);
 //void engine_window_resize_pointers_reset(void);
 
-/* UI rendering */
-/* See rendering_ui.c for implementation */
-i64 engine_render_text(i32 font_id, Engine_color fg, char* text,
-                       v2_i32* size_out, bool wrapped);
 void engine_draw_sprite(Sprite* s, v2_i32* pos, f32 scale);
 void engine_draw_sprite_ex(Sprite* s, v2_i32* pos, f32 scale,
                            Engine_color colormod);
 
 Sprite sprite_new(u64 tid, u8 coord);
 
-//#ifdef ENGINE_INTERNALS
-//#include <engine/engine.h>
-//
-////#include <glad/gl.h>
-////#define GLFW_INCLUDE_NONE
-////#include <GLFW/glfw3.h>
-//
-//#define TEXTURES_INCREMENT 512
-//
 typedef enum {
-  RenderDrawCallType_UITree,
-  /*RenderDrawCallType_UIButton,*/
   RenderDrawCallType_Text,
   RenderDrawCallType_Sprite,
 } RenderDrawCallType;
@@ -100,8 +83,4 @@ typedef struct {
 
 RenderObject RenderObject_new();
 
-//
-//
-//#endif
-
 #endif
diff --git a/src/rendering/src/gl.c b/src/rendering/src/gl.c
index 390e42b..e9d986f 100644
--- a/src/rendering/src/gl.c
+++ b/src/rendering/src/gl.c
@@ -6,6 +6,11 @@
 #include <engine/core/types.h>
 #include <engine/core/logging.h>
 
+#include <engine/rendering/rendering.h>
+#include <engine/core/platform.h>
+
+extern Platform* GLOBAL_PLATFORM;
+
 isize f_get_sz(FILE* f) {
   if (f == NULL) {
     ERROR("File was null!");
diff --git a/src/rendering/src/rendering.c b/src/rendering/src/rendering.c
index 740e3a9..2795c69 100644
--- a/src/rendering/src/rendering.c
+++ b/src/rendering/src/rendering.c
@@ -32,12 +32,6 @@ void render_present(Window w) {
 //  for (i32 i = 0; i < drawcall_len; i++) {
 //    RenderDrawCall dc = drawcalls[i];
 //    switch (dc.type) {
-//    case RenderDrawCallType_UITree:
-//      render_uitree(w, dc.data.data);
-//      break;
-//    case RenderDrawCallType_Text:
-//      LOG("RenderDrawCallType_Text rendering not implemented!");
-//      break;
 //    case RenderDrawCallType_Sprite: {
 //#ifdef _DEBUG
 //      if (dc.data.sprite.sprite == NULL) {
@@ -76,12 +70,6 @@ void engine_window_resize_pointers_reset(void) {
   //GLOBAL_PLATFORM->window->game_h = NULL;
 }
 
-void engine_draw_uitree(UITree* t) {
-  if (drawcall_len + 1 >= drawcall_limit) return;
-  drawcalls[drawcall_len++] = (RenderDrawCall){
-      .type = RenderDrawCallType_UITree, .data.data = (void*)t};
-}
-
 void engine_draw_sprite(Sprite* s, v2_i32* pos, f32 scale) {
   if (drawcall_len + 1 >= drawcall_limit) return;
 #ifdef _DEBUG