Remove UI elements

Author: chutsu

src/xyz_gui.c

@@ -1306,15 +1306,6 @@ void gui_loop(void) {
     // draw_line3d(line_data, line_size, line_color, line_lw);
     // draw_image(10, 10, image_data, width, height, channels);
 
-    // ui_menu(&menu_bounds);
-    // if (ui_button("Button", button_bounds) == 1) {
-    //   printf("Button pressed!\n");
-    // }
-    //
-    // if (ui_checkbox("Checkbox", checkbox_bounds) == 1) {
-    //   printf("Button pressed!\n");
-    // }
-
     // Update
     if ((time_now - last_frame) >= fps_limit) {
       glfwSwapBuffers(_window);
@@ -2920,128 +2911,3 @@ void gl_model_draw(const gl_model_t *model, const gl_camera_t *camera) {
     gl_mesh_draw(&model->meshes[i], model->program_id);
   }
 }
-
-// UI-UTILS //////////////////////////////////////////////////////////////////
-
-static int ui_intercept(const gl_bounds_t bounds) {
-  const int x = bounds.x;
-  const int y = bounds.y;
-  const int w = bounds.w;
-  const int h = bounds.h;
-  const int within_x = (x <= _cursor_x && _cursor_x <= x + w);
-  const int within_y = (y <= _cursor_y && _cursor_y <= y + h);
-  return (within_x && within_y) ? 1 : 0;
-}
-
-void ui_menu(gl_bounds_t *bounds) {
-  // Menu
-  gl_color_t color = (gl_color_t){1.0f, 1.0f, 1.0f};
-
-  // Toolbar
-  gl_color_t toolbar_color = (gl_color_t){0.7f, 0.7f, 0.7f};
-  gl_bounds_t toolbar_bounds;
-  toolbar_bounds.x = bounds->x;
-  toolbar_bounds.y = bounds->y;
-  toolbar_bounds.w = bounds->w;
-  toolbar_bounds.h = 16.0f;
-
-  if (ui_intercept(toolbar_bounds) && _cursor_is_dragging) {
-    bounds->x += _cursor_dx;
-    bounds->y += _cursor_dy;
-    toolbar_bounds.x += _cursor_dx;
-    toolbar_bounds.y += _cursor_dy;
-    _ui_engaged = 1;
-  }
-
-  draw_rect(bounds, &color);
-  draw_rect(&toolbar_bounds, &toolbar_color);
-}
-
-int ui_button(const char *label, gl_bounds_t bounds) {
-  gl_color_t text_color = (gl_color_t){0.0f, 0.0f, 0.0f};
-  gl_color_t color = (gl_color_t){1.0f, 1.0f, 1.0f};
-  gl_color_t color_press = (gl_color_t){0.0f, 0.0f, 1.0f};
-
-  gl_float_t text_w = 0.0f;
-  gl_float_t text_h = 0.0f;
-  text_width_height(label, &text_w, &text_h);
-  gl_float_t text_x = bounds.x + (bounds.w / 2.0f - text_w / 2.0f);
-  gl_float_t text_y = bounds.y + (bounds.h / 2.0f - text_h / 2.0f);
-
-  // Button color
-  int button_on = 0;
-  if (ui_intercept(bounds) && _mouse_button_left == GLFW_PRESS) {
-    color = color_press;
-    if (_ui_engaged == 0) {
-      _ui_engaged = 1;
-      button_on = 1;
-    }
-  }
-
-  // Draw button
-  draw_rect(&bounds, &color);
-  draw_text(label, text_x, text_y, text_color);
-
-  return button_on;
-}
-
-int ui_checkbox(const char *label, gl_bounds_t bounds) {
-  gl_color_t text_color = (gl_color_t){0.0f, 0.0f, 0.0f};
-  gl_color_t color = (gl_color_t){1.0f, 1.0f, 1.0f};
-  // gl_color_t color_hover = (gl_color_t){1.0f, 0.0f, 0.0f};
-  // gl_color_t color_press = (gl_color_t){0.0f, 0.0f, 1.0f};
-
-  gl_float_t text_w = 0.0f;
-  gl_float_t text_h = 0.0f;
-  text_width_height(label, &text_w, &text_h);
-  gl_float_t text_x = bounds.x + (bounds.w / 2.0f - text_w / 2.0f);
-  gl_float_t text_y = bounds.y + (bounds.h / 2.0f - text_h / 2.0f);
-
-  // Button color
-  int button_on = 0;
-  // const int button_hover = ui_intercept(bounds);
-
-  gl_bounds_t cb_bounds;
-  cb_bounds.w = 12.0f;
-  cb_bounds.h = 12.0f;
-  cb_bounds.x = bounds.x + 10.0f;
-  cb_bounds.y = bounds.y + bounds.h / 2.0f - cb_bounds.h / 2.0f;
-
-  gl_bounds_t on_bounds;
-  on_bounds.w = 8.0f;
-  on_bounds.h = 8.0f;
-  on_bounds.x = bounds.x + 12.0f;
-  on_bounds.y = bounds.y + bounds.h / 2.0f - on_bounds.h / 2.0f;
-
-  gl_color_t off_color = (gl_color_t){0.2f, 0.2f, 0.2f};
-  gl_color_t on_color = (gl_color_t){1.0f, 1.0f, 1.0f};
-
-  // Checkbox color
-  // int button_on = 0;
-  // if (ui_intercept(on_bounds) && _mouse_button_left == GLFW_PRESS) {
-  //   color = on_color;
-  //   if (_ui_engaged == 0) {
-  //     _ui_engaged = 1;
-  //     button_on = 1;
-  //   }
-  // }
-
-  // if (button_hover == 1 && button_pressed == 0) {
-  //   color = color_hover;
-  //   _ui_engaged = 0;
-  // } else if (button_hover == 1 && button_pressed == 1) {
-  //   color = color_press;
-  //   if (_ui_engaged == 0) {
-  //     button_on = 1;
-  //     _ui_engaged = 1;
-  //   }
-  // }
-
-  // Draw button
-  draw_rect(&bounds, &color);
-  draw_rect(&cb_bounds, &off_color);
-  draw_rect(&on_bounds, &on_color);
-  draw_text(label, text_x, text_y, text_color);
-
-  return button_on;
-}

src/xyz_gui.h

@@ -450,15 +450,3 @@ typedef struct gl_model_t {
 gl_model_t *gl_model_load(const char *model_path);
 void gl_model_free(gl_model_t *model);
 void gl_model_draw(const gl_model_t *model, const gl_camera_t *camera);
-
-// UI ////////////////////////////////////////////////////////////////////////
-
-void ui_menu(gl_bounds_t *bounds);
-int ui_button(const char *label, gl_bounds_t bounds);
-int ui_checkbox(const char *label, gl_bounds_t bounds);
-
-// TODO: IMPLEMENT THE FOLLOWING UI ELEMENTS
-// UI-CHECKBOX ///////////////////////////////////////////////////////////////
-// UI-SLIDER  ////////////////////////////////////////////////////////////////
-// UI-DROPDOWN ///////////////////////////////////////////////////////////////
-// UI-TEXTBOX ////////////////////////////////////////////////////////////////