Merge pull request #28 from Databean/render_roll

Render roll

Author: Databean

include/GameBoard.h

@@ -16,7 +16,7 @@
 #include "Settlement.h"
 #include "tinyxml2.h"
 #include "Road.h"
-
+#include "GameDice.h"
 
 class GameVisitor;
 
@@ -29,6 +29,9 @@ class GameBoard {
 
 	std::map<Coordinate, std::unique_ptr<ResourceTile>> resources;
 
+	GameDice dice;
+
+
 
 	std::map<Coordinate, std::vector<std::shared_ptr<Road>>> roads;
 

include/GameDice.h

@@ -0,0 +1,28 @@
+#ifndef GAMEDICE_H
+#define GAMEDICE_H
+
+
+
+
+
+class GameVisitor;
+
+class GameDice {
+	private:
+		int first;
+		int second;
+		
+		
+	public:
+		int getFirst();
+		int getSecond();
+		bool shown;
+		void setFirst(int newFirst);
+		void setSecond(int newSecond);
+		virtual void accept(GameVisitor& visitor);
+
+
+
+};
+
+#endif	

include/GameView.h

@@ -79,6 +79,7 @@ class DrawingGameVisitor : public GameVisitor {
 	virtual void visit(Player&);
 	virtual void visit(ResourceTile&);
 	virtual void visit(DevelopmentCard&);
+	virtual void visit(GameDice&);
 	virtual void visit(Wonder&);
 };
 

include/GameVisitor.h

@@ -8,6 +8,7 @@ class Road;
 class City;
 class Player;
 class DevelopmentCard;
+class GameDice;
 class Wonder;
 
 /**
@@ -29,6 +30,7 @@ class GameVisitor {
 	virtual void visit(Player&) = 0;
 	virtual void visit(ResourceTile&) = 0;
 	virtual void visit(DevelopmentCard&) = 0;
+	virtual void visit(GameDice&) = 0;
 	virtual void visit(Wonder&) = 0;
 };
 

include/Serialization.h

@@ -33,6 +33,7 @@ class XMLVisitor : public GameVisitor {
 	virtual void visit(Player&);
 	virtual void visit(ResourceTile&);
 	virtual void visit(DevelopmentCard&);
+	virtual void visit(GameDice&);
 	virtual void visit(Wonder&);
 
 	const tinyxml2::XMLDocument& getXMLDoc() const;

resources/catan_dice_new.bmp

@@ -13,6 +13,7 @@
 #include "tinyxml2.h"
 
 #include "CornerPiece.h"
+#include "GameDice.h"
 
 #include "Settlement.h"
 #include "City.h"
@@ -45,6 +46,10 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {
 	const static vector<int> boardRolls = {0, 2, 3, 3, 4, 4, 5, 5, 6, 6, 8, 8, 9, 9, 10, 10, 11, 11, 12};
 
 	bool valid = false;
+
+	
+
+
 
 	const static Coordinate center {0, 4};
 
@@ -665,6 +670,7 @@ void GameBoard::accept(GameVisitor& visitor) {
 			it->accept(visitor);
 		}
 	}
+	dice.accept(visitor);
 }
 
 /**
@@ -805,8 +811,9 @@ std::pair<int, int> GameBoard::startTurn()
     int die1 = std::rand() % 6 + 1;
     int die2 = std::rand() % 6 + 1;
     int roll = die1+die2;
-    std::cout << "\nDie 1: " << die1 << "\nDie 2: " << die2 << "\nRoll: " << roll <<"\n";
-    
+
+    dice.setFirst(die1);
+    dice.setSecond(die2);
     if (roll==7)
         enableRobber();
 

src/GameBoard.cpp

@@ -0,0 +1,22 @@
+#include "GameDice.h"
+#include "GameVisitor.h"
+
+int GameDice::getFirst(){
+	return first;
+}
+
+int GameDice::getSecond(){
+	return second;
+}
+
+void GameDice::setFirst(int newFirst){
+	first = newFirst;
+}
+
+void GameDice::setSecond(int newSecond){
+	second = newSecond;
+}
+
+void GameDice::accept(GameVisitor& visitor) {
+	visitor.visit(*this);
+}

src/GameDice.cpp

@@ -147,6 +147,8 @@ void DrawingGameVisitor::visit(GameBoard& model) {
 
 }
 
+
+
 /**
  * Draw a road.
  * @param road The road to draw.
@@ -265,17 +267,112 @@ void drawTexturedCircle(std::pair<float, float> texCenter, float texRadius, std:
 		double tangle = ((double) -i) * (2. * M_PI) / (double)articulation;
 		texCoordPair({texCenter.first + texRadius * std::cos(tangle), texCenter.second + texRadius * std::sin(tangle)});
 		glVertex2d(screenCenter.first + (screenRadius * std::cos(angle)), screenCenter.second + (screenRadius * std::sin(angle)));
+		
 	}
 	glEnd();
 }
 
+void drawTexturedRectangle(std::pair<float, float> texTopLeft, float sideLength, std::pair<float, float> screenTopLeft, float screenSideLength) {
+	
+	
+
+	glBegin(GL_QUADS);
+
+
+	
+
+	texCoordPair({texTopLeft.first + 0.0f, texTopLeft.second + 0.0f});
+	glVertex2d(screenTopLeft.first + 0.0f, screenTopLeft.second + 0.0f);
+
+	texCoordPair({texTopLeft.first + sideLength, texTopLeft.second + 0.0f});
+	glVertex2d(screenTopLeft.first + screenSideLength, screenTopLeft.second + 0.0f);
+
+
+	texCoordPair({texTopLeft.first + sideLength, texTopLeft.second + sideLength});
+	glVertex2d(screenTopLeft.first + screenSideLength, screenTopLeft.second + screenSideLength);
+
+	texCoordPair({texTopLeft.first + 0.0f, texTopLeft.second + sideLength});
+	glVertex2d(screenTopLeft.first + 0.0f, screenTopLeft.second + screenSideLength);
+
+	/*
+	//redraw the image for reasons
+	texCoordPair({texTopLeft.first + sideLength, texTopLeft.second + sideLength});
+	glVertex2d(screenTopLeft.first + screenSideLength, screenTopLeft.second + screenSideLength);
+
+	texCoordPair({texTopLeft.first + 0.0f, texTopLeft.second + sideLength});
+	glVertex2d(screenTopLeft.first + 0.0f, screenTopLeft.second + screenSideLength);
+
+	texCoordPair({texTopLeft.first + sideLength, texTopLeft.second + 0.0f});
+	glVertex2d(screenTopLeft.first + screenSideLength, screenTopLeft.second + 0.0f);
+
+	texCoordPair({texTopLeft.first + 0.0f, texTopLeft.second + 0.0f});
+	glVertex2d(screenTopLeft.first + 0.0f, screenTopLeft.second + 0.0f);
+
+	*/
+	
+	
+
+	glEnd();
+
+
+	
+
+
+
+}
+
+void DrawingGameVisitor::visit(GameDice& dice) {
+
+	static const GLuint diceTextures = loadImageAsTexture("resources/catan_dice_new.bmp");
+	glBindTexture(GL_TEXTURE_2D, diceTextures);
+
+	glColor3d(1.0, 1.0, 1.0);	
+	static const std::map<int, std::pair<float, float>> topLeftOffset = {
+		make_pair(1, make_pair(9.f, 3.f)),
+		make_pair(2, make_pair(134.f, 3.f)),
+		make_pair(3, make_pair(259.f, 3.f)),
+		make_pair(4, make_pair(9.f, 142.f)),
+		make_pair(5, make_pair(134.f, 142.f)),
+		make_pair(6, make_pair(259.f, 142.f))
+	};
+
+	drawTexturedRectangle(topLeftOffset.find(dice.getFirst())->second, 95.f, 
+		make_pair(.7f, .9f), 0.06);
+		
+
+	drawTexturedRectangle(topLeftOffset.find(dice.getSecond())->second, 95.f, 
+		make_pair(.78f, .9f), 0.06);
+
+	
+
+	//render all dice
+	//drawTexturedRectangle(make_pair(9.f, 3.f), 95.f, make_pair(.6f, .9f), 0.06);
+	//drawTexturedRectangle(make_pair(8.f, 4.f), 96.f, make_pair(.67f, .95f), 0.06);
+	//drawTexturedRectangle(make_pair(16.f, 8.f), 96.f, make_pair(.74f, .95f), 0.06);
+	//drawTexturedRectangle(make_pair(2.f, 8.f), 96.f, make_pair(.6f, .95f), 0.06);
+	//drawTexturedRectangle(make_pair(2.f, 8.f), 96.f, make_pair(.6f, .95f), 0.06);
+	//drawTexturedRectangle(make_pair(2.f, 8.f), 96.f, make_pair(.6f, .95f), 0.06);
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+	//hardcoded 2 die for testing
+	//drawTexturedRectangle(make_pair(4.f, 8.f), 96.f, make_pair(.7f, .9f), 0.03);
+
+
+	
+
+
+	//std::cout << dice.getFirst() << "\n";
+
+}
+
 /**
  * Draw a resource tile.
  * @param tile The tile to draw.
  */
 void DrawingGameVisitor::visit(ResourceTile& tile) {
 	Coordinate coord = tile.getLocation();
 	static const GLuint tileTextures = loadImageAsTexture("resources/catan_sprite_sheet.bmp");
+	
 	glBindTexture(GL_TEXTURE_2D, tileTextures);
 	static const std::map<resourceType, pair<float, float>> topRightPoints = {
 		make_pair(WOOD, make_pair(260.f, 17.f)),
@@ -330,6 +427,11 @@ void DrawingGameVisitor::visit(ResourceTile& tile) {
 		drawTexturedCircle(numberTexPoints.find(tile.getDiceValue())->second, radius, coordToScreen(coord), 0.04);
 	}
 	glBindTexture(GL_TEXTURE_2D, 0);
+
+
+	
+
+	
 }
 
 /**

src/GameView.cpp

@@ -211,6 +211,9 @@ void XMLVisitor::visit(ResourceTile& tile) {
 	tilesElement->InsertEndChild(newTileElement);
 }
 
+void XMLVisitor::visit(GameDice& dice){
+	
+}
 /**
  * Serialize a development card.
  * @param card The card to serialize.