Added buttons with callbacks for trade accept/cancel

Author: Databean

include/GameController.h

@@ -3,6 +3,8 @@
 
 #include "Util.h"
 
+#include <array>
+
 class GameBoard;
 class ClickCoordinateEvent;
 class GameView;
@@ -31,6 +33,7 @@ class GameController {
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
 	bool handlePlayerClick(ScreenCoordinate, Player&);
+	bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving);
 };
 
 #endif

include/GameView.h

@@ -61,6 +61,7 @@ class GameView {
 	void addElement(std::unique_ptr<ViewElement>);
 	void addElement(int priority, std::unique_ptr<ViewElement>);
 
+	std::unique_ptr<ViewElement> removeElement(int priority);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement*);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement&);
 };
@@ -185,12 +186,15 @@ class TradingView : public ViewElement {
 
 	std::array<int, 5> offer;
 
+	ViewButtonText trade;
+	ViewButtonText cancel;
+	
 	TradingView(TradingView& o) = delete;
 	TradingView& operator=(TradingView& o) = delete;
 protected:
 	virtual bool clicked(ScreenCoordinate coord);
 public:
-	TradingView(Player& initiating, Player& receiving);
+	TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel);
 	virtual ~TradingView();
 
 	void render();

src/GameController.cpp

@@ -89,8 +89,35 @@ bool GameController::handleSettlementButtonEvent(ScreenCoordinate coord) {
  * @param player The player whose name was clicked on.
  */
 bool GameController::handlePlayerClick(ScreenCoordinate coord, Player& player) {
-	view.addElement(-10, std::unique_ptr<ViewElement>(new TradingView(*model.getPlayers()[0], player)));
+	using namespace std::placeholders;
+	Player& initiating = *model.getPlayers()[0];
+	Player& receiving = player;
+	auto priority = -10;
+	
+	std::function<bool(std::array<int, 5>, ScreenCoordinate)> tradeFunction(std::bind(&GameController::handleTradeOffer, this, _2, std::ref(initiating), _1, std::ref(receiving)));
+	std::function<bool(ScreenCoordinate)> cancelFunction([this, priority](ScreenCoordinate coord) {
+		view.removeElement(priority); 
+		return true;
+	});
+	
+	view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating, receiving, tradeFunction, cancelFunction)));
 	std::cout << player.getName() << std::endl;
 	return true;
 }
 
+/**
+ * Handle a trade offer from a player.
+ * @param coord The coordinate clicked on to initiate the trade.
+ * @param initiating The player initiating the trade.
+ * @param offer The offer the player is giving.
+ * @param receiving The other player in the trade.
+ */
+bool GameController::handleTradeOffer(ScreenCoordinate coord, Player& initiating, std::array<int, 5> offer, Player& receiving) {
+	std::cout << "Received trade offer of ";
+	for(auto& it : offer) {
+		std::cout << it << " ";
+	}
+	std::cout << std::endl;
+	return true;
+}
+

src/GameView.cpp

@@ -161,6 +161,22 @@ unique_ptr<ViewElement> GameView::removeElement(const ViewElement& element) {
 	return removeElement(&element);
 }
 
+/**
+ * Remove a ViewElement from the list, and return its owning pointer.
+ * @param priority The priority of the element to remove.
+ * @return An owning pointer to the element that was removed.
+ */
+unique_ptr<ViewElement> GameView::removeElement(int priority) {
+	auto it = viewElements.find(priority);
+	if(it == viewElements.end()) {
+		return std::unique_ptr<ViewElement>();
+	} else {
+		auto ret = std::move(it->second);
+		viewElements.erase(it);
+		return ret;
+	}
+}
+
 /**
  * Construct a ViewButton.
  * @param action The action to take when the button is pressed.
@@ -478,7 +494,10 @@ void DrawingGameVisitor::visit(DevelopmentCard& card) {
 
 }
 
-TradingView::TradingView(Player& initiating, Player& receiving) : ViewElement({{0.1, 0.1},{0.9, 0.9}}), initiating(initiating), receiving(receiving) {
+TradingView::TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel) : ViewElement({{0.1, 0.1},{0.9, 0.9}}), initiating(initiating), receiving(receiving),
+	trade(std::bind(trade, std::ref(offer), std::placeholders::_1), {{0.7, 0.1}, {0.9, 0.2}}, "resources/TypeWritersSubstitute-Black.ttf", 50, "Trade"),
+	cancel(cancel, {{0.1, 0.1}, {0.3, 0.2}}, "resources/TypeWritersSubstitute-Black.ttf", 50, "Cancel") {
+	
 	for(auto& res : offer) {
 		res = 0;
 	}
@@ -489,8 +508,13 @@ TradingView::~TradingView() {
 }
 
 bool TradingView::clicked(ScreenCoordinate coord) {
+	if(cancel.handleClick(coord)) {
+		return true;
+	} else if(trade.handleClick(coord)) {
+		return true;
+	}
 	int modifier = coord.first <= 0.5 ? -1 : 1;
-	int resource = (coord.second - 0.1) / 0.13;
+	int resource = (coord.second - 0.2) / 0.13;
 	if(resource >= 0 && resource <= 5) {
 		offer[resource] += modifier;
 	}
@@ -518,4 +542,7 @@ void TradingView::render() {
 		renderText(font, fontSize, {0.3, 0.2 + (i * height)}, {0.6, 0.2 + height + (i * height)}, toString(offer[i]) + " " + resources[i]);
 	}
 	renderText(font, fontSize, {0.1, 0.8}, {0.9, 0.9}, initiating.getName() + " -> " + receiving.getName());
+	
+	cancel.render();
+	trade.render();
 }