Commit 15edcb375e2730903c1e265b7c98090475d27730
2001-12-11T03:53:24
Tidied up includes
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 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/src/FTCharmap.cpp b/src/FTCharmap.cpp
index 27178cd..ae75315 100644
--- a/src/FTCharmap.cpp
+++ b/src/FTCharmap.cpp
@@ -1,9 +1,8 @@
+#include "FTCharmap.h"
#ifdef FTGL_DEBUG
#include "mmgr.h"
#endif
-#include "FTCharmap.h"
-
FTCharmap::FTCharmap( FT_Face face)
: ftFace( face),
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 3604b06..af2df9e 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -1,12 +1,11 @@
+#include "FTGLTextureFont.h"
+#include "FTTextureGlyph.h"
#ifdef FTGL_DEBUG
#include "mmgr.h"
#endif
-#include "FTGLTextureFont.h"
-#include "FTGlyphContainer.h"
-#include "FTTextureGlyph.h"
-using namespace std;
+using namespace std; // for memset
inline GLuint NextPowerOf2( GLuint in)
@@ -35,8 +34,7 @@ FTGLTextureFont::FTGLTextureFont()
remGlyphs(0),
xOffset(0),
yOffset(0)
-{
-}
+{}
FTGLTextureFont::~FTGLTextureFont()
@@ -61,7 +59,6 @@ FTGlyph* FTGLTextureFont::MakeGlyph( unsigned int g)
glTextureID[0] = CreateTexture();
xOffset = yOffset = padding;
++numTextures;
-
}
// will it fit in the current texture
@@ -95,8 +92,6 @@ FTGlyph* FTGLTextureFont::MakeGlyph( unsigned int g)
}
-
-
bool FTGLTextureFont::MakeGlyphList()
{
if( !maxTextSize)