2d batch rendering

1 files changed, 4 insertions, 5 deletions

diff --git a/src/gui/base.h b/src/gui/base.h
index 73816a7..e62c66a 100644
--- a/src/gui/base.h
+++ b/src/gui/base.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "../util/color.h"
-#include "../util/allocator.h"
+#include "../render/gl_2d.h"
+#include <functional>
 
 // ======================================= [ colorscheme ] ========================================
 
@@ -46,7 +46,7 @@ extern U8                 gui_is_fg_window( struct GUI_BASE* node );  // 1 if pa
 
 // ======================================= [ components ] =========================================
 
-typedef void( *GUI_CALLBACK )( void* ptr );
+using GUI_CALLBACK = std::function<void( void* )>;
 struct GUI_LIST_ENTRY {
   I32 val;
   char title[256];
@@ -320,8 +320,7 @@ struct __gui_internal {
   } fonts;
 
   // draw stuff below
-  struct GL_SHADER_PROGRAM* gl2d;
-  struct GL_SHADER_PROGRAM* gl2d_font;
+  GL_BATCH2D* batch;
 };
 
 void __gui_internal_vectorinput_init(