X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_ui.h;fp=vg%2Fvg_ui.h;h=3e4ae5e3717d272c90af5d9832368b5f5bb032c5;hb=fa88b9de1e8416023822f91ec88971bfadcf1702;hp=03647392a27ebe8cfce24e7f82b891197720066f;hpb=8f89e6bd64229500954908e79ce500f80dda774d;p=fishladder.git

diff --git a/vg/vg_ui.h b/vg/vg_ui.h
index 0364739..3e4ae5e 100644
--- a/vg/vg_ui.h
+++ b/vg/vg_ui.h
@@ -39,7 +39,7 @@ SHADER_DEFINE( shader_ui,
 		"float clip_blend = step( aWsp.x, aClip.z ) * step( aWsp.y, aClip.w ) * step( aClip.x, aWsp.x ) * step( aClip.y, aWsp.y );"
 	
 		"vec4 glyph = texture( uTexGlyphs, aTexCoords );"
-		"FragColor = aColour * vec4( 1.0, 1.0, 1.0, glyph.r * clip_blend );"
+		"FragColor = vec4( aColour.rgb * glyph.rgb, aColour.a*glyph.a*clip_blend );"
 	"}"
 	,
 	UNIFORMS({ "uPv", "uTexGlyphs" })
@@ -120,41 +120,20 @@ struct ui_ctx
 	
 	ui_colourset *colours_main;
 	ui_colourset *colours_current;
+	
+	GLuint vao;
+	GLuint vbo;
+	GLuint ebo;
+	
+	struct ui_image
+	{
+		ui_rect rc;
+		GLuint image;
+	}
+	images[16];
+	int image_count;
 };
 
-// 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
 // ===========================================================================================================
 
@@ -162,12 +141,6 @@ struct ui_ctx
 int ui_glyph_override = 0;
 ui_px ui_glyph_spacing_x = 6;
 GLuint ui_glyph_texture = 0;
-GLuint ui_vao;
-GLuint ui_vbo;
-GLuint ui_ebo;
-
-#define UI_BUFFER_SIZE 30000
-#define UI_INDEX_SIZE 20000
 
 ui_colourset ui_default_colours = {
 	.main = 0xff00ff00,
@@ -176,7 +149,6 @@ ui_colourset ui_default_colours = {
 };
 ui_ctx ui_global_ctx = { 
 	.padding = 8, 
-	.colours_current = &ui_default_colours, 
 	.colours_main = &ui_default_colours
 };
 
@@ -184,6 +156,64 @@ 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
+	{
+		glGenVertexArrays(1, &ctx->vao);
+		glGenBuffers( 1, &ctx->vbo );
+		glGenBuffers( 1, &ctx->ebo );
+		glBindVertexArray( ctx->vao );
+		
+		glBindBuffer( GL_ARRAY_BUFFER, ctx->vbo );
+		
+		glBufferData( GL_ARRAY_BUFFER, vertex_buffer_size * sizeof( struct ui_vert ), NULL, GL_DYNAMIC_DRAW );
+		glBindVertexArray( ctx->vao );
+		
+		glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, ctx->ebo );
+		glBufferData( GL_ELEMENT_ARRAY_BUFFER, index_buffer_size * sizeof( u16 ), NULL, GL_DYNAMIC_DRAW );
+		
+		u32 const stride = sizeof( struct ui_vert );
+		
+		// XY
+		glVertexAttribPointer( 0, 2, GL_SHORT, GL_FALSE, stride, (void *)offsetof( struct ui_vert, co ) );
+		glEnableVertexAttribArray( 0 );
+		
+		// UV
+		glVertexAttribPointer( 1, 2, GL_UNSIGNED_BYTE, GL_FALSE, stride, (void *)offsetof( struct ui_vert, uv ) );
+		glEnableVertexAttribArray( 1 );
+		
+		// COLOUR
+		glVertexAttribPointer( 2, 4, GL_UNSIGNED_BYTE, GL_TRUE, stride, (void *)offsetof( struct ui_vert, colour ) );
+		glEnableVertexAttribArray( 2 );
+		
+		// CLIPPING
+		glVertexAttribPointer( 3, 4, GL_SHORT, GL_FALSE, stride, (void *)offsetof( struct ui_vert, clip ) );
+		glEnableVertexAttribArray( 3 );
+	}
+	
+	// Initialize default context
+	{
+		ctx->verts = (struct ui_vert *)malloc( vertex_buffer_size * sizeof(struct ui_vert) );
+		ctx->indices = (u16*)malloc( index_buffer_size * sizeof(u16) );
+	}
+}
+
+static void ui_context_free( ui_ctx *ctx )
+{
+	glDeleteVertexArrays( 1, &ctx->vao );
+	glDeleteBuffers( 1, &ctx->vbo );
+	glDeleteBuffers( 1, &ctx->ebo );
+	
+	free( ctx->verts );
+	free( ctx->indices );
+}
+
 static void ui_override_font( GLuint new_tex, ui_px space_x )
 {
 	if( ui_glyph_texture )
@@ -233,47 +263,8 @@ static void ui_default_init(void)
 	}
 	
 	// Setup OpenGL memory
-	{
-		SHADER_INIT( shader_ui );
-		
-		// Generate the buffer we are gonna be drawing to
-		glGenVertexArrays(1, &ui_vao);
-		glGenBuffers( 1, &ui_vbo );
-		glGenBuffers( 1, &ui_ebo );
-		glBindVertexArray( ui_vao );
-		
-		glBindBuffer( GL_ARRAY_BUFFER, ui_vbo );
-		
-		glBufferData( GL_ARRAY_BUFFER, UI_BUFFER_SIZE * sizeof( struct ui_vert ), NULL, GL_DYNAMIC_DRAW );
-		glBindVertexArray( ui_vao );
-		
-		glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, ui_ebo );
-		glBufferData( GL_ELEMENT_ARRAY_BUFFER, UI_INDEX_SIZE * sizeof( u16 ), NULL, GL_DYNAMIC_DRAW );
-		
-		u32 const stride = sizeof( struct ui_vert );
-		
-		// XY
-		glVertexAttribPointer( 0, 2, GL_SHORT, GL_FALSE, stride, (void *)offsetof( struct ui_vert, co ) );
-		glEnableVertexAttribArray( 0 );
-		
-		// UV
-		glVertexAttribPointer( 1, 2, GL_UNSIGNED_BYTE, GL_FALSE, stride, (void *)offsetof( struct ui_vert, uv ) );
-		glEnableVertexAttribArray( 1 );
-		
-		// COLOUR
-		glVertexAttribPointer( 2, 4, GL_UNSIGNED_BYTE, GL_TRUE, stride, (void *)offsetof( struct ui_vert, colour ) );
-		glEnableVertexAttribArray( 2 );
-		
-		// CLIPPING
-		glVertexAttribPointer( 3, 4, GL_SHORT, GL_FALSE, stride, (void *)offsetof( struct ui_vert, clip ) );
-		glEnableVertexAttribArray( 3 );
-	}
-	
-	// Initialize default context
-	{
-		ui_global_ctx.verts = (struct ui_vert *)malloc( UI_BUFFER_SIZE * sizeof(struct ui_vert) );
-		ui_global_ctx.indices = (u16*)malloc( UI_INDEX_SIZE * sizeof(u16) );
-	}
+	SHADER_INIT( shader_ui );
+	ui_init_context( &ui_global_ctx, 20000 );
 }
 
 static void ui_default_free(void)
@@ -281,22 +272,24 @@ static void ui_default_free(void)
 	if( !ui_glyph_override )	
 		glDeleteTextures( 1, &ui_glyph_texture );
 	
-	glDeleteVertexArrays( 1, &ui_vao );
-	glDeleteBuffers( 1, &ui_vbo );
-	glDeleteBuffers( 1, &ui_ebo );
-	
-	free( ui_global_ctx.verts );
-	free( ui_global_ctx.indices );
+	ui_context_free( &ui_global_ctx );
 }
 
+static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, ui_px uv[4] );
 static void ui_draw( ui_ctx *ctx, m3x3f view_override )
 {
-	glBindVertexArray( ui_vao );
+	u32 num_indices_normal = ctx->num_indices;
 	
-	glBindBuffer( GL_ARRAY_BUFFER, ui_vbo );
+	// Append images to back of buffer
+	for( int i = 0; i < ctx->image_count; i ++ )
+		ui_fill_rect_uv( ctx, ctx->images[i].rc, 0xffffffff, (ui_px[4]){0,0,128,128} );
+
+	glBindVertexArray( ctx->vao );
+	
+	glBindBuffer( GL_ARRAY_BUFFER, ctx->vbo );
 	glBufferSubData( GL_ARRAY_BUFFER, 0, ctx->num_verts * sizeof( struct ui_vert ), ctx->verts );
 	
-	glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, ui_ebo );
+	glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, ctx->ebo );
 	glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, 0, ctx->num_indices * sizeof( u16 ), ctx->indices );
 	
 	glEnable(GL_BLEND);
@@ -321,9 +314,16 @@ static void ui_draw( ui_ctx *ctx, m3x3f view_override )
 	glBindTexture( GL_TEXTURE_2D, ui_glyph_texture );
 	glUniform1i( SHADER_UNIFORM( shader_ui, "uTexGlyphs" ), 0 );
 	
-	glDrawElements( GL_TRIANGLES, ctx->num_indices, GL_UNSIGNED_SHORT, (void*)(0) );
+	glDrawElements( GL_TRIANGLES, num_indices_normal, GL_UNSIGNED_SHORT, (void*)(0) );
 	
-	//vg_info( "Verts: %u, Indices: %u\n", ctx->num_verts, ctx->num_indices );
+	// Draw image elements
+	for( int i = 0; i < ctx->image_count; i ++ )
+	{
+		struct ui_image *img = &ctx->images[i];
+		
+		glBindTexture( GL_TEXTURE_2D, img->image );
+		glDrawElements( GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, (void*)( (num_indices_normal + 6*i)*sizeof(u16) ) );
+	}
 	
 	glDisable(GL_BLEND);
 }
@@ -679,6 +679,8 @@ static void ui_begin( ui_ctx *ctx, ui_px res_x, ui_px res_y )
 	
 	if( ctx->click_state == 0 )
 		ctx->capture_mouse_id = 0;
+	
+	ctx->image_count = 0;
 }
 
 static void ui_resolve( ui_ctx *ctx )
@@ -898,3 +900,43 @@ 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 ++ ];
+	ui_rect_copy( rc, img->rc );
+	img->image = image;
+}
+
+// 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_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 )