Merge pull request #9 from Databean/renderCornerPieces

Added rendering of roads and settlements.

Author: PickledMonkey

src/GameBoard.cpp

@@ -422,10 +422,12 @@ void GameBoard::PlaceCity(Coordinate location, Player& Owner){
 
 void GameBoard::accept(GameVisitor& visitor) {
 	visitor.visit(*this);
-	for(auto& it : corners) {
+	// Drawing needs this to happen in this order. Visitors technically should be order-independent, but this was an easy fix at the moment.
+	// Keep that in mind when modifying this.
+	for(auto& it : resources) {
 		it.second->accept(visitor);
 	}
-	for(auto& it : resources) {
+	for(auto& it : corners) {
 		it.second->accept(visitor);
 	}
 	for(auto& roadCoordVec : roads) {

src/GameView.cpp

@@ -1,6 +1,9 @@
 #include "GameView.h"
 
+#define _USE_MATH_DEFINES
+
 #include <stdexcept>
+#include <cmath>
 
 #include "GameBoard.h"
 #include "GameController.h"
@@ -48,11 +51,50 @@ void DrawingGameVisitor::visit(GameBoard& model) {
 }
 
 void DrawingGameVisitor::visit(Road& road) {
+	static const auto roadWidth = 0.01;
+	
+	auto startScreenPos = coordToScreen(road.getStart());
+	auto endScreenPos = coordToScreen(road.getEnd());
+	
+	auto roadAngle = 0.;
+	/*
+	 * Fixes a bug in road rendering of horizontal road. My best guess is that
+	 * this is necessary because small floating point errors in the conversion from game coordinates to screen coordinates
+	 * mess up the angle calculation.
+	 */
+	if(road.getEnd().second == road.getStart().second) {
+		roadAngle = 0;
+	} else {
+		roadAngle = std::atan2(endScreenPos.first - startScreenPos.first, endScreenPos.second - startScreenPos.second);\
+	}
+	auto roadPerpAngle = roadAngle + (M_PI / 2.);
+	
+	auto cosPerp = std::cos(roadPerpAngle);
+	auto sinPerp = std::sin(roadPerpAngle);
 
+	glColor3d(0., 0., 0.);
+	glBindTexture(GL_TEXTURE_2D, 0);
+	glBegin(GL_QUADS);
+	glVertex2d(startScreenPos.first - cosPerp * roadWidth, startScreenPos.second - sinPerp * roadWidth);
+	glVertex2d(startScreenPos.first + cosPerp * roadWidth, startScreenPos.second + sinPerp * roadWidth);
+	glVertex2d(endScreenPos.first + cosPerp * roadWidth, endScreenPos.second + sinPerp * roadWidth);
+	glVertex2d(endScreenPos.first - cosPerp * roadWidth, endScreenPos.second - sinPerp * roadWidth);
+	glEnd();
 }
 
 void DrawingGameVisitor::visit(Settlement& settlement) {
+	static const auto settlementRadius = 0.03;
+	
+	auto centerScreenPos = coordToScreen(settlement.getLocation());
 
+	glBindTexture(GL_TEXTURE_2D, 0);
+	glColor3d(0., 0., 0.);
+	glBegin(GL_QUADS);
+	glVertex2d(centerScreenPos.first, centerScreenPos.second + settlementRadius);
+	glVertex2d(centerScreenPos.first + settlementRadius, centerScreenPos.second);
+	glVertex2d(centerScreenPos.first, centerScreenPos.second - settlementRadius);
+	glVertex2d(centerScreenPos.first - settlementRadius, centerScreenPos.second);
+	glEnd();
 }
 
 void DrawingGameVisitor::visit(City& city) {
@@ -87,6 +129,7 @@ void DrawingGameVisitor::visit(ResourceTile& tile) {
 		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));
 	vertexPair(coord);

src/main.cpp

@@ -25,12 +25,11 @@ void initGame() {
 }
 
 void initOpenGL() {
-	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_TEXTURE_2D);
 	glEnable (GL_BLEND); 
 	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glClearColor(1.f, 1.f, 1.f, 1.f);
-	//glDepthFunc(GL_NEVER);
+	glDepthFunc(GL_NEVER);
 }
 
 /* function to reset our viewport after a window resize */
@@ -66,10 +65,17 @@ int main(int argc, char *argv[]) {
 	vector<unique_ptr<Player>> players;
 	players.emplace_back(unique_ptr<Player>(new Player("test")));
 
+	Player& firstPlayer = *players[0];
+	
 	GameBoard model(std::move(players));
 	GameController controller(model);
 	GameView view(model, controller);
 
+	model.PlaceSettlement(Coordinate{0, 0}, firstPlayer);
+	model.PlaceRoad(Coordinate{0, 0}, Coordinate{1, 0}, firstPlayer);
+	model.PlaceRoad(Coordinate{1, 0}, Coordinate{1, 1}, firstPlayer);
+	model.PlaceRoad(Coordinate{1, 1}, Coordinate{0, 2}, firstPlayer);
+	
 	bool running = true;
 	while(running) {
 		SDL_Event event;
@@ -84,6 +90,8 @@ int main(int argc, char *argv[]) {
 	}
 
 	SDL_GL_DeleteContext(glContext);
+	SDL_DestroyWindow(displayWindow);
+	SDL_DestroyRenderer(displayRenderer);
 	SDL_Quit();
 
 	return 0;