Ajout de sprite de couleur pour les pieces

merge-requests/1/merge
marouault 4 years ago
parent ea635c070b
commit 3f134538c6

@ -22,7 +22,10 @@
#define MACRO_FOR_ALL_TEXTURES(M) \
M(Island) \
M(Bridge) \
M(Piece) \
M(PieceRed) \
M(PieceViolet) \
M(PieceBlue) \
M(PieceYellow) \
M(Water)
/**

@ -5,6 +5,6 @@
#include <stdbool.h>
#include "model/Piece.h"
void drawPieces(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, SDL_Texture* piece);
void drawPiecesPlayer(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, const size_t numPlayer, SDL_Texture* piece);
#endif //PIECES_DRAWER_INCLUDED

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 B

Before

Width:  |  Height:  |  Size: 683 B

After

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 665 B

@ -17,7 +17,10 @@ bool drawGame(SDL_Renderer* renderer, const SDL_Rect* windowSize, const SDL_Rect
drawBoard(renderer, boardRect, &(game->board), textureHandler->textures[TEXTURE_Island], textureHandler->textures[TEXTURE_Bridge], textureHandler->textures[TEXTURE_Water]);
drawPieces(renderer, boardRect, game->board.arrPieces, game->board.nbPieces, textureHandler->textures[TEXTURE_Piece]);
drawPiecesPlayer(renderer, boardRect, game->board.arrPieces, game->board.nbPieces, 0, textureHandler->textures[TEXTURE_PieceRed]);
drawPiecesPlayer(renderer, boardRect, game->board.arrPieces, game->board.nbPieces, 1, textureHandler->textures[TEXTURE_PieceViolet]);
return true;
}

@ -16,11 +16,13 @@ SDL_Rect islandToRect(const SDL_Rect* boardRect, const Island island) {
return r;
}
void drawPieces(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, SDL_Texture* piece) {
void drawPiecesPlayer(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, const size_t numPlayer, SDL_Texture* piece) {
for (size_t i = 0; i < nbPieces; ++i)
{
if (arrPieces[i].idJ == numPlayer) {
const SDL_Rect rDest = islandToRect(boardRect, arrPieces[i].island);
SDL_RenderCopy(renderer, piece, NULL, &rDest);
}
}
}

Loading…
Cancel
Save