Commit 15c06ee529cbbf3e48773dd317acaf74745361d8
2001-09-14T01:11:02
Added FIXME comment for max number of textures
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
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index d5a6124..c7e1c4c 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -8,7 +8,6 @@
typedef unsigned long UInt32; // a mac thing?
-
inline UInt32 NextPowerOf2( UInt32 in)
{
in -= 1;
@@ -56,7 +55,7 @@ bool FTGLTextureFont::MakeGlyphList()
if( textureHeight > maxTextSize)
{
numTextures = static_cast<int>( textureHeight / maxTextSize) + 1;
- if( numTextures > 15)
+ if( numTextures > 15) // FIXME
numTextures = 15;
int heightRemain = NextPowerOf2( textureHeight % maxTextSize);
@@ -125,7 +124,7 @@ unsigned int FTGLTextureFont::FillGlyphs( unsigned int glyphStart, int id, int w
tempGlyph = new FTTextureGlyph( *ftGlyph, n, id, data, width, height, currTextU, currTextV);
glyphList->Add( tempGlyph);
-
+
currentTextX += glyphWidth;
if( currentTextX > ( width - glyphWidth))
{
@@ -149,7 +148,7 @@ unsigned int FTGLTextureFont::FillGlyphs( unsigned int glyphStart, int id, int w
void FTGLTextureFont::GetSize()
{
- //work out the max width. Most likely maxTextSize!
+ //work out the max width. Most likely maxTextSize
textureWidth = NextPowerOf2( numGlyphs * glyphWidth);
if( textureWidth > maxTextSize)
{