lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove useless GUI font code

This commit is contained in:
twinaphex 2014-12-09 16:45:14 +01:00
parent a4a7f66364
commit a39ed082f7
5 changed files with 3 additions and 5978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5882
font.h
View File

File diff suppressed because it is too large Load Diff

2
input.c
View File

@ -295,7 +295,7 @@ u32 update_input()
}
case BUTTON_ID_FASTFORWARD:
print_string("FASTFORWARD", 0xFFFF, 0x0000, 0, 50);
//print_string("FASTFORWARD", 0xFFFF, 0x0000, 0, 50);
synchronize_flag ^= 1;
return 0;
}

8
main.c
View File

@ -406,14 +406,10 @@ u32 update_gba()
update_gbc_sound(cpu_ticks);
if(fps_debug)
{
char print_buffer[32];
sprintf(print_buffer, "%2d (%2d)", fps, frames_drawn);
print_string(print_buffer, 0xFFFF, 0x000, 0, 0);
}
#if 0
if(!synchronize_flag)
print_string("-FF-", 0xFFFF, 0x000, 216, 0);
#endif
update_screen();

82
video.c
View File

@ -18,8 +18,6 @@
*/
#include "common.h"
#define WANT_FONT_BITS
#include "font.h"
#ifdef PSP_BUILD
@ -3676,86 +3674,6 @@ void blit_to_screen(u16 *src, u32 w, u32 h, u32 dest_x, u32 dest_y)
}
}
void print_string_ext(const char *str, u16 fg_color, u16 bg_color,
u32 x, u32 y, void *_dest_ptr, u32 pitch, u32 pad, u32 h_offset, u32 height)
{
u16 *dest_ptr = (u16 *)_dest_ptr + (y * pitch) + x;
u8 current_char = str[0];
u32 current_row;
u32 glyph_offset;
u32 i = 0, i2, i3, h;
u32 str_index = 1;
u32 current_x = x;
if(y + height > resolution_height)
return;
while(current_char)
{
if(current_char == '\n')
{
y += FONT_HEIGHT;
current_x = x;
dest_ptr = get_screen_pixels() + (y * pitch) + x;
}
else
{
glyph_offset = _font_offset[current_char];
current_x += FONT_WIDTH;
glyph_offset += h_offset;
for(i2 = h_offset, h = 0; i2 < FONT_HEIGHT && h < height; i2++, h++, glyph_offset++)
{
current_row = _font_bits[glyph_offset];
for(i3 = 0; i3 < FONT_WIDTH; i3++)
{
if((current_row >> (15 - i3)) & 0x01)
*dest_ptr = fg_color;
else
*dest_ptr = bg_color;
dest_ptr++;
}
dest_ptr += (pitch - FONT_WIDTH);
}
dest_ptr = dest_ptr - (pitch * h) + FONT_WIDTH;
}
i++;
current_char = str[str_index];
if((i < pad) && (current_char == 0))
{
current_char = ' ';
}
else
{
str_index++;
}
if(current_x + FONT_WIDTH > resolution_width /* EDIT */)
{
while (current_char && current_char != '\n')
{
current_char = str[str_index++];
}
}
}
}
void print_string(const char *str, u16 fg_color, u16 bg_color,
u32 x, u32 y)
{
print_string_ext(str, fg_color, bg_color, x, y, get_screen_pixels(),
get_screen_pitch(), 0, 0, FONT_HEIGHT);
}
void print_string_pad(const char *str, u16 fg_color, u16 bg_color,
u32 x, u32 y, u32 pad)
{
print_string_ext(str, fg_color, bg_color, x, y, get_screen_pixels(),
get_screen_pitch(), pad, 0, FONT_HEIGHT);
}
u32 debug_cursor_x = 0;
u32 debug_cursor_y = 0;

7
video.h
View File

@ -27,13 +27,6 @@ void update_screen();
void init_video();
void video_resolution_large();
void video_resolution_small();
void print_string(const char *str, u16 fg_color, u16 bg_color,
u32 x, u32 y);
void print_string_pad(const char *str, u16 fg_color, u16 bg_color,
u32 x, u32 y, u32 pad);
void print_string_ext(const char *str, u16 fg_color, u16 bg_color,
u32 x, u32 y, void *_dest_ptr, u32 pitch, u32 pad,
u32 h_offset, u32 height);
void clear_screen(u16 color);
void blit_to_screen(u16 *src, u32 w, u32 h, u32 x, u32 y);
u16 *copy_screen();