diff --git a/.gitignore b/.gitignore index e92e1aa..8c1cf93 100644 --- a/.gitignore +++ b/.gitignore @@ -73,7 +73,8 @@ _deps bin/ build_debug/ build_release/ - +buildDebug/ +buildRelease/ Documentation/doxygen/ diff --git a/Pontu/CMakeLists.txt b/Pontu/CMakeLists.txt index fadbcc4..316a2a3 100644 --- a/Pontu/CMakeLists.txt +++ b/Pontu/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) SET(PROJECT_NAME Pontu) -project(${PROJECT_NAME}) +project(${PROJECT_NAME} C) add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/entryPoints/main.c) add_executable(Test ${CMAKE_CURRENT_SOURCE_DIR}/entryPoints/test.c) diff --git a/Pontu/buildDebug/Pontu b/Pontu/buildDebug/Pontu deleted file mode 100755 index 902adbe..0000000 Binary files a/Pontu/buildDebug/Pontu and /dev/null differ diff --git a/Pontu/buildDebug/rsrc b/Pontu/buildDebug/rsrc deleted file mode 120000 index 1677044..0000000 --- a/Pontu/buildDebug/rsrc +++ /dev/null @@ -1 +0,0 @@ -../rsrc/ \ No newline at end of file diff --git a/Pontu/src/model/Game.c b/Pontu/src/model/Game.c index 2d763a5..8013e02 100644 --- a/Pontu/src/model/Game.c +++ b/Pontu/src/model/Game.c @@ -34,7 +34,7 @@ Game newGame(const size_t nbPlayers, const Player player[]) { Game g = { // In Placement phase, the last player initialized is the 1st to play .currentPlayerID = nbPlayers - 1, - .nb_rounds = 0, + .nb_rounds = 1, .phase = PLACEMENT, .board = newBoard(nbPlayers), .nbPlayers = nbPlayers, diff --git a/Pontu/src/view/GameInterface.c b/Pontu/src/view/GameInterface.c index 3be3fb2..1772519 100644 --- a/Pontu/src/view/GameInterface.c +++ b/Pontu/src/view/GameInterface.c @@ -45,26 +45,25 @@ struct array_P_Button createGameInterfaceButtons(SDL_Renderer* renderer, FontHan struct array_TextLabel createGameInterfaceLabels(SDL_Renderer* renderer, FontHandler* fontHandler) { //Postion text label SDL_Point positonNbTurnLabel = {.x=60, .y=850}; + SDL_Point positionNumberNbTurnLabel = {.x=100, .y=850}; SDL_Point positionTimeLablel = {.x=770, .y=850}; //Color labal SDL_Color colorLabel = {0, 255, 0, 255}; - - //Position label - PositionX_Type positionX = POSX_CENTER; - PositionY_Type positionY = POSY_CENTER; - struct array_TextLabel labels = array_TextLabel_Create(); // Label : Nb Turn - TextLabel nbTurnLabel = createTextLabel("Turn : ",&positonNbTurnLabel,1,&colorLabel,fontHandler->fonts[FONT_retro],renderer,positionX,positionY); + TextLabel nbTurnLabel = createTextLabel("Turn : ",&positonNbTurnLabel,1,&colorLabel,fontHandler->fonts[FONT_retro],renderer,POSX_CENTER,POSY_CENTER); + // Label : Number -> Nb Turn + TextLabel NumbernbTurnLabel = createTextLabel("1",&positionNumberNbTurnLabel,1,&colorLabel,fontHandler->fonts[FONT_retro],renderer,POSX_CENTER,POSY_CENTER); // Label : Time of the game - TextLabel timeLabel = createTextLabel("Time : ",&positionTimeLablel,1,&colorLabel,fontHandler->fonts[FONT_retro],renderer,positionX,positionY); + TextLabel timeLabel = createTextLabel("Time : ",&positionTimeLablel,1,&colorLabel,fontHandler->fonts[FONT_retro],renderer,POSX_CENTER,POSY_CENTER); //Add TextLabel to the array array_TextLabel_AddElement(&labels, nbTurnLabel); array_TextLabel_AddElement(&labels, timeLabel); + array_TextLabel_AddElement(&labels,NumbernbTurnLabel); return labels; diff --git a/Pontu/src/view/GameMain.c b/Pontu/src/view/GameMain.c index 10ffe6f..c350ea2 100644 --- a/Pontu/src/view/GameMain.c +++ b/Pontu/src/view/GameMain.c @@ -65,8 +65,8 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend for (size_t i=0; i nbTurn label - sprintf(newNbTurn,"Turn : ",game.nb_rounds); //Concatenate Turn with nbTurn - replaceTextAndTextureOfTextLabel(renderer, &nbTurnTextLabel, fontHandler->fonts[FONT_retro], newNbTurn, &nbTurnTextLabel.color); - drawTextLabel(renderer,&nbTurnTextLabel); - //Nouv text label ->nbTurn (replace texture) => replaceTextAndTextureOfTextLabel - //Redraw text label - SDL_RenderPresent(renderer); + TextLabel nbTurnTextLabel = tabLabel.elems[2]; //Third element -> Number of nbTurn + sprintf(newNbTurn,"%d",game.nb_rounds); //Concatenate Turn with nbTurn + replaceTextAndTextureOfTextLabel(renderer, &nbTurnTextLabel, fontHandler->fonts[FONT_retro], newNbTurn, &nbTurnTextLabel.color); + SDL_SetRenderDrawColor(renderer, 50,10,10, SDL_ALPHA_OPAQUE); + SDL_RenderFillRect(renderer,&nbTurnTextLabel.textZone); + fprintf(stderr,"%s\n",nbTurnTextLabel.text); + drawTextLabel(renderer,&nbTurnTextLabel); + needToPresent=true; } } - break; } case InputType_Window_Resize: { @@ -159,7 +160,7 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend for (size_t i=0; i