Removed ClickCoordinateEvent, used std::bind instead of lambdas

Author: Databean

include/GameController.h

@@ -22,7 +22,9 @@ class GameController {
 	GameController(GameBoard&, GameView& view);
 	~GameController();
 
-	void handleEvent(const ClickCoordinateEvent&);
+	bool handleBoardEvent(ScreenCoordinate);
+	bool handleRoadButtonEvent(ScreenCoordinate);
+	bool handleSettlementButtonEvent(ScreenCoordinate);
 };
 
 #endif

include/GameView.h

@@ -71,18 +71,6 @@ class DrawingGameVisitor : public GameVisitor {
 	virtual void visit(DevelopmentCard&);
 };
 
-class ClickCoordinateEvent {
-private:
-	Coordinate clicked;
-public:
-	ClickCoordinateEvent(const Coordinate& clicked);
-	ClickCoordinateEvent(const ClickCoordinateEvent&);
-	~ClickCoordinateEvent();
-	ClickCoordinateEvent& operator=(const ClickCoordinateEvent&);
-	
-	Coordinate getCoordinate() const;
-};
-
 template<class Fn>
 class ViewButton : public ViewElement {
 private:

src/GameController.cpp

@@ -1,53 +1,48 @@
 #include "GameController.h"
 
 #include <iostream>
+#include <functional>
 
 #include "GameBoard.h"
 #include "GameView.h"
 #include "Renderer.h"
 
 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;
-		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;
-		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}}));
+	using namespace std::placeholders;
+	
+	view.addElement(makeViewButtonColor(std::bind(&GameController::handleRoadButtonEvent, this, _1), {{0, 0}, {0.1, 0.1}}, std::make_tuple(1.f, 0.f, 0.f)));
+	view.addElement(makeViewButtonColor(std::bind(&GameController::handleSettlementButtonEvent, this, _1), {{0, 0.1}, {0.1, 0.2}}, std::make_tuple(0.f, 1.0f, 0.f)));
+	view.addElement(makeViewButton(std::bind(&GameController::handleBoardEvent, this, _1), {{0, 0}, {1, 1}}));
 }
 
 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 {
-		static Coordinate adjacentCoordDiffs[] = {Coordinate(0, 1), Coordinate(1, 0), Coordinate(1, -1), Coordinate(0, -1), Coordinate(-1, 0), Coordinate(-1, 1)};
-		for(auto& adjacent : adjacentCoordDiffs) {
-			Coordinate start {event.getCoordinate().first + adjacent.first, event.getCoordinate().second + adjacent.second}; 
-			if(model.getRoads(start).size() > 0) {
-				model.PlaceRoad(start, event.getCoordinate(), *model.getPlayers()[0]);
-				break;
-			}
-		}
-	}*/
+bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
+	auto coord = screenToCoord(screenCoord);
 	if(placingRoads) {
 		if(lastCoordClick.first == -100 && lastCoordClick.second == -100) {
-			lastCoordClick = event.getCoordinate();
+			lastCoordClick = coord;
 		} else {
-			model.PlaceRoad(lastCoordClick, event.getCoordinate(), *model.getPlayers()[0]);
+			model.PlaceRoad(lastCoordClick, coord, *model.getPlayers()[0]);
 			lastCoordClick = {-100, -100};
 		}
 	} else if(placingCities) {
-		model.PlaceSettlement(event.getCoordinate(), *model.getPlayers()[0]);
+		model.PlaceSettlement(coord, *model.getPlayers()[0]);
 	}
+	return true;
+}
+
+bool GameController::handleRoadButtonEvent(ScreenCoordinate coord) {
+	placingRoads = true; 
+	placingCities = false;
+	return true;
+}
+
+bool GameController::handleSettlementButtonEvent(ScreenCoordinate coord) {
+	placingRoads = false; 
+	placingCities = true;
+	return true;
 }
 

src/GameView.cpp

@@ -239,24 +239,3 @@ void DrawingGameVisitor::visit(ResourceTile& tile) {
 void DrawingGameVisitor::visit(DevelopmentCard& card) {
 
 }
-
-ClickCoordinateEvent::ClickCoordinateEvent(const Coordinate& clicked) : clicked(clicked) {
-	
-}
-
-ClickCoordinateEvent::ClickCoordinateEvent(const ClickCoordinateEvent& event) : clicked(event.clicked) {
-	
-}
-
-ClickCoordinateEvent::~ClickCoordinateEvent() {
-	
-}
-
-ClickCoordinateEvent& ClickCoordinateEvent::operator=(const ClickCoordinateEvent& event) {
-	clicked = event.clicked;
-	return *this;
-}
-
-Coordinate ClickCoordinateEvent::getCoordinate() const {
-	return clicked;
-}