Commit c0ac7ac6df7b03fc00251da6e9f9827c7206f1cc
2004-09-26T09:47:40
Finalised texture coordinate generation code. Tidied some code.
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 141 142 143 144 145 146 147 148 149 150 151 152
diff --git a/src/FTExtrdGlyph.cpp b/src/FTExtrdGlyph.cpp
index c2c5bd7..4b33a9c 100644
--- a/src/FTExtrdGlyph.cpp
+++ b/src/FTExtrdGlyph.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+
#include <math.h>
#include "FTExtrdGlyph.h"
@@ -18,7 +20,7 @@ FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d)
}
FTVectoriser vectoriser( glyph);
- if ( ( vectoriser.ContourCount() < 1) || ( vectoriser.PointCount() < 3))
+ if( ( vectoriser.ContourCount() < 1) || ( vectoriser.PointCount() < 3))
{
return;
}
@@ -30,7 +32,8 @@ FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d)
vectoriser.MakeMesh( 1.0);
glNormal3d(0.0, 0.0, 1.0);
- unsigned int textureCoordRange = glyph->face->units_per_EM;
+ unsigned int horizontalTextureScale = glyph->face->size->metrics.x_ppem * 64;
+ unsigned int verticalTextureScale = glyph->face->size->metrics.y_ppem * 64;
const FTMesh* mesh = vectoriser.GetMesh();
for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex)
@@ -41,11 +44,13 @@ FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d)
glBegin( polyonType);
for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
{
- glTexCoord2f( subMesh->Point(pointIndex).x / textureCoordRange,
- subMesh->Point(pointIndex).y / textureCoordRange);
+ FTPoint point = subMesh->Point(pointIndex);
+
+ glTexCoord2f( point.x / horizontalTextureScale,
+ point.y / verticalTextureScale);
- glVertex3f( subMesh->Point( pointIndex).x / 64.0f,
- subMesh->Point( pointIndex).y / 64.0f,
+ glVertex3f( point.x / 64.0f,
+ point.y / 64.0f,
0.0f);
}
glEnd();
@@ -63,8 +68,10 @@ FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d)
glBegin( polyonType);
for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
{
- glTexCoord2f( subMesh->Point(pointIndex).x / textureCoordRange,
- subMesh->Point(pointIndex).y / textureCoordRange);
+ FTPoint point = subMesh->Point(pointIndex);
+
+ glTexCoord2f( subMesh->Point(pointIndex).x / horizontalTextureScale,
+ subMesh->Point(pointIndex).y / verticalTextureScale);
glVertex3f( subMesh->Point( pointIndex).x / 64.0f,
subMesh->Point( pointIndex).y / 64.0f,
@@ -83,27 +90,29 @@ FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d)
glBegin( GL_QUAD_STRIP);
for( unsigned int j = 0; j <= numberOfPoints; ++j)
{
- unsigned int index = ( j == numberOfPoints) ? 0 : j;
- unsigned int nextIndex = ( index == numberOfPoints - 1) ? 0 : index + 1;
+ unsigned int pointIndex = ( j == numberOfPoints) ? 0 : j;
+ unsigned int nextPointIndex = ( pointIndex == numberOfPoints - 1) ? 0 : pointIndex + 1;
- FTPoint normal = GetNormal( contour->Point(index), contour->Point(nextIndex));
+ FTPoint point = contour->Point(pointIndex);
+
+ FTPoint normal = GetNormal( point, contour->Point(nextPointIndex));
glNormal3f( normal.x, normal.y, 0.0f);
if( contourFlag & ft_outline_reverse_fill)
{
- glTexCoord2f( contour->Point(index).x / textureCoordRange,
- contour->Point(index).y / textureCoordRange);
+ glTexCoord2f( point.x / horizontalTextureScale,
+ point.y / verticalTextureScale);
- glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, 0.0f);
- glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, -depth);
+ glVertex3f( point.x / 64.0f, point.y / 64.0f, 0.0f);
+ glVertex3f( point.x / 64.0f, point.y / 64.0f, -depth);
}
else
{
- glTexCoord2f( contour->Point(index).x / textureCoordRange,
- contour->Point(index).y / textureCoordRange);
+ glTexCoord2f( point.x / horizontalTextureScale,
+ point.y / verticalTextureScale);
- glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, -depth);
- glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, 0.0f);
+ glVertex3f( point.x / 64.0f, point.y / 64.0f, -depth);
+ glVertex3f( point.x / 64.0f, point.y / 64.0f, 0.0f);
}
}
glEnd();
diff --git a/src/FTOutlineGlyph.cpp b/src/FTOutlineGlyph.cpp
index bab9779..3d96f5c 100644
--- a/src/FTOutlineGlyph.cpp
+++ b/src/FTOutlineGlyph.cpp
@@ -27,9 +27,10 @@ FTOutlineGlyph::FTOutlineGlyph( FT_GlyphSlot glyph)
const FTContour* contour = vectoriser.Contour(c);
glBegin( GL_LINE_LOOP);
- for( unsigned int p = 0; p < contour->PointCount(); ++p)
+ for( unsigned int pointIndex = 0; pointIndex < contour->PointCount(); ++pointIndex)
{
- glVertex2f( contour->Point(p).x / 64.0f, contour->Point(p).y / 64.0f);
+ FTPoint point = contour->Point(pointIndex);
+ glVertex2f( point.x / 64.0f, point.y / 64.0f);
}
glEnd();
}
diff --git a/src/FTPolyGlyph.cpp b/src/FTPolyGlyph.cpp
index 4deef59..5580c40 100644
--- a/src/FTPolyGlyph.cpp
+++ b/src/FTPolyGlyph.cpp
@@ -19,8 +19,9 @@ FTPolyGlyph::FTPolyGlyph( FT_GlyphSlot glyph)
return;
}
- unsigned int textureCoordRange = glyph->face->units_per_EM;
-
+ unsigned int horizontalTextureScale = glyph->face->size->metrics.x_ppem * 64;
+ unsigned int verticalTextureScale = glyph->face->size->metrics.y_ppem * 64;
+
vectoriser.MakeMesh( 1.0);
glList = glGenLists( 1);
@@ -35,11 +36,13 @@ FTPolyGlyph::FTPolyGlyph( FT_GlyphSlot glyph)
glBegin( polyonType);
for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
{
- glTexCoord2f( subMesh->Point(pointIndex).x / textureCoordRange,
- subMesh->Point(pointIndex).y / textureCoordRange);
+ FTPoint point = subMesh->Point(pointIndex);
+
+ glTexCoord2f( point.x / horizontalTextureScale,
+ point.y / verticalTextureScale);
- glVertex3f( subMesh->Point(pointIndex).x / 64.0f,
- subMesh->Point(pointIndex).y / 64.0f,
+ glVertex3f( point.x / 64.0f,
+ point.y / 64.0f,
0.0f);
}
glEnd();