Commit 58b4a6b7faac97389cc8e91239d1b9bb28a1c669
2002-12-21T07:10:03
Refactored variable names
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
diff --git a/include/FTGlyphContainer.h b/include/FTGlyphContainer.h
index 3eeba93..a9388e6 100755
--- a/include/FTGlyphContainer.h
+++ b/include/FTGlyphContainer.h
@@ -40,7 +40,7 @@ class FTGL_EXPORT FTGlyphContainer
* @param g The glyphs index in the container.
* @return <code>true</code>
*/
- bool Add( FTGlyph* glyph, unsigned int g);
+ bool Add( FTGlyph* glyph, unsigned int glyphIndex);
/**
* Get a glyph from the glyph list
@@ -49,10 +49,12 @@ class FTGL_EXPORT FTGlyphContainer
* @return An FTGlyph or <code>null</code> is it hasn't been
* loaded.
*/
- const FTGlyph* const Glyph( const unsigned int c) const;
+ const FTGlyph* const Glyph( const unsigned int characterCode) const;
-
- FTBBox BBox( const unsigned int index) const;
+ /**
+ * Get the bounding box for a character.
+ */
+ FTBBox BBox( const unsigned int characterCode) const;
/**
* Returns the kerned advance width for a glyph.
@@ -61,7 +63,7 @@ class FTGL_EXPORT FTGlyphContainer
* @param next the next glyph in a string
* @return advance width
*/
- float Advance( unsigned int index, unsigned int next);
+ float Advance( unsigned int characterCode, unsigned int nextCharacterCode);
/**
* Renders a character
@@ -70,7 +72,7 @@ class FTGL_EXPORT FTGlyphContainer
* @param pen the position to Render the glyph
* @return The distance to advance the pen position after Rendering
*/
- FTPoint Render( unsigned int index, unsigned int next, FTPoint pen);
+ FTPoint Render( unsigned int characterCode, unsigned int nextCharacterCode, FTPoint penPosition);
/**
* Queries the Font for errors.
diff --git a/src/FTGlyphContainer.cpp b/src/FTGlyphContainer.cpp
index 91cca28..6e75048 100755
--- a/src/FTGlyphContainer.cpp
+++ b/src/FTGlyphContainer.cpp
@@ -27,34 +27,34 @@ FTGlyphContainer::~FTGlyphContainer()
}
-bool FTGlyphContainer::Add( FTGlyph* tempGlyph, unsigned int g)
+bool FTGlyphContainer::Add( FTGlyph* tempGlyph, unsigned int glyphIndex)
{
- if( g >= numberOfGlyphs)
+ if( glyphIndex >= numberOfGlyphs)
{
return false;
}
- glyphs[g] = tempGlyph;
+ glyphs[glyphIndex] = tempGlyph;
return true;
}
-const FTGlyph* const FTGlyphContainer::Glyph( const unsigned int c) const
+const FTGlyph* const FTGlyphContainer::Glyph( const unsigned int characterCode) const
{
- return glyphs[face->CharIndex( c)];
+ return glyphs[face->CharIndex( characterCode)];
}
-FTBBox FTGlyphContainer::BBox( const unsigned int index) const
+FTBBox FTGlyphContainer::BBox( const unsigned int characterCode) const
{
- return glyphs[face->CharIndex( index)]->BBox();
+ return glyphs[face->CharIndex( characterCode)]->BBox();
}
-float FTGlyphContainer::Advance( unsigned int index, unsigned int next)
+float FTGlyphContainer::Advance( unsigned int characterCode, unsigned int nextCharacterCode)
{
- unsigned int left = face->CharIndex( index);
- unsigned int right = face->CharIndex( next);
+ unsigned int left = face->CharIndex( characterCode);
+ unsigned int right = face->CharIndex( nextCharacterCode);
float width = face->KernAdvance( left, right).x;
width += glyphs[left]->Advance();
@@ -63,19 +63,19 @@ float FTGlyphContainer::Advance( unsigned int index, unsigned int next)
}
-FTPoint FTGlyphContainer::Render( unsigned int index, unsigned int next, FTPoint pen)
+FTPoint FTGlyphContainer::Render( unsigned int characterCode, unsigned int nextCharacterCode, FTPoint penPosition)
{
FTPoint kernAdvance;
float advance = 0;
- unsigned int left = face->CharIndex( index);
- unsigned int right = face->CharIndex( next);
+ unsigned int left = face->CharIndex( characterCode);
+ unsigned int right = face->CharIndex( nextCharacterCode);
kernAdvance = face->KernAdvance( left, right);
if( !face->Error())
{
- advance = glyphs[left]->Render( pen);
+ advance = glyphs[left]->Render( penPosition);
}
kernAdvance.x = advance + kernAdvance.x;