finishing with some good ol' ctrl-shift-f

Author: PickledMonkey

include/GameView.h

@@ -18,63 +18,59 @@ class GameController;
 class ViewElement;
 class GameView;
 
-
-
 /**
  * The class in charge of drawing the view to the screen, using OpenGL calls.
  */
 class GameView {
 private:
 	GameBoard& model;
-	
+
 	std::map<int, std::unique_ptr<ViewElement>> viewElements;
 	std::vector<ScreenCoordinate> pointsOfInterest;
 
 	void highlightPoint(ScreenCoordinate & coord);
-	
+
 	std::string controlStateText;
 
 	GameView(const GameView& o) = delete;
 	GameView& operator=(const GameView& o) = delete;
-    
+
 public:
 	GameView(GameBoard&);
 	~GameView();
-	
+
 	void render();
 	bool acceptInput(SDL_Event& event);
-	
-	void setControlStateText(std::string newText);
 
+	void setControlStateText(std::string newText);
 
 	void addPointOfInterest(ScreenCoordinate);
 	void clearPointsOfInterest();
 	void addElement(std::unique_ptr<ViewElement> element);
 	void addElement(int priority, std::unique_ptr<ViewElement>);
-	
 
 	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 drawCardCount(std::string font, int fontSize);
 	void drawResourceCount(std::string font, int fontSize);
-    bool showTotals;
+	bool showTotals;
 };
 
 /**
  * A visitor of the GameBoard hierarchy that draws the entire model.
  */
-class DrawingGameVisitor : public GameVisitor {
+class DrawingGameVisitor: public GameVisitor {
 private:
 	GameView& view;
-	
+
 	DrawingGameVisitor(const DrawingGameVisitor& o) = delete;
 	DrawingGameVisitor& operator=(const DrawingGameVisitor& o) = delete;
 public:
 	DrawingGameVisitor(GameView& view);
 	~DrawingGameVisitor();
-	
+
 	virtual void visit(GameBoard&);
 	virtual void visit(Road&);
 	virtual void visit(Settlement&);
@@ -86,5 +82,4 @@ class DrawingGameVisitor : public GameVisitor {
 	virtual void visit(Wonder&);
 };
 
-
 #endif

include/Renderer.h

@@ -13,16 +13,25 @@
 void renderBoard(const GameBoard& board, const Player& perspective);
 
 GLuint loadImageAsTexture(const std::string& name);
-GLuint loadTextAsTexture(const std::string& font, int fontSize, const std::string& text);
-
-void renderText(const std::string& font, int fontSize, const std::pair<float, float> bottomLeft, const std::pair<float, float> topRight, const std::string& text);
-void renderText(const std::pair<float, float> bottomLeft, const std::pair<float, float> topRight, const GLuint& texture);
-void renderRectangle(const std::pair<float, float> bottomLeft, const std::pair<float, float> topRight, const std::tuple<float, float, float> color);
-
-void renderTexturedCircle(const std::pair<float, float> texCenter, const float texRadius, const std::pair<float, float> screenCenter,
+GLuint loadTextAsTexture(const std::string& font, int fontSize,
+		const std::string& text);
+
+void renderText(const std::string& font, int fontSize,
+		const std::pair<float, float> bottomLeft,
+		const std::pair<float, float> topRight, const std::string& text);
+void renderText(const std::pair<float, float> bottomLeft,
+		const std::pair<float, float> topRight, const GLuint& texture);
+void renderRectangle(const std::pair<float, float> bottomLeft,
+		const std::pair<float, float> topRight,
+		const std::tuple<float, float, float> color);
+
+void renderTexturedCircle(const std::pair<float, float> texCenter,
+		const float texRadius, const std::pair<float, float> screenCenter,
 		const float screenRadius, const GLuint& texture, int articulation = 20);
-void renderTexturedRectangle(const std::pair<float, float> screenBottomLeft, const std::pair<float, float> screenTopRight,
-		const std::pair<float, float> texBottomLeft, const std::pair<float, float> texTopRight, const GLuint& texture);
+void renderTexturedRectangle(const std::pair<float, float> screenBottomLeft,
+		const std::pair<float, float> screenTopRight,
+		const std::pair<float, float> texBottomLeft,
+		const std::pair<float, float> texTopRight, const GLuint& texture);
 
 std::pair<float, float> coordToScreen(const Coordinate& coord);
 Coordinate screenToCoord(const std::pair<float, float>&);
@@ -31,6 +40,7 @@ void vertexPair(const Coordinate& coord);
 
 void texCoordPair(const std::pair<float, float>& p);
 
-std::pair<float, float> averagePoint(const std::vector<std::pair<float, float>>& points);
+std::pair<float, float> averagePoint(
+		const std::vector<std::pair<float, float>>& points);
 
 #endif