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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2018-01-19 04:13:02 +01:00
parent 9f45370120
commit 88873776c8
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gfx/drivers_font/d3d_w32_font.c
View File

@ -63,7 +63,7 @@ static void *d3dfonts_w32_init_font(void *video_data,
{ {
TEXTMETRICA metrics; TEXTMETRICA metrics;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
D3DXFONT_DESC desc = { D3DXFONT_DESC desc = {
(int)(font_size), 0, 400, 0, (int)(font_size), 0, 400, 0,
false, DEFAULT_CHARSET, false, DEFAULT_CHARSET,
OUT_TT_PRECIS, OUT_TT_PRECIS,
@ -79,16 +79,18 @@ static void *d3dfonts_w32_init_font(void *video_data,
if (!d3dfonts) if (!d3dfonts)
return NULL; return NULL;
d3dfonts->font_size = font_size * 1.2; /* to match the other font drivers */ d3dfonts->font_size = font_size * 1.2; /* to match the other font drivers */
d3dfonts->d3d = (d3d_video_t*)video_data; d3dfonts->d3d = (d3d_video_t*)video_data;
desc.Height = d3dfonts->font_size;
desc.Height = d3dfonts->font_size;
if (!d3dx_create_font_indirect(d3dfonts->d3d->dev, if (!d3dx_create_font_indirect(d3dfonts->d3d->dev,
&desc, (void**)&d3dfonts->font)) &desc, (void**)&d3dfonts->font))
goto error; goto error;
IDirect3DXFont_GetTextMetricsA(d3dfonts->font, &metrics); IDirect3DXFont_GetTextMetricsA(d3dfonts->font, &metrics);
d3dfonts->ascent = metrics.tmAscent;
d3dfonts->ascent = metrics.tmAscent;
return d3dfonts; return d3dfonts;
@ -120,19 +122,21 @@ static int d3dfonts_w32_get_message_width(void* data, const char* msg,
if (!d3dfonts || !d3dfonts->d3d | !msg) if (!d3dfonts || !d3dfonts->d3d | !msg)
return 0; return 0;
IDirect3DXFont_DrawTextA(d3dfonts->font, NULL, msg, msg_len? msg_len : -1, &box, DT_CALCRECT, 0); IDirect3DXFont_DrawTextA(d3dfonts->font, NULL, msg,
msg_len? msg_len : -1, &box, DT_CALCRECT, 0);
return box.right - box.left; return box.right - box.left;
} }
static void d3dfonts_w32_render_msg(video_frame_info_t *video_info, void *data, const char *msg, static void d3dfonts_w32_render_msg(video_frame_info_t *video_info,
const void *userdata) void *data, const char *msg, const void *userdata)
{ {
unsigned format; unsigned format;
unsigned a, r, g, b; unsigned a, r, g, b;
RECT rect, *p_rect; RECT rect, rect_shifted;
RECT rect_shifted, *p_rect_shifted; RECT *p_rect_shifted = NULL;
RECT *p_rect = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const struct font_params *params = (const struct font_params*)userdata; const struct font_params *params = (const struct font_params*)userdata;
d3dfonts_t *d3dfonts = (d3dfonts_t*)data; d3dfonts_t *d3dfonts = (d3dfonts_t*)data;
@ -143,11 +147,8 @@ static void d3dfonts_w32_render_msg(video_frame_info_t *video_info, void *data,
int drop_x = -2; int drop_x = -2;
int drop_y = -2; int drop_y = -2;
if (!d3dfonts || !d3dfonts->d3d) if (!d3dfonts || !d3dfonts->d3d || !msg)
return; return;
if (!msg)
return;
if (!d3d_begin_scene(d3dfonts->d3d->dev)) if (!d3d_begin_scene(d3dfonts->d3d->dev))
return; return;
@ -212,15 +213,14 @@ static void d3dfonts_w32_render_msg(video_frame_info_t *video_info, void *data,
if(drop_x || drop_y) if(drop_x || drop_y)
{ {
unsigned drop_a, drop_r, drop_g, drop_b; unsigned drop_a = a * drop_alpha;
unsigned drop_r = r * drop_mod;
unsigned drop_g = g * drop_mod;
unsigned drop_b = b * drop_mod;
drop_a = a * drop_alpha; IDirect3DXFont_DrawTextA(d3dfonts->font, NULL,
drop_r = r * drop_mod; msg, -1, p_rect_shifted, format,
drop_g = g * drop_mod; D3DCOLOR_ARGB(drop_a , drop_r, drop_g, drop_b));
drop_b = b * drop_mod;
IDirect3DXFont_DrawTextA(d3dfonts->font, NULL, msg, -1, p_rect_shifted, format,
D3DCOLOR_ARGB(drop_a , drop_r, drop_g, drop_b));
} }