Merge pull request #35 from Databean/DevCardUI_textButtons

Dev card ui text buttons

Author: Databean

include/GameView.h

@@ -52,6 +52,7 @@ class GameView {
 	std::vector<ScreenCoordinate> pointsOfInterest;
 
 	void highlightPoint(ScreenCoordinate & coord);
+	void drawCardCount(std::string font, int fontSize);
 
 	GameView(const GameView& o) = delete;
 	GameView& operator=(const GameView& o) = delete;
@@ -144,91 +145,7 @@ class ViewButtonColor : public ViewButton {
 	virtual void render();
 };
 
-template<class Fn>
-class ConfirmationDialogue : public ViewElement {
-private:
-	Fn confirm_action;
-	Fn cancel_action;
 
-	bool clickedConfirm(ScreenCoordinate coord);
-	bool clickedCancel(ScreenCoordinate coord);
-	ScreenCoordinate topLeft;
-	ScreenCoordinate bottomRight;
-	ScreenCoordinate confirmTopLeft;
-	ScreenCoordinate confirmBottomRight;
-	ScreenCoordinate cancelTopLeft;
-	ScreenCoordinate cancelBottomRight;
-
-
-protected:
-	virtual bool clicked_confirm(ScreenCoordinate coord){
-		return confirmTopLeft.first < coord.first &&
-				confirmTopLeft.second < coord.second &&
-				coord.first < confirmBottomRight.first &&
-				coord.second < confirmBottomRight.second;
-	}
-	virtual bool clicked_cancel(ScreenCoordinate coord){
-			return cancelTopLeft.first < coord.first &&
-					cancelTopLeft.second < coord.second &&
-					coord.first < cancelBottomRight.first &&
-					coord.second < cancelBottomRight.second;
-	}
-
-	virtual bool clicked(ScreenCoordinate coord){
-		if(clicked_confirm(coord)){
-			confirm_action(coord);
-		} else if(clicked_cancel(coord)){
-			cancel_action(coord);
-		}
-		return false;
-	}
-
-public:
-	ConfirmationDialogue(Fn confirm_action, Fn cancel_action, std::pair<ScreenCoordinate, ScreenCoordinate> rect): ViewElement(rect), confirm_action(confirm_action), cancel_action(cancel_action){
-		topLeft = ViewElement::getRect().first;
-		bottomRight = ViewElement::getRect().second;
-
-		float width = bottomRight.first - topLeft.first;
-		float height = bottomRight.second - topLeft.second;
-		confirmTopLeft = ScreenCoordinate(topLeft.first +(width*.1), topLeft.second+(height*.1));
-		confirmBottomRight = ScreenCoordinate(bottomRight.first - (width * .6), bottomRight.second - (height * .6));
-		cancelTopLeft = ScreenCoordinate(topLeft.first + (width*.6), topLeft.second + (height *.1));
-		cancelBottomRight = ScreenCoordinate(bottomRight.first - (width * .1), bottomRight.second - (height * .6));
-
-	}
-	virtual void render(){
-		glBindTexture(GL_TEXTURE_2D, 0);
-
-		glColor3f(1., 1., 1.);
-		glBegin(GL_QUADS);
-		glVertex2f(topLeft.first, topLeft.second);
-		glVertex2f(bottomRight.first, topLeft.second);
-		glVertex2f(bottomRight.first, bottomRight.second);
-		glVertex2f(topLeft.first, bottomRight.second);
-		glEnd();
-
-		glColor3f(0., 1., 0.);
-		glBegin(GL_QUADS);
-		glVertex2f(confirmTopLeft.first, confirmTopLeft.second);
-		glVertex2f(confirmBottomRight.first, confirmTopLeft.second);
-		glVertex2f(confirmBottomRight.first, confirmBottomRight.second);
-		glVertex2f(confirmTopLeft.first, confirmBottomRight.second);
-		glEnd();
-
-		glColor3f(1.,0.,0.);
-		glBegin(GL_QUADS);
-		glVertex2f(cancelTopLeft.first, cancelTopLeft.second);
-		glVertex2f(cancelBottomRight.first, cancelTopLeft.second);
-		glVertex2f(cancelBottomRight.first, cancelBottomRight.second);
-		glVertex2f(cancelTopLeft.first, cancelBottomRight.second);
-		glEnd();
-	}
-};
-
-template<class Fn>
-std::unique_ptr<ViewElement> makeConfirmationDialogue(Fn confirm_fn, Fn cancel_fn, std::pair<ScreenCoordinate, ScreenCoordinate> rect) {
-	return std::unique_ptr<ViewElement>(new ConfirmationDialogue<Fn>(confirm_fn, cancel_fn, rect));
-}
 
 
 
@@ -298,4 +215,30 @@ class TradingView : public ViewElement {
 	void render();
 };
 
+
+class ConfirmationDialogue : public ViewElement {
+private:
+	ScreenCoordinate topLeft;
+	ScreenCoordinate bottomRight;
+
+	std::string message;
+
+	std::unique_ptr<ViewElement> confirmButton;
+	std::unique_ptr<ViewElement> cancelButton;
+
+protected:
+	virtual bool clicked(ScreenCoordinate coord);
+
+public:
+	ConfirmationDialogue(std::function<bool(ScreenCoordinate)> confirm_action, std::function<bool(ScreenCoordinate)> cancel_action, std::pair<ScreenCoordinate, ScreenCoordinate> rect, std::string message);
+	void render();
+};
+
+template<class Fn>
+std::unique_ptr<ViewElement> makeConfirmationDialogue(Fn confirm_fn, Fn cancel_fn, std::pair<ScreenCoordinate, ScreenCoordinate> rect, std::string message) {
+	return std::unique_ptr<ViewElement>(new ConfirmationDialogue(confirm_fn, cancel_fn, rect, message));
+}
+
+
+
 #endif

include/Util.h

@@ -7,6 +7,7 @@
 typedef std::pair<int, int> Coordinate;
 typedef std::pair<float, float> ScreenCoordinate;
 
+
 /**
  * Converts any instance that has istream& operator>>(istream&, T&) defined from a string to its type.
  * @param s The string to read the value from

src/GameBoard.cpp

@@ -907,12 +907,10 @@ const std::vector<std::unique_ptr<Player>>& GameBoard::getPlayers() const {
 }
 
 /**
- * WARNING THIS FUNCTION GIVES THE PLAYERS CHEATS SO I COULD DEBUG
  * @return reference to the current Player
  */
 Player& GameBoard::getCurrentPlayer() const
 {
-	(*players[currentTurn]).giveDevCardBoon();
 	return *players[currentTurn];
 }
 

src/GameController.cpp

@@ -17,13 +17,12 @@
 GameController::GameController(GameBoard& model, GameView& view) : model(model), view(view) {
 	using namespace std::placeholders;
 
+	view.addElement(makeViewButton(std::bind(&GameController::handleBoardEvent, this, _1), {{0, 0}, {1, 1}}));
 
 	view.addElement(makeViewButtonColor(std::bind(&GameController::nextTurn, this, _1), {{0, 0.2}, {0.1, 0.3}}, std::make_tuple(0.f, 0.f, 1.f)));
 	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}}));
-
 	auto font = "resources/TypeWritersSubstitute-Black.ttf";
 	auto fontSize = 50;
 
@@ -41,11 +40,12 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 
 	view.addElement(makeViewButtonColor(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.95, .95}, {1.0, 1.0}}, std::make_tuple(1.f, 0.0f, 0.f)));
 
-	view.addElement(makeViewButtonColor(std::bind(&GameController::handleRoadCardButtonEvent, this, _1), {{.2, 0}, {.3, .05}}, std::make_tuple(1.f, 0.0f, 0.f)));
-	view.addElement(makeViewButtonColor(std::bind(&GameController::handleKnightCardButtonEvent, this, _1), {{0.3, 0}, {.4, .05}}, std::make_tuple(0.f, 0.0f, 0.f)));
-	view.addElement(makeViewButtonColor(std::bind(&GameController::handleYearOfPlentyCardButtonEvent, this, _1), {{0.4, 0}, {.5, .05}}, std::make_tuple(1.f, 1.0f, 0.f)));
-	view.addElement(makeViewButtonColor(std::bind(&GameController::handleMonopolyCardButtonEvent, this, _1), {{0.5, 0}, {.6, .05}}, std::make_tuple(1.f, 0.0f, 1.f)));
-	view.addElement(makeViewButtonColor(std::bind(&GameController::handleVictoryPointCardButtonEvent, this, _1), {{0.6, 0}, {.7, .05}}, std::make_tuple(0.f, 1.0f, 1.f)));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleRoadCardButtonEvent, this, _1), {{0.85, 0.0}, {0.97, 0.05}}, font, fontSize, "Road Building "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleKnightCardButtonEvent, this, _1), {{0.85, 0.05}, {0.97, 0.10}},  font, fontSize, "Knight "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleYearOfPlentyCardButtonEvent, this, _1), {{0.85, 0.10}, {0.97, 0.15}},  font, fontSize, "Year of Plenty "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleMonopolyCardButtonEvent, this, _1), {{0.85, 0.15}, {0.97, 0.20}},  font, fontSize, "Monopoly "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleVictoryPointCardButtonEvent, this, _1), {{0.85, 0.20}, {0.97, 0.25}},  font, fontSize, "Victory Point "));
+
 
 
 	stateStack.push_back(BASESTATE);
@@ -157,7 +157,6 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 
 	switch (getState()){
 	case BUILDROAD:
-		std::cout << "BUILDROAD\n";
 		if(!hasClickHistory()) {
 			storeClick(coord);
 		} else {
@@ -178,7 +177,8 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 			using namespace std::placeholders;
 			view.addElement(28, makeConfirmationDialogue(
 				std::bind(&GameController::handleConfirmRoadCard, this, _1),
-				std::bind(&GameController::handleCancelDialogueEvent, this, _1), {{.2, .3}, {.8, .6}}));
+				std::bind(&GameController::handleCancelDialogueEvent, this, _1), {{.2, .3}, {.8, .6}},
+				"Use road building card on these points?"));
 			pushState(MODALSTATE);
 		}
 		break;
@@ -209,6 +209,10 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 	return true;
 }
 
+/**
+ * Handles the event when the cancel button in the top right corner of the screen is pressed. This will
+ * reset the control state back to the base state.
+ */
 bool GameController::handleCancelButtonEvent(ScreenCoordinate){
 	while(getState() != BASESTATE){
 		popState();
@@ -235,7 +239,7 @@ bool GameController::handleRoadButtonEvent(ScreenCoordinate coord) {
 /**
  * Handles a click on the "create settlement" button. Changes the internal state to indicate the user is going to be making roads on the board.
  * @param coord The place the user clicked on screen.
- * @return Whether thi sevent was handled by this element. Always true.
+ * @return Whether this event was handled by this element. Always true.
  */
 bool GameController::handleSettlementButtonEvent(ScreenCoordinate coord) {
 	if(getState() != BASESTATE){
@@ -245,6 +249,12 @@ bool GameController::handleSettlementButtonEvent(ScreenCoordinate coord) {
 	return true;
 }
 
+
+/**
+ * Handles a click on the road Building Card button. This changes the control state to indicate the user is going to be building roads on the board.
+ * @param coord The place the user clicked on the screen
+ * @return whether this event was handles by this element. Always true.
+ */
 bool GameController::handleRoadCardButtonEvent(ScreenCoordinate coord){
 	if(getState() != BASESTATE){
 		return true;
@@ -254,42 +264,73 @@ bool GameController::handleRoadCardButtonEvent(ScreenCoordinate coord){
 	return true;
 }
 
+/**
+ * Handles a click on the confirm button in the confirmation dialogues for the Road Building Card. This will attempt to place the roads the
+ * user chose and clear the control state.
+ * @param coord The place the user clicked on the screen
+ * @return true
+ */
 bool GameController::handleConfirmRoadCard(ScreenCoordinate coord){
 	model.getCurrentPlayer().playRoadBuilding(getPastClick(3), getPastClick(2), getPastClick(1), getPastClick(0));
 	view.removeElement(28);
 	return handleCancelButtonEvent(coord);
 }
 
+/**
+ * Handles a click on the cancel button in the confrimation dialogue for the Road Building Card. This will clear the control state back to default.
+ * @param coord The place the user clicked on the screen
+ * @return true
+ */
 bool GameController::handleCancelDialogueEvent(ScreenCoordinate coord){
 	view.removeElement(28);
 	return handleCancelButtonEvent(coord);
 }
 
-
-bool GameController::handleKnightCardButtonEvent(ScreenCoordinate){
+/**
+ * Handles a click on the Knight Card button.
+ * @param coord The place the user clicked
+ * @return true
+ */
+bool GameController::handleKnightCardButtonEvent(ScreenCoordinate coord){
 	if(getState() != BASESTATE){
 		return true;
 	}
 	pushState(KNIGHT_DEVCARD);
 	return true;
 }
 
-bool GameController::handleYearOfPlentyCardButtonEvent(ScreenCoordinate){
+/**
+ * Handles a click on the Year of Plenty Card button
+ * @param coord The place the user clicked
+ * @return true
+ */
+bool GameController::handleYearOfPlentyCardButtonEvent(ScreenCoordinate coord){
 	if(getState() != BASESTATE){
 		return true;
 	}
 	pushState(YEAROFPLENTY_DEVCARD);
 	return true;
 }
-bool GameController::handleMonopolyCardButtonEvent(ScreenCoordinate){
+
+/**
+ * Handles a click on the Monopoly Card Button
+ * @param coord The place the user clicked
+ * @return true;
+ */
+bool GameController::handleMonopolyCardButtonEvent(ScreenCoordinate coord){
 	if(getState() != BASESTATE){
 		return true;
 	}
 	pushState(MONOPOLY_DEVCARD);
 	return true;
 }
 
-bool GameController::handleVictoryPointCardButtonEvent(ScreenCoordinate){
+/**
+ * Handles a click on the VictoryPoint card button. Will push the victory point card state to the control stack
+ * @param coord The place the user clicked
+ * @return true
+ */
+bool GameController::handleVictoryPointCardButtonEvent(ScreenCoordinate coord){
 	if(getState() != BASESTATE){
 		return true;
 	}