Merge pull request #67 from Databean/main_refactor

Split up logic into more methods. Added and used make_resource

Author: PickledMonkey

include/Util.h

@@ -3,6 +3,8 @@
 
 #include <utility>
 #include <sstream>
+#include <memory>
+#include <stdexcept>
 
 typedef std::pair<int, int> Coordinate;
 typedef std::pair<float, float> ScreenCoordinate;
@@ -33,4 +35,23 @@ std::string toString(T t) {
 	return stream.str();
 }
 
+/**
+ * Construct a resource unique_ptr, given a constructor, destructor, and arugments.
+ * Intended for use with C-style constructor and destructor functions that operate on pointers.
+ * From http://ericscottbarr.com/blog/2014/04/c-plus-plus-14-and-sdl2-managing-resources/
+ * @param c The creator/initialization function.
+ * @param d The destructor function
+ * @param args The arguments to give to the constructor.
+ * @return A unique pointer to the constructed resource.
+ */
+template<typename Creator, typename Destructor, typename... Arguments>
+auto make_resource(Creator c, Destructor d, Arguments&&... args)
+-> std::unique_ptr<typename std::decay<decltype(*c(std::forward<Arguments>(args)...))>::type, void(*)(typename std::decay<decltype(*c(std::forward<Arguments>(args)...))>::type*)>
+{
+	auto r = c(std::forward<Arguments>(args)...);
+	if (!r) { throw std::runtime_error {"Unable to create resource"}; }
+	typedef typename std::decay<decltype(*r)>::type ResourceType;
+	return std::unique_ptr<ResourceType, void(*)(ResourceType*)>(r, d);
+}
+
 #endif

resources/graphics.conf

@@ -3,6 +3,9 @@ font.path = resources/ComicNeue-Bold.ttf
 font.size = 50
 
 # General window settings
+screen.x=100
+screen.y=100
+
 screen.width = 1280
 screen.height = 720
 

src/main.cpp

@@ -18,6 +18,7 @@
 #include "Player.h"
 #include "GameView.h"
 #include "GameController.h"
+#include "Util.h"
 
 using std::vector;
 using std::unique_ptr;
@@ -48,32 +49,63 @@ void updateViewport(int width, int height) {
 }
 
 /**
- * Main. Initializes SDL and the model, view, and controller. Also has the main game loop.
+ * Run the game loop until the game exits.
+ * @param displayWindow The window the game is being drawn in.
+ * @param view The view of the game being drawn.
  */
-int main(int argc, char *argv[]) {
-	
-	if(TTF_Init()==-1) {
-		std::cout << "Error in TTF_Init: " << TTF_GetError() << std::endl;
-		return 2;
+void gameLoop(SDL_Window& displayWindow, GameView& view) {
+	bool running = true;
+	while(running) {
+		SDL_Event event;
+		while(SDL_PollEvent(&event)) {
+			running = view.acceptInput(event);
+		}
+		
+		view.render();
+		
+		SDL_GL_SwapWindow(&displayWindow);
+		SDL_Delay(100);
 	}
-	
-	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
-	SDL_Window* displayWindow;
-	SDL_Renderer* displayRenderer;
+}
+
+/**
+ * Check the renderer created by SDL is valid for our purposes (uses accelerated graphics).
+ * @param displayRenderer The renderer being used for the game.
+ * @return If the renderer is valid.
+ */
+bool checkRenderer(SDL_Renderer& displayRenderer) {
 	SDL_RendererInfo displayRendererInfo;
-	SDL_CreateWindowAndRenderer(getGraphicsConfig()["screen.width"], getGraphicsConfig()["screen.height"], SDL_WINDOW_OPENGL, &displayWindow, &displayRenderer);
-	SDL_GetRendererInfo(displayRenderer, &displayRendererInfo);
-	/*TODO: Check that we have OpenGL */
-	if ((displayRendererInfo.flags & SDL_RENDERER_ACCELERATED) == 0 || 
-		(displayRendererInfo.flags & SDL_RENDERER_TARGETTEXTURE) == 0) {
-		std::cout << "Unable to create a window using accelerated graphics." << std::endl;
-		return 0;
+	SDL_GetRendererInfo(&displayRenderer, &displayRendererInfo);
+	return (displayRendererInfo.flags & SDL_RENDERER_ACCELERATED) && (displayRendererInfo.flags & SDL_RENDERER_TARGETTEXTURE);
+}
+
+/**
+ * Initialize the game objects, and run the game loop.
+ */
+void game() {
+	auto displayWindow = make_resource(SDL_CreateWindow, SDL_DestroyWindow, 
+		"Wars of Catan", 
+		(float)getGraphicsConfig()["screen.x"], 
+		(float)getGraphicsConfig()["screen.y"], 
+		(float)getGraphicsConfig()["screen.width"], 
+		(float)getGraphicsConfig()["screen.height"], 
+		SDL_WINDOW_OPENGL);
+	
+	auto displayRenderer = make_resource(SDL_CreateRenderer, SDL_DestroyRenderer, 
+		displayWindow.get(), 
+		-1, 
+		SDL_RENDERER_ACCELERATED);
+	
+	if(checkRenderer(*displayRenderer)) {}
+	else {
+		std::cerr << "Unable to create a rendering window using accelerated graphics." << std::endl;
+		return;
 	}
 
-	SDL_GLContext glContext = SDL_GL_CreateContext(displayWindow);
+	SDL_GLContext glContext = SDL_GL_CreateContext(displayWindow.get());
 
 	initOpenGL();
-
+	
 	updateViewport(getGraphicsConfig()["screen.width"], getGraphicsConfig()["screen.height"]);
 
 	GameBoard model({"Southern Tribes", "Western Watch", "North Guard", "East Raiders"});
@@ -82,32 +114,27 @@ int main(int argc, char *argv[]) {
 
 	model.initializeGame();
 
-//	Player& firstPlayer = model.getPlayer(0);
-//
-//	model.PlaceSettlement(Coordinate{0, 0}, firstPlayer);
-//	model.PlaceRoad(Coordinate{0, 0}, Coordinate{1, 0}, firstPlayer);
-//	model.PlaceRoad(Coordinate{1, 0}, Coordinate{1, 1}, firstPlayer);
-//	model.PlaceRoad(Coordinate{1, 1}, Coordinate{0, 2}, firstPlayer);
-//	model.PlaceSettlement(Coordinate{0, 2}, firstPlayer);
-//	model.UpgradeSettlement(Coordinate{0, 2});
-//
-	bool running = true;
-	while(running) {
-		SDL_Event event;
-		while(SDL_PollEvent(&event)) {
-			running = view.acceptInput(event);
-		}
-		
-		view.render();
-		
-		SDL_GL_SwapWindow(displayWindow);
-		SDL_Delay(100);
-	}
+	gameLoop(*displayWindow, view);
 
 	SDL_GL_DeleteContext(glContext);
-	SDL_DestroyWindow(displayWindow);
-	SDL_DestroyRenderer(displayRenderer);
-	SDL_Quit();
+}
+
+/**
+ * Main. Initializes SDL and the model, view, and controller. Also has the main game loop.
+ */
+int main(int argc, char *argv[]) {
 
-	return 0;
+	if(TTF_Init()==-1) {
+		std::cerr << "Error in TTF_Init: " << TTF_GetError() << std::endl;
+		return 2;
+	}
+	
+	if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0) {
+		std::cerr << "Error in SDL_Init: " << SDL_GetError() << std::endl;
+		return -1;
+	}
+	
+	game();
+	
+	SDL_Quit();
 }