Moved more graphics values into the soft config

Author: Databean

resources/graphics.conf

@@ -8,19 +8,19 @@ screen.height=720
 
 # Buttons
 screen.roadButton.text=Road |
-screen.roadButton.area=((0, 0),(0.1,0.1))
+screen.roadButton.area=((0,0),(0.1,0.1))
 
 screen.cityButton.text=City |
 screen.cityButton.area=((0.1,0),(0.2,0.1))
 
 screen.settlementButton.text=Settlement
-screen.settlementButton.area=((0.20, 0.0),(0.33, 0.1))
+screen.settlementButton.area=((0.20,0.0),(0.33,0.1))
 
 screen.wonderButton.text=|Wonder
-screen.wonderButton.area=((0.55, 0.0),(0.65, 0.1))
+screen.wonderButton.area=((0.55,0.0),(0.65,0.1))
 
 screen.endTurnButton.text=End Turn
-screen.endTurnButton.area=((0, 0.3),(0.1, 0.4))
+screen.endTurnButton.area=((0,0.3),(0.1,0.4))
 
 screen.players.topY=0.82
 screen.players.width=0.15
@@ -30,6 +30,47 @@ screen.players.right=1.0
 screen.bankButton.text=Bank
 screen.bankButton.area=((0,0.8),(0.1,0.9))
 
+screen.cancelButton.text=Cancel
+screen.cancelButton.area=((.92,.96),(1.0,1.0))
+
+screen.developmentCardButton.text=Development Cards
+screen.developmentCardButton.area=((.85,.23),(1,.30))
+
+screen.roadBuildingButton.text=Road Building 
+screen.roadBuildingButton.area=((0.85,0.0),(0.97,0.05))
+
+screen.knightButton.text=Knight 
+screen.knightButton.area=((0.85,0.05),(0.97,0.10))
+
+screen.yearOfPlentyButton.text=Year of Plenty
+screen.yearOfPlentyButton.area=((0.85,0.10),(0.97,0.15))
+
+screen.monopolyButton.text=Monopoly 
+screen.monopolyButton.area=((0.85,0.15),(0.97,0.20))
+
+screen.victoryPointButton.text=Victory Point 
+screen.victoryPointButton.area=((0.85,0.20),(0.97,0.25))
+
+screen.woodButton.text=Wood
+screen.woodButton.area=((.85,.30),(.97,.35))
+
+screen.sheepButton.text=Sheep 
+screen.sheepButton.area=((.85,.35),(.97,.40))
+
+screen.oreButton.text=Ore 
+screen.oreButton.area=((.85,.40),(.97,.45))
+
+screen.brickButton.text=Brick 
+screen.brickButton.area=((.85,.45),(.97,.50))
+
+screen.wheatButton.text=Wheat 
+screen.wheatButton.area=((.85,.50),(.97,.55))
+
+screen.showTotalButton.text=Show Totals
+screen.showTotalButton.area=((.85,.55),(.97,.60))
+
+screen.board.area=((0,0),(1,1))
+
 # Trading view screen coordinates
 screen.tradingView.bottomLeft=(0.1,0.1)
 screen.tradingView.topRight=(0.9,0.9)

src/Config.cpp

@@ -156,7 +156,7 @@ void Config::init(istream& source) {
 const ConfigValue& Config::operator[](const string& name) const {
 	auto it = values.find(name);
 	if(it == values.end()) {
-		throw runtime_error("No such key in the config");
+		throw runtime_error("No such key in the config: \"" + name + "\"");
 	} else {
 		return it->second;
 	}

src/GameController.cpp

@@ -61,24 +61,66 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 		getGraphicsConfig()["screen.bankButton.area"],
 		font, fontSize, getGraphicsConfig()["screen.bankButton.text"]));
 
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.92, .96}, {1.0, 1.0}}, font, fontSize, "Cancel"));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleCancelButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.cancelButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.cancelButton.text"]));
 
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleBuyDevelopmentCardButtonEvent, 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 "));
-	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 "));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleBuyDevelopmentCardButtonEvent, this, _1),
+		getGraphicsConfig()["screen.developmentCardButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.developmentCardButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleRoadCardButtonEvent, this, _1),
+		getGraphicsConfig()["screen.roadBuildingButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.roadBuildingButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleKnightCardButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.knightButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.knightButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleYearOfPlentyCardButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.yearOfPlentyButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.yearOfPlentyButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleMonopolyCardButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.monopolyButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.monopolyButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleVictoryPointCardButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.victoryPointButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.victoryPointButton.text"]));
+	
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleWoodButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.woodButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.woodButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleSheepButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.sheepButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.sheepButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleOreButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.oreButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.oreButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleBrickButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.brickButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.brickButton.text"]));
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::handleWheatButtonEvent, this, _1), 
+		getGraphicsConfig()["screen.wheatButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.wheatButton.text"]));
+	
+	view.addElement(makeViewButtonText(
+		std::bind(&GameController::viewCardTotals, this, _1), 
+		getGraphicsConfig()["screen.showTotalButton.area"],
+		font, fontSize, getGraphicsConfig()["screen.showTotalButton.text"]));
+	
+	view.addElement(100, makeViewButton(
+		std::bind(&GameController::handleBoardEvent, this, _1), 
+		getGraphicsConfig()["screen.board.area"]));
 
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleWoodButtonEvent, this, _1), {{.85, .30}, {.97, .35}}, font, fontSize, "Wood "));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleSheepButtonEvent, this, _1), {{.85, .35}, {.97, .40}}, font, fontSize, "Sheep "));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleOreButtonEvent, this, _1), {{.85, .40}, {.97, .45}}, font, fontSize, "Ore "));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleBrickButtonEvent, this, _1), {{.85, .45}, {.97, .50}}, font, fontSize, "Brick "));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleWheatButtonEvent, this, _1), {{.85, .50}, {.97, .55}}, font, fontSize, "Wheat "));
-    
-    view.addElement(makeViewButtonText(std::bind(&GameController::viewCardTotals, this, _1), {{.85, .55}, {.97, .60}}, font, fontSize, "Show Totals"));
-
-	view.addElement(100, makeViewButton(std::bind(&GameController::handleBoardEvent, this, _1), {{0, 0}, {1, 1}}));
 	stateStack.push_back(BASESTATE);
 }
 
@@ -165,17 +207,6 @@ int GameController::getClickHistorySize(){
 	return clickHistory.size();
 }
 
-/**
- * Now that the GUI has this information implemented, I am returning before this function prints.  To use this function again simply remove the return
- */
-void printPlayerInfo(const Player& player)
-{
-    return;
-	auto color = player.getColor();
-	std::cout << player.getName() << "'s turn. (" << std::get<0>(color) << ", " << std::get<1>(color) << ", " << std::get<2>(color) <<")" << std::endl;
-	std::cout << "Wood: " << player.getWood() << ", Brick: " << player.getBrick() << ", Ore: " << player.getOre() << ", Wheat: " << player.getWheat() << ", Wool: " << player.getWool() << std::endl;
-}
-
 /**
  *  calls a function to advance turn, hide resource and development cards, check for victory, and roll dice
  */
@@ -192,8 +223,6 @@ bool GameController::nextTurn(ScreenCoordinate) {
 		view.setControlStateText("The Robber is out! Click a tile to place it!");
 		pushState(ROBBER);
 	}
-
-	printPlayerInfo(model.getCurrentPlayer());
 	return true;
 }
 
@@ -205,7 +234,6 @@ bool GameController::nextTurn(ScreenCoordinate) {
  * @return Whether this event was handled by this element. Always true.
  */
 bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
-	printPlayerInfo(model.getCurrentPlayer());
 	auto coord = screenToCoord(screenCoord);
 	std::vector<Settlement*> neighbors;