kc3-lang/ftgl

diff --git a/include/FTFont.h b/include/FTFont.h
index 47406cf..7e5c471 100755
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -9,23 +9,22 @@
 #include FT_FREETYPE_H
 
 #include "FTFace.h"
-#include "FTGL.h"
 
 
 class FTGlyphContainer;
+class FTGlyph;
 
 using namespace std;
 
 
-
 /**
  * FTFont is the public interface for the FTGL library.
  *
  * Specific font classes are derived from this class. It uses the helper
  * classes FTFace and FTSize to access the Freetype library. This class
  * is abstract and deriving classes must implement the protected
- * <code>MakeGlyphList</code> function to build a glyphList with the
- * appropriate glyph type.
+ * <code>MakeGlyph</code> function to create glyphs of the
+ * appropriate type.
  *
  * @see		FTFace
  * @see		FTSize
@@ -49,10 +48,14 @@ class FTGL_EXPORT FTFont
 		 * Opens and reads a font file.
 		 *
 		 * @param fontname	font file name.
+		 * @param preCache	A flag to indicate whether or not to build
+		 * 					a complete set of glyphs at startup
+		 *					(<code>true</code>) or as prequired
+		 *					(<code>false</code>). Defaults to true.
 		 * @return			<code>true</code> if file has opened
 		 *					successfully.
 		 */
-		virtual bool Open( const char* fontname );
+		virtual bool Open( const char* fontname, bool preCache = true);
 		
 		/**
 		 * Disposes of the font
@@ -66,7 +69,7 @@ class FTGL_EXPORT FTFont
 		 * @param res		the resolution of the target device.
 		 * @return			<code>true</code> if size was set correctly
 		 */
-		virtual bool FaceSize( const unsigned int size, const unsigned int res = 72 );
+		virtual bool FaceSize( const unsigned int size, const unsigned int res = 72);
 		
 		/**
 		 * Sets the character map for the face.
@@ -131,12 +134,25 @@ class FTGL_EXPORT FTFont
 
 	protected:
 		/**
-		 * Constructs the internal glyph cache.
+		 * Construct a glyph of the correct type.
+		 *
+		 * Clients must overide the function and return their specialised
+		 * FTGlyph.
+		 *
+		 * @param g	The glyph index NOT the char code.
+		 * @return	An FT****Glyph or <code>null</code> on failure.
+		 */
+		virtual FTGlyph* MakeGlyph( unsigned int g) = 0;
+		
+		/**
+		 * Construct the internal glyph cache.
 		 *
 		 * This a list of glyphs processed for openGL rendering NOT
-		 * freetype glyphs
+		 * freetype glyphs.
+		 *
+		 * @return	<code>true</code> on success.
 		 */
-		virtual bool MakeGlyphList() = 0;
+		virtual bool MakeGlyphList();
 		
 		/**
 		 * Current face object
@@ -164,6 +180,11 @@ class FTGL_EXPORT FTFont
 		unsigned int numGlyphs;
 		
 		/**
+		 * Have glyphs been pre-cached
+		 */
+		bool preCache;
+		
+		/**
 		 * Current pen or cursor position;
 		 */
 		FT_Vector pen;
diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index 6193de9..3a3b2b7 100755
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -6,7 +6,7 @@
 
 #include "FTFont.h"
 
-class FTBitmapGlyph;
+class FTGlyph;
 
 /**
  * FTGLBitmapFont is a specialisation of the FTFont class for handling
@@ -45,12 +45,12 @@ class FTGL_EXPORT FTGLBitmapFont : public FTFont
 		
 	private:
 		/**
-		 * Constructs the internal glyph cache.
+		 * Construct a FTBitmapGlyph.
 		 *
-		 * This a list of glyphs processed for openGL rendering NOT
-		 * freetype glyphs
+		 * @param g	The glyph index NOT the char code.
+		 * @return	An FTBitmapGlyph or <code>null</code> on failure.
 		 */
-		bool MakeGlyphList();
-		
+		virtual FTGlyph* MakeGlyph( unsigned int g);
+				
 };
 #endif	//	__FTGLBitmapFont__
diff --git a/include/FTGLOutlineFont.h b/include/FTGLOutlineFont.h
index 2e8378d..698fe34 100755
--- a/include/FTGLOutlineFont.h
+++ b/include/FTGLOutlineFont.h
@@ -5,8 +5,7 @@
 
 #include "FTFont.h"
 
-
-class FTOutlineGlyph;
+class FTGlyph;
 
 /**
  * FTGLOutlineFont is a specialisation of the FTFont class for handling
@@ -45,12 +44,12 @@ class FTGL_EXPORT FTGLOutlineFont : public FTFont
 		
 	private:
 		/**
-		 * Constructs the internal glyph cache.
+		 * Construct a FTOutlineGlyph.
 		 *
-		 * This a list of glyphs processed for openGL rendering NOT
-		 * freetype glyphs
+		 * @param g	The glyph index NOT the char code.
+		 * @return	An FTOutlineGlyph or <code>null</code> on failure.
 		 */
-		bool MakeGlyphList();
+		virtual FTGlyph* MakeGlyph( unsigned int g);
 		
 };
 #endif // __FTGLOutlineFont__
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index 8b8e150..9f7fe7b 100755
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -6,7 +6,7 @@
 
 #include "FTFont.h"
 
-class FTPixmapGlyph;
+class FTGlyph;
 
 /**
  * FTGLPixmapFont is a specialisation of the FTFont class for handling
@@ -44,12 +44,12 @@ class FTGL_EXPORT FTGLPixmapFont : public FTFont
 
 	private:
 		/**
-		 * Constructs the internal glyph cache.
+		 * Construct a FTPixmapGlyph.
 		 *
-		 * This a list of glyphs processed for openGL rendering NOT
-		 * freetype glyphs
+		 * @param g	The glyph index NOT the char code.
+		 * @return	An FTPixmapGlyph or <code>null</code> on failure.
 		 */
-		bool MakeGlyphList();
+		virtual FTGlyph* MakeGlyph( unsigned int g);
 		
 };
 
diff --git a/include/FTGLPolygonFont.h b/include/FTGLPolygonFont.h
index 14d3bf0..fb2d436 100755
--- a/include/FTGLPolygonFont.h
+++ b/include/FTGLPolygonFont.h
@@ -5,8 +5,7 @@
 
 #include	"FTFont.h"
 
-
-class FTPolyGlyph;
+class FTGlyph;
 
 /**
  * FTGLPolygonFont is a specialisation of the FTFont class for handling
@@ -29,12 +28,12 @@ class FTGL_EXPORT FTGLPolygonFont : public FTFont
 		
 	private:
 		/**
-		 * Constructs the internal glyph cache.
+		 * Construct a FTPolyGlyph.
 		 *
-		 * This a list of glyphs processed for openGL rendering NOT
-		 * freetype glyphs
+		 * @param g	The glyph index NOT the char code.
+		 * @return	An FTPolyGlyph or <code>null</code> on failure.
 		 */
-		bool MakeGlyphList();
+		virtual FTGlyph* MakeGlyph( unsigned int g);
 		
 };
 
diff --git a/include/FTGLTextureFont.h b/include/FTGLTextureFont.h
index 31f8def..4edf316 100755
--- a/include/FTGLTextureFont.h
+++ b/include/FTGLTextureFont.h
@@ -51,6 +51,8 @@ class  FTGL_EXPORT FTGLTextureFont : public FTFont
 
 		
 	private:
+		virtual FTGlyph* MakeGlyph( unsigned int g){ return NULL;}
+				
 		/**
 		 * Constructs the internal glyph cache.
 		 *
diff --git a/include/FTGlyphContainer.h b/include/FTGlyphContainer.h
index bb2cb41..1f51ae2 100755
--- a/include/FTGlyphContainer.h
+++ b/include/FTGlyphContainer.h
@@ -9,7 +9,6 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-//#include "FTGL.h"
 class FTFace;
 class FTGlyph;
 
@@ -44,7 +43,16 @@ class FTGL_EXPORT FTGlyphContainer
 		 * @param glyph		
 		 * @return			<code>true</code>
 		 */
-		bool Add( FTGlyph* glyph);
+		bool Add( FTGlyph* tempGlyph, unsigned int g);
+
+		/**
+		 * Get a glyph from the glyph list
+		 *
+		 * @param c	The char code of the glyph NOT the glyph index		
+		 * @return	An FTGlyph or <code>null</code> is it hasn't been
+		 * loaded.
+		 */
+		FTGlyph* Glyph( unsigned int c) const;
 
 		/**
 		* Returns the kerned advance width for a glyph.
@@ -101,9 +109,6 @@ class FTGL_EXPORT FTGlyphContainer
 		 * A structure to hold the glyphs
 		 */
 		vector<FTGlyph*> glyphs;
-//		typedef pair<int, FTGlyph*> CHARREF; // glyphIndex, glyph
-//		vector<CHARREF> glyphs;
-//		map< int, FTGlyph*> CHARREF; // charCode, glyph
 
 		/**
 		 * Current error code. Zero means no error.
diff --git a/src/FTFont.cpp b/src/FTFont.cpp
index fb93213..630f129 100755
--- a/src/FTFont.cpp
+++ b/src/FTFont.cpp
@@ -7,6 +7,8 @@
 FTFont::FTFont()
 :	numFaces(0),
 	glyphList(0),
+	numGlyphs(0),
+	preCache(true),
 	err(0)
 {
 	pen.x = 0;
@@ -20,8 +22,10 @@ FTFont::~FTFont()
 }
 
 
-bool FTFont::Open( const char* fontname )
+bool FTFont::Open( const char* fontname, bool p)
 {
+	preCache = p;
+	
 	if( face.Open( fontname))
 	{
 		FT_Face* ftFace = face.Face();		
@@ -50,7 +54,7 @@ bool FTFont::FaceSize( const unsigned int size, const unsigned int res )
 	if( glyphList)
 		delete glyphList;
 	
-	glyphList = new FTGlyphContainer( &face, numGlyphs);
+	glyphList = new FTGlyphContainer( &face, numGlyphs, preCache);
 	
 	if( MakeGlyphList())
 	{
@@ -63,6 +67,24 @@ bool FTFont::FaceSize( const unsigned int size, const unsigned int res )
 }
 
 
+bool FTFont::MakeGlyphList()
+{
+	for( unsigned int c = 0; c < numGlyphs; ++c)
+	{
+		if( preCache)
+		{
+			glyphList->Add( MakeGlyph( c), c);
+		}
+		else
+		{
+			glyphList->Add( NULL, c);
+		}
+	}
+	
+	return !err;
+}
+
+
 bool FTFont::CharMap( FT_Encoding encoding)
 {
 	err = face.CharMap( encoding);
@@ -89,6 +111,12 @@ float FTFont::Advance( const wchar_t* string)
 
 	while( *c)
 	{
+		if( !glyphList->Glyph( static_cast<unsigned int>(*c)))
+		{
+			unsigned int g = face.CharIndex( static_cast<unsigned int>(*c));
+			glyphList->Add( MakeGlyph( g), g);
+		}
+
 		width += glyphList->Advance( *c, *(c + 1));	
 		++c;
 	}
@@ -104,7 +132,13 @@ float FTFont::Advance( const char* string)
 
 	while( *c)
 	{
-		width += glyphList->Advance( *c, *(c + 1));	
+		if( !glyphList->Glyph( static_cast<unsigned int>(*c)))
+		{
+			unsigned int g = face.CharIndex( static_cast<unsigned int>(*c));
+			glyphList->Add( MakeGlyph( g), g);
+		}
+
+		width += glyphList->Advance( *c, *(c + 1));
 		++c;
 	}
 
@@ -120,11 +154,16 @@ void FTFont::render( const char* string )
 
 	while( *c)
 	{
+		if( !glyphList->Glyph( static_cast<unsigned int>(*c)))
+		{
+			unsigned int g = face.CharIndex( static_cast<unsigned int>(*c));
+			glyphList->Add( MakeGlyph( g), g);
+		}
+
 		kernAdvance = glyphList->render( *c, *(c + 1), pen);
 		
 		pen.x += kernAdvance.x;
 		pen.y += kernAdvance.y;
-		
 		++c;
 	}
 }
@@ -138,11 +177,16 @@ void FTFont::render( const wchar_t* string )
 
 	while( *c)
 	{
+		if( !glyphList->Glyph( static_cast<unsigned int>(*c)))
+		{
+			unsigned int g = face.CharIndex( static_cast<unsigned int>(*c));
+			glyphList->Add( MakeGlyph( g), g);
+		}
+
 		kernAdvance = glyphList->render( *c, *(c + 1), pen);
 		
 		pen.x += kernAdvance.x;
 		pen.y += kernAdvance.y;
-		
 		++c;
 	}
 }
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index 4136e0e..6ad3d12 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -11,27 +11,18 @@ FTGLBitmapFont::~FTGLBitmapFont()
 {}
 
 
-// OPSignature: bool FTGlyphContainer:MakeGlyphList() 
-bool FTGLBitmapFont::MakeGlyphList()
+FTGlyph* FTGLBitmapFont::MakeGlyph( unsigned int g)
 {
-//	if( preCache)
-	for( unsigned int c = 0; c < numGlyphs; ++c)
+	FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT);
+
+	if( ftGlyph)
 	{
-		FT_Glyph* ftGlyph = face.Glyph( c, FT_LOAD_DEFAULT);
-//		FT_HAS_VERTICAL(face)
-
-		if( ftGlyph)
-		{
-			FTBitmapGlyph* tempGlyph = new FTBitmapGlyph( *ftGlyph);
-			glyphList->Add( tempGlyph);
-		}
-		else
-		{
-			err = face.Error();
-		}
+		FTBitmapGlyph* tempGlyph = new FTBitmapGlyph( *ftGlyph);
+		return tempGlyph;
 	}
-	
-	return !err;
+
+	err = face.Error();
+	return NULL;
 }
 
 
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index fcb404a..3b5aada 100755
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -12,24 +12,18 @@ FTGLOutlineFont::~FTGLOutlineFont()
 {}
 
 
-bool FTGLOutlineFont::MakeGlyphList()
+FTGlyph* FTGLOutlineFont::MakeGlyph( unsigned int g)
 {
-	for( unsigned int n = 0; n < numGlyphs; ++n)
+	FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT);
+
+	if( ftGlyph)
 	{
-		FT_Glyph* ftGlyph = face.Glyph( n, FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP);
-		
-		if( ftGlyph)
-		{
-			FTOutlineGlyph* tempGlyph = new FTOutlineGlyph( *ftGlyph);
-			glyphList->Add( tempGlyph);
-		}
-		else
-		{
-			err = face.Error();
-		}
+		FTOutlineGlyph* tempGlyph = new FTOutlineGlyph( *ftGlyph);
+		return tempGlyph;
 	}
-	
-	return !err;
+
+	err = face.Error();
+	return NULL;
 }
 
 
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index 7ad2cfe..a5a3542 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -11,27 +11,18 @@ FTGLPixmapFont::~FTGLPixmapFont()
 {}
 
 
-// OPSignature: bool FTGlyphContainer:MakeGlyphList() 
-bool FTGLPixmapFont::MakeGlyphList()
+FTGlyph* FTGLPixmapFont::MakeGlyph( unsigned int g)
 {
-//	if( preCache)
-	for( unsigned int c = 0; c < numGlyphs; ++c)
+	FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT);
+
+	if( ftGlyph)
 	{
-		FT_Glyph* ftGlyph = face.Glyph( c, FT_LOAD_DEFAULT);
-//		FT_HAS_VERTICAL(face)
-	
-		if( ftGlyph)
-		{
-			FTPixmapGlyph* tempGlyph = new FTPixmapGlyph( *ftGlyph);
-			glyphList->Add( tempGlyph);
-		}
-		else
-		{
-			err = face.Error();
-		}
+		FTPixmapGlyph* tempGlyph = new FTPixmapGlyph( *ftGlyph);
+		return tempGlyph;
 	}
-	
-	return !err;
+
+	err = face.Error();
+	return NULL;
 }
 
 
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index 57a2033..9023aa8 100755
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -13,22 +13,18 @@ FTGLPolygonFont::~FTGLPolygonFont()
 {}
 
 
-bool FTGLPolygonFont::MakeGlyphList()
+FTGlyph* FTGLPolygonFont::MakeGlyph( unsigned int g)
 {
-	for( unsigned int n = 0; n < numGlyphs; ++n)
+	FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT);
+
+	if( ftGlyph)
 	{
-		FT_Glyph* ftGlyph = face.Glyph( n, FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP);
-		
-		if( ftGlyph)
-		{
-			FTPolyGlyph* tempGlyph = new FTPolyGlyph( *ftGlyph);
-			glyphList->Add( tempGlyph);
-		}
-		else
-		{
-			err = face.Error();
-		}
+		FTPolyGlyph* tempGlyph = new FTPolyGlyph( *ftGlyph);
+		return tempGlyph;
 	}
-	
-	return !err;
+
+	err = face.Error();
+	return NULL;
 }
+
+
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index cde8eb1..dd10b4e 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -117,7 +117,7 @@ unsigned int FTGLTextureFont::FillGlyphs( unsigned int glyphStart, GLuint id, GL
 			currTextU = (float)currentTextX / (float)width;
 			
 			FTTextureGlyph* tempGlyph = new FTTextureGlyph( *ftGlyph, id, data, width, height, currTextU, currTextV);
-			glyphList->Add( tempGlyph);
+			glyphList->Add( tempGlyph, n);
 
 			currentTextX += glyphWidth;
 			if( currentTextX > ( width - glyphWidth))
diff --git a/src/FTGlyphContainer.cpp b/src/FTGlyphContainer.cpp
index 53a95f7..c643b6f 100755
--- a/src/FTGlyphContainer.cpp
+++ b/src/FTGlyphContainer.cpp
@@ -10,6 +10,8 @@ FTGlyphContainer::FTGlyphContainer( FTFace* f, unsigned int g, bool p)
 	err( 0)
 {
 	glyphs.reserve( g);
+	for( unsigned int i = 0; i < g; ++i)
+		glyphs.push_back( NULL);
 }
 
 
@@ -26,14 +28,22 @@ FTGlyphContainer::~FTGlyphContainer()
 }
 
 
-bool FTGlyphContainer::Add( FTGlyph* tempGlyph)
+bool FTGlyphContainer::Add( FTGlyph* tempGlyph, unsigned int g)
 {
 	// At the moment we are using a vector. Vectors don't return bool.
-	glyphs.push_back( tempGlyph);
+//	unsigned int glyphIndex = face->CharIndex( g);
+
+	glyphs[g] = tempGlyph;
 	return true;
 }
 
 
+FTGlyph* FTGlyphContainer::Glyph( unsigned int c) const
+{
+	unsigned int g = face->CharIndex( c);
+	return glyphs[g];
+}
+
 float FTGlyphContainer::Advance( unsigned int index, unsigned int next)
 {
 	unsigned int left = face->CharIndex( index);