Commit 678be1a16bd0d98078038ad7126f581b2b749c68
2001-08-05T21:34:40
Minor tidy ups
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
diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index 427054e..b85bd94 100755
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -1,5 +1,5 @@
-#ifndef __FTGLBitmapFont
-#define __FTGLBitmapFont
+#ifndef __FTGLBitmapFont__
+#define __FTGLBitmapFont__
#include "FTFont.h"
@@ -23,4 +23,4 @@ class FTGLBitmapFont : public FTFont
FTBitmapGlyph* tempGlyph;
};
-#endif
+#endif // __FTGLBitmapFont__
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index 68f4759..a5044d2 100755
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -12,7 +12,7 @@ class FTGLPixmapFont : public FTFont
// methods
FTGLPixmapFont();
~FTGLPixmapFont();
-
+
private:
// methods
bool MakeGlyphList();
diff --git a/include/FTLibrary.h b/include/FTLibrary.h
index 5bb3a8c..d88dc01 100755
--- a/include/FTLibrary.h
+++ b/include/FTLibrary.h
@@ -8,7 +8,7 @@
#include "FTGL.h"
-// OPSignature: FTLibrary
+
class FTLibrary
{
public:
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index ead744a..3646e2b 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -4,22 +4,12 @@
FTGLBitmapFont::FTGLBitmapFont()
-//Insert your own initialization here.
-
-//End of user initialization.
-{
-//Insert your own code here.
-
-//End of user code.
-}
+: tempGlyph(0)
+{}
FTGLBitmapFont::~FTGLBitmapFont()
-{
-//Insert your own code here.
-
-//End of user code.
-}
+{}
// OPSignature: bool FTGlyphContainer:MakeGlyphList()
@@ -29,7 +19,6 @@ bool FTGLBitmapFont::MakeGlyphList()
FT_Face* ftFace = face.Face();
long glyphIndex;
- FT_Error err;
for( int c = 0; c < numGlyphs; ++c)
{
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index 7f9da7e..4529e56 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -4,22 +4,12 @@
FTGLPixmapFont::FTGLPixmapFont()
-//Insert your own initialization here.
-
-//End of user initialization.
-{
-//Insert your own code here.
-
-//End of user code.
-}
+: tempGlyph(0)
+{}
FTGLPixmapFont::~FTGLPixmapFont()
-{
-//Insert your own code here.
-
-//End of user code.
-}
+{}
// OPSignature: bool FTGlyphContainer:MakeGlyphList()
@@ -50,4 +40,4 @@ bool FTGLPixmapFont::MakeGlyphList()
glyphList->Add( tempGlyph);
}
-}
+}
\ No newline at end of file
diff --git a/src/FTLibrary.cpp b/src/FTLibrary.cpp
index b847543..ccdc25c 100755
--- a/src/FTLibrary.cpp
+++ b/src/FTLibrary.cpp
@@ -2,7 +2,6 @@
#include "FTGL.h"
-// OPSignature: FTLibrary& FTLibrary:Instance()
FTLibrary& FTLibrary::Instance()
{
static FTLibrary ftlib;
@@ -10,7 +9,6 @@ FTLibrary& FTLibrary::Instance()
}
-// OPSignature: FTLibrary:~FTLibrary()
FTLibrary::~FTLibrary()
{
if( lib != 0)
@@ -31,7 +29,6 @@ FTLibrary::~FTLibrary()
}
-// OPSignature: FTLibrary:FTLibrary()
FTLibrary::FTLibrary()
: lib(0)
{
@@ -39,7 +36,6 @@ FTLibrary::FTLibrary()
}
-// OPSignature: bool FTLibrary:Init()
bool FTLibrary::Init()
{
if( lib != 0 )
@@ -63,6 +59,5 @@ bool FTLibrary::Init()
// return false;
// }
-
return true;
}