Controller now has a reference to View instead of vice versa

Author: Databean

include/GameController.h

@@ -3,15 +3,17 @@
 
 class GameBoard;
 class ClickCoordinateEvent;
+class GameView;
 
 class GameController {
 private:
 	GameBoard& model;
+	GameView& view;
 
-	GameController(const GameController& o) : model(o.model) {} //deleted
+	GameController(const GameController& o) : model(o.model), view(o.view) {} //deleted
 	GameController& operator=(const GameController& o) { return *this; } //deleted
 public:
-	GameController(GameBoard&);
+	GameController(GameBoard&, GameView& view);
 	~GameController();
 
 	void handleEvent(const ClickCoordinateEvent&);

include/GameView.h

@@ -18,15 +18,14 @@ class GameView;
 
 class ViewElement {
 private:
-	GameView& view;
 	std::pair<ScreenCoordinate, ScreenCoordinate> rect;
 
-	ViewElement(const ViewElement& vw) : view(vw.view) {} //deleted
+	ViewElement(const ViewElement& vw) {} //deleted
 	ViewElement& operator=(const ViewElement&) { return *this; } // deleted
 protected:
 	virtual bool clicked(ScreenCoordinate coord) = 0;
 public:
-	ViewElement(GameView& view, decltype(rect) rect);
+	ViewElement(decltype(rect) rect);
 	virtual ~ViewElement();
 
 	virtual decltype(rect) getRect() const;
@@ -38,18 +37,19 @@ class ViewElement {
 class GameView {
 private:
 	GameBoard& model;
-	GameController& controller;
 
 	std::vector<std::unique_ptr<ViewElement>> viewElements;
 
-	GameView(const GameView& o) : model(o.model), controller(o.controller) {} //deleted
+	GameView(const GameView& o) : model(o.model) {} //deleted
 	GameView& operator=(const GameView& o) { return *this; } //deleted
 public:
-	GameView(GameBoard&, GameController&);
+	GameView(GameBoard&);
 	~GameView();
 
 	void render();
 	bool acceptInput(SDL_Event& event);
+	
+	void addElement(std::unique_ptr<ViewElement>);
 };
 
 class DrawingGameVisitor : public GameVisitor {
@@ -87,23 +87,41 @@ template<class Fn>
 class ViewButton : public ViewElement {
 private:
 	Fn action;
-	std::tuple<float, float, float> color;
 
 	ViewButton(const ViewButton& vb) : ViewElement(vb) {} //deleted
-	ViewButton& operator=(const ViewButton& vb) { return *this; }
+	ViewButton& operator=(const ViewButton&) { return *this; } //deleted
 protected:
 	virtual bool clicked(ScreenCoordinate coord) {
 		return action(coord);
 	}
 public:
-	ViewButton(Fn& action, std::pair<ScreenCoordinate, ScreenCoordinate> rect, std::tuple<float, float, float> color) : ViewElement(rect), action(action), color(color) {}
-	~ViewButton() {}
+	ViewButton(Fn action, std::pair<ScreenCoordinate, ScreenCoordinate> rect) : ViewElement(rect), action(action) {}
+	virtual ~ViewButton() {}
 
-	void render() {
+	virtual void render() {}
+};
+
+template<class Fn>
+std::unique_ptr<ViewElement> makeViewButton(Fn fn, std::pair<ScreenCoordinate, ScreenCoordinate> rect) {
+	return std::unique_ptr<ViewElement>(new ViewButton<Fn>(fn, rect));
+}
+
+template<class Fn>
+class ViewButtonColor : public ViewButton<Fn> {
+private:
+	std::tuple<float, float, float> color;
+	
+	ViewButtonColor(const ViewButtonColor& vb) : ViewElement(vb) {} //deleted
+	ViewButtonColor& operator=(const ViewButtonColor& vb) { return *this; }
+public:
+	ViewButtonColor(Fn action, std::pair<ScreenCoordinate, ScreenCoordinate> rect, std::tuple<float, float, float> color) : ViewElement(rect, action), color(color) {}
+	virtual ~ViewButtonColor() {}
+	
+	virtual void render() {
 		glBindTexture(GL_TEXTURE_2D, 0);
 		glColor3f(std::get<0>(color), std::get<1>(color), std::get<2>(color));
-		auto topLeft = getRect().first;
-		auto bottomRight = getRect().second;
+		auto topLeft = ViewElement::getRect().first;
+		auto bottomRight = ViewElement::getRect().second;
 		glBegin(GL_QUADS);
 		glVertex3f(topLeft.first, topLeft.second);
 		glVertex3f(bottomRight.first, topLeft.second);
@@ -113,4 +131,9 @@ class ViewButton : public ViewElement {
 	}
 };
 
+template<class Fn>
+std::unique_ptr<ViewElement> makeViewButtonColor(Fn fn, std::pair<ScreenCoordinate, ScreenCoordinate> rect, std::tuple<float, float, float> color) {
+	return std::unique_ptr<ViewElement>(new ViewButtonColor<Fn>(fn, rect, color));
+}
+
 #endif

src/GameController.cpp

@@ -4,9 +4,10 @@
 
 #include "GameBoard.h"
 #include "GameView.h"
+#include "Renderer.h"
 
-GameController::GameController(GameBoard& model) : model(model) {
-	
+GameController::GameController(GameBoard& model, GameView& view) : model(model), view(view) {
+	view.addElement(makeViewButton([this](ScreenCoordinate coord) { this->handleEvent(ClickCoordinateEvent(screenToCoord(coord))); return true; }, {{0, 0}, {1, 1}}));
 }
 
 GameController::~GameController() {

src/GameView.cpp

@@ -15,7 +15,7 @@ using std::pair;
 using std::runtime_error;
 using std::string;
 
-ViewElement::ViewElement(GameView& view, decltype(rect) rect) : view(view) {
+ViewElement::ViewElement(decltype(rect) rect) {
 	using std::min;
 	using std::max;
 
@@ -47,7 +47,7 @@ bool ViewElement::handleClick(ScreenCoordinate coord) {
 	return false;
 }
 
-GameView::GameView(GameBoard& model, GameController& controller) : model(model), controller(controller) {
+GameView::GameView(GameBoard& model) : model(model) {
 
 }
 
@@ -75,14 +75,17 @@ bool GameView::acceptInput(SDL_Event& event) {
 		ScreenCoordinate screen = {(float) event.button.x / 900.f, 1.f - (float) event.button.y / 800.f};
 		for(auto& it : viewElements) {
 			if(it->handleClick(screen)) {
-				return true;
+				break;
 			}
 		}
-		controller.handleEvent(ClickCoordinateEvent(screenToCoord(screen)));
 	}
 	return true;
 }
 
+void GameView::addElement(std::unique_ptr<ViewElement> element) {
+	viewElements.emplace_back(std::move(element));
+}
+
 DrawingGameVisitor::DrawingGameVisitor(GameView& view) : view(view) {
 
 }

src/main.cpp

@@ -68,8 +68,8 @@ int main(int argc, char *argv[]) {
 	Player& firstPlayer = *players[0];
 
 	GameBoard model(std::move(players));
-	GameController controller(model);
-	GameView view(model, controller);
+	GameView view(model);
+	GameController controller(model, view);
 
 	model.PlaceSettlement(Coordinate{0, 0}, firstPlayer);
 	model.PlaceRoad(Coordinate{0, 0}, Coordinate{1, 0}, firstPlayer);