Commit 5fdcdcb89d105fc60d92076798d1ed5b3dc9a6c4
2002-11-28T08:01:38
Removed some redundant code
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/demo/FTGLDemo.cpp b/demo/FTGLDemo.cpp
index 317fd96..c33ba1d 100644
--- a/demo/FTGLDemo.cpp
+++ b/demo/FTGLDemo.cpp
@@ -104,18 +104,8 @@ void do_display (void)
switch( current_font)
{
case FTGL_BITMAP:
-// glDisable( GL_BLEND);
- break;
case FTGL_PIXMAP:
-// glDisable( GL_TEXTURE_2D);
-// glEnable(GL_BLEND);
-// glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE
- break;
case FTGL_OUTLINE:
-// glDisable( GL_TEXTURE_2D);
-// glEnable( GL_LINE_SMOOTH);
-// glEnable(GL_BLEND);
-// glBlendFunc( GL_SRC_ALPHA, GL_ONE); // GL_ONE_MINUS_SRC_ALPHA
break;
case FTGL_POLYGON:
glDisable( GL_BLEND);
@@ -131,7 +121,6 @@ void do_display (void)
glDisable( GL_DEPTH_TEST);
my_lighting();
glNormal3f( 0.0, 0.0, 1.0);
-// glDisable( GL_BLEND);
break;
}
@@ -191,7 +180,7 @@ void do_display (void)
glColor3f( 0.0, 0.0, 1.0);
glVertex3f( 0.0, 0.0, 0.0);
glVertex3f( fonts[current_font]->Advance( myString), 0.0, 0.0);
-
+
glVertex3f( 0.0, fonts[current_font]->Ascender(), 0.0);
glVertex3f( 0.0, fonts[current_font]->Descender(), 0.0);