Rename data types and start implementing drawing quads in ui

src/compositor.c

@@ -15,35 +15,35 @@
 #define WINDOW_WIDTH 1280
 #define WINDOW_HEIGHT 720
 
-typedef struct compositor compositor_t;
+typedef struct compositor compositor;
 struct compositor {
-  window_t windows[MAX_WINDOWS];
+  window windows[MAX_WINDOWS];
   u32 active_window;
   SDL_Event event;
   bool running;
   i64 node_hovered;
   u64 count;
-  node_t *nodes;
+  node *nodes;
   bool move_node;
-  ui_ctx_t ctx;
+  ui_ctx ctx;
 };
 
-void add_node(compositor_t *comp, node_type_t type, node_data_t data, i32 x,
-              i32 y, ui_elem_colours_t colours);
+void add_node(compositor *comp, node_type type, node_data data, i32 x, i32 y,
+              ui_elem_colours colours);
 
 i32 run_main_loop(void) {
   if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
     return EXIT_FAILURE;
   }
 
-  compositor_t comp = {0};
+  compositor comp = {0};
 
   init_ui_ctx(&(comp.ctx));
 
-  comp.nodes = (node_t *)malloc(sizeof(node_t) * MAX_NODES);
+  comp.nodes = (node *)malloc(sizeof(node) * MAX_NODES);
 
-  window_t *main_window = &(comp.windows[0]);
-  window_t *toolbox = &(comp.windows[1]);
+  window *main_window = &(comp.windows[0]);
+  window *toolbox = &(comp.windows[1]);
 
   if (!init_window(main_window, "Compositor", WINDOW_WIDTH, WINDOW_HEIGHT, -1,
                    -1)) {
@@ -60,22 +60,29 @@ i32 run_main_loop(void) {
 
   SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
 
-  colour_t bg_colour = {.abgr = 0xffffffff};
-  ui_elem_colours_t button_colours = (ui_elem_colours_t){
-      .fill = (colour_t){.abgr = 0xff89a83c},
-      .border = (colour_t){.abgr = 0xff768432},
+  colour bg_colour = {.abgr = 0xffffffff};
+  ui_elem_colours button_colours = (ui_elem_colours){
+      .fill = (colour){.abgr = 0xff89a83c},
+      .border = (colour){.abgr = 0xff768432},
   };
-  ui_elem_colours_t io_node_colours = (ui_elem_colours_t){
-      .fill = (colour_t){.abgr = 0xff2c84b7},
-      .border = (colour_t){.abgr = 0xff315c89},
+  ui_elem_colours io_node_colours = (ui_elem_colours){
+      .fill = (colour){.abgr = 0xff2c84b7},
+      .border = (colour){.abgr = 0xff315c89},
   };
-  ui_elem_colours_t op_node_colours = (ui_elem_colours_t){
-      .fill = (colour_t){.abgr = 0xffad6c3a},
-      .border = (colour_t){.abgr = 0xff8e4a33},
+  ui_elem_colours op_node_colours = (ui_elem_colours){
+      .fill = (colour){.abgr = 0xffad6c3a},
+      .border = (colour){.abgr = 0xff8e4a33},
   };
 
   i32 toolbox_button_x = (toolbox->width - BUTTON_WIDTH) / 2;
 
+  quad qd = (quad){
+      .p0 = (point){140, 40},
+      .p1 = (point){190, 40},
+      .p2 = (point){170, 200},
+      .p3 = (point){210, 200},
+  };
+
   while (comp.running) {
     while (SDL_PollEvent(&(comp.event))) {
       handle_ui_events(&(comp.windows[comp.active_window - 1]), &(comp.ctx),
@@ -92,10 +99,10 @@ i32 run_main_loop(void) {
           break;
         case SDL_WINDOWEVENT_ENTER: {
           u32 id = comp.event.window.windowID;
-          window_t *wnd = NULL;
+          window *wnd = NULL;
 
           for (u64 i = 0; i < MAX_WINDOWS; ++i) {
-            window_t *window = &(comp.windows[i]);
+            window *window = &(comp.windows[i]);
 
             if (id == window->id) {
               comp.active_window = id;
@@ -117,10 +124,10 @@ i32 run_main_loop(void) {
         break;
       case SDL_DROPFILE:
         if (comp.event.drop.windowID == main_window->id) {
-          node_data_t data = (node_data_t){.path = comp.event.drop.file};
+          node_data data = (node_data){.path = comp.event.drop.file};
 
-          add_node(&comp, NODE_TYPE_IO, data, comp.ctx.mouse_x,
-                   comp.ctx.mouse_y, io_node_colours);
+          add_node(&comp, NODEYPE_IO, data, comp.ctx.mouse_x, comp.ctx.mouse_y,
+                   io_node_colours);
 
           break;
         }
@@ -132,26 +139,28 @@ i32 run_main_loop(void) {
     }
 
     for (u64 i = 0; i < COUNT_COMP_OPS; ++i) {
-      rect_t rect = {
+      rect rect = {
           .topleft.x = toolbox_button_x,
           .topleft.y = i * (BUTTON_HEIGHT + 20) + 30,
           .w = BUTTON_WIDTH,
           .h = BUTTON_HEIGHT,
       };
 
-      if (button(toolbox, &(comp.ctx), rect, button_colours)) {
-        node_data_t data = (node_data_t){.func = ops[i]};
+      if (ui_button(toolbox, &(comp.ctx), rect, button_colours)) {
+        node_data data = (node_data){.func = ops[i]};
 
-        add_node(&comp, NODE_TYPE_OP, data, comp.ctx.mouse_x, comp.ctx.mouse_y,
+        add_node(&comp, NODEYPE_OP, data, comp.ctx.mouse_x, comp.ctx.mouse_y,
                  op_node_colours);
       }
     }
 
     for (u64 i = 0; i < comp.count; ++i) {
-      comp.nodes[i].rect = node(main_window, &(comp.ctx), comp.nodes[i].rect,
-                                comp.nodes[i].colours);
+      comp.nodes[i].rec = ui_node(main_window, &(comp.ctx), comp.nodes[i].rec,
+                                  comp.nodes[i].colours);
     }
 
+    qd = ui_quad(main_window, &(comp.ctx), qd, op_node_colours);
+
     for (u64 i = 0; i < MAX_WINDOWS; ++i) {
       swap_buffers(&(comp.windows[i]));
     }
@@ -168,15 +177,15 @@ i32 run_main_loop(void) {
   return EXIT_SUCCESS;
 }
 
-void add_node(compositor_t *comp, node_type_t type, node_data_t data, i32 x,
-              i32 y, ui_elem_colours_t colours) {
+void add_node(compositor *comp, node_type type, node_data data, i32 x, i32 y,
+              ui_elem_colours colours) {
   if (comp->count + 1 >= MAX_NODES) {
     return;
   }
 
-  comp->nodes[(comp->count)++] = (node_t){
-      .rect =
-          (rect_t){
+  comp->nodes[(comp->count)++] = (node){
+      .rec =
+          (rect){
               .topleft.x = x,
               .topleft.y = y,
               .w = NODE_WIDTH,