Commit eeef12c68d6f03ee476508a9659a71599abf4ea3
2003-04-03T23:59:34
Made vectoriser a stack var and refactored variables
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
diff --git a/src/FTExtrdGlyph.cpp b/src/FTExtrdGlyph.cpp
index 466dfc8..2f76399 100644
--- a/src/FTExtrdGlyph.cpp
+++ b/src/FTExtrdGlyph.cpp
@@ -9,68 +9,66 @@ FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
glList(0),
depth(d)
{
- unsigned int index;
-
+ bBox.upperZ = -depth;
+
if( ft_glyph_format_outline != glyph->format)
{
return;
}
- bBox.upperZ = -depth;
-
- FTVectoriser* vectoriser = new FTVectoriser( glyph);
- if ( ( vectoriser->ContourCount() < 1) || ( vectoriser->PointCount() < 3))
+ FTVectoriser vectoriser( glyph);
+ if ( ( vectoriser.ContourCount() < 1) || ( vectoriser.PointCount() < 3))
{
- delete vectoriser;
return;
}
+ unsigned int tesselationIndex;
glList = glGenLists(1);
glNewList( glList, GL_COMPILE);
- vectoriser->MakeMesh( 1.0);
+ vectoriser.MakeMesh( 1.0);
glNormal3d(0.0, 0.0, 1.0);
- const FTMesh* mesh = vectoriser->GetMesh();
- for( index = 0; index < mesh->TesselationCount(); ++index)
+ const FTMesh* mesh = vectoriser.GetMesh();
+ for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex)
{
- const FTTesselation* subMesh = mesh->Tesselation( index);
+ const FTTesselation* subMesh = mesh->Tesselation( tesselationIndex);
unsigned int polyonType = subMesh->PolygonType();
glBegin( polyonType);
- for( unsigned int x = 0; x < subMesh->PointCount(); ++x)
+ for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
{
- glVertex3f( subMesh->Point(x).x / 64.0f,
- subMesh->Point(x).y / 64.0f,
+ glVertex3f( subMesh->Point( pointIndex).x / 64.0f,
+ subMesh->Point( pointIndex).y / 64.0f,
0.0f);
}
glEnd();
}
- vectoriser->MakeMesh( -1.0);
+ vectoriser.MakeMesh( -1.0);
glNormal3d(0.0, 0.0, -1.0);
- mesh = vectoriser->GetMesh();
- for( index = 0; index < mesh->TesselationCount(); ++index)
+ mesh = vectoriser.GetMesh();
+ for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex)
{
- const FTTesselation* subMesh = mesh->Tesselation( index);
+ const FTTesselation* subMesh = mesh->Tesselation( tesselationIndex);
unsigned int polyonType = subMesh->PolygonType();
glBegin( polyonType);
- for( unsigned int x = 0; x < subMesh->PointCount(); ++x)
+ for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
{
- glVertex3f( subMesh->Point(x).x / 64.0f,
- subMesh->Point(x).y / 64.0f,
+ glVertex3f( subMesh->Point( pointIndex).x / 64.0f,
+ subMesh->Point( pointIndex).y / 64.0f,
-depth);
}
glEnd();
}
- int contourFlag = vectoriser->ContourFlag();
+ int contourFlag = vectoriser.ContourFlag();
- for( size_t c = 0; c < vectoriser->ContourCount(); ++c)
+ for( size_t c = 0; c < vectoriser.ContourCount(); ++c)
{
- const FTContour* contour = vectoriser->Contour(c);
+ const FTContour* contour = vectoriser.Contour(c);
unsigned int numberOfPoints = contour->PointCount();
glBegin( GL_QUAD_STRIP);
@@ -98,8 +96,6 @@ FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
glEndList();
- delete vectoriser;
-
// discard glyph image (bitmap or not)
FT_Done_Glyph( glyph); // Why does this have to be HERE
}