Commit 1010afa2e68a105e796972084639d7af873c3bfe
2001-10-25T02:01:20
Removed redundant tempGlyph members
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 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index 43e4e20..6193de9 100755
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -52,10 +52,5 @@ class FTGL_EXPORT FTGLBitmapFont : public FTFont
*/
bool MakeGlyphList();
- /**
- * Temp variable for a FTBitmapGlyph
- */
- FTBitmapGlyph* tempGlyph;
-
};
#endif // __FTGLBitmapFont__
diff --git a/include/FTGLOutlineFont.h b/include/FTGLOutlineFont.h
index fee7499..2e8378d 100755
--- a/include/FTGLOutlineFont.h
+++ b/include/FTGLOutlineFont.h
@@ -52,10 +52,5 @@ class FTGL_EXPORT FTGLOutlineFont : public FTFont
*/
bool MakeGlyphList();
- /**
- * A temporary FTOutlineGlyph used for building the glyphList
- */
- FTOutlineGlyph* tempGlyph;
-
};
#endif // __FTGLOutlineFont__
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index 05cf171..8b8e150 100755
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -51,11 +51,6 @@ class FTGL_EXPORT FTGLPixmapFont : public FTFont
*/
bool MakeGlyphList();
- /**
- * A temporary FTPixmapGlyph used for building the glyphList
- */
- FTPixmapGlyph* tempGlyph;
-
};
diff --git a/include/FTGLPolygonFont.h b/include/FTGLPolygonFont.h
index 92c3b9a..14d3bf0 100755
--- a/include/FTGLPolygonFont.h
+++ b/include/FTGLPolygonFont.h
@@ -36,12 +36,6 @@ class FTGL_EXPORT FTGLPolygonFont : public FTFont
*/
bool MakeGlyphList();
- /**
- * A temporary FTPolyGlyph used for building the glyphList
- */
- FTPolyGlyph* tempGlyph;
-
-
};
diff --git a/include/FTGLTextureFont.h b/include/FTGLTextureFont.h
index 0f5ec01..a32c1c2 100755
--- a/include/FTGLTextureFont.h
+++ b/include/FTGLTextureFont.h
@@ -100,12 +100,6 @@ class FTGL_EXPORT FTGLTextureFont : public FTFont
void CreateTexture( int id, int width, int height, unsigned char* data);
/**
- * A temporary FTTextureGlyph used for building the glyphList
- */
- FTTextureGlyph* tempGlyph;
-
-
- /**
* The maximum texture dimension on this OpenGL implemetation
*/
long maxTextSize;
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index 9e1c56d..fef372b 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -4,7 +4,6 @@
FTGLBitmapFont::FTGLBitmapFont()
-: tempGlyph(0)
{}
@@ -23,7 +22,7 @@ bool FTGLBitmapFont::MakeGlyphList()
if( ftGlyph)
{
- tempGlyph = new FTBitmapGlyph( *ftGlyph);
+ FTBitmapGlyph* tempGlyph = new FTBitmapGlyph( *ftGlyph);
glyphList->Add( tempGlyph);
}
else
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index 25a4ed3..fcb404a 100755
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -5,7 +5,6 @@
FTGLOutlineFont::FTGLOutlineFont()
-: tempGlyph(0)
{}
@@ -21,7 +20,7 @@ bool FTGLOutlineFont::MakeGlyphList()
if( ftGlyph)
{
- tempGlyph = new FTOutlineGlyph( *ftGlyph);
+ FTOutlineGlyph* tempGlyph = new FTOutlineGlyph( *ftGlyph);
glyphList->Add( tempGlyph);
}
else
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index 0fe7caa..7ad2cfe 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -4,7 +4,6 @@
FTGLPixmapFont::FTGLPixmapFont()
-: tempGlyph(0)
{}
@@ -23,7 +22,7 @@ bool FTGLPixmapFont::MakeGlyphList()
if( ftGlyph)
{
- tempGlyph = new FTPixmapGlyph( *ftGlyph);
+ FTPixmapGlyph* tempGlyph = new FTPixmapGlyph( *ftGlyph);
glyphList->Add( tempGlyph);
}
else
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index 7cbb1ed..57a2033 100755
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -6,7 +6,6 @@
FTGLPolygonFont::FTGLPolygonFont()
-: tempGlyph(0)
{}
@@ -22,7 +21,7 @@ bool FTGLPolygonFont::MakeGlyphList()
if( ftGlyph)
{
- tempGlyph = new FTPolyGlyph( *ftGlyph);
+ FTPolyGlyph* tempGlyph = new FTPolyGlyph( *ftGlyph);
glyphList->Add( tempGlyph);
}
else
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 74c9b42..ca504e1 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -24,7 +24,6 @@ FTGLTextureFont::FTGLTextureFont()
: numTextures(1),
textMem(0),
padding(1),
- tempGlyph(0),
maxTextSize(0),
textureWidth(0),
textureHeight(0),
@@ -122,7 +121,7 @@ unsigned int FTGLTextureFont::FillGlyphs( unsigned int glyphStart, int id, int w
currTextU = (float)currentTextX / (float)width;
- tempGlyph = new FTTextureGlyph( *ftGlyph, id, data, width, height, currTextU, currTextV);
+ FTTextureGlyph* tempGlyph = new FTTextureGlyph( *ftGlyph, id, data, width, height, currTextU, currTextV);
glyphList->Add( tempGlyph);
currentTextX += glyphWidth;