X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_ui.h;h=f6693cbcd7e3320be1d4aef22a9a2abae929dc1a;hb=ae365687964bb357d4f371f685c02731ce3d0e00;hp=70d30aa64677e985150df3fd2e6b7775b15d6093;hpb=b2ed006db6dc46c57b163f572391ac74a94f4a4f;p=fishladder.git diff --git a/vg/vg_ui.h b/vg/vg_ui.h index 70d30aa..f6693cb 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;" @@ -17,7 +17,7 @@ SHADER_DEFINE( shader_ui, "void main()" "{" "gl_Position = vec4( uPv * vec3( a_co, 1.0 ), 1.0 );" - "aTexCoords = a_uv * 0.0078125;" + "aTexCoords = a_uv * 0.01388888888;" "aColour = a_colour;" "aWsp = a_co;" @@ -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 = vec4( aColour.rgb * glyph.rgb, aColour.a*glyph.a*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" }) @@ -93,7 +103,7 @@ struct ui_ctx struct ui_vert { ui_px co[2]; //32 4 - i16 uv[2]; //32 4 + u8 uv[2]; //16 2 u32 colour; //32 4 ui_rect clip; //64 8 } @@ -134,18 +144,6 @@ struct ui_ctx int image_count; }; -struct ui_sdf_char -{ - int x, y, width, height, originX, originY, advance; -}; - -struct ui_sdf_font -{ - const char *name; - int size, width, height; - struct ui_sdf_char *characters; -}; - // Globals // =========================================================================================================== @@ -197,7 +195,7 @@ static void ui_init_context( ui_ctx *ctx, int index_buffer_size ) glEnableVertexAttribArray( 0 ); // UV - glVertexAttribPointer( 1, 2, GL_SHORT, GL_FALSE, stride, (void *)offsetof( struct ui_vert, uv ) ); + glVertexAttribPointer( 1, 2, GL_UNSIGNED_BYTE, GL_FALSE, stride, (void *)offsetof( struct ui_vert, uv ) ); glEnableVertexAttribArray( 1 ); // COLOUR @@ -572,51 +570,16 @@ 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; -} - -enum text_alignment -{ - k_text_alignment_left = 0, - k_text_alignment_center, - k_text_alignment_right -}; - -static ui_px 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; - - u32 current_colour = ctx->override_colour; + text_cursor[2] = 7*scale; + text_cursor[3] = 7*scale; - ui_px offset = 0; - if( alignment != k_text_alignment_left ) - { - const char *pch = str; - for(;;) - { - offset += (ui_glyph_spacing_x*scale)/4; - if( !(*pch) || *pch == '\n' ) - break; - pch ++; - } - - if( alignment == k_text_alignment_right ) - text_cursor[0] = ctx->cursor[0]+ctx->cursor[2]-offset; - else - text_cursor[0] = (ctx->cursor[0]+(ctx->cursor[2]/2))-(offset/2); - } + u32 current_colour = 0x00ffffff; const char *_c = str; char c; @@ -624,7 +587,7 @@ static ui_px ui_text( ui_ctx *ctx, const char *str, ui_px scale, enum text_align { if( c == '\n' ) { - text_cursor[1] += (7*scale)/2; + text_cursor[1] += 10*scale; text_cursor[0] = ctx->cursor[0]; continue; } @@ -632,19 +595,13 @@ static ui_px ui_text( ui_ctx *ctx, const char *str, ui_px scale, enum text_align { 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); - - glyph_base[0] *= 8; - glyph_base[1] *= 8; + glyph_base[0] = glyph_index%10; + glyph_base[1] = (glyph_index-glyph_base[0])/10; - 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) - }); + glyph_base[0] *= 7; + glyph_base[1] *= 7; + + ui_fill_rect_uv( ctx, text_cursor, current_colour, (ui_px[4]){glyph_base[0],glyph_base[1],glyph_base[0]+7,glyph_base[1]+7} ); } else if( c == '\x1B' ) { @@ -660,14 +617,14 @@ static ui_px ui_text( ui_ctx *ctx, const char *str, ui_px scale, enum text_align 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; @@ -681,13 +638,10 @@ static ui_px ui_text( ui_ctx *ctx, const char *str, ui_px scale, enum text_align break; } } - continue; } - text_cursor[0] += (ui_glyph_spacing_x*scale)/4; + text_cursor[0] += 6*scale; } - - return text_cursor[0]; } // API control @@ -819,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; @@ -833,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 ) )