Commit 51a202a368c9e344be6104090b162fa9bcaa590a

henry 2004-10-11T09:46:30

Added a test for pen position

diff --git a/test/FTGLBitmapFont-Test.cpp b/test/FTGLBitmapFont-Test.cpp
index b5345f2..5926c17 100644
--- a/test/FTGLBitmapFont-Test.cpp
+++ b/test/FTGLBitmapFont-Test.cpp
@@ -14,6 +14,7 @@ class FTGLBitmapFontTest : public CppUnit::TestCase
     CPPUNIT_TEST_SUITE( FTGLBitmapFontTest);
         CPPUNIT_TEST( testConstructor);
         CPPUNIT_TEST( testRender);
+        CPPUNIT_TEST( testPenPosition);
         CPPUNIT_TEST( testDisplayList);
     CPPUNIT_TEST_SUITE_END();
         
@@ -41,7 +42,7 @@ class FTGLBitmapFontTest : public CppUnit::TestCase
         void testRender()
         {
             buildGLContext();
-        
+
             FTGLBitmapFont* bitmapFont = new FTGLBitmapFont( FONT_FILE);            
             bitmapFont->Render(GOOD_ASCII_TEST_STRING);
 
@@ -54,6 +55,29 @@ class FTGLBitmapFontTest : public CppUnit::TestCase
             CPPUNIT_ASSERT( bitmapFont->Error() == 0);        
             CPPUNIT_ASSERT( glGetError() == GL_NO_ERROR);        
         }
+        
+        
+        void testPenPosition()
+        {
+            buildGLContext();
+            float rasterPosition[4];
+            
+            glRasterPos2f(0.0f,0.0f);
+            
+            glGetFloatv(GL_CURRENT_RASTER_POSITION, rasterPosition);
+            CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, rasterPosition[0], 0.01);
+            
+            FTGLBitmapFont* bitmapFont = new FTGLBitmapFont( FONT_FILE);            
+            bitmapFont->FaceSize(18);
+
+            bitmapFont->Render(GOOD_ASCII_TEST_STRING);
+            bitmapFont->Render(GOOD_ASCII_TEST_STRING);
+
+            glGetFloatv(GL_CURRENT_RASTER_POSITION, rasterPosition);
+            CPPUNIT_ASSERT_DOUBLES_EQUAL( 122, rasterPosition[0], 0.01);
+            CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, rasterPosition[1], 0.01);
+        }
+
 
         void testDisplayList()
         {
diff --git a/test/FTGLPixmapFont-Test.cpp b/test/FTGLPixmapFont-Test.cpp
index 326084d..4c82148 100644
--- a/test/FTGLPixmapFont-Test.cpp
+++ b/test/FTGLPixmapFont-Test.cpp
@@ -41,7 +41,7 @@ class FTGLPixmapFontTest : public CppUnit::TestCase
         void testRender()
         {
             buildGLContext();
-        
+            
             FTGLPixmapFont* pixmapFont = new FTGLPixmapFont( FONT_FILE);            
 
             pixmapFont->Render(GOOD_ASCII_TEST_STRING);