Commit a5fd3ea108e3e5b430c17414a6895d71a7d0a1e7
2008-05-21T16:38:25
* Revert the simple C++ demo to its previous state, now that FTBufferFont starts to work.
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 41 42 43 44 45 46 47
diff --git a/demo/simple.cpp b/demo/simple.cpp
index aa25bd8..710b58f 100644
--- a/demo/simple.cpp
+++ b/demo/simple.cpp
@@ -103,12 +103,9 @@ static void RenderScene(void)
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-#if 0
glEnable(GL_LIGHTING);
-#endif
glEnable(GL_DEPTH_TEST);
-#if 0
glPushMatrix();
glTranslatef(-0.9, -0.2, -10.0);
float ambient[4] = { (t1 + 2.0) / 3,
@@ -123,14 +120,11 @@ static void RenderScene(void)
glLightfv(GL_LIGHT1, GL_POSITION, position);
glEnable(GL_LIGHT1);
glPopMatrix();
-#endif
glPushMatrix();
-#if 0
float front_ambient[4] = { 0.7, 0.7, 0.7, 0.0 };
glMaterialfv(GL_FRONT, GL_AMBIENT, front_ambient);
glColorMaterial(GL_FRONT, GL_DIFFUSE);
-#endif
glTranslatef(0.0, 0.0, 20.0);
glRotatef(n / 1.11, 0.0, 1.0, 0.0);
glRotatef(n / 2.23, 1.0, 0.0, 0.0);
@@ -203,11 +197,9 @@ int main(int argc, char **argv)
gluLookAt(0.0, 0.0, 640.0f / 2.0f, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
// Initialise FTGL stuff
- //font[0] = new FTExtrudeFont(file);
- font[0] = new FTOutlineFont(file);
- font[1] = new FTBufferFont(file);
- font[2] = new FTTextureFont(file);
- //font[2] = new FTHaloFont(file);
+ font[0] = new FTExtrudeFont(file);
+ font[1] = new FTPolygonFont(file);
+ font[2] = new FTHaloFont(file);
if(font[0]->Error() || font[1]->Error() || font[2]->Error())
{