Merge pull request #21 from Databean/addSDL_ttf

Add sdl ttf

Author: apolitakis

Makefile

@@ -8,7 +8,7 @@ ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++
 export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -Wall
-export LDFLAGS := -L/usr/local/lib -lSDL2 -lGL -lGLU
+export LDFLAGS := -L/usr/local/lib -lSDL2 -lSDL2_ttf -lGL -lGLU
 
 .PHONY: all
 all: $(EXECUTABLE)

include/Renderer.h

@@ -1,6 +1,8 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
+#include <string>
+
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_opengl.h>
 #include <GL/gl.h>
@@ -12,6 +14,8 @@ void renderBoard(const GameBoard& board, const Player& perspective);
 
 GLuint loadImageAsTexture(const std::string& name);
 
+void renderText(const std::string& font, int fontSize, const std::pair<float, float> bottomLeft, const std::pair<float, float> topRight, const std::string& text);
+
 std::pair<float, float> coordToScreen(const Coordinate& coord);
 Coordinate screenToCoord(const std::pair<float, float>&);
 

resources/TypeWritersSubstitute-Black.ttf

@@ -93,6 +93,8 @@ void GameView::render() {
 		it->render();
 	}
 
+	renderText("resources/TypeWritersSubstitute-Black.ttf", 20, {.2, .9}, {.8, 1}, "Settlers of Catan");
+	
 	glFlush();
 }
 

resources/TypeWritersSubstitute-Oblique.ttf

@@ -11,6 +11,7 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_opengl.h>
+#include <SDL2/SDL_ttf.h>
 #include <GL/gl.h>
 
 #include "GameBoard.h"
@@ -21,6 +22,59 @@ using std::pair;
 using std::runtime_error;
 using std::string;
 
+/**
+ * Render some text on screen.
+ * 
+ * @param fontPath The path to the font ttf
+ * @param fontSize The size to draw the letters in.
+ * @param bottomLeft The bottom left screen coordinate of the bounding box to draw to.
+ * @param topRight The top right screen coordinate of the bounding box to draw to.
+ * @param text The text to render.
+ */
+void renderText(const std::string& fontPath, int fontSize, const std::pair<float, float> bottomLeft, const std::pair<float, float> topRight, const std::string& text) {
+	TTF_Font* font = TTF_OpenFont(fontPath.c_str(), fontSize);
+	if(!font) {
+		throw runtime_error("TTF_OpenFont: " + string(TTF_GetError()));
+	}
+	
+	SDL_Color color { 0, 0, 0, 255 };
+	
+	SDL_Surface* textSurface = TTF_RenderText_Solid(font, text.c_str(), color);
+	TTF_CloseFont(font);
+	
+	if(!textSurface) {
+		throw runtime_error("TTF_RenderText_Solid: " + string(TTF_GetError()));
+	}
+	
+	SDL_PixelFormat* format = SDL_AllocFormat(SDL_PIXELFORMAT_RGB888);
+	SDL_Surface* imageSurface = SDL_ConvertSurface(textSurface, format, 0);
+	SDL_FreeSurface(textSurface);
+	SDL_FreeFormat(format);
+	
+	GLuint texture;
+	glGenTextures(1, &texture);
+	glBindTexture(GL_TEXTURE_2D, texture);
+	
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, imageSurface->w, imageSurface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, imageSurface->pixels);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	
+	SDL_FreeSurface(imageSurface);
+	
+	glBegin(GL_QUADS);
+	glTexCoord2f(0, 1);
+	glVertex2f(bottomLeft.first, bottomLeft.second);
+	glTexCoord2f(0, 0);
+	glVertex2f(bottomLeft.first, topRight.second);
+	glTexCoord2f(1, 0);
+	glVertex2f(topRight.first, topRight.second);
+	glTexCoord2f(1, 1);
+	glVertex2f(topRight.first, bottomLeft.second);
+	glEnd();
+	
+	glDeleteTextures(1, &texture);
+}
+
 /**
  * Loads an image into an OpenGL texture.
  * @param name The file name of the texture to load.

src/GameView.cpp

@@ -3,6 +3,7 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_opengl.h>
+#include <SDL2/SDL_ttf.h>
 
 #include <GL/gl.h>
 #include <GL/glu.h>
@@ -49,11 +50,18 @@ void updateViewport(int width, int height) {
  * Main. Initializes SDL and the model, view, and controller. Also has the main game loop.
  */
 int main(int argc, char *argv[]) {
+	const int windowWidth = 900, windowHeight = 800;
+	
+	if(TTF_Init()==-1) {
+		std::cout << "Error in TTF_Init: " << TTF_GetError() << std::endl;
+		return 2;
+	}
+	
 	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
 	SDL_Window* displayWindow;
 	SDL_Renderer* displayRenderer;
 	SDL_RendererInfo displayRendererInfo;
-	SDL_CreateWindowAndRenderer(900, 800, SDL_WINDOW_OPENGL, &displayWindow, &displayRenderer);
+	SDL_CreateWindowAndRenderer(windowWidth, windowHeight, SDL_WINDOW_OPENGL, &displayWindow, &displayRenderer);
 	SDL_GetRendererInfo(displayRenderer, &displayRendererInfo);
 	/*TODO: Check that we have OpenGL */
 	if ((displayRendererInfo.flags & SDL_RENDERER_ACCELERATED) == 0 || 
@@ -66,7 +74,7 @@ int main(int argc, char *argv[]) {
 
 	initOpenGL();
 
-	updateViewport(1024, 768);
+	updateViewport(windowWidth, windowHeight);
 
 	vector<unique_ptr<Player>> players;
 	players.emplace_back(unique_ptr<Player>(new Player("test")));