Removed unused code

ChangeLog

@@ -5,6 +5,10 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140119 ]
+	* Removed unused TGA font parts of GLString
+	* Removed unused glDrawGrid & glDrawAxis from SDLSystem
+
 	[ 20140118 ]
 	* Removed unused (and pretty empty) Entity class
 

include/GLString.h

@@ -15,7 +15,6 @@
 typedef struct gl_string_s {
     int x; //!< X Coordinate
     int y; //!< Y Coordinate
-    int font; //!< Font ID
     float scale; //!< Scale factor
     char *text; //!< Text buffer
     bool active; //!< active state
@@ -39,12 +38,10 @@ public:
     ~GLString();
 
     /*!
-     * \brief Set max number of strings and font faces
+     * \brief Set max number of strings
      * \param max_strings maximum number of strings
-     * \param max_fonts maximum number of fonts and length of tex_map
-     * \param tex_map int array as a map of font texture ids
      */
-    void Init(unsigned int max_strings, unsigned int max_fonts, int *tex_map);
+    void Init(unsigned int max_strings);
 
     /*!
      * \brief Sets a single byte in a string
@@ -86,21 +83,13 @@ public:
     void Scale(float scale);
 
     /*!
-     * \brief Adds a new font face to font list
-     * \param index valid index into the font base list
-     * \returns index of font on no error, -1 on full font list
-     */
-    int BuildFontList(int index);
-
-    /*!
      * \brief Generates a new string and renders it to the gl target
      * \param x valid X screen coordinate
      * \param y valid Y screen coordinate
-     * \param font valid font index
      * \param string valid format string with args like for printf
-     * \returns 0 on success, -1 on invalid string, -2 on full string list, -3 on full font list
+     * \returns 0 on success, -1 on invalid string, -2 on full string list
      */
-    int glPrintf(int x, int y, int font, const char *string, ...);
+    int glPrintf(int x, int y, const char *string, ...);
 
     /*!
      * \brief Renders strings over GL scene.
@@ -121,11 +110,7 @@ public:
 
 private:
     unsigned int _num_string_max; //!< Max number of strings buffered
-    unsigned int _num_font_max; //!< Max number of font faces
-    unsigned int _num_font; //!< Current number of font faces
     unsigned int _num_string; //!< Current number of strings buffered
-    int *_font_texture; //!< Font texture mapping to actual texture index
-    int *_font_base; //!< Font GL list, base index list
     gl_string_t *_string; //!< Buffered strings and their properities
     float _scale; //!< Default scale factor for new strings
 };

src/GLString.cpp

@@ -26,12 +26,8 @@
 GLString::GLString()
 {
 	_num_string_max = 0;
-	_num_font_max = 0;
-	_num_font = 0;
 	_num_string = 0;
 	_scale = 1.0;
-	_font_texture = NULL;
-	_font_base = NULL;
 	_string = NULL;
 }
 
@@ -40,22 +36,6 @@ GLString::~GLString()
 {
 	unsigned int i;
 
-
-	for (i = 0; i < _num_font; ++i)
-	{
-		glDeleteLists(_font_base[i], 256);
-	}
-
-	if (_font_texture)
-	{
-		delete [] _font_texture;
-	}
-
-	if (_font_base)
-	{
-		delete [] _font_base;
-	}
-
 	if (_string)
 	{
 
@@ -72,33 +52,18 @@ GLString::~GLString()
 }
 
 
-void GLString::Init(unsigned int max_strings, unsigned int max_fonts,
-						  int *tex_map)
+void GLString::Init(unsigned int max_strings)
 {
 	unsigned int i;
 
 
-	if (!max_strings || !max_fonts || !tex_map)
+	if (!max_strings)
 	{
 		return;
 	}
 
 	_num_string_max = max_strings;
-	_num_font_max = max_fonts;
-
-	_font_texture = new int[max_fonts];
-	_font_base = new int[max_fonts];
 	_string = new gl_string_t[max_strings];
-
-	for (i = 0; i < max_fonts; ++i)
-	{
-		_font_texture[i] = tex_map[i];
-
-		if (BuildFontList(i) < 0)
-		{
-			printf("GLString::Init> BuildFontList failed for %i\n", i);
-		}
-	}
 }
 
 
@@ -190,65 +155,7 @@ void GLString::Scale(float scale)
 }
 
 
-int GLString::BuildFontList(int index)
-{
-	int i;
-	float cx;
-	float cy;
-
-
-	if (_num_font >= _num_font_max || index < 0 || index >= (int)_num_font_max)
-	{
-		return -1;
-	}
-
-	_font_base[index] = glGenLists(256);
-	glBindTexture(GL_TEXTURE_2D, _font_texture[index]);
-
-	// Mongoose 2002.01.01, Generate 256 lists per font
-	//   one per symbol
-	for (i = 0; i < 256; i++)
-	{
-		/* X Position Of Current Character */
-		cx = 1 - (float)(i % 16) / 16.0f;
-		/* Y Position Of Current Character */
-		cy = 1 - (float)(i / 16) / 16.0f;
-
-		/* Start Building A List */
-		glNewList(_font_base[index] + (255 - i), GL_COMPILE);
-		/* Use A Quad For Each Character */
-		glBegin(GL_QUADS);
-		/* Texture Coord (Bottom Left) */
-		glTexCoord2f(cx - 0.0625, cy);
-		/* Vertex Coord (Bottom Left) */
-		glVertex2i(0, 0);
-
-		/* Texture Coord (Bottom Right) */
-		glTexCoord2f(cx, cy);
-		/* Vertex Coord (Bottom Right) */
-		glVertex2i(16, 0);
-
-		/* Texture Coord (Top Right) */
-		glTexCoord2f(cx, cy - 0.0625f);
-		 /* Vertex Coord (Top Right) */
-		glVertex2i(16, 16);
-
-		/* Texture Coord (Top Left) */
-		glTexCoord2f(cx - 0.0625f, cy - 0.0625f);
-		/* Vertex Coord (Top Left) */
-		glVertex2i(0, 16);
-		glEnd();
-
-		/* Move To The Left Of The Character */
-		glTranslated(10, 0, 0);
-		glEndList();
-	}
-
-	return 0;
-}
-
-
-int GLString::glPrintf(int x, int y, int font, const char *string, ...)
+int GLString::glPrintf(int x, int y, const char *string, ...)
 {
 	int sz = 60;
 	int n;
@@ -267,11 +174,6 @@ int GLString::glPrintf(int x, int y, int font, const char *string, ...)
 		return -2;
 	}
 
-	if (font < 0 || font > (int)_num_font_max)
-	{
-		return -3;
-	}
-
 	// Mongoose 2002.01.01, Assume no longer than 'sz' wide lines
 	//   on first try
 	_string[_num_string].text = new char[sz];
@@ -283,9 +185,6 @@ int GLString::glPrintf(int x, int y, int font, const char *string, ...)
 	_string[_num_string].x = x;
 	_string[_num_string].y = y;
 
-	//  Mongoose 2002.01.01, Setup font list base index to use
-	_string[_num_string].font = font;
-
 	va_start(args, string);
 
 	// Mongoose 2002.01.01, Get exact size needed if the first try fails
@@ -336,48 +235,6 @@ void GLString::Render(int width, int height)
 {
 	unsigned int i;
 
-#ifndef HAVE_SDL_TTF
-	// Mongoose 2001.12.31, Start the evil font rendering...
-	glLoadIdentity();
-	glDisable(GL_DEPTH_TEST);
-
-	// Mongoose 2001.12.31, New 'flat' projection
-	glMatrixMode(GL_PROJECTION);
-	glPushMatrix();
-	glLoadIdentity();
-	glOrtho(0, width, 0, height, -1, 1);
-
-	// Mongoose 2001.12.31, New rendering matrix
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-	glLoadIdentity();
-
-	// Mongoose 2001.12.31, Rasterize strings' text
-	for (i = 0; i < _num_string; ++i)
-	{
-		if (_string[i].active)
-		{
-			glPushMatrix();
-			glBindTexture(GL_TEXTURE_2D, _font_texture[_string[i].font]);
-			glTranslated(_string[i].x, _string[i].y, 0);
-			glScaled(_string[i].scale, _string[i].scale, _string[i].scale);
-			glListBase(_font_base[_string[i].font] - 32);
-			glCallLists(strlen(_string[i].text), GL_BYTE, _string[i].text);
-			glPopMatrix();
-		}
-	}
-
-
-	// Mongoose 2001.12.31, Restore scene projection
-	glMatrixMode(GL_PROJECTION);
-	glPopMatrix();
-
-	// Mongoose 2001.12.31, Restore scene matrix
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
-
-	glEnable(GL_DEPTH_TEST);
-#else
 	for (i = 0; i < _num_string; ++i)
 	{
 		if (_string[i].active)
@@ -387,7 +244,6 @@ void GLString::Render(int width, int height)
 						 _string[i].text);
 		}
 	}
-#endif
 }
 
 

src/OpenRaider.cpp

@@ -1247,7 +1247,7 @@ void OpenRaider::gameFrame()
 		if (time - lastTime > 100.0f)
 		{
 			if (mText)
-				mText->SetString(1, "FPS %d", frames);
+				mText->SetString(1, "%dFPS", frames);
 
 			lastTime = time;
 			frames = 0;

src/Render.cpp

@@ -197,7 +197,6 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
 	int snow2_id;
 	int bg_id;
 	int err;
-	int id[5];
 	unsigned int numTextures = 0;
 	unsigned char color[4];
 
@@ -267,61 +266,57 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
 	// Setup particle system test
 	initEmitter("Snow test", 650, snow1_id, snow2_id);
 
-	// Mongoose 2002.01.01, Temp placement of GLString init
-	id[0] = font_id;
-	id[4] = id[3] = id[2] = id[1] = -1;
-
-	mString.Init(5, 5, id);
+	mString.Init(5);
 
 	// String 0: OpenRaider version in lower right corner
 	mString.Scale(1.00);
 	err = mString.glPrintf(mWidth - 15 * strlen(VERSION),
-								  mHeight-35, 0, VERSION);
+								  mHeight-35, VERSION);
 	mString.SetString(0, VERSION);
 
 	if (err)
 	{
-		printf("\n*** GLPrint test: ERROR %i font_tex %i\n", err, id[0]);
+		printf("\n*** GLPrint test: ERROR %i\n", err);
 	}
 
 	// String 1: Used for FPS in game text output
-	mString.Scale(1.0);
-	err = mString.glPrintf(8, mHeight - 35, 0, "                ");
+	mString.Scale(0.75);
+	err = mString.glPrintf(8, mHeight - 25, "                ");
     mString.SetString(1, "                ");
 
 	if (err)
 	{
-		printf("\n*** GLPrint test: ERROR %i font_tex %i\n", err, id[0]);
+		printf("\n*** GLPrint test: ERROR %i\n", err);
 	}
 
 	// String 2: Used for game console
     mString.Scale(1.0);
-	err = mString.glPrintf(8, 25, 0, console);
+	err = mString.glPrintf(8, 25, console);
     mString.SetString(2, console);
 
 	if (err)
 	{
-		printf("\n*** GLPrint test: ERROR %i font_tex %i\n", err, id[0]);
+		printf("\n*** GLPrint test: ERROR %i\n", err);
 	}
 
 	// String 3: Used for one line map select menu
 	mString.Scale(1.75);
-	err = mString.glPrintf(mWidth/2-235, mHeight/2-24, 0, menu);
+	err = mString.glPrintf(mWidth/2-235, mHeight/2-24, menu);
     mString.SetString(3, menu);
 
 	if (err)
 	{
-		printf("\n*** GLPrint test: ERROR %i font_tex %i\n", err, id[0]);
+		printf("\n*** GLPrint test: ERROR %i\n", err);
 	}
 
 	// String 4: Used for one line in game text output
 	mString.Scale(1.0);
-	err = mString.glPrintf(8, 55, 0, "                    ");
+	err = mString.glPrintf(8, 55, "                    ");
     mString.SetString(4, "                    ");
 
 	if (err)
 	{
-		printf("\n*** GLPrint test: ERROR %i font_tex %i\n", err, id[0]);
+		printf("\n*** GLPrint test: ERROR %i\n", err);
 	}
 
 	printf("\n");

src/SDLSystem.cpp

@@ -48,74 +48,6 @@
 unsigned int *gWidth = 0x0;
 unsigned int *gHeight = 0x0;
 
-/* 500, 50 */
-void glDrawGrid(float size, float step)
-{
-	float x, y;
-
-
-	// Draw grid
-	glPushMatrix();
-	glScalef(2.0f, 2.0f, 2.0f);
-	glColor3f(0.4f, 0.4f, 0.6f);
-
-	for (x = -size; x < size; x += step)
-	{
-		glBegin(GL_LINE_LOOP);
-		for (y = -size; y < size; y += step)
-		{
-			glVertex3f(x + step, 0.0f, y);
-			glVertex3f(x, 0.0f, y);
-			glVertex3f(x, 0.0f, y + step);
-			glVertex3f(x + step, 0.0f, y + step);
-		}
-		glEnd();
-	}
-
-	glPopMatrix();
-}
-
-void glDrawAxis(float length, float arrowLenght)
-{
-	/* Draw axis list to show bone orientation */
-	glBegin(GL_LINES);
-
-	/* X axis */
-	glColor3f(1.0f, 0.0f, 0.0f);
-	glVertex3f(-8.0f, 0.0f, 0.0f);
-	glVertex3f(8.0f, 0.0f, 0.0f);
-
-	/* X direction */
-	glVertex3f(8.0f, 0.0f, 0.0f);
-	glVertex3f(7.0f, 1.0f, 0.0f);
-	glVertex3f(8.0f, 0.0f, 0.0f);
-	glVertex3f(7.0f, -1.0f, 0.0f);
-
-	/* Y axis */
-	glColor3f(0.0f, 1.0f, 0.0f);
-	glVertex3f(0.0f, -8.0f, 0.0f);
-	glVertex3f(0.0f, 8.0f, 0.0f);
-
-	/* Y direction */
-	glVertex3f(0.0f, 8.0f, 0.0f);
-	glVertex3f(0.0f, 7.0f, 1.0f);
-	glVertex3f(0.0f, 8.0f, 0.0f);
-	glVertex3f(0.0f, 7.0f, -1.0f);
-
-	/* Z axis */
-	glColor3f(0.0f, 0.0f, 1.0f);
-	glVertex3f(0.0f, 0.0f, -8.0f);
-	glVertex3f(0.0f, 0.0f, 8.0f);
-
-	/* Z direction */
-	glVertex3f(0.0f, 0.0f, 8.0f);
-	glVertex3f(0.0f, 1.0f, 7.0f);
-	glVertex3f(0.0f, 0.0f, 8.0f);
-	glVertex3f(0.0f, -1.0f, 7.0f);
-
-	glEnd();
-}
-
 
 ////////////////////////////////////////////////////////////
 // Constructors
@@ -210,7 +142,7 @@ void SDLSystem::setGrabMouse(bool on)
 void SDLSystem::initVideo(unsigned int width, unsigned int height,
 								  bool fullscreen)
 {
-	int flags; //, x, y;
+	int flags = 0; //, x, y;
 
 
 	// Create GL context
@@ -242,15 +174,11 @@ void SDLSystem::initVideo(unsigned int width, unsigned int height,
 	}
 #endif
 
-	flags = 0;
-
 	flags |= SDL_OPENGL;
 
     mFullscreen = fullscreen;
 	if (mFullscreen)
-	{
 		flags |= SDL_FULLSCREEN;
-	}
 
     SDL_ShowCursor(SDL_DISABLE);
     setGrabMouse(true); // Always grab mouse!
@@ -280,7 +208,7 @@ void SDLSystem::initVideo(unsigned int width, unsigned int height,
 
 void SDLSystem::resize(unsigned int width, unsigned int height)
 {
-    int flags;
+    int flags = 0;
 
 	GLfloat aspect;
 
@@ -306,7 +234,8 @@ void SDLSystem::resize(unsigned int width, unsigned int height)
 	glLoadIdentity();
 
 	// Resize window
-    flags = SDL_OPENGL;
+    flags |= SDL_OPENGL;
+
     if (mFullscreen)
         flags |= SDL_FULLSCREEN;
 

src/Texture.cpp

@@ -231,7 +231,7 @@ void glPrint3d(float x, float y, float z,
 	glRotatef(pitch, 0, 0, 1);
 	glScalef(scale, scale, scale);
 
-	/* FIXME:
+	/*! \fixme
 	 * Add utf-8 dencoding of char* string
 	 *
 	 *	Also this string must be preprocessed to have glyph offsets
@@ -278,7 +278,7 @@ int Texture::loadFontTTF(const char *filename,
 
 		gFontTest = generateFont(texture);
 
-		/* FIXME: Until UTF8 decoder is working, we map from
+		/*! \fixme Until UTF8 decoder is working, we map from
 			ASCII when rendering */
 		gFontTest->utf8Offset = 32; // hack to use ASCII strings to test unicode