Skip to content

Commit c85e0e7

Browse files
committed
added robber sprite and render it on the board at (0,4)
1 parent 83f3f6e commit c85e0e7

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

resources/catan_sprite_sheet.bmp

0 Bytes
Binary file not shown.

src/GameBoard.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {
6666
}
6767
valid = isValidBoard();
6868
}
69+
moveRobber(Coordinate(0,4));
70+
6971
}
7072

7173
/**
@@ -99,6 +101,8 @@ void GameBoard::createRing(Coordinate topRight, int sideLength, vector<resourceT
99101
void GameBoard::insertTile(Coordinate location, vector<resourceType>& resources, vector<int>& rolls) {
100102
if(rolls.back() == 0) {
101103
addResource(location.first, location.second, DESERT, rolls.back());
104+
//moveRobber(Coordinate(location.first, location.second));
105+
//std::cout << location.first << location.second << "\n";
102106
rolls.pop_back();
103107
} else {
104108
addResource(location.first, location.second, resources.back(), rolls.back());

src/GameView.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ void drawTexturedRectangle(std::pair<float, float> texTopLeft, float sideLength,
550550
void DrawingGameVisitor::visit(GameDice& dice) {
551551

552552
static const GLuint diceTextures = loadImageAsTexture("resources/catan_dice_new.bmp");
553+
static const GLuint gameTextures = loadImageAsTexture("resources/catan_sprite_sheet_thatnewnew.bmp");
553554
glBindTexture(GL_TEXTURE_2D, diceTextures);
554555

555556
glColor3d(1.0, 1.0, 1.0);
@@ -571,6 +572,8 @@ void DrawingGameVisitor::visit(GameDice& dice) {
571572

572573

573574
glBindTexture(GL_TEXTURE_2D, 0);
575+
576+
574577

575578
}
576579

@@ -633,7 +636,15 @@ void DrawingGameVisitor::visit(ResourceTile& tile) {
633636
glEnd();
634637

635638
if(tile.getDiceValue() != 0) {
636-
drawTexturedCircle(numberTexPoints.find(tile.getDiceValue())->second, radius, coordToScreen(coord), 0.04);
639+
if (tile.getBoard().getRobber() == coord) { //draw the robber on this tile
640+
//static const GLuint robberTextures = loadImageAsTexture("resource/catan_sprite_sheet_thatnewnew.bmp");
641+
642+
//glBindTexture(GL_TEXTURE_2D, robberTextures);
643+
//glColor3d(1.0, 1.0, 1.0);
644+
drawTexturedCircle(make_pair(1240.f, 643.f), 59.5f, coordToScreen(coord), 0.04);
645+
}
646+
else
647+
drawTexturedCircle(numberTexPoints.find(tile.getDiceValue())->second, radius, coordToScreen(coord), 0.04);
637648
}
638649
glBindTexture(GL_TEXTURE_2D, 0);
639650

0 commit comments

Comments
 (0)