Commit 9e554e336e757be5fe46df4567388a3c86e6a0f6
2002-12-18T03:53:55
Trying to simplify the constructor.
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 153 154 155 156 157 158 159 160 161 162 163 164
diff --git a/include/FTContour.h b/include/FTContour.h
index 6a351cd..fd936fe 100644
--- a/include/FTContour.h
+++ b/include/FTContour.h
@@ -59,6 +59,8 @@ class FTGL_EXPORT FTContour
*/
inline void AddPoint( FTPoint point);
+ void AddPoint( float x, float y);
+
/**
* De Casteljau (bezier) algorithm contributed by Jed Soane
* Evaluates a quadratic or conic (second degree) curve
@@ -80,7 +82,7 @@ class FTGL_EXPORT FTContour
/**
* 2D array storing values of de Casteljau algorithm.
*/
- float bValues[4][2];
+ float controlPoints[4][2];
};
#endif // __FTContour__
diff --git a/src/FTContour.cpp b/src/FTContour.cpp
index 7635c1e..d24a0cd 100644
--- a/src/FTContour.cpp
+++ b/src/FTContour.cpp
@@ -11,7 +11,7 @@ FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOf
if( pointTag == FT_Curve_Tag_On)
{
- AddPoint( FTPoint( contour[pointIndex]));
+ AddPoint( contour[pointIndex].x, contour[pointIndex].y);
continue;
}
@@ -36,9 +36,9 @@ FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOf
static_cast<float>( controlPoint.y + nextPoint.y) * 0.5f,
0);
- bValues[0][0] = previousPoint.x; bValues[0][1] = previousPoint.y;
- bValues[1][0] = controlPoint.x; bValues[1][1] = controlPoint.y;
- bValues[2][0] = nextPoint.x; bValues[2][1] = nextPoint.y;
+ controlPoints[0][0] = previousPoint.x; controlPoints[0][1] = previousPoint.y;
+ controlPoints[1][0] = controlPoint.x; controlPoints[1][1] = controlPoint.y;
+ controlPoints[2][0] = nextPoint.x; controlPoints[2][1] = nextPoint.y;
evaluateQuadraticCurve();
++pointIndex;
@@ -53,9 +53,9 @@ FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOf
: pointTags[pointIndex + 1];
}
- bValues[0][0] = previousPoint.x; bValues[0][1] = previousPoint.y;
- bValues[1][0] = controlPoint.x; bValues[1][1] = controlPoint.y;
- bValues[2][0] = nextPoint.x; bValues[2][1] = nextPoint.y;
+ controlPoints[0][0] = previousPoint.x; controlPoints[0][1] = previousPoint.y;
+ controlPoints[1][0] = controlPoint.x; controlPoints[1][1] = controlPoint.y;
+ controlPoints[2][0] = nextPoint.x; controlPoints[2][1] = nextPoint.y;
evaluateQuadraticCurve();
continue;
@@ -69,10 +69,10 @@ FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOf
? pointList[0]
: FTPoint( contour[pointIndex + 2]);
- bValues[0][0] = previousPoint.x; bValues[0][1] = previousPoint.y;
- bValues[1][0] = controlPoint.x; bValues[1][1] = controlPoint.y;
- bValues[2][0] = controlPoint2.x; bValues[2][1] = controlPoint2.y;
- bValues[3][0] = nextPoint.x; bValues[3][1] = nextPoint.y;
+ controlPoints[0][0] = previousPoint.x; controlPoints[0][1] = previousPoint.y;
+ controlPoints[1][0] = controlPoint.x; controlPoints[1][1] = controlPoint.y;
+ controlPoints[2][0] = controlPoint2.x; controlPoints[2][1] = controlPoint2.y;
+ controlPoints[3][0] = nextPoint.x; controlPoints[3][1] = nextPoint.y;
evaluateCubicCurve();
++pointIndex;
@@ -91,24 +91,35 @@ void FTContour::AddPoint( FTPoint point)
}
+void FTContour::AddPoint( float x, float y)
+{
+ FTPoint point( x, y, 0.0f);
+
+ if( pointList.empty() || point != pointList[pointList.size() - 1])
+ {
+ pointList.push_back( point);
+ }
+}
+
+
void FTContour::evaluateQuadraticCurve()
{
for( unsigned int i = 0; i <= ( 1.0f / BEZIER_STEP_SIZE); i++)
{
- float tempBValues[2][2];
+ float bezierValues[2][2];
float t = static_cast<float>(i) * BEZIER_STEP_SIZE;
- tempBValues[0][0] = (1.0f - t) * bValues[0][0] + t * bValues[1][0];
- tempBValues[0][1] = (1.0f - t) * bValues[0][1] + t * bValues[1][1];
+ bezierValues[0][0] = (1.0f - t) * controlPoints[0][0] + t * controlPoints[1][0];
+ bezierValues[0][1] = (1.0f - t) * controlPoints[0][1] + t * controlPoints[1][1];
- tempBValues[1][0] = (1.0f - t) * bValues[1][0] + t * bValues[2][0];
- tempBValues[1][1] = (1.0f - t) * bValues[1][1] + t * bValues[2][1];
+ bezierValues[1][0] = (1.0f - t) * controlPoints[1][0] + t * controlPoints[2][0];
+ bezierValues[1][1] = (1.0f - t) * controlPoints[1][1] + t * controlPoints[2][1];
- tempBValues[0][0] = (1.0f - t) * tempBValues[0][0] + t * tempBValues[1][0];
- tempBValues[0][1] = (1.0f - t) * tempBValues[0][1] + t * tempBValues[1][1];
+ bezierValues[0][0] = (1.0f - t) * bezierValues[0][0] + t * bezierValues[1][0];
+ bezierValues[0][1] = (1.0f - t) * bezierValues[0][1] + t * bezierValues[1][1];
- AddPoint( FTPoint( tempBValues[0][0], tempBValues[0][1], 0.0f));
+ AddPoint( bezierValues[0][0], bezierValues[0][1]);
}
}
@@ -116,29 +127,29 @@ void FTContour::evaluateCubicCurve()
{
for( unsigned int i = 0; i <= ( 1.0f / BEZIER_STEP_SIZE); i++)
{
- float tempBValues[3][2];
+ float bezierValues[3][2];
float t = static_cast<float>(i) * BEZIER_STEP_SIZE;
- tempBValues[0][0] = (1.0f - t) * bValues[0][0] + t * bValues[1][0];
- tempBValues[0][1] = (1.0f - t) * bValues[0][1] + t * bValues[1][1];
+ bezierValues[0][0] = (1.0f - t) * controlPoints[0][0] + t * controlPoints[1][0];
+ bezierValues[0][1] = (1.0f - t) * controlPoints[0][1] + t * controlPoints[1][1];
- tempBValues[1][0] = (1.0f - t) * bValues[1][0] + t * bValues[2][0];
- tempBValues[1][1] = (1.0f - t) * bValues[1][1] + t * bValues[2][1];
+ bezierValues[1][0] = (1.0f - t) * controlPoints[1][0] + t * controlPoints[2][0];
+ bezierValues[1][1] = (1.0f - t) * controlPoints[1][1] + t * controlPoints[2][1];
- tempBValues[2][0] = (1.0f - t) * bValues[2][0] + t * bValues[3][0];
- tempBValues[2][1] = (1.0f - t) * bValues[2][1] + t * bValues[3][1];
+ bezierValues[2][0] = (1.0f - t) * controlPoints[2][0] + t * controlPoints[3][0];
+ bezierValues[2][1] = (1.0f - t) * controlPoints[2][1] + t * controlPoints[3][1];
- tempBValues[0][0] = (1.0f - t) * tempBValues[0][0] + t * tempBValues[1][0];
- tempBValues[0][1] = (1.0f - t) * tempBValues[0][1] + t * tempBValues[1][1];
+ bezierValues[0][0] = (1.0f - t) * bezierValues[0][0] + t * bezierValues[1][0];
+ bezierValues[0][1] = (1.0f - t) * bezierValues[0][1] + t * bezierValues[1][1];
- tempBValues[1][0] = (1.0f - t) * tempBValues[1][0] + t * tempBValues[2][0];
- tempBValues[1][1] = (1.0f - t) * tempBValues[1][1] + t * tempBValues[2][1];
+ bezierValues[1][0] = (1.0f - t) * bezierValues[1][0] + t * bezierValues[2][0];
+ bezierValues[1][1] = (1.0f - t) * bezierValues[1][1] + t * bezierValues[2][1];
- tempBValues[0][0] = (1.0f - t) * tempBValues[0][0] + t * tempBValues[1][0];
- tempBValues[0][1] = (1.0f - t) * tempBValues[0][1] + t * tempBValues[1][1];
+ bezierValues[0][0] = (1.0f - t) * bezierValues[0][0] + t * bezierValues[1][0];
+ bezierValues[0][1] = (1.0f - t) * bezierValues[0][1] + t * bezierValues[1][1];
- AddPoint( FTPoint( tempBValues[0][0], tempBValues[0][1], 0.0f));
+ AddPoint( bezierValues[0][0], bezierValues[0][1]);
}
}