Commit 24f0f7f16fd21c088e799696dc17681110c08740

henry 2001-10-28T04:06:52

Got rid of the static in FTTextureGlyph and tidied the code up

diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 6f70bb7..bf49b72 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -177,13 +177,8 @@ void FTGLTextureFont::render( const char* string)
 	glEnable(GL_BLEND);
  	glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE
  	
-	glBindTexture( GL_TEXTURE_2D, (GLuint)FTTextureGlyph::activeTextureID);
+ 	FTFont::render( string);
 
- 	// QUADS are faster!? Less function call overhead?
- 	glBegin( GL_QUADS);
- 		FTFont::render( string);
- 	glEnd();
-	
 	glPopAttrib();
 }
 
@@ -195,12 +190,7 @@ void FTGLTextureFont::render( const wchar_t* string)
 	glEnable(GL_BLEND);
  	glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE
  	
-	glBindTexture( GL_TEXTURE_2D, (GLuint)FTTextureGlyph::activeTextureID);
-
- 	// QUADS are faster!? Less function call overhead?
- 	glBegin( GL_QUADS);
- 		FTFont::render( string);
- 	glEnd();
+ 	FTFont::render( string);
 	
 	glPopAttrib();
 }