Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut

Pontu/include/engine/TextLabel.h

@@ -25,7 +25,7 @@ typedef struct
 	SDL_Texture* texture;
 }TextLabel;
 
-TextLabel createTextLabel(const char text[], const SDL_Point* pos, const SDL_Color* color, TTF_Font* font, SDL_Renderer* renderer, const POSITIONX_TYPE posXType, const POSITIONY_TYPE posYType);
+TextLabel createTextLabel(const char text[], const SDL_Point* pos, const float factorSize,const SDL_Color* color, TTF_Font* font, SDL_Renderer* renderer, const POSITIONX_TYPE posXType, const POSITIONY_TYPE posYType);
 void freeTextLabel(TextLabel* label);
 
 void drawTextLabel(SDL_Renderer* renderer, TextLabel* label);

Pontu/src/engine/TextLabel.c

@@ -3,7 +3,7 @@
 #include "engine/TextureLoader.h"
 #include <errno.h>
 
-TextLabel createTextLabel(const char text[], const SDL_Point* pos, const SDL_Color* color, TTF_Font* font, SDL_Renderer* renderer, const POSITIONX_TYPE posXType, const POSITIONY_TYPE posYType) {
+TextLabel createTextLabel(const char text[], const SDL_Point* pos, const float factorSize, const SDL_Color* color, TTF_Font* font, SDL_Renderer* renderer, const POSITIONX_TYPE posXType, const POSITIONY_TYPE posYType) {
     TextLabel label = {
         .color = *color,
         .texture = NULL
@@ -37,8 +37,8 @@ TextLabel createTextLabel(const char text[], const SDL_Point* pos, const SDL_Col
         }
     }
 
-    label.textZone.w = calculateStringPixelLenght(font, label.text);
-    label.textZone.h = TTF_FontHeight(font);
+    label.textZone.w = calculateStringPixelLenght(font, label.text)*factorSize;
+    label.textZone.h = TTF_FontHeight(font)*factorSize;
 
     switch (posXType)
     {

Pontu/src/view/MenuEndGame.c

@@ -17,7 +17,7 @@ void drawTitle(SDL_Renderer* renderer, const SDL_Rect* rect, FontHandler* fontHa
 	SDL_Point pos = {rect->x+rect->w/2, rect->y+rect->h/100};
 	SDL_Color color = {0,0,0,0};
 
-	TextLabel titre = createTextLabel("Scores", &pos, &color, fontHandler->fonts[FONT_retro], renderer, POSX_CENTER, POSY_TOP);
+	TextLabel titre = createTextLabel("Scores", &pos, 2, &color, fontHandler->fonts[FONT_retro], renderer, POSX_CENTER, POSY_TOP);
 
 	drawTextLabel(renderer, &titre);
 
@@ -38,7 +38,7 @@ void drawPseudoAndRank(SDL_Renderer* renderer, const SDL_Rect* rect, const int h
 	}
 	sprintf(text, "%lld. %s", rank, pseudo);
 
-	TextLabel joueur = createTextLabel(text, &posRangPseudo, color, font, renderer, POSX_LEFT, POSY_TOP);
+	TextLabel joueur = createTextLabel(text, &posRangPseudo, 1, color, font, renderer, POSX_LEFT, POSY_TOP);
 	free(text);
 
 	drawTextLabel(renderer, &joueur);
@@ -61,7 +61,7 @@ void drawEliminationTurn(SDL_Renderer* renderer, const SDL_Rect* rect, const int
 	}
 	sprintf(text, "Tour: %d", eliminationTurn);
 
-	TextLabel label = createTextLabel(text, &posTourElimination, color, font, renderer, POSX_RIGHT, POSY_TOP);
+	TextLabel label = createTextLabel(text, &posTourElimination, 1, color, font, renderer, POSX_RIGHT, POSY_TOP);
 	
 	free(text);
 	drawTextLabel(renderer, &label);

Pontu/src/view/Settings.c

@@ -18,7 +18,7 @@ bool settingsView(SDL_Renderer* renderer, AudioHandler* ah) {
 
     SDL_SetRenderDrawColor(renderer, blue.r, blue.g, blue.b, blue.a);
     SDL_RenderFillRect(renderer,&title_area);
-    tmp_textLabel = createTextLabel("Paramètres", &((SDL_Point) {150,50}), &black,
+    tmp_textLabel = createTextLabel("Paramètres", &((SDL_Point) {150,50}), 1, &black,
                                     FONT_Curvilingus, renderer, POSX_CENTER, POSY_CENTER);
 
 

Pontu/test/testMenuEndGame.c

@@ -64,7 +64,7 @@ void testMenuEndGame() {
 	SDL_RenderPresent(renderer);
 
 	SDL_Rect rectMenuEndGme = {.x=20, .y=0, .w=300, .h=480};
-	//P_Button buttonMenuEndGame = createButtonForEndGameMenu(renderer, fontHandler.fonts[FONT_retro], &rectMenuEndGme);
+	P_Button buttonMenuEndGame = createButtonForEndGameMenu(renderer, fontHandler.fonts[FONT_retro], &rectMenuEndGme);
 
 	while(!quit)
 	{
@@ -92,7 +92,7 @@ void testMenuEndGame() {
 		players[0].rank = 1;
 		players[1].rank = 2;
 		drawEndGameMenu(renderer, players, 2, &rectMenuEndGme, &fontHandler);
-		//drawButtonOnRenderer(renderer, &buttonMenuEndGame);
+		drawButtonOnRenderer(renderer, &buttonMenuEndGame);
 
 		SDL_RenderPresent(renderer);
 		SDL_Delay(50);
@@ -100,7 +100,7 @@ void testMenuEndGame() {
 
 Quit:
 	freeFonts(fontHandler);
-	//SDL_DestroyTexture(buttonMenuEndGame.texture);
+	SDL_DestroyTexture(buttonMenuEndGame.texture);
 	if(renderer != NULL)
 		SDL_DestroyRenderer(renderer);
 	if(window != NULL)