From a88dd793f4d80d9e8a9615b5fe5f6887f9b85069 Mon Sep 17 00:00:00 2001 From: hgn Date: Thu, 20 Jan 2022 03:31:02 +0000 Subject: [PATCH] patch up things from text changes --- fishladder.c | 19 +++++------ fonts/vg_font.png | Bin 3017 -> 4218 bytes fonts/weiholmir.h | 22 ------------ vg/vg_console.h | 2 +- vg/vg_pxfont.h | 18 +++++----- vg/vg_ui.h | 83 +++++++++++++++++++--------------------------- 6 files changed, 53 insertions(+), 91 deletions(-) delete mode 100644 fonts/weiholmir.h diff --git a/fishladder.c b/fishladder.c index 2bc9277..6b26da2 100644 --- a/fishladder.c +++ b/fishladder.c @@ -3289,14 +3289,14 @@ void vg_ui(void) gui_new_node(); { - gui_text( "Settings", 3 ); + gui_text( "SETTINGS", 2 ); } gui_end(); // Colour scheme selection ui_global_ctx.cursor[1] += 30; - gui_text( "Colour Scheme", 2 ); + gui_text( "Colour Scheme", 1 ); ui_global_ctx.cursor[1] += 25; gui_new_node(); @@ -3328,7 +3328,7 @@ void vg_ui(void) if( colour_set_id > 0 ) colour_set_id --; } - gui_text( "<", 2 ); + gui_text( "<", 1 ); gui_end_right(); ui_global_ctx.cursor[2] = 150; @@ -3337,7 +3337,7 @@ void vg_ui(void) gui_fill_rect( ui_global_ctx.cursor, 0x33ffffff ); ui_global_ctx.cursor[0] += 45; ui_global_ctx.cursor[1] += 6; - gui_text( (const char *[]){ "Normal", "Extra1", "Extra2" }[ colour_set_id ], 2 ); + gui_text( (const char *[]){ "Normal", "Extra1", "Extra2" }[ colour_set_id ], 1 ); } gui_end_right(); @@ -3347,7 +3347,7 @@ void vg_ui(void) if( colour_set_id < vg_list_size( colour_sets )-1 ) colour_set_id ++; } - gui_text( ">", 2 ); + gui_text( ">", 1 ); gui_end_down(); } gui_end_down(); @@ -3356,7 +3356,7 @@ void vg_ui(void) // TODO: remove code dupe ui_global_ctx.cursor[1] += 16; - gui_text( "Tile Theme", 2 ); + gui_text( "Tile Theme", 1 ); ui_global_ctx.cursor[1] += 20; gui_new_node(); @@ -3367,7 +3367,7 @@ void vg_ui(void) if( world_theme_id > 0 ) world_theme_id --; } - gui_text( "<", 2 ); + gui_text( "<", 1 ); gui_end_right(); ui_global_ctx.cursor[2] = 150; @@ -3376,7 +3376,7 @@ void vg_ui(void) gui_fill_rect( ui_global_ctx.cursor, 0x33ffffff ); ui_global_ctx.cursor[0] += 45; ui_global_ctx.cursor[1] += 6; - gui_text( world_themes[ world_theme_id ].name, 2 ); + gui_text( world_themes[ world_theme_id ].name, 1 ); } gui_end_right(); @@ -3386,7 +3386,7 @@ void vg_ui(void) if( world_theme_id < vg_list_size( world_themes )-1 ) world_theme_id ++; } - gui_text( ">", 2 ); + gui_text( ">", 1 ); gui_end_down(); } gui_end_down(); @@ -3510,7 +3510,6 @@ static int console_credits( int argc, char const *argv[] ) vg_info( " miniaudio MIT0 miniaud.io\n" ); vg_info( " QOI MIT phoboslab.org\n" ); vg_info( " STB library MIT nothings.org\n" ); - vg_info( " Weiholmir JustFredrik\n" ); vg_info( " Ubuntu Regular ubuntu.com\n" ); return 0; } diff --git a/fonts/vg_font.png b/fonts/vg_font.png index 282b38aa49a307ea153ec52c28f5d6033ef7b63a..34b2b63da09af2adeee264407e8cf41a174c6b45 100644 GIT binary patch delta 3784 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 delta 2573 zcmbVOdpOf=AOFo*6yfdhO3ryZ5s}CoHidP%QYtx=L(L%}%3<2@n@8!is2rkXX}vE` zVh$k|KdBJQD4X+Euh45_*~Zvxd)3o(_5Sxh*K^C4R)0D#(?eeS!CB@IoFax2R0wGchL&3r}Yf2d|2J9NLQ z8|hOwc;^m9pG(ukMhV5qC~`d!f*^hC5}F&J1ZV+7Ks9MOh#Z!t20SuPv8u9o zplD>YM%@lL3ILt z`_82W4-0m#6?ASx853vwIxQf~Vn7V6h!OrJ1zM(t4qGHdJ`&xj682Vu-tjO^%UVEaUBFt(sCi8t*1jeNJxOp-PF{5j%$(nomATgH1`c zf!I06ynDgbPG7`(-}T`4N)lgQ|%P5{_8A9FV@en${<-iL}7E@TC__2v^8X&)r8 z5C}bkq~hC9q)M4L7dnEzGnMIDFwT~VsT7z6tr!!QGq^E;`Np^j`z((!pdfM3{wS`H z=Mo8W=5hS(f$cQC-xi_zeYV!~E_b~L*!kQP#hO99c z5m_jB{j!o2WkbLt9Q&zWTJ27 zE98HUu9q%^LkDIW6nfD>@2tqu^zdk6{AYu;0vZrr=#V?Mm{q}A1Xn)NXPFHKe_@QQ zFn@HWmrIdsl*4d_Qdsld)y6*g&Y$PjIpUWH-R)l;s)>0h=Iu4q+T<|fslB)!(wd8H ziwm}mxAtVb3S+<9quR>40iKYLBA2Q*eVixj@h|Dk@CT<0)i^z1(6t1G!kMs%Jd@-*m4=Y=9lm&J{|W;JM41f6v&T30lxWF-^hq`x#&wwHWQs4_p{As6} zO=B*2FP`iKr-UqC?JtX{?akXc<@f<^G6Xx5BiM7dMkdvE+ZeQmdfu5UB* z=$HA!kpyQj1LN9Ubk%}Yh*6aW3e`ra$x3ye5p@!kLT0YRn7FK>)u+(Og?54LxXxM# zV4#B~8ZE+YY3o{|G`3LGPv5JZ(9-DnGHYDCL2fQI-Lb;8%_GO9fnvTiJEo&|+|rer zB6qo#@OIU_)o(n7;C9h0}XY6RiIB3GfT!o}T1-@%jB`A8DTduub8lUYe_~ zQvwModVZdBv*hx5--Ov1XmXY-HJX42Uo)4I0@4_&MT&ztWfhAqgPKJf-pI3mtj&I0m?DcW(0nM~P8sX9ty6%ntl*3bmZ1l))dk*vNsR^x0VC=w znokbzn!B5TaX|2}TU%84?o8YD4f==TlbOKsHGMNn;*HXELrz_{z|%16Ma>Q|r&40D zR%Y-w;3S*mR!q3aJ6Lf&@K^!=6+vz?OdT{>Ym@~DQ1W6=w| z^OCwZwcrWE)~KuZUpbK%MFVm~IPXJ6RyyX%F1?!8W9QuXbwnK80iU`B=al8^Bm?5-x}#U zxbtq2W-#ki71hnxVunZ_ip6V`bPw=vr%F5a_SJym_5$Xl*ZZAVWC2Bh=Yx^(nL3x# zF{&Yf$rzQQNU@nKe^%tJR#>H}$LJwU#!J1eB9Y};pr={kDsLB9Noh2jO+wJmCCm(7 ze-}Nls-oJoYKo>cp&Wwb8^NAfU1GBCAAtkUes}nv#ZL7P@BJ$wA^^s!{_yUindices ); } -static void ui_override_font( GLuint new_tex, ui_px space_x ) -{ - if( ui_glyph_texture ) - glDeleteTextures( 1, &ui_glyph_texture ); - - 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 ) - { - u32 compressed[] = { - #include "vg/vg_pxfont.h" - }; - - u32 pixels = 0, total = 256*256, data = 0; - u8 *image = malloc( total ); - - while( pixels < total ) - { - for( int b = 31; b >= 0; b-- ) - { - image[ pixels ++ ] = (compressed[data] & (0x1 << b))? 0xff: 0x00; - - if( pixels >= total ) - { - total = 0; - break; - } - } - data++; - } - - glGenTextures( 1, &ui_glyph_texture ); - glBindTexture( GL_TEXTURE_2D, ui_glyph_texture ); - - glTexImage2D( GL_TEXTURE_2D, 0, GL_R8, 256, 256, 0, GL_RED, GL_UNSIGNED_BYTE, image ); - - vg_tex2d_clamp(); - vg_tex2d_nearest(); - - free( image ); - } + u32 compressed[] = { + #include "vg/vg_pxfont.h" + }; + + u32 pixels = 0, total = 256*256, data = 0; + u8 *image = malloc( total ); + + while( pixels < total ) + { + for( int b = 31; b >= 0; b-- ) + { + image[ pixels ++ ] = (compressed[data] & (0x1 << b))? 0xff: 0x00; + + if( pixels >= total ) + { + total = 0; + break; + } + } + data++; + } + + glGenTextures( 1, &ui_glyph_texture ); + glBindTexture( GL_TEXTURE_2D, ui_glyph_texture ); + + glTexImage2D( GL_TEXTURE_2D, 0, GL_R8, 256, 256, 0, GL_RED, GL_UNSIGNED_BYTE, image ); + + vg_tex2d_clamp(); + vg_tex2d_nearest(); + + free( image ); // Setup OpenGL memory SHADER_INIT( shader_ui ); @@ -279,8 +265,7 @@ static void ui_default_init(void) static void ui_default_free(void) { - if( !ui_glyph_override ) - glDeleteTextures( 1, &ui_glyph_texture ); + glDeleteTextures( 1, &ui_glyph_texture ); ui_context_free( &ui_global_ctx ); } -- 2.25.1