Enable linear filtering for font texture

ChangeLog

@@ -6,9 +6,12 @@
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
 	[ 20140119 ]
+	* Enabled linear texture filtering for fonts, resulting in nicer
+	  looking down scaling
 	* Removed unused TGA font parts of GLString with slight API changes
 	* Modified GLString Unit Test to work with new GLString
-	* Removed unused glDrawGrid & glDrawAxis from SDLSystem
+	* Removed unused glDrawGrid, glDrawAxis, glPrintf2d, glPrintf3d
+	  from SDLSystem
 	* Silenced many more warnings
 
 	[ 20140118 ]

Makefile

@@ -110,7 +110,7 @@ LD_FLAGS=-L/usr/X11/lib -lXmu -lXt -lSM -lICE -lXext -lX11 -lXi \
 	 -lm $(BASE_LIBS)
 
 RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
-	-fomit-frame-pointer -O2
+	-fomit-frame-pointer -O2 -Wall
 
 DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 $(DEBUG_DEFS) $(WARNINGS)
 

src/GLString.cpp

@@ -54,9 +54,6 @@ GLString::~GLString()
 
 void GLString::Init(unsigned int max_strings)
 {
-	unsigned int i;
-
-
 	if (!max_strings)
 	{
 		return;

src/SDLSystem.cpp

@@ -98,41 +98,6 @@ void SDLSystem::bindKeyCommand(const char *cmd, int key, int event)
 #endif
 
 
-
-void SDLSystem::glPrintf2d(float x, float y, char *string)
-{
-#ifdef HAVE_SDL_TTF
-#   ifdef FIXME
-	//! \fixme Filler
-	glBindTexture(GL_TEXTURE_2D, texture);
-	glBegin(GL_TRIANGLE_STRIP);
-	glTexCoord2f(texMinX, texMinY); glVertex2i(x,   y  );
-	glTexCoord2f(texMaxX, texMinY); glVertex2i(x+w, y  );
-	glTexCoord2f(texMinX, texMaxY); glVertex2i(x,   y+h);
-	glTexCoord2f(texMaxX, texMaxY); glVertex2i(x+w, y+h);
-	glEnd();
-#   endif
-#endif
-}
-
-
-void SDLSystem::glPrintf3d(float x, float y, float z, char *string)
-{
-#ifdef HAVE_SDL_TTF_FIXME
-	/*! \fixme Filler
-	 * Billboarding here requires a yaw jackass =)
-     */
-	glBindTexture(GL_TEXTURE_2D, texture);
-	glBegin(GL_TRIANGLE_STRIP);
-	glTexCoord2f(texMinX, texMinY); glVertex2i(x,   y  );
-	glTexCoord2f(texMaxX, texMinY); glVertex2i(x+w, y  );
-	glTexCoord2f(texMinX, texMaxY); glVertex2i(x,   y+h);
-	glTexCoord2f(texMaxX, texMaxY); glVertex2i(x+w, y+h);
-	glEnd();
-#endif
-}
-
-
 void SDLSystem::setGrabMouse(bool on)
 {
 	SDL_WM_GrabInput(on ? SDL_GRAB_ON : SDL_GRAB_OFF);

src/Texture.cpp

@@ -183,12 +183,14 @@ void glPrint2d(float x, float y, float scale, char *string)
 		static int errors = 0;
 
 		if (errors < 10)
-			printf("ERROR: glPrintf2d failed, %i\n", ++errors);
+			printf("ERROR: glPrint2d failed, %i\n", ++errors);
 		return;
 	}
 
 	glPushMatrix();
 	glBindTexture(GL_TEXTURE_2D, font->textureId);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTranslatef(x, y, 0);
 	glScalef(scale, scale, 1);
 
@@ -215,12 +217,14 @@ void glPrint3d(float x, float y, float z,
 		static int errors = 0;
 
 		if (errors < 10)
-			printf("ERROR: glPrintf3d failed, %i\n", ++errors);
+			printf("ERROR: glPrint3d failed, %i\n", ++errors);
 		return;
 	}
 
 	glPushMatrix();
 	glBindTexture(GL_TEXTURE_2D, font->textureId);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTranslatef(x, y, z);
 	glRotatef(roll,  1, 0, 0);
 	glRotatef(yaw,   0, 1, 0);