X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_ui.h;h=fe46da0040a8bcd795f9628134d3519d78807b63;hb=a46972aa1ee718339c2512cae986f2943bed0e04;hp=a2cc77057af0da407c4681fe83333acdbd3a5570;hpb=42fc2b14afbe5a37bdd469b9bac5f642bc50ccc4;p=fishladder.git

diff --git a/vg/vg_ui.h b/vg/vg_ui.h
index a2cc770..fe46da0 100644
--- a/vg/vg_ui.h
+++ b/vg/vg_ui.h
@@ -55,6 +55,26 @@ typedef i16 				ui_px;
 typedef u32 				ui_colour;
 typedef ui_px 				ui_rect[4];
 typedef struct ui_ctx 	ui_ctx;
+typedef struct ui_colourset ui_colourset;
+
+struct ui_colourset
+{
+	union
+	{
+		struct
+		{
+			ui_colour main;
+			ui_colour hover;
+			ui_colour active;
+		};
+		struct
+		{
+			ui_colour background;
+			ui_colour bar;
+			ui_colour bar_hover;
+		};
+	};
+};
 
 struct ui_ctx
 {
@@ -96,8 +116,44 @@ struct ui_ctx
 	// User input
 	ui_px mouse[2];
 	int click_state;	// 0: released, 1: on down, 2: pressed, 3: on release
+	
+	ui_colourset *colours_main;
+	ui_colourset *colours_current;
 };
 
+// Shortnames
+#define gui_draw(...) ui_draw( &ui_global_ctx, __VA_ARGS__)
+#define gui_current(...) ui_current( &ui_global_ctx, __VA_ARGS__)
+#define gui_new_node() ui_new_node( &ui_global_ctx )
+#define gui_hasmouse(...) ui_hasmouse( &ui_global_ctx, __VA_ARGS__)
+#define gui_end() ui_end( &ui_global_ctx )
+#define gui_end_down() ui_end_down( &ui_global_ctx )
+#define gui_end_right() ui_end_right( &ui_global_ctx )
+#define gui_fill_y() ui_fill_y( &ui_global_ctx)
+#define gui_fill_x() ui_fill_x( &ui_global_ctx)
+#define gui_align_bottom() ui_align_bottom( &ui_global_ctx )
+#define gui_align_right() ui_align_right( &ui_global_ctx )
+#define gui_align_top() ui_align_top( &ui_global_ctx )
+#define gui_align_left() ui_align_left( &ui_global_ctx )
+#define gui_clamp_rect(...) ui_clamp_rect( &ui_global_ctx, __VA_ARGS__)
+#define gui_group_id(...) ui_group_id( &ui_global_ctx, __VA_ARGS__)
+#define gui_capture_mouse(...) ui_capture_mouse( &ui_global_ctx, __VA_ARGS__)
+#define gui_set_clip(...) ui_set_clip( &ui_global_ctx, __VA_ARGS__)
+#define gui_release_clip() ui_release_clip( &ui_global_ctx )
+#define gui_fill_rect_uv(...) ui_fill_rect_uv( &ui_global_ctx, __VA_ARGS__)
+#define gui_fill_rect(...) ui_fill_rect( &ui_global_ctx, __VA_ARGS__)
+#define gui_text(...) ui_text( &ui_global_ctx, __VA_ARGS__)
+#define gui_begin(...) ui_begin( &ui_global_ctx, __VA_ARGS__)
+#define gui_resolve(...) ui_resolve( &ui_global_ctx, __VA_ARGS__)
+#define gui_set_mouse(...) ui_set_mouse( &ui_global_ctx, __VA_ARGS__)
+#define gui_button(...) ui_button( &ui_global_ctx, __VA_ARGS__)
+#define gui_window(...) ui_window( &ui_global_ctx, __VA_ARGS__)
+#define gui_want_mouse() ui_want_mouse( &ui_global_ctx )
+
+#define gui_scrollbar(...) ui_scrollbar( &ui_global_ctx, __VA_ARGS__)
+#define gui_override_colours(...) ui_override_colours( &ui_global_ctx, __VA_ARGS__)
+#define gui_reset_colours(...) ui_reset_colours( &ui_global_ctx )
+
 // Globals
 // ===========================================================================================================
 
@@ -112,7 +168,16 @@ GLuint ui_ebo;
 #define UI_BUFFER_SIZE 30000
 #define UI_INDEX_SIZE 20000
 
-ui_ctx ui_global_ctx = { .padding = 8 };
+ui_colourset ui_default_colours = {
+	.main = 0xff00ff00,
+	.hover = 0xffff00ff,
+	.active = 0xffff0000
+};
+ui_ctx ui_global_ctx = { 
+	.padding = 8, 
+	.colours_current = &ui_default_colours, 
+	.colours_main = &ui_default_colours 
+};
 
 
 // Initialization
@@ -420,6 +485,11 @@ static void ui_capture_mouse( ui_ctx *ctx, u32 id )
 	}
 }
 
+static int ui_want_mouse( ui_ctx *ctx )
+{
+	return ctx->capture_mouse_id == 0? 0: 1;
+}
+
 static void ui_set_clip( ui_ctx *ctx, ui_rect clip )
 {
 	ctx->clipping[0] = clip[0];
@@ -589,6 +659,9 @@ static void ui_begin( ui_ctx *ctx, ui_px res_x, ui_px res_y )
 	ctx->num_indices = 0;
 	
 	ui_release_clip( ctx );
+	
+	if( ctx->click_state == 0 )
+		ctx->capture_mouse_id = 0;
 }
 
 static void ui_resolve( ui_ctx *ctx )
@@ -625,6 +698,14 @@ struct ui_window
 	ui_px drag_offset[2];
 };
 
+enum button_state
+{
+	k_button_released = 0,
+	k_button_start_click,
+	k_button_click,
+	k_button_hold
+};
+
 static int ui_button( ui_ctx *ctx, u32 id )
 {
 	ui_new_node( ctx );
@@ -633,20 +714,23 @@ static int ui_button( ui_ctx *ctx, u32 id )
 		
 		if( ui_hasmouse(ctx) )
 		{
-			ui_fill_rect( ctx, ctx->cursor, 0xffcccccc );
-		
+			ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->hover );
+			
 			if( ctx->click_state == 1 )
-				ctx->capture_lock = 1;
-			else if( ctx->capture_lock && ctx->click_state == 3 )
 			{
-				return 1;
+				ctx->capture_lock = 1;
+				return k_button_start_click;
 			}
+			else if( ctx->capture_lock && ctx->click_state == 3 )
+				return k_button_click;
+			else if( ctx->capture_lock && ctx->click_state == 2 )
+				return k_button_hold;
 		}
 		else
-			ui_fill_rect( ctx, ctx->cursor, 0xff999999 );
+			ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->main );
 	}
 	
-	return 0;
+	return k_button_released;
 }
 
 static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group )
@@ -721,3 +805,79 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group )
 	
 	return 1;
 }
+
+struct ui_scrollbar
+{
+	int 	drag;
+	ui_px drag_offset;
+	
+	ui_px py;
+	ui_px bar_height;
+	ui_px view_height;
+};
+
+static void ui_scrollbar( ui_ctx *ctx, struct ui_scrollbar *scrollbar, u32 id )
+{
+	scrollbar->view_height = ctx->cursor[3];
+
+	if( scrollbar->drag )
+	{
+		scrollbar->py = ctx->mouse[1]+scrollbar->drag_offset;
+		scrollbar->py = VG_MAX( scrollbar->py, 0 );
+		scrollbar->py = VG_MIN( scrollbar->py, ctx->cursor[3] - scrollbar->bar_height );
+		
+		if( ctx->click_state == 0 || ctx->click_state == 3 )
+			scrollbar->drag = 0;
+	}
+	
+	ui_new_node( ctx );
+	{
+		ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->background );
+		ui_capture_mouse( ctx, id );
+		
+		ctx->cursor[1] += scrollbar->py;
+		ctx->cursor[3] = scrollbar->bar_height;
+		
+		ui_new_node( ctx );
+		{
+			ui_capture_mouse( ctx, __COUNTER__ );
+			struct ui_vert *drag_bar = ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->bar );
+
+			if( ui_hasmouse( ctx ) || scrollbar->drag )
+			{
+				drag_bar[0].colour = ctx->colours_current->bar_hover;
+				drag_bar[1].colour = ctx->colours_current->bar_hover;
+				drag_bar[2].colour = ctx->colours_current->bar_hover;
+				drag_bar[3].colour = ctx->colours_current->bar_hover;
+			
+				// start drag
+				if( ctx->click_state == 1 )
+				{
+					scrollbar->drag = 1;
+					scrollbar->drag_offset = scrollbar->py - ctx->mouse[1];
+				}
+			}
+		}
+		ui_end_down( ctx );
+	}
+	ui_end( ctx );
+}
+
+static ui_px ui_calculate_content_scroll( struct ui_scrollbar *scrollbar, ui_px content )
+{
+	float overlap = vg_maxf( 0.0f, (float)(content - scrollbar->view_height) );
+	
+	float range = scrollbar->view_height - scrollbar->bar_height;
+	return ((float)scrollbar->py / range) * overlap;
+}
+
+static void ui_override_colours( ui_ctx *ctx, ui_colourset *set )
+{
+	ctx->colours_current = set;
+}
+
+static void ui_reset_colours( ui_ctx *ctx )
+{
+	ctx->colours_current = ctx->colours_main;
+	ctx->override_colour = 0xffffffff;
+}