FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Completed work on osgText compilation under Win32. We now

Browse Source 
have fonts under Wndows and Linux :-)
This commit is contained in:
Robert Osfield
2001-10-24 23:15:15 +00:00
parent e96a17564f
commit 0551da3613
4 changed files with 59 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osgText/FTGL.h
View File

@@ -68,17 +68,18 @@
#endif
#if defined(_MSC_VER)
# ifdef FTGL_LIBRARY_STATIC // staticLib
# define FTGL_EXPORT
# elif FTGL_LIBRARY // dynamicLib
# define FTGL_EXPORT __declspec(dllexport)
# else
# define FTGL_EXPORT __declspec(dllimport)
# endif /* FTGL_LIBRARY */
#else
// #if defined(_MSC_VER)
// # ifdef FTGL_LIBRARY_STATIC // staticLib
// # define FTGL_EXPORT
// # elif FTGL_LIBRARY // dynamicLib
// # define FTGL_EXPORT __declspec(dllexport)
// # else
// # define FTGL_EXPORT __declspec(dllimport)
// # endif /* FTGL_LIBRARY */
// #else
# define FTGL_EXPORT
#endif
// #endif
#endif // __FTGL__

7
src/osgText/FTVectorGlyph.cpp
View File

@@ -1,5 +1,3 @@
#include "GL/gl.h"
#include "FTVectorGlyph.h"
#include "FTVectoriser.h"
#include "FTGL.h"
@@ -26,7 +24,8 @@ FTVectorGlyph::FTVectorGlyph( FT_Glyph glyph)
numContours = vectoriser->contours();
contourLength = new int[ numContours];
for( int c = 0; c < numContours; ++c)
int c;
for( c = 0; c < numContours; ++c)
{
contourLength[c] = vectoriser->contourSize( c);
}
@@ -46,7 +45,7 @@ FTVectorGlyph::FTVectorGlyph( FT_Glyph glyph)
int d = 0;
glNewList( glList, GL_COMPILE);
for( int c = 0; c < numContours; ++c)
for( c = 0; c < numContours; ++c)
{
glBegin( GL_LINE_LOOP);
for( int p = 0; p < ( contourLength[c]); ++p)