Merge branch 'master' into renderCornerPieces

Author: Databean

resources/catan_sprite_sheet.bmp

@@ -117,42 +117,75 @@ void DrawingGameVisitor::visit(Player& player) {
 
 }
 
+void drawTexturedCircle(std::pair<float, float> texCenter, float texRadius, std::pair<float, float> screenCenter, float screenRadius, int articulation = 20) {
+	glBegin(GL_TRIANGLE_FAN);
+	texCoordPair(texCenter);
+	glVertex2f(screenCenter.first, screenCenter.second);
+	for(int i = 0; i < articulation + 1; i++) {
+		double angle = ((double) i) * (2. * M_PI) / (double)articulation;
+		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 DrawingGameVisitor::visit(ResourceTile& tile) {
 	Coordinate coord = tile.getLocation();
-	static GLuint tileTextures = loadImageAsTexture("resources/tiles.bmp");
+	static const GLuint tileTextures = loadImageAsTexture("resources/catan_sprite_sheet.bmp");
 	glBindTexture(GL_TEXTURE_2D, tileTextures);
-	typedef std::vector<pair<float, float> > texCoordList;
-	static const std::map<resourceType, texCoordList> resourceTexCoords = {
-		make_pair(WHEAT, texCoordList { make_pair(377, 73), make_pair(500, 285), 
-			make_pair(380, 502), make_pair(136, 503), make_pair(10, 288), make_pair(134, 74)}),
-		make_pair(SHEEP, texCoordList { make_pair(959, 75), make_pair(1076, 288),
-			make_pair(955, 503), make_pair(712, 501), make_pair(586, 289), make_pair(708, 73)}),
-		make_pair(WOOD, texCoordList { make_pair(1491, 60), make_pair(1618, 269),
-			make_pair(1479, 490), make_pair(1260, 493), make_pair(1126, 283), make_pair(1246, 65)}),
-		make_pair(STONE, texCoordList { make_pair(382, 689), make_pair(506, 898),
-			make_pair(386, 1118), make_pair(142, 1120), make_pair(17, 905), make_pair(138, 691)}),
-		make_pair(BRICK, texCoordList { make_pair(1496, 690), make_pair(1617, 908),
-			make_pair(1490, 1120), make_pair(1248, 1118), make_pair(1124, 898), make_pair(1250, 688)}),
-		make_pair(DESERT, texCoordList { make_pair(1496, 690), make_pair(1617, 908),
-			make_pair(1490, 1120), make_pair(1248, 1118), make_pair(1124, 898), make_pair(1250, 688)}),
+	static const std::map<resourceType, pair<float, float>> topRightPoints = {
+		make_pair(WOOD, make_pair(260.f, 17.f)),
+		make_pair(BRICK, make_pair(629.f, 17.f)),
+		make_pair(STONE, make_pair(262.f, 282.f)),
+		make_pair(SHEEP, make_pair(621.f, 286.f)),
+		make_pair(WHEAT, make_pair(267.f, 554.f)),
+		make_pair(DESERT, make_pair(620.f, 555.f))
 	};
+	static const std::vector<pair<float, float>> resourceTexOffsets = {
+		make_pair(0.f, 0.f),
+		make_pair(87.f, 130.f),
+		make_pair(0.f, 261.f),
+		make_pair(-174.f, 261.f),
+		make_pair(-260.f, 130.f),
+		make_pair(-175, -1)
+	};
+	static const std::map<int, pair<float, float>> numberTexPoints = {
+		make_pair(2, make_pair(1238.5f, 70.5f)),
+		make_pair(3, make_pair(1365.5f, 70.5f)),
+		make_pair(4, make_pair(1238.5f, 178.5f)),
+		make_pair(5, make_pair(1365.5f, 178.5f)),
+		make_pair(6, make_pair(1238.5f, 286.5f)),
+		make_pair(8, make_pair(1365.5f, 286.5f)),
+		make_pair(9, make_pair(1238.5f, 404.5f)),
+		make_pair(10, make_pair(1365.5f, 404.5f)),
+		make_pair(11, make_pair(1238.5f, 515.5f)),
+		make_pair(12, make_pair(1365.5f, 515.5f))
+	};
+	static const float radius = 59.5f;
 	static Coordinate adjacentCoordDiffs[] = {Coordinate(0, 1), Coordinate(1, 0), Coordinate(1, -1), Coordinate(0, -1), Coordinate(-1, 0), Coordinate(-1, 1)};
-	if(resourceTexCoords.find(tile.resource) == resourceTexCoords.end()) {
+	auto topRightPoint = topRightPoints.find(tile.getType());
+	if(topRightPoint == topRightPoints.end()) {
 		throw runtime_error("Cannot draw this tile; it is invalid.");
 	}
-	const texCoordList& texCoords = resourceTexCoords.find(tile.resource)->second;
 	glColor3d(1.0, 1.0, 1.0);
+	
 	glBegin(GL_TRIANGLE_FAN);
-	texCoordPair(averagePoint(texCoords));
+	auto average = averagePoint(resourceTexOffsets);
+	texCoordPair({average.first + topRightPoint->second.first, average.second + topRightPoint->second.second});
 	vertexPair(coord);
-	for(unsigned int i = 0; i < texCoords.size(); i++) {
-		texCoordPair(texCoords[i]);
+	for(unsigned int i = 0; i < resourceTexOffsets.size(); i++) {
+		texCoordPair(std::make_pair(resourceTexOffsets[i].first + topRightPoint->second.first, resourceTexOffsets[i].second + topRightPoint->second.second));
 		Coordinate diff = adjacentCoordDiffs[i];
 		vertexPair(Coordinate(coord.first + diff.first, coord.second + diff.second));
 	}
-	texCoordPair(texCoords[0]);
+	texCoordPair(topRightPoint->second);
 	vertexPair(Coordinate(coord.first + adjacentCoordDiffs[0].first, coord.second + adjacentCoordDiffs[0].second));
 	glEnd();
+	
+	if(tile.getDiceValue() != 0) {
+		drawTexturedCircle(numberTexPoints.find(tile.getDiceValue())->second, radius, coordToScreen(coord), 0.04);
+	}
 	glBindTexture(GL_TEXTURE_2D, 0);
 }
 

resources/tiles.bmp

@@ -60,7 +60,7 @@ void vertexPair(const Coordinate& coord) {
 }
 
 void texCoordPair(const pair<float, float>& p) {
-	glTexCoord2f(p.first / 2048., p.second / 2048.);
+	glTexCoord2f(p.first / 2048., p.second / 1024.);
 }
 
 pair<float, float> averagePoint(const std::vector<pair<float, float>>& points) {