X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_ui.h;h=d4fb20bab148ddb058bbef6a1aa756d6255dfb3f;hb=fdc58fb6b2fddec9e179baaba53e059ae1e54a54;hp=03647392a27ebe8cfce24e7f82b891197720066f;hpb=4e217c7bc7d079364a999ee39773fa70ca25733a;p=fishladder.git diff --git a/vg/vg_ui.h b/vg/vg_ui.h index 0364739..d4fb20b 100644 --- a/vg/vg_ui.h +++ b/vg/vg_ui.h @@ -4,7 +4,7 @@ SHADER_DEFINE( shader_ui, // VERTEX "layout (location=0) in vec2 a_co;" // i16, i16, .. ? - "layout (location=1) in vec2 a_uv;" // i8, i8 + "layout (location=1) in vec2 a_uv;" // i16, i16 "layout (location=2) in vec4 a_colour;" // u32 "layout (location=3) in vec4 a_clip;" // i16, i16, i16, i16 "uniform mat3 uPv;" @@ -37,9 +37,19 @@ SHADER_DEFINE( shader_ui, "void main()" "{" "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 );" + "vec4 glyph = vec4(1.0,1.0,1.0,1.0);" + + "if( aColour.a == 0.0 )" + "{" + "glyph = texture( uTexGlyphs, aTexCoords );" + "glyph.a = smoothstep( 0.47, 0.53, glyph.r );" + "}" + "else" + "{" + "glyph.a = aColour.a;" + "}" + + "FragColor = vec4( aColour.rgb, glyph.a*clip_blend );" "}" , UNIFORMS({ "uPv", "uTexGlyphs" }) @@ -120,54 +130,27 @@ 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 // =========================================================================================================== // Opengl int ui_glyph_override = 0; -ui_px ui_glyph_spacing_x = 6; +ui_px ui_glyph_spacing_x = 9; 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 +159,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 +166,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 ) @@ -200,10 +240,10 @@ static void ui_default_init(void) if( !ui_glyph_override ) { u32 compressed[] = { - #include "fonts/weiholmir.h" + #include "vg/vg_pxfont.h" }; - u32 pixels = 0, total = 72*72, data = 0; + u32 pixels = 0, total = 256*256, data = 0; u8 *image = malloc( total ); while( pixels < total ) @@ -224,7 +264,7 @@ static void ui_default_init(void) glGenTextures( 1, &ui_glyph_texture ); glBindTexture( GL_TEXTURE_2D, ui_glyph_texture ); - glTexImage2D( GL_TEXTURE_2D, 0, GL_R8, 72, 72, 0, GL_RED, GL_UNSIGNED_BYTE, image ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_R8, 256, 256, 0, GL_RED, GL_UNSIGNED_BYTE, image ); vg_tex2d_clamp(); vg_tex2d_nearest(); @@ -233,47 +273,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 +282,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; + + // 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, ui_vbo ); + 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 +324,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); } @@ -384,8 +394,8 @@ static void ui_new_node( ui_ctx *ctx ) if( parent->mouse_over ) { - if( ctx->mouse[0] >= node->rect[0] && ctx->mouse[0] <= node->rect[0]+node->rect[2] && - ctx->mouse[1] >= node->rect[1] && ctx->mouse[1] <= node->rect[1]+node->rect[3] ) + if( ctx->mouse[0] >= node->rect[0] && ctx->mouse[0] < node->rect[0]+node->rect[2] && + ctx->mouse[1] >= node->rect[1] && ctx->mouse[1] < node->rect[1]+node->rect[3] ) node->mouse_over = 1; else node->mouse_over = 0; @@ -557,35 +567,19 @@ static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, u static struct ui_vert *ui_fill_rect( ui_ctx *ctx, ui_rect rect, u32 colour ) { - return ui_fill_rect_uv( ctx, rect, colour, (ui_px[4]){ 4,124,4,124 } ); -} - -static void ui_text_use_title( ui_ctx *ctx ) -{ - ctx->glyph_base = 0; -} - -static void ui_text_use_paragraph( ui_ctx *ctx ) -{ - ctx->glyph_base = 6; + return ui_fill_rect_uv( ctx, rect, colour, (ui_px[4]){ 4,4, 4,4 } ); } -enum text_alignment -{ - k_text_alignment_left = 0, - k_text_alignment_center -}; - -static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, enum text_alignment alignment ) +static void ui_text( ui_ctx *ctx, const char *str, ui_px scale ) { ui_rect text_cursor; text_cursor[0] = ctx->cursor[0]; text_cursor[1] = ctx->cursor[1]; - text_cursor[2] = (scale*8)/2; - text_cursor[3] = (scale*8)/2; + text_cursor[2] = 8*scale; + text_cursor[3] = 14*scale; - u32 current_colour = ctx->override_colour; + u32 current_colour = 0x00ffffff; const char *_c = str; char c; @@ -593,27 +587,21 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, enum text_alignm { if( c == '\n' ) { - text_cursor[1] += (7*scale)/2; + text_cursor[1] += 14*scale; text_cursor[0] = ctx->cursor[0]; continue; } else if( c >= 33 && c <= 126 ) { u8 glyph_base[2]; - u8 glyph_index = c - 32; - glyph_base[0] = (glyph_index&0xf); - glyph_base[1] = ctx->glyph_base + ((glyph_index-glyph_base[0])>>4); - + u8 glyph_index = c; + glyph_base[0] = glyph_index & 0xf; + glyph_base[1] = (glyph_index-glyph_base[0])>>4; + glyph_base[0] *= 8; glyph_base[1] *= 8; - ui_fill_rect_uv( ctx, text_cursor, current_colour, - (ui_px[4]){ - glyph_base[0], - 128-glyph_base[1], - glyph_base[0]+8, - 128-(glyph_base[1]+8) - }); + ui_fill_rect_uv( ctx, text_cursor, current_colour, (ui_px[4]){glyph_base[0]+2,glyph_base[1]+1,glyph_base[0]+6,glyph_base[1]+8} ); } else if( c == '\x1B' ) { @@ -629,14 +617,14 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, enum text_alignm switch( colour_id ) { - case '0': current_colour = 0xffffffff; break; - case '3'|'1'<<8: current_colour = 0xff201fee; break; - case '3'|'2'<<8: current_colour = 0xff37e420; break; - case '3'|'3'<<8: current_colour = 0xff0ed8e2; break; - case '3'|'4'<<8: current_colour = 0xfff15010; break; - case '3'|'5'<<8: current_colour = 0xffee20ee; break; - case '3'|'6'<<8: current_colour = 0xffeeee20; break; - case '3'|'7'<<8: current_colour = 0xffffffff; break; + case '0': current_colour = 0x00ffffff; break; + case '3'|'1'<<8: current_colour = 0x00201fee; break; + case '3'|'2'<<8: current_colour = 0x0037e420; break; + case '3'|'3'<<8: current_colour = 0x000ed8e2; break; + case '3'|'4'<<8: current_colour = 0x00f15010; break; + case '3'|'5'<<8: current_colour = 0x00ee20ee; break; + case '3'|'6'<<8: current_colour = 0x00eeee20; break; + case '3'|'7'<<8: current_colour = 0x00ffffff; break; } break; @@ -650,10 +638,9 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, enum text_alignm break; } } - continue; } - text_cursor[0] += (ui_glyph_spacing_x*scale)/4; + text_cursor[0] += 9*scale; } } @@ -679,6 +666,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 ) @@ -784,7 +773,7 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group ) // title.. ctx->cursor[0] += 2; ctx->cursor[1] += 2; - ui_text( ctx, window->title, 2, 0 ); + ui_text( ctx, window->title, 2 ); // Close button ctx->cursor[3] = 25; @@ -798,7 +787,7 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group ) vg_info( "Click clacked\n" ); } ctx->cursor[0] += 2; - ui_text( ctx, "x", 2, 0 ); + ui_text( ctx, "x", 2 ); ui_end( ctx ); if( ui_hasmouse( ctx ) ) @@ -898,3 +887,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 )