mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Blit fonts to full viewport.

Browse Source
This commit is contained in:
Themaister 2014-06-07 21:27:52 +02:00
parent e545d695ec
commit 8ee747a12d
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.def.h
View File

@ -404,11 +404,8 @@ static const bool crop_overscan = true;
#if defined(HAVE_RMENU) #if defined(HAVE_RMENU)
static const float font_size = 1.0f; static const float font_size = 1.0f;
#else #else
static const float font_size = 48; static const float font_size = 32;
#endif #endif
// Attempt to scale the font size.
// The scale factor will be window_size / desktop_size.
static const bool font_scale = true;
// Offset for where messages will be placed on-screen. Values are in range [0.0, 1.0]. // Offset for where messages will be placed on-screen. Values are in range [0.0, 1.0].
static const float message_pos_offset_x = 0.05; static const float message_pos_offset_x = 0.05;

4
gfx/fonts/fonts.c
View File

@ -36,8 +36,8 @@ bool font_renderer_create_default(const font_renderer_driver_t **driver, void **
unsigned i; unsigned i;
for (i = 0; font_backends[i]; i++) for (i = 0; font_backends[i]; i++)
{ {
const char *path = NULL; const char *path = font_path;
if (!font_path) if (!path)
path = font_backends[i]->get_default_font(); path = font_backends[i]->get_default_font();
if (!path) if (!path)
continue; continue;

3
gfx/fonts/gl_raster_font.c
View File

@ -123,7 +123,7 @@ static void render_message(gl_raster_t *font, const char *msg, GLfloat scale, co
if (gl->shader && gl->shader->use) if (gl->shader && gl->shader->use)
gl->shader->use(gl, GL_SHADER_STOCK_BLEND); gl->shader->use(gl, GL_SHADER_STOCK_BLEND);
gl_set_viewport(gl, gl->win_width, gl->win_height, false, false); gl_set_viewport(gl, gl->win_width, gl->win_height, true, false);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBindTexture(GL_TEXTURE_2D, font->tex); glBindTexture(GL_TEXTURE_2D, font->tex);
@ -206,6 +206,7 @@ static void render_message(gl_raster_t *font, const char *msg, GLfloat scale, co
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]); glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
glDisable(GL_BLEND); glDisable(GL_BLEND);
gl_set_viewport(gl, gl->win_width, gl->win_height, false, true);
} }
static void gl_render_msg(void *data, const char *msg, const struct font_params *params) static void gl_render_msg(void *data, const char *msg, const struct font_params *params)

5
retroarch.cfg
View File

@ -180,10 +180,7 @@
# video_font_path = # video_font_path =
# Size of the font rendered. # Size of the font rendered.
# video_font_size = 48 # video_font_size = 32
# Attempt to scale the font to fit better for multiple window sizes.
# video_font_scale = true
# Enable usage of OSD messages. # Enable usage of OSD messages.
# video_font_enable = true # video_font_enable = true