Added buttons to control road and settlement placement

Author: Databean

include/GameController.h

@@ -1,6 +1,8 @@
 #ifndef GAME_CONTROLLER_H
 #define GAME_CONTROLLER_H
 
+#include "Util.h"
+
 class GameBoard;
 class ClickCoordinateEvent;
 class GameView;
@@ -10,6 +12,10 @@ class GameController {
 	GameBoard& model;
 	GameView& view;
 
+	bool placingRoads;
+	bool placingCities;
+	Coordinate lastCoordClick;
+	
 	GameController(const GameController& o) : model(o.model), view(o.view) {} //deleted
 	GameController& operator=(const GameController& o) { return *this; } //deleted
 public:

include/GameView.h

@@ -114,7 +114,7 @@ class ViewButtonColor : public ViewButton<Fn> {
 	ViewButtonColor(const ViewButtonColor& vb) : ViewElement(vb) {} //deleted
 	ViewButtonColor& operator=(const ViewButtonColor& vb) { return *this; }
 public:
-	ViewButtonColor(Fn action, std::pair<ScreenCoordinate, ScreenCoordinate> rect, std::tuple<float, float, float> color) : ViewElement(rect, action), color(color) {}
+	ViewButtonColor(Fn action, std::pair<ScreenCoordinate, ScreenCoordinate> rect, std::tuple<float, float, float> color) : ViewButton<Fn>(action, rect), color(color) {}
 	virtual ~ViewButtonColor() {}
 
 	virtual void render() {
@@ -123,10 +123,10 @@ class ViewButtonColor : public ViewButton<Fn> {
 		auto topLeft = ViewElement::getRect().first;
 		auto bottomRight = ViewElement::getRect().second;
 		glBegin(GL_QUADS);
-		glVertex3f(topLeft.first, topLeft.second);
-		glVertex3f(bottomRight.first, topLeft.second);
-		glVertex3f(bottomRight.first, bottomRight.second);
-		glVertex3f(topLeft.first, bottomRight.second);
+		glVertex2f(topLeft.first, topLeft.second);
+		glVertex2f(bottomRight.first, topLeft.second);
+		glVertex2f(bottomRight.first, bottomRight.second);
+		glVertex2f(topLeft.first, bottomRight.second);
 		glEnd();
 	}
 };

src/GameController.cpp

@@ -6,7 +6,19 @@
 #include "GameView.h"
 #include "Renderer.h"
 
-GameController::GameController(GameBoard& model, GameView& view) : model(model), view(view) {
+GameController::GameController(GameBoard& model, GameView& view) : model(model), view(view), placingRoads(false), placingCities(false) ,lastCoordClick(-100, -100) {
+	view.addElement(makeViewButtonColor([&](ScreenCoordinate coord) { 
+		placingRoads = true; 
+		placingCities = false;
+		std::cout << __PRETTY_FUNCTION__ << std::endl;
+		return true;
+	}, {{0, 0}, {0.1, 0.1}}, std::make_tuple(1.f, 0.f, 0.f)));
+	view.addElement(makeViewButtonColor([&](ScreenCoordinate coord) { 
+		placingRoads = false; 
+		placingCities = true;
+		std::cout << __PRETTY_FUNCTION__ << std::endl;
+		return true;
+	}, {{0, 0.1}, {0.1, 0.2}}, std::make_tuple(0.f, 1.0f, 0.f)));
 	view.addElement(makeViewButton([this](ScreenCoordinate coord) { this->handleEvent(ClickCoordinateEvent(screenToCoord(coord))); return true; }, {{0, 0}, {1, 1}}));
 }
 
@@ -16,6 +28,7 @@ GameController::~GameController() {
 
 void GameController::handleEvent(const ClickCoordinateEvent& event) {
 	//std::cout << "user clicked at " << event.getCoordinate().first << ", " << event.getCoordinate().second << std::endl;
+	/*
 	if(model.getRoads(event.getCoordinate()).size() > 0) {
 		model.PlaceSettlement(event.getCoordinate(), *model.getPlayers()[0]);
 	} else {
@@ -27,6 +40,17 @@ void GameController::handleEvent(const ClickCoordinateEvent& event) {
 				break;
 			}
 		}
+	}*/
+	std::cout << placingRoads << " " << placingCities << std::endl;
+	if(placingRoads) {
+		if(lastCoordClick.first == -100 && lastCoordClick.second == -100) {
+			lastCoordClick = event.getCoordinate();
+		} else {
+			model.PlaceRoad(lastCoordClick, event.getCoordinate(), *model.getPlayers()[0]);
+			lastCoordClick = {-100, -100};
+		}
+	} else if(placingCities) {
+		model.PlaceSettlement(event.getCoordinate(), *model.getPlayers()[0]);
 	}
 }