diff --git a/Roboto-Regular.ttf b/Roboto-Regular.ttf new file mode 100755 index 0000000..2d116d9 Binary files /dev/null and b/Roboto-Regular.ttf differ diff --git a/display.c b/display.c index fa8c2ed..13f1d52 100644 --- a/display.c +++ b/display.c @@ -8,6 +8,7 @@ #include #include #include +#include void screenDisplay (unsigned short int **tab, int size) { @@ -95,6 +96,7 @@ int getMaxSize (dis display_user) void initSDL (dis *display_user) { SDL_Init (SDL_INIT_VIDEO); + TTF_Init(); display_user->window = SDL_CreateWindow ("Sokoman", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, display_user->size_window, @@ -126,20 +128,31 @@ void displayImage (SDL_Renderer *renderer, SDL_Texture *texture, vect pos, void displayTextSDL(dis *display_user,char *text, vect coor, vect size, int font_size) { - TTF_Font* Sans = TTF_OpenFont("Sans.ttf", 24); - SDL_Color white = {255,255,255}; + TTF_Font* Sans = TTF_OpenFont("Roboto-Regular.ttf", font_size); + system("pwd"); + printf("%p\n", Sans); + SDL_Color white = {255,0,0,255}; + int text_width, text_height; + SDL_Surface* surface_text = TTF_RenderText_Solid(Sans, text, white); SDL_Texture* message = SDL_CreateTextureFromSurface(display_user->renderer, surface_text); - + + TTF_SizeText(Sans, text, &text_height, &text_width); SDL_Rect message_rect ; message_rect.x = coor.x; message_rect.y = coor.y; - message_rect.w = size.x; - message_rect.h = size.y; + message_rect.w = text_height; + message_rect.h = text_width; + if (message_rect.w > size.y) message_rect.w = size.y; + if (message_rect.h > size.x) message_rect.h = size.x; + + printf("%d, %d", message_rect.w, message_rect.h); SDL_RenderCopy(display_user-> renderer, message, NULL, &message_rect); + SDL_RenderPresent(display_user->renderer); + puts("Fa it"); SDL_FreeSurface(surface_text); SDL_DestroyTexture(message); diff --git a/main.c b/main.c index 53667f3..9344c27 100644 --- a/main.c +++ b/main.c @@ -7,7 +7,7 @@ #include #include -#define SIZE_PLAY 5 +#define SIZE_PLAY 19 #define SIZE_MENU 200; int main () @@ -27,11 +27,11 @@ int main () playerScore.before = time (NULL); targets - = fileToTab2D ("test3.txt", tab2d, SIZE_PLAY, playerPos, &nbr_targets); + = fileToTab2D ("test.txt", tab2d, SIZE_PLAY, playerPos, &nbr_targets); screenDisplayGameSDL (tab2d, &display_user); - vect size = {100, 100}; - vect pos = {900, 0}; - displayTextSDL(&display_user, "213", pos, size, 24); + vect size = {display_user.size_menu , display_user.size_window / 3}; + vect pos = {0, display_user.size_window - display_user.size_menu}; + displayTextSDL(&display_user, "Time 20:4345999", pos, size, 69); screenDisplay (tab2d, SIZE_PLAY); inGameLoop (tab2d, SIZE_PLAY, playerPos, targets, nbr_targets, &display_user); diff --git a/test.txt b/test.txt index f214e67..e5df6f4 100644 --- a/test.txt +++ b/test.txt @@ -9,16 +9,3 @@ ##### ### #P## II# # ######### ####### - - - - - - - - - - - - - #