Commit df172ba4aaeb2e05e6909a463f41a7ea907cdf2a
2001-10-10T22:03:16
Minor changes, mainly to includes, for the windows port
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
diff --git a/src/FTBitmapGlyph.cpp b/src/FTBitmapGlyph.cpp
index 07af04a..d7af2c8 100755
--- a/src/FTBitmapGlyph.cpp
+++ b/src/FTBitmapGlyph.cpp
@@ -1,7 +1,4 @@
-#include "GL/gl.h"
-
#include "FTBitmapGlyph.h"
-#include "FTGL.h"
FTBitmapGlyph::FTBitmapGlyph( FT_Glyph glyph)
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index c85e18c..9e1c56d 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -1,5 +1,3 @@
-#include "GL/gl.h"
-
#include "FTGLBitmapFont.h"
#include "FTGlyphContainer.h"
#include "FTBitmapGlyph.h"
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index 9a06af9..25a4ed3 100755
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -1,5 +1,3 @@
-#include "GL/gl.h"
-
#include "FTGLOutlineFont.h"
#include "FTGlyphContainer.h"
#include "FTGL.h"
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index e00d1f9..0fe7caa 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -1,5 +1,3 @@
-#include "GL/gl.h"
-
#include "FTGLPixmapFont.h"
#include "FTGlyphContainer.h"
#include "FTPixmapGlyph.h"
@@ -64,3 +62,4 @@ void FTGLPixmapFont::render( const wchar_t* string)
glPopAttrib();
}
+
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 8a3e21d..1cc74af 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -1,8 +1,5 @@
-#include "GL/gl.h"
-
#include "FTGLTextureFont.h"
#include "FTGlyphContainer.h"
-#include "FTGL.h"
#include "FTTextureGlyph.h"
using namespace std;
@@ -91,7 +88,7 @@ bool FTGLTextureFont::MakeGlyphList()
glGenTextures( numTextures, (GLuint*)&glTextureID[0]);
textMem = new unsigned char[totalMem]; // GL_ALPHA texture;
- std::memset( textMem, 0, totalMem);
+ memset( textMem, 0, totalMem);
FillGlyphs( 0, glTextureID[0], textureWidth, textureHeight, textMem);
CreateTexture( 0, textureWidth, textureHeight, textMem);
@@ -208,3 +205,4 @@ void FTGLTextureFont::render( const wchar_t* string)
glPopAttrib();
}
+
diff --git a/src/FTLibrary.cpp b/src/FTLibrary.cpp
index 5a6369c..72788c0 100755
--- a/src/FTLibrary.cpp
+++ b/src/FTLibrary.cpp
@@ -1,5 +1,4 @@
#include "FTLibrary.h"
-#include "FTGL.h"
FTLibrary& FTLibrary::Instance()
diff --git a/src/FTOutlineGlyph.cpp b/src/FTOutlineGlyph.cpp
index 8e53871..67d0919 100644
--- a/src/FTOutlineGlyph.cpp
+++ b/src/FTOutlineGlyph.cpp
@@ -1,5 +1,3 @@
-#include "GL/gl.h"
-
#include "FTOutlineGlyph.h"
#include "FTVectoriser.h"
#include "FTGL.h"
@@ -81,3 +79,4 @@ float FTOutlineGlyph::Render( const FT_Vector& pen)
return advance;
}
+
diff --git a/src/FTPixmapGlyph.cpp b/src/FTPixmapGlyph.cpp
index 1970be9..8dd5873 100755
--- a/src/FTPixmapGlyph.cpp
+++ b/src/FTPixmapGlyph.cpp
@@ -1,5 +1,3 @@
-#include "GL/gl.h"
-
#include "FTPixmapGlyph.h"
#include "FTGL.h"
diff --git a/src/FTPolyGlyph.cpp b/src/FTPolyGlyph.cpp
index f400bbe..1c31f31 100644
--- a/src/FTPolyGlyph.cpp
+++ b/src/FTPolyGlyph.cpp
@@ -1,10 +1,8 @@
-#include "GL/gl.h"
-#include "GL/glu.h"
#include "FTPolyGlyph.h"
#include "FTVectoriser.h"
-#include "FTGL.h"
+#include "GL/glu.h"
#ifndef CALLBACK
#define CALLBACK
diff --git a/src/FTTextureGlyph.cpp b/src/FTTextureGlyph.cpp
index d15f878..8e17b9e 100755
--- a/src/FTTextureGlyph.cpp
+++ b/src/FTTextureGlyph.cpp
@@ -1,5 +1,3 @@
-#include "GL/gl.h"
-
#include "FTTextureGlyph.h"
#include "FTGL.h"
@@ -90,3 +88,4 @@ float FTTextureGlyph::Render( const FT_Vector& pen)
return advance;
}
+