Storing font information in the config

Author: Databean

resources/graphics.conf

@@ -0,0 +1,4 @@
+# Font settings
+font.path=resources/ComicNeue-Bold.ttf
+font.size=50
+

src/GameController.cpp

@@ -4,6 +4,7 @@
 #include <functional>
 #include <memory>
 
+#include "Config.h"
 #include "GameBoard.h"
 #include "GameView.h"
 #include "Renderer.h"
@@ -22,11 +23,10 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 	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)));
-
-	auto font = "resources/ComicNeue-Bold.ttf";
-	auto fontSize = 50;
 
-
+	auto font = getGraphicsConfig()["font.path"];
+	auto fontSize = getGraphicsConfig()["font.size"];
+	
 	auto playerTopY = 0.9;
 	for(auto i = 0; i < model.getNoOfPlayers(); i++) {
 		auto width = 0.15;

src/GameView.cpp

@@ -5,6 +5,7 @@
 #include <stdexcept>
 #include <cmath>
 
+#include "Config.h"
 #include "GameBoard.h"
 #include "GameController.h"
 #include "Renderer.h"
@@ -135,9 +136,9 @@ void GameView::render() {
 		highlightPoint(it);
 	}
 
-	auto font = "resources/ComicNeue-Bold.ttf";
-	auto fontSize = 50;
-
+	auto font = getGraphicsConfig()["font.path"];
+	auto fontSize = getGraphicsConfig()["font.size"];
+	
 	glColor3d(1, 1, 1);
 	renderText(font, fontSize, {.2, .9}, {.8, 1}, "Settlers of Catan");
 
@@ -660,8 +661,8 @@ void DrawingGameVisitor::visit(DevelopmentCard& card) {
  */
 TradingView::TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel, std::array<int, 5> initialOffer) : 
 	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/ComicNeue-Bold.ttf", 50, "Trade"),
-	cancel(cancel, {{0.1, 0.1}, {0.3, 0.2}}, "resources/ComicNeue-Bold.ttf", 50, "Cancel"),
+	trade(std::bind(trade, std::ref(offer), std::placeholders::_1), {{0.7, 0.1}, {0.9, 0.2}}, getGraphicsConfig()["font.path"], getGraphicsConfig()["font.size"], "Trade"),
+	cancel(cancel, {{0.1, 0.1}, {0.3, 0.2}}, getGraphicsConfig()["font.path"], getGraphicsConfig()["font.size"], "Cancel"),
 	offer(initialOffer) {
 
 }
@@ -706,8 +707,8 @@ void TradingView::render() {
 	glVertex2f(topLeft.first, bottomRight.second);
 	glEnd();
 
-	auto font = "resources/ComicNeue-Bold.ttf";
-	auto fontSize = 50;
+	auto font = getGraphicsConfig()["font.path"];
+	auto fontSize = getGraphicsConfig()["font.size"];
 
 	std::string resources[] = {"Wood", "Brick", "Ore", "Wheat", "Wool"};
 	for(int i = 0; i < 5; i++) {
@@ -760,9 +761,10 @@ void ConfirmationDialogue::render(){
 	glVertex2f(bottomRight.first, bottomRight.second);
 	glVertex2f(topLeft.first, bottomRight.second);
 	glEnd();
-
-	auto font = "resources/ComicNeue-Bold.ttf";
-	auto fontSize = 50;
+	
+	auto font = getGraphicsConfig()["font.path"];
+	auto fontSize = getGraphicsConfig()["font.size"];
+	
 	float width = bottomRight.first - topLeft.first;
 	float height = bottomRight.second - topLeft.second;
 

tests/testRenderer.cpp

@@ -3,8 +3,6 @@
 #include "UnitTest++.h"
 #include "Renderer.h"
 
-using std::cout;
-using std::endl;
 using std::make_pair;
 
 TEST(coordToScreen) {