X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_ui.h;h=35a3e3b8df9294a8ab30aac94f4d2d41a33bbb72;hb=e00ea4ccba1891970699f9b5b78ba1ebaada2974;hp=4d54a6d7ccae0db31af5e8261553a0ac62897d9b;hpb=245a716a607eeed6e7d11f4bb3d9e0f643be1a8e;p=fishladder.git diff --git a/vg/vg_ui.h b/vg/vg_ui.h index 4d54a6d..35a3e3b 100644 --- a/vg/vg_ui.h +++ b/vg/vg_ui.h @@ -1,16 +1,4 @@ // Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved -/* - - Concurrent UI buffer system - Coordinate space: - - 0,0 --- +(res:x) - | - | - | -+(res:y) - -*/ SHADER_DEFINE( shader_ui, @@ -18,16 +6,22 @@ SHADER_DEFINE( shader_ui, "layout (location=0) in vec2 a_co;" // i16, i16, .. ? "layout (location=1) in vec2 a_uv;" // i8, i8 "layout (location=2) in vec4 a_colour;" // u32 + "layout (location=3) in vec4 a_clip;" // i16, i16, i16, i16 "uniform mat3 uPv;" "" "out vec2 aTexCoords;" "out vec4 aColour;" + "out vec2 aWsp;" + "out vec4 aClip;" "" "void main()" "{" "gl_Position = vec4( uPv * vec3( a_co, 1.0 ), 1.0 );" - "aTexCoords = a_uv * 0.01388888888;" + "aTexCoords = a_uv * 0.0078125;" "aColour = a_colour;" + + "aWsp = a_co;" + "aClip = a_clip;" "}", // FRAGMENT @@ -37,33 +31,31 @@ SHADER_DEFINE( shader_ui, "in vec2 aTexCoords;" "in vec4 aColour;" "" + "in vec2 aWsp;" + "in vec4 aClip;" + "" "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 );" + "FragColor = aColour * vec4( 1.0, 1.0, 1.0, glyph.r * clip_blend );" "}" , UNIFORMS({ "uPv", "uTexGlyphs" }) ) #define UI_AUTO_FILL 0 +//#define UI_DEBUG // Types -// ================================================================ +// =========================================================================================================== + typedef i16 ui_px; typedef u32 ui_colour; typedef ui_px ui_rect[4]; typedef struct ui_ctx ui_ctx; -#pragma pack(push,1) -struct ui_vert -{ - ui_px co[2]; - u8 uv[2]; - u32 colour; -}; -#pragma pack(pop) - struct ui_ctx { ui_px padding; @@ -77,11 +69,24 @@ struct ui_ctx } stack[ 32 ]; - struct ui_vert *verts; + #pragma pack(push,1) + struct ui_vert + { + ui_px co[2]; //32 4 + u8 uv[2]; //16 2 + u32 colour; //32 4 + ui_rect clip; //64 8 + } + *verts; + #pragma pack(pop) + + u32 override_colour; + u32 num_verts; u16 *indices; u32 num_indices; + ui_rect clipping; ui_rect cursor; u32 stack_count; u32 capture_mouse_id; @@ -93,100 +98,161 @@ struct ui_ctx int click_state; // 0: released, 1: on down, 2: pressed, 3: on release }; +// 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_fill_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 ) + +// Globals +// =========================================================================================================== + // Opengl -GLuint ui_glyph_texture; +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 -static void ui_glyphs_load( u32 *compressed ) +ui_ctx ui_global_ctx = { .padding = 8 }; + + +// Initialization +// =========================================================================================================== + +static void ui_override_font( GLuint new_tex, ui_px space_x ) { - u32 pixels = 0, total = 72*72, data = 0; - u8 *image = malloc( total ); + if( ui_glyph_texture ) + glDeleteTextures( 1, &ui_glyph_texture ); - while( pixels < total ) + ui_glyph_texture = new_tex; + ui_glyph_override = 1; + ui_glyph_spacing_x = space_x; +} + +static void ui_default_init(void) +{ + // Load default font + if( !ui_glyph_override ) { - for( int b = 31; b >= 0; b-- ) + u32 compressed[] = { + #include "fonts/weiholmir.h" + }; + + u32 pixels = 0, total = 72*72, data = 0; + u8 *image = malloc( total ); + + while( pixels < total ) { - image[ pixels ++ ] = (compressed[data] & (0x1 << b))? 0xff: 0x00; - - if( pixels >= total ) + for( int b = 31; b >= 0; b-- ) { - total = 0; - break; + image[ pixels ++ ] = (compressed[data] & (0x1 << b))? 0xff: 0x00; + + if( pixels >= total ) + { + total = 0; + break; + } } + data++; } - data++; + + 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 ); + + vg_tex2d_clamp(); + vg_tex2d_nearest(); + + free( image ); } - for( int j = 0; j < 70; j ++ ) + // Setup OpenGL memory { - for( int i = 0; i < 70; i ++ ) - printf( "%s",image[j*72+i]?"#":" " ); - printf( "\n" ); + 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 ); } - 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 ); - - vg_tex2d_clamp(); - vg_tex2d_nearest(); - - free( image ); -} - -static void ui_default_init(void) -{ - ui_glyphs_load( (u32[]){ - #include "fonts/weiholmir.h" - }); - - 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 ); - - // XY - glVertexAttribPointer( 0, 2, GL_UNSIGNED_SHORT, GL_FALSE, sizeof( struct ui_vert ), (void *)offsetof( struct ui_vert, co ) ); - glEnableVertexAttribArray( 0 ); - - // UV - glVertexAttribPointer( 1, 2, GL_UNSIGNED_BYTE, GL_FALSE, sizeof( struct ui_vert ), (void *)offsetof( struct ui_vert, uv ) ); - glEnableVertexAttribArray( 1 ); - - // COLOUR - glVertexAttribPointer( 2, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof( struct ui_vert ), (void *)offsetof( struct ui_vert, colour ) ); - glEnableVertexAttribArray( 2 ); + // 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) ); + } } static void ui_default_free(void) { - glDeleteTextures( 1, &ui_glyph_texture ); + 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 ); } -static void ui_draw( ui_ctx *ctx ) +static void ui_draw( ui_ctx *ctx, m3x3f view_override ) { glBindVertexArray( ui_vao ); @@ -203,9 +269,16 @@ static void ui_draw( ui_ctx *ctx ) SHADER_USE( shader_ui ); m3x3f view = M3X3_IDENTITY; - m3x3_translate( view, (v3f){ -1.0f, 1.0f, 0.0f } ); - m3x3_scale( view, (v3f){ 1.0f/((float)vg_window_x*0.5f), -1.0f/((float)vg_window_y*0.5f), 1.0f } ); - glUniformMatrix3fv( SHADER_UNIFORM( shader_ui, "uPv" ), 1, GL_FALSE, (float *)view ); + + if( !view_override ) + { + view_override = view; + + m3x3_translate( view, (v3f){ -1.0f, 1.0f, 0.0f } ); + m3x3_scale( view, (v3f){ 1.0f/((float)vg_window_x*0.5f), -1.0f/((float)vg_window_y*0.5f), 1.0f } ); + } + + glUniformMatrix3fv( SHADER_UNIFORM( shader_ui, "uPv" ), 1, GL_FALSE, (float *)view_override ); glActiveTexture( GL_TEXTURE0 ); glBindTexture( GL_TEXTURE_2D, ui_glyph_texture ); @@ -219,7 +292,7 @@ static void ui_draw( ui_ctx *ctx ) } // Rect controls -// ========================================================== +// =========================================================================================================== static void ui_rect_copy( ui_rect src, ui_rect dst ) { @@ -239,6 +312,7 @@ static void ui_rect_pad( ui_rect rect, ui_px pad ) static void ui_vis_rect( ui_rect rect, u32 colour ) { + #ifdef UI_DEBUG v2f p0; v2f p1; @@ -251,6 +325,15 @@ static void ui_vis_rect( ui_rect rect, u32 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 +// =========================================================================================================== + +static struct ui_qnode *ui_current( ui_ctx *ctx ) +{ + return &ctx->stack[ ctx->stack_count-1 ]; } static void ui_new_node( ui_ctx *ctx ) @@ -278,7 +361,7 @@ static void ui_new_node( ui_ctx *ctx ) static int ui_hasmouse( ui_ctx *ctx ) { - struct ui_qnode *node = &ctx->stack[ ctx->stack_count-1 ]; + struct ui_qnode *node = ui_current( ctx ); return (node->mouse_over && (node->capture_id == ctx->capture_mouse_id)); } @@ -287,39 +370,57 @@ 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 ); + 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 ) { - ui_px height = ctx->stack[ ctx->stack_count-1 ].rect[3]; + ui_px height = ui_current( ctx )->rect[3]; ui_end( ctx ); ctx->cursor[1] += height; } static void ui_end_right( ui_ctx *ctx ) { - ui_px width = ctx->stack[ ctx->stack_count-1 ].rect[2]; + ui_px width = ui_current( ctx )->rect[2]; ui_end( ctx ); ctx->cursor[0] += width; } static void ui_fill_y( ui_ctx *ctx ) { - struct ui_qnode *node = &ctx->stack[ ctx->stack_count-1 ]; + struct ui_qnode *node = ui_current( ctx ); ctx->cursor[3] = node->rect[3] - (ctx->cursor[1]-node->rect[1]); } +static void ui_fill_x( ui_ctx *ctx ) +{ + struct ui_qnode *node = ui_current( ctx ); + ctx->cursor[2] = node->rect[2] - (ctx->cursor[0]-node->rect[0]); +} + +// Alignment: | [] | -> | []| +static void ui_align_bottom( ui_ctx *ctx ) +{ + struct ui_qnode *node = ui_current( ctx ); + ctx->cursor[1] = node->rect[1] + node->rect[3] - ctx->cursor[3]; +} + static void ui_align_right( ui_ctx *ctx ) { - struct ui_qnode *node = &ctx->stack[ ctx->stack_count-1 ]; + struct ui_qnode *node = ui_current( ctx ); ctx->cursor[0] = node->rect[0] + node->rect[2] - ctx->cursor[2]; } static void ui_align_top( ui_ctx *ctx ) { - struct ui_qnode *node = &ctx->stack[ ctx->stack_count-1 ]; - ctx->cursor[1] = node->rect[1] + node->rect[3] - ctx->cursor[3]; + ctx->cursor[1] = ui_current( ctx )->rect[1]; +} + +static void ui_align_left( ui_ctx *ctx ) +{ + ctx->cursor[0] = ui_current( ctx )->rect[0]; } static void ui_clamp_rect( ui_rect parent, ui_rect dest ) @@ -348,6 +449,30 @@ 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]; + ctx->clipping[1] = clip[1]; + ctx->clipping[2] = clip[0] + clip[2]; + ctx->clipping[3] = clip[1] + clip[3]; +} + +static void ui_release_clip( ui_ctx *ctx ) +{ + ctx->clipping[0] = -32000; + ctx->clipping[1] = -32000; + ctx->clipping[2] = 32000; + ctx->clipping[3] = 32000; +} + +// Drawing +// =========================================================================================================== + static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, ui_px uv[4] ) { struct ui_vert *vertices = &ctx->verts[ ctx->num_verts ]; @@ -374,6 +499,11 @@ static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, u u16 ind_start = ctx->num_verts; u16 *indices = &ctx->indices[ ctx->num_indices ]; + ui_rect_copy( ctx->clipping, vertices[0].clip ); + ui_rect_copy( ctx->clipping, vertices[1].clip ); + ui_rect_copy( ctx->clipping, vertices[2].clip ); + ui_rect_copy( ctx->clipping, vertices[3].clip ); + indices[0] = ind_start+0; indices[1] = ind_start+2; indices[2] = ind_start+1; @@ -390,7 +520,7 @@ 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]){ 66, 66, 66, 66 } ); + return ui_fill_rect_uv( ctx, rect, colour, (ui_px[4]){ 4,124,4,124 } ); } static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment ) @@ -399,8 +529,10 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment ) text_cursor[0] = ctx->cursor[0]; text_cursor[1] = ctx->cursor[1]; - text_cursor[2] = 7*scale; - text_cursor[3] = 7*scale; + text_cursor[2] = scale*8; + text_cursor[3] = scale*8; + + u32 current_colour = ctx->override_colour; const char *_c = str; char c; @@ -416,16 +548,59 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment ) { u8 glyph_base[2]; u8 glyph_index = c - 32; - glyph_base[0] = glyph_index%10; - glyph_base[1] = (glyph_index-glyph_base[0])/10; + glyph_base[0] = glyph_index&0xf; + glyph_base[1] = (glyph_index-glyph_base[0])>>4; - glyph_base[0] *= 7; - glyph_base[1] *= 7; + glyph_base[0] *= 8; + glyph_base[1] *= 8; - ui_fill_rect_uv( ctx, text_cursor, 0xffffffff, (ui_px[4]){glyph_base[0],glyph_base[1],glyph_base[0]+7,glyph_base[1]+7} ); + 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) + }); + } + else if( c == '\x1B' ) + { + _c ++; + u16 colour_id = 0; + for( int i = 0; i < 3; i ++ ) + { + if( _c[i] ) + { + if( _c[i] == 'm' ) + { + _c = _c + i + 1; + + 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; + } + + break; + } + + colour_id |= _c[i] << (i*8); + } + else + { + _c = _c +i; + break; + } + } + continue; } - text_cursor[0] += 6*scale; + text_cursor[0] += (ui_glyph_spacing_x*scale)/2; } } @@ -446,6 +621,11 @@ static void ui_begin( ui_ctx *ctx, ui_px res_x, ui_px res_y ) ctx->num_verts = 0; 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 ) @@ -482,6 +662,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 ); @@ -491,19 +679,22 @@ static int ui_button( ui_ctx *ctx, u32 id ) if( ui_hasmouse(ctx) ) { ui_fill_rect( ctx, ctx->cursor, 0xffcccccc ); - + 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 ); } - return 0; + return k_button_released; } static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group ) @@ -529,8 +720,6 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group ) { ui_capture_mouse( ctx, __COUNTER__ ); - //ui_fill_rect( ctx, ctx->cursor, 0xff333333 ); - // Drag bar ctx->cursor[3] = 25; ui_new_node( ctx ); @@ -581,100 +770,67 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group ) return 1; } -ui_ctx test_ctx = { .padding = 8 }; - -static void ui_test_init(void) +struct ui_scrollbar { - test_ctx.verts = (struct ui_vert *)malloc( UI_BUFFER_SIZE * sizeof(struct ui_vert) ); - test_ctx.indices = (u16*)malloc( UI_INDEX_SIZE * sizeof(u16) ); -} - -static void ui_test_free(void) -{ - free( test_ctx.verts ); - free( test_ctx.indices ); -} + int drag; + ui_px drag_offset; + + ui_px py; + ui_px bar_height; + ui_px view_height; +}; -static void ui_test(void) +static void ui_scrollbar( ui_ctx *ctx, struct ui_scrollbar *scrollbar, u32 id ) { - /* - +------------------------------------------------------+ - | Central Market [x]| - +------+--------------+-+------------------------------+ - | Buy | Balance |#| [filters] [favorites] | - | <>_ | () 2,356 |#|----------------------------+-+ - |------|--------------|#| [] potion of madness 4 |#| - | Sell | \ Main sword |#|----------------------------|#| - | _*^ |--------------|#| [] Balance of time 23 | | - |------| * Side arm |#|----------------------------| | - | 235 |--------------| | [] Strength 5,300 | | - | | () Sheild | |----------------------------| | - | |--------------| | [] Bewilder 2,126 | | - | [ & Spells ] |----------------------------| | - | |--------------| | [] Eternal flames 6 | | - +------+--------------+-+----------------------------+-+ - */ + scrollbar->view_height = ctx->cursor[3]; - ui_begin( &test_ctx, vg_window_x, vg_window_y ); - - // TODO: Find a more elegent form for this - int mouse_state = 0; - if( vg_get_button( "primary" ) ) mouse_state = 2; - if( vg_get_button_down( "primary" ) ) mouse_state = 1; - if( vg_get_button_up( "primary" ) ) mouse_state = 3; - - ui_set_mouse( &test_ctx, vg_mouse[0], vg_mouse[1], mouse_state ); - - static struct ui_window window = + if( scrollbar->drag ) { - .transform = { 20, 20, 500, 350 }, - .title = "Central Market" - }; + 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; + } - if( ui_window( &test_ctx, &window, __COUNTER__ ) ) + ui_new_node( ctx ); { - // Contents - //ui_text( &test_ctx, "A slice of heaven. O for awesome, this chocka \nfull cuzzie is as rip-off as a cracker.\nMeanwhile, in behind the bicycle shed, Hercules Morse,\nas big as a horse and Mrs Falani were up to no \ngood with a bunch of crook pikelets. Meanwhile, \nat the black singlet woolshed party, not even au,\nsort your drinking out.", 1, 0 ); - test_ctx.cursor[2] = 75; - ui_fill_y( &test_ctx ); + ui_fill_rect( ctx, ctx->cursor, 0xff000000 ); + ui_capture_mouse( ctx, __COUNTER__ ); + + ctx->cursor[1] += scrollbar->py; + ctx->cursor[3] = scrollbar->bar_height; - ui_new_node( &test_ctx ); + ui_new_node( ctx ); { - test_ctx.cursor[3] = 75; - - if( ui_button( &test_ctx, __COUNTER__ ) ) - vg_info( "Buy\n" ); + ui_capture_mouse( ctx, __COUNTER__ ); + struct ui_vert *drag_bar = ui_fill_rect( ctx, ctx->cursor, 0xff555555 ); + + if( ui_hasmouse( ctx ) || scrollbar->drag ) { - ui_rect_pad( test_ctx.cursor, 4 ); - ui_text( &test_ctx, "Buy", 2, 0 ); - } - ui_end_down( &test_ctx ); + drag_bar[0].colour = 0xff777777; + drag_bar[1].colour = 0xff777777; + drag_bar[2].colour = 0xff777777; + drag_bar[3].colour = 0xff777777; - if( ui_button( &test_ctx, __COUNTER__ ) ) - vg_info( "Sell\n" ); - { - ui_rect_pad( test_ctx.cursor, 4 ); - ui_text( &test_ctx, "Sell", 2, 0 ); + // start drag + if( ctx->click_state == 1 ) + { + scrollbar->drag = 1; + scrollbar->drag_offset = scrollbar->py - ctx->mouse[1]; + } } - ui_end_down( &test_ctx ); } - ui_end_right( &test_ctx ); - - test_ctx.cursor[2] = 200; - ui_new_node( &test_ctx ); - { - - } - ui_end_right( &test_ctx ); + ui_end_down( ctx ); } - ui_end( &test_ctx ); + ui_end( ctx ); +} - ui_resolve( &test_ctx ); - - m3x3f view = M3X3_IDENTITY; - m3x3_translate( view, (v3f){ -1.0f, 1.0f, 0.0f } ); - m3x3_scale( view, (v3f){ 1.0f/((float)vg_window_x*0.5f), -1.0f/((float)vg_window_y*0.5f), 1.0f } ); - vg_lines_drawall( (float*)view ); +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) ); - ui_draw( &test_ctx ); + float range = scrollbar->view_height - scrollbar->bar_height; + return ((float)scrollbar->py / range) * overlap; }