Merge branch 'master' into main_refactor

Conflicts:
	resources/graphics.conf

Author: Databean

Makefile

@@ -20,6 +20,7 @@ $(EXECUTABLE): $(ALLFILES)
 .PHONY: tests
 tests: $(EXECUTABLE)
 	cd tests && $(MAKE)
+	tests/main.test
 
 .PHONY: clean
 clean:

include/Config.h

@@ -27,6 +27,7 @@ class ConfigValue {
 	operator std::string() const;
 	operator Coordinate() const;
 	operator ScreenCoordinate() const;
+	operator std::pair<ScreenCoordinate, ScreenCoordinate>() const;
 };
 
 /**

include/GameController.h

@@ -25,7 +25,7 @@ class GameController {
 	GameBoard& model;
 	GameView& view;
 
-	std::vector<ControlState> stateStack;
+	ControlState state;
 	std::vector<Coordinate> clickHistory;
 
 	GameController(const GameController& o) : model(o.model), view(o.view) {} //deleted

resources/graphics.conf

@@ -1,28 +1,93 @@
 # Font settings
-font.path=resources/ComicNeue-Bold.ttf
-font.size=50
+font.path = resources/ComicNeue-Bold.ttf
+font.size = 50
 
 # General window settings
 screen.x=100
 screen.y=100
 
-screen.width=1280
-screen.height=720
+screen.width = 1280
+screen.height = 720
+
+# Buttons
+screen.roadButton.text=Road |
+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.wonderButton.text=|Wonder
+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.players.topY=0.82
+screen.players.width=0.15
+screen.players.height=0.05
+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)
+screen.tradingView.bottomLeft = (0.1,0.1)
+screen.tradingView.topRight = (0.9,0.9)
 
-screen.tradingView.tradeButton.bottomLeft=(0.7,0.1)
-screen.tradingView.tradeButton.topRight=(0.9,0.2)
+screen.tradingView.tradeButton.bottomLeft = (0.7,0.1)
+screen.tradingView.tradeButton.topRight = (0.9,0.2)
 
-screen.tradingView.cancelButton.bottomLeft=(0.1,0.1)
-screen.tradingView.cancelButton.topRight=(0.3,0.2)
+screen.tradingView.cancelButton.bottomLeft = (0.1,0.1)
+screen.tradingView.cancelButton.topRight = (0.3,0.2)
 
-screen.tradingView.resources.height=0.13
-screen.tradingView.resources.leftX=0.3
-screen.tradingView.resources.rightX=0.6
-screen.tradingView.resources.bottomY=0.2
+screen.tradingView.resources.height = 0.13
+screen.tradingView.resources.leftX = 0.3
+screen.tradingView.resources.rightX = 0.6
+screen.tradingView.resources.bottomY = 0.2
 
-screen.tradingView.players.bottomLeft=(0.1,0.8)
-screen.tradingView.players.topRight=(0.9,0.9)
+screen.tradingView.players.bottomLeft = (0.1,0.8)
+screen.tradingView.players.topRight = (0.9,0.9)

src/Config.cpp

@@ -35,14 +35,15 @@ ConfigValue::operator string() const {
 	return value;
 }
 
+
 /**
- * Convert the ConfigValue into a game Coordinate.
- * @throws runtime_error If the value cannot be converted.
- * @return The text of the ConfigValue, interpreted as a game Coordinate.
+ * Read a pair (S,T) in from a stream.
+ * @throws runtime_error If the pair is not in the form (S,T).
+ * @param stream The stream to read in from.
+ * @param ret The pair to read into.
  */
-ConfigValue::operator Coordinate() const {
-	stringstream stream(value);
-	Coordinate ret;
+template<class S, class T>
+void readPair(std::stringstream& stream, std::pair<S, T>& ret) {
 	char c = stream.get();
 	if(c != '(') {
 		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
@@ -53,6 +54,21 @@ ConfigValue::operator Coordinate() const {
 		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
 	}
 	stream >> ret.second;
+	c = stream.get();
+	if(c != ')') {
+		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
+	}
+}
+
+/**
+ * Convert the ConfigValue into a game Coordinate.
+ * @throws runtime_error If the value cannot be converted.
+ * @return The text of the ConfigValue, interpreted as a game Coordinate.
+ */
+ConfigValue::operator Coordinate() const {
+	stringstream stream(value);
+	Coordinate ret;
+	readPair(stream, ret);
 	return ret;
 }
 
@@ -64,16 +80,28 @@ ConfigValue::operator Coordinate() const {
 ConfigValue::operator ScreenCoordinate() const {
 	stringstream stream(value);
 	ScreenCoordinate ret;
+	readPair(stream, ret);
+	return ret;
+}
+
+/**
+ * Convert the ConfigValue into a pair of ScreenCoordinates.
+ * @throws runtime_error If the value cannot be converted.
+ * @return The text of the ConfigValue, interpreted as a pair of ScreenCoordinates.
+ */
+ConfigValue::operator std::pair<ScreenCoordinate, ScreenCoordinate>() const {
+	stringstream stream(value);
+	std::pair<ScreenCoordinate, ScreenCoordinate> ret;
 	char c = stream.get();
 	if(c != '(') {
 		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
 	}
-	stream >> ret.first;
+	readPair(stream, ret.first);
 	c = stream.get();
 	if(c != ',') {
 		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
 	}
-	stream >> ret.second;
+	readPair(stream, ret.second);
 	return ret;
 }
 
@@ -114,7 +142,13 @@ void Config::init(istream& source) {
 			continue;
 		}
 		string name = line.substr(0, line.find('='));
+		while(name[name.size()-1] == ' ' || name[name.size()-1] == '\t') {
+			name = name.substr(0, name.size()-1);
+		}
 		string value = line.substr(line.find('=') + 1);
+		while(value[0] == ' ' || value[0] == '\t') {
+			value = value.substr(1);
+		}
 		values.insert(std::make_pair(name, ConfigValue(value)));
 	}
 }
@@ -128,7 +162,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;
 	}