X-Git-Url: https://harrygodden.com/git/?p=fishladder.git;a=blobdiff_plain;f=vg%2Fvg_ui.h;fp=vg%2Fvg_ui.h;h=f6fa8955333ac76f19987b477038c3c2dac6d70b;hp=eb8c84eaaeaac3703a7f4f187e36338b421c1f53;hb=7756287016b03ba7eb76b0a57cebe28952a4ce41;hpb=bf818249690c5ae1a1e4634714dd2e722fa35632

diff --git a/vg/vg_ui.h b/vg/vg_ui.h
index eb8c84e..f6fa895 100644
--- a/vg/vg_ui.h
+++ b/vg/vg_ui.h
@@ -55,9 +55,6 @@ SHADER_DEFINE( shader_ui,
 	UNIFORMS({ "uPv", "uTexGlyphs" })
 )
 
-#define UI_AUTO_FILL 0
-//#define UI_DEBUG
-
 // Types
 // ===========================================================================================================
 
@@ -96,8 +93,6 @@ struct ui_colourset
 
 struct ui_ctx
 {
-	ui_px padding;
-
 	struct ui_qnode
 	{
 		ui_rect 		rect;
@@ -118,8 +113,6 @@ struct ui_ctx
 	*verts;
 	#pragma pack(pop)
 	
-	u32 override_colour;
-	
 	u32 num_verts;
 	u16 *indices;
 	u32 num_indices;
@@ -136,8 +129,7 @@ struct ui_ctx
 	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;
+	ui_colourset *colours;
 	
 	GLuint vao;
 	GLuint vbo;
@@ -155,29 +147,22 @@ struct ui_ctx
 // Globals
 // ===========================================================================================================
 
-// Opengl
-static ui_px ui_glyph_spacing_x = 9;
-static GLuint ui_glyph_texture = 0;
+#define UI_GLYPH_SPACING_X 9
 
-ui_colourset ui_default_colours = {
-	.main = 0xff00ff00,
-	.hover = 0xffff00ff,
-	.active = 0xffff0000
-};
-ui_ctx ui_global_ctx = { 
-	.padding = 8, 
-	.colours_main = &ui_default_colours
+static GLuint ui_glyph_texture = 0;
+static ui_colourset ui_default_colours = {
+	.main = 0xff807373,
+	.hover = 0xff918484,
+	.active = 0xffad9f9e
 };
 
+static ui_ctx ui_global_ctx;
 
 // Initialization
 // ===========================================================================================================
 
-static void ui_reset_colours( ui_ctx *ctx );
 static void ui_init_context( ui_ctx *ctx, int index_buffer_size )
 {
-	ui_reset_colours( ctx );
-	
 	u32 vertex_buffer_size = (index_buffer_size+(index_buffer_size/2));
 	
 	// Generate the buffer we are gonna be drawing to
@@ -218,6 +203,9 @@ static void ui_init_context( ui_ctx *ctx, int index_buffer_size )
 	{
 		ctx->verts = (struct ui_vert *)malloc( vertex_buffer_size * sizeof(struct ui_vert) );
 		ctx->indices = (u16*)malloc( index_buffer_size * sizeof(u16) );
+
+      if( !ctx->colours )
+         ctx->colours = &ui_default_colours;
 	}
 }
 
@@ -274,7 +262,6 @@ static void ui_default_init(void)
 static void ui_default_free(void)
 {
    glDeleteTextures( 1, &ui_glyph_texture );
-	
 	ui_context_free( &ui_global_ctx );
 }
 
@@ -350,24 +337,6 @@ static void ui_rect_pad( ui_rect rect, ui_px pad )
 	rect[3] -= pad*2;
 }
 
-static void ui_vis_rect( ui_rect rect, u32 colour )
-{
-	#ifdef UI_DEBUG
-	v2f p0;
-	v2f p1;
-	
-	p0[0] = rect[0];
-	p0[1] = rect[1];
-	p1[0] = rect[0]+rect[2];
-	p1[1] = rect[1]+rect[3];
-
-	vg_line( p0, (v2f){p1[0],p0[1]}, colour );
-	vg_line( (v2f){p1[0],p0[1]}, p1, colour );
-	vg_line( p1, (v2f){p0[0],p1[1]}, colour );
-	vg_line( (v2f){p0[0],p1[1]}, p0, colour );
-	#endif
-}
-
 // Stack control
 // ===========================================================================================================
 
@@ -408,10 +377,7 @@ static int ui_hasmouse( ui_ctx *ctx )
 static void ui_end( ui_ctx *ctx )
 {
 	struct ui_qnode *node = &ctx->stack[ --ctx->stack_count ];
-
 	ui_rect_copy( node->rect, ctx->cursor );
-	ui_vis_rect( ctx->cursor, 
-		(node->mouse_over && (node->capture_id == ctx->capture_mouse_id))? 0xffff0000: 0xff0000ff );
 }
 
 static void ui_end_down( ui_ctx *ctx )
@@ -590,7 +556,7 @@ static void ui_text( ui_ctx *ctx, ui_px pos[2], const char *str, ui_px scale, en
 	u32 current_colour = 0x00ffffff;
 	
    const char *_c = str;
-	char c;
+	u8 c;
 
 	text_cursor[0] = pos[0] + ui_text_line_offset( str, scale, align );
 	text_cursor[1] = pos[1];
@@ -602,10 +568,10 @@ static void ui_text( ui_ctx *ctx, ui_px pos[2], const char *str, ui_px scale, en
 		if( c == '\n' )
 		{
 			text_cursor[1] += 14*scale;
-			text_cursor[0] = ctx->cursor[0] + ui_text_line_offset( _c, scale, align );
+			text_cursor[0] = pos[0] + ui_text_line_offset( _c, scale, align );
 			continue;
 		}
-		else if( c >= 33 && c <= 126 )
+		else if( c >= 33 )
 		{
 			u8 glyph_base[2];
 			u8 glyph_index = c;
@@ -652,9 +618,16 @@ static void ui_text( ui_ctx *ctx, ui_px pos[2], const char *str, ui_px scale, en
 					break;
 				}
 			}
+
+         continue;
 		}
+      else if( c == '\t' )
+      {
+         text_cursor[0] += UI_GLYPH_SPACING_X*scale*4;
+         continue;
+      }
 		
-		text_cursor[0] += 9*scale;
+   	text_cursor[0] += UI_GLYPH_SPACING_X*scale;
 	}
 }
 
@@ -734,7 +707,7 @@ static int ui_button( ui_ctx *ctx, u32 id )
 		
 		if( ui_hasmouse(ctx) )
 		{
-			ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->hover );
+			ui_fill_rect( ctx, ctx->cursor, ctx->colours->hover );
 			
 			if( ctx->click_state == 1 )
 			{
@@ -747,7 +720,7 @@ static int ui_button( ui_ctx *ctx, u32 id )
 				return k_button_hold;
 		}
 		else
-			ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->main );
+			ui_fill_rect( ctx, ctx->cursor, ctx->colours->main );
 	}
 	
 	return k_button_released;
@@ -852,7 +825,7 @@ static void ui_scrollbar( ui_ctx *ctx, struct ui_scrollbar *scrollbar, u32 id )
 	
 	ui_new_node( ctx );
 	{
-		ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->background );
+		ui_fill_rect( ctx, ctx->cursor, ctx->colours->background );
 		ui_capture_mouse( ctx, id );
 		
 		ctx->cursor[1] += scrollbar->py;
@@ -861,14 +834,14 @@ static void ui_scrollbar( ui_ctx *ctx, struct ui_scrollbar *scrollbar, u32 id )
 		ui_new_node( ctx );
 		{
 			ui_capture_mouse( ctx, __COUNTER__ );
-			struct ui_vert *drag_bar = ui_fill_rect( ctx, ctx->cursor, ctx->colours_current->bar );
+			struct ui_vert *drag_bar = ui_fill_rect( ctx, ctx->cursor, ctx->colours->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;
+				drag_bar[0].colour = ctx->colours->bar_hover;
+				drag_bar[1].colour = ctx->colours->bar_hover;
+				drag_bar[2].colour = ctx->colours->bar_hover;
+				drag_bar[3].colour = ctx->colours->bar_hover;
 			
 				// start drag
 				if( ctx->click_state == 1 )
@@ -891,17 +864,6 @@ static ui_px ui_calculate_content_scroll( struct ui_scrollbar *scrollbar, ui_px
 	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;
-}
-
 static void ui_push_image( ui_ctx *ctx, ui_rect rc, GLuint image )
 {
 	struct ui_image *img = &ctx->images[ ctx->image_count ++ ];
@@ -939,5 +901,4 @@ static void ui_push_image( ui_ctx *ctx, ui_rect rc, GLuint image )
 #define gui_want_mouse() ui_want_mouse( &ui_global_ctx )
 #define gui_push_image(...) ui_push_image( &ui_global_ctx, __VA_ARGS__ )
 #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 )