Added ViewElement and ViewButton

Author: Databean

include/GameView.h

@@ -1,19 +1,47 @@
 #ifndef GAME_VIEW_H
 #define GAME_VIEW_H
 
+#include <vector>
+#include <memory>
+
 #include "SDL2/SDL.h"
+#include "SDL2/SDL_opengl.h"
+#include "GL/gl.h"
 
 #include "GameVisitor.h"
 #include "Util.h"
 
 class GameBoard;
 class GameController;
+class ViewElement;
+class GameView;
+
+class ViewElement {
+private:
+	GameView& view;
+	std::pair<ScreenCoordinate, ScreenCoordinate> rect;
+	
+	ViewElement(const ViewElement& vw) : view(vw.view) {} //deleted
+	ViewElement& operator=(const ViewElement&) { return *this; } // deleted
+protected:
+	virtual bool clicked(ScreenCoordinate coord) = 0;
+public:
+	ViewElement(GameView& view, decltype(rect) rect);
+	virtual ~ViewElement();
+	
+	virtual decltype(rect) getRect() const;
+	virtual bool containsPoint(ScreenCoordinate coord) const;
+	virtual bool handleClick(ScreenCoordinate coord);
+	virtual void render() = 0;
+};
 
 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& operator=(const GameView& o) { return *this; } //deleted
 public:
@@ -55,4 +83,34 @@ class ClickCoordinateEvent {
 	Coordinate getCoordinate() const;
 };
 
+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; }
+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() {}
+	
+	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;
+		glBegin(GL_QUADS);
+		glVertex3f(topLeft.first, topLeft.second);
+		glVertex3f(bottomRight.first, topLeft.second);
+		glVertex3f(bottomRight.first, bottomRight.second);
+		glVertex3f(topLeft.first, bottomRight.second);
+		glEnd();
+	}
+};
+
 #endif

include/Util.h

@@ -5,6 +5,7 @@
 #include <sstream>
 
 typedef std::pair<int, int> Coordinate;
+typedef std::pair<float, float> ScreenCoordinate;
 
 template<class T> 
 T fromString(const std::string& s) {

src/GameView.cpp

@@ -15,6 +15,38 @@ using std::pair;
 using std::runtime_error;
 using std::string;
 
+ViewElement::ViewElement(GameView& view, decltype(rect) rect) : view(view) {
+	using std::min;
+	using std::max;
+	
+	//rect.first is the min x/min y corner
+	//rect.second is the max x/max y corner
+	this->rect.first = {min(rect.first.first, rect.second.first), min(rect.first.second, rect.second.second)};
+	this->rect.second = {max(rect.first.first, rect.second.first), max(rect.first.second, rect.second.second)};
+}
+
+ViewElement::~ViewElement() {
+	
+}
+
+decltype(ViewElement::rect) ViewElement::getRect() const {
+	return rect;
+}
+
+bool ViewElement::containsPoint(ScreenCoordinate coord) const {
+	return rect.first.first < coord.first &&
+		rect.first.second < coord.second &&
+		coord.first < rect.second.first &&
+		coord.second < rect.second.second;
+}
+
+bool ViewElement::handleClick(ScreenCoordinate coord) {
+	if(containsPoint(coord)) {
+		return clicked(coord);
+	}
+	return false;
+}
+
 GameView::GameView(GameBoard& model, GameController& controller) : model(model), controller(controller) {
 
 }
@@ -29,14 +61,24 @@ void GameView::render() {
 	DrawingGameVisitor visitor(*this);
 	model.accept(visitor);
 
+	for(auto& it : viewElements) {
+		it->render();
+	}
+	
 	glFlush();
 }
 
 bool GameView::acceptInput(SDL_Event& event) {
 	if(event.type == SDL_QUIT) {
 		return false;
 	} else if(event.type == SDL_MOUSEBUTTONUP) {
-		controller.handleEvent(ClickCoordinateEvent(screenToCoord({(float) event.button.x / 900.f, 1.f - (float) event.button.y / 800.f})));
+		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;
+			}
+		}
+		controller.handleEvent(ClickCoordinateEvent(screenToCoord(screen)));
 	}
 	return true;
 }