Added resource& dev card show/hide functionality, but can't get the button to draw properly.

Author: malecki1

include/GameController.h

@@ -57,6 +57,8 @@ class GameController {
 
 	bool handleConfirmRoadCard(ScreenCoordinate);
 	bool handleCancelDialogueEvent(ScreenCoordinate);
+    
+    bool viewCardTotals(ScreenCoordinate coord);
 
 	void pushState(ControlState);
 	ControlState getState();

include/GameView.h

@@ -52,13 +52,12 @@ class GameView {
 	std::vector<ScreenCoordinate> pointsOfInterest;
 
 	void highlightPoint(ScreenCoordinate & coord);
-	void drawCardCount(std::string font, int fontSize);
-	void drawResourceCount(std::string font, int fontSize);
 
 	std::string controlStateText;
 
 	GameView(const GameView& o) = delete;
 	GameView& operator=(const GameView& o) = delete;
+    
 public:
 	GameView(GameBoard&);
 	~GameView();
@@ -78,6 +77,10 @@ class GameView {
 	std::unique_ptr<ViewElement> removeElement(int priority);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement*);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement&);
+    
+    void drawCardCount(std::string font, int fontSize);
+	void drawResourceCount(std::string font, int fontSize);
+    bool showTotals;
 };
 
 /**

src/GameController.cpp

@@ -38,7 +38,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.92, .96}, {1.0, 1.0}}, font, fontSize, "Cancel"));
 
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleBuyDevelopmentCardButtonEvent, this, _1), {{.85, .23}, {1, .30}}, font, fontSize, "Development Cards"));
+	view.addElement(makeViewButtonText(std::bind(/*&GameController::handleBuyDevelopmentCardButtonEvent*/&GameController::viewCardTotals, this, _1), {{.85, .23}, {1, .30}}, font, fontSize, "Development Cards"));
 	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 "));
@@ -50,6 +50,8 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleOreButtonEvent, this, _1), {{.85, .45}, {.97, .50}}, font, fontSize, "Ore "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleBrickButtonEvent, this, _1), {{.85, .50}, {.97, .55}}, font, fontSize, "Brick "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleWheatButtonEvent, this, _1), {{.85, .55}, {.97, .60}}, font, fontSize, "Wheat "));
+    
+    //view.addElement(makeViewButtonText(std::bind(&GameController::viewCardTotals, this, _1), {{.85, .35}, {.97, .35}}, font, fontSize, "Show Totals"));
 
 
 	stateStack.push_back(BASESTATE);
@@ -145,13 +147,15 @@ void printPlayerInfo(const Player& player) {
 }
 
 /**
- *  calls a function to advance turn, check for victory and roll dice
+ *  calls a function to advance turn, hide resource and development cards, check for victory, and roll dice
  */
 bool GameController::nextTurn(ScreenCoordinate) {
 	if(getState() != BASESTATE){
 		return false;
 	}
-
+    
+    view.showTotals = false;
+    
 	model.endTurn();
 	if (model.getDice().getFirst() + model.getDice().getSecond() == 7)
 	{
@@ -413,6 +417,19 @@ bool GameController::handleVictoryPointCardButtonEvent(ScreenCoordinate coord){
 	return true;
 }
 
+/**
+ * Makes the development and resource card totals visible
+ */
+bool GameController::viewCardTotals(ScreenCoordinate coord)
+{
+    auto font = getGraphicsConfig()["font.path"];
+	auto fontSize = getGraphicsConfig()["font.size"];
+    view.showTotals = !view.showTotals;
+    view.drawCardCount(font, fontSize);
+    view.drawResourceCount(font, fontSize);
+    return true;
+}
+
 
 template<int size>
 auto negativeArr(std::array<int, size> arr) -> std::array<int, size> {

src/GameView.cpp

@@ -86,9 +86,10 @@ bool ViewElement::handleClick(ScreenCoordinate coord) {
  * Constrct a GameView.
  * @param model The GameBoard the view is displaying.
  */
-GameView::GameView(GameBoard& model) : model(model) {
+GameView::GameView(GameBoard& model) : model(model)
+{
 	controlStateText = "Welcome to Wars of Catan";
-	
+	showTotals = false;
 }
 
 /**
@@ -104,7 +105,19 @@ GameView::~GameView() {
  * @param font the style of font to use, fontSize the resolution of the font used
  * @return void
  */
-void GameView::drawCardCount(std::string font, int fontSize){
+void GameView::drawCardCount(std::string font, int fontSize)
+{
+    if (showTotals==false)
+    {
+        renderText(font, fontSize, {0.97, 0.0}, {1.0, 0.05}, "?");	//Road Building
+        renderText(font, fontSize, {0.97, 0.05}, {1.0, 0.1}, "?");		//Knight
+        renderText(font, fontSize, {0.97, 0.1}, {1.0, 0.15}, "?");	//Year of Plenty
+        renderText(font, fontSize, {0.97, 0.15}, {1.0, 0.2}, "?");		//Monopoly
+        renderText(font, fontSize, {0.97, 0.2}, {1.0, 0.25}, "?");		//Victory Point
+        return;
+    }
+    
+    
 	renderText(font, fontSize, {0.97, 0.0}, {1.0, 0.05},
 			toString(model.getCurrentPlayer().getRoadBuildingCards()));	//Road Building
 	renderText(font, fontSize, {0.97, 0.05}, {1.0, 0.1},
@@ -120,7 +133,18 @@ void GameView::drawCardCount(std::string font, int fontSize){
 /**
  * Draws the count of resources the currentPlayer has
  */
-void GameView::drawResourceCount(std::string font, int fontSize){
+void GameView::drawResourceCount(std::string font, int fontSize)
+{
+    if(showTotals==false)
+    {
+        renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40}, "?");		//Wood
+        renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45}, "?");		//Sheep
+        renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50}, "?");		//Ore
+        renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55}, "?");		//Brick
+        renderText(font, fontSize, {0.97, 0.55}, {1.0, 0.60}, "?");     //Wheat
+        return;
+    }
+    
 	renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40},
 			toString(model.getCurrentPlayer().getWood()));		//Wood
 	renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45},