Commit 71eb8253d9e51ca02d624c3383792fbc1763665c
2008-04-13T07:48:50
* Refactoring FTContour.
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 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266
diff --git a/include/FTContour.h b/include/FTContour.h
index 62bb6ec..12e8293 100644
--- a/include/FTContour.h
+++ b/include/FTContour.h
@@ -92,31 +92,24 @@ class FTGL_EXPORT FTContour
* @param point The point to be added to the contour.
*/
inline void AddPoint( FTPoint point);
-
- inline void AddPoint( float x, float y);
-
+
/**
* De Casteljau (bezier) algorithm contributed by Jed Soane
* Evaluates a quadratic or conic (second degree) curve
*/
- inline void evaluateQuadraticCurve();
+ inline void evaluateQuadraticCurve(FTPoint, FTPoint, FTPoint);
/**
* De Casteljau (bezier) algorithm contributed by Jed Soane
* Evaluates a cubic (third degree) curve
*/
- inline void evaluateCubicCurve();
+ inline void evaluateCubicCurve(FTPoint, FTPoint, FTPoint, FTPoint);
/**
* The list of points in this contour
*/
typedef FTVector<FTPoint> PointVector;
PointVector pointList;
-
- /**
- * 2D array storing values of de Casteljau algorithm.
- */
- float controlPoints[4][2];
};
#endif // __FTContour__
diff --git a/src/FTContour.cpp b/src/FTContour.cpp
index ae57efc..ca4a989 100644
--- a/src/FTContour.cpp
+++ b/src/FTContour.cpp
@@ -2,6 +2,7 @@
* FTGL - OpenGL font library
*
* Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
+ * 2008 Sam Hocevar <sam@zoy.org>
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -10,10 +11,10 @@
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -39,145 +40,98 @@
static const float BEZIER_STEP_SIZE = 0.2f;
-void FTContour::AddPoint( FTPoint point)
+void FTContour::AddPoint(FTPoint point)
{
- if( pointList.empty() || point != pointList[pointList.size() - 1])
+ if(pointList.empty() || point != pointList[pointList.size() - 1])
{
- pointList.push_back( point);
+ pointList.push_back(point);
}
}
-void FTContour::AddPoint( float x, float y)
-{
- AddPoint( FTPoint( x, y, 0.0f));
-}
-
-
-void FTContour::evaluateQuadraticCurve()
+void FTContour::evaluateQuadraticCurve(FTPoint A, FTPoint B, FTPoint C)
{
- for( unsigned int i = 0; i <= ( 1.0f / BEZIER_STEP_SIZE); i++)
+ for(unsigned int i = 0; i <= (1.0f / BEZIER_STEP_SIZE); i++)
{
- float bezierValues[2][2];
-
float t = static_cast<float>(i) * BEZIER_STEP_SIZE;
- 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];
-
- 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];
-
- 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( bezierValues[0][0], bezierValues[0][1]);
+ FTPoint U = (1.0f - t) * A + t * B;
+ FTPoint V = (1.0f - t) * B + t * C;
+
+ AddPoint((1.0f - t) * U + t * V);
}
}
-void FTContour::evaluateCubicCurve()
+
+void FTContour::evaluateCubicCurve(FTPoint A, FTPoint B, FTPoint C, FTPoint D)
{
- for( unsigned int i = 0; i <= ( 1.0f / BEZIER_STEP_SIZE); i++)
+ for(unsigned int i = 0; i <= (1.0f / BEZIER_STEP_SIZE); i++)
{
- float bezierValues[3][2];
-
float t = static_cast<float>(i) * BEZIER_STEP_SIZE;
- 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];
-
- 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];
-
- 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];
-
- 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];
-
- 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];
-
- 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( bezierValues[0][0], bezierValues[0][1]);
+ FTPoint U = (1.0f - t) * A + t * B;
+ FTPoint V = (1.0f - t) * B + t * C;
+ FTPoint W = (1.0f - t) * C + t * D;
+
+ FTPoint M = (1.0f - t) * U + t * V;
+ FTPoint N = (1.0f - t) * V + t * W;
+
+ AddPoint((1.0f - t) * M + t * N);
}
}
-FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOfPoints)
+FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n)
{
- for( unsigned int pointIndex = 0; pointIndex < numberOfPoints; ++ pointIndex)
+ for(unsigned int i = 0; i < n; ++ i)
{
- char pointTag = pointTags[pointIndex];
-
- if( pointTag == FT_Curve_Tag_On || numberOfPoints < 2)
+ if(tags[i] == FT_Curve_Tag_On || n < 2)
{
- AddPoint( contour[pointIndex].x, contour[pointIndex].y);
+ AddPoint(contour[i]);
continue;
}
-
- FTPoint controlPoint( contour[pointIndex]);
- FTPoint previousPoint = ( 0 == pointIndex)
- ? FTPoint( contour[numberOfPoints - 1])
- : pointList[pointList.size() - 1];
- FTPoint nextPoint = ( pointIndex == numberOfPoints - 1)
- ? pointList[0]
- : FTPoint( contour[pointIndex + 1]);
+ FTPoint cur(contour[i]);
+ FTPoint prev = (0 == i)
+ ? FTPoint(contour[n - 1])
+ : pointList[pointList.size() - 1];
+
+ FTPoint next = (i == n - 1)
+ ? pointList[0]
+ : FTPoint(contour[i + 1]);
- if( pointTag == FT_Curve_Tag_Conic)
+ if(tags[i] == FT_Curve_Tag_Conic)
{
- char nextPointTag = ( pointIndex == numberOfPoints - 1)
- ? pointTags[0]
- : pointTags[pointIndex + 1];
-
- while( nextPointTag == FT_Curve_Tag_Conic)
+ while(tags[(i == n - 1) ? 0 : i + 1] == FT_Curve_Tag_Conic)
{
- nextPoint = ( controlPoint + nextPoint) * 0.5f;
-
- 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;
-
- previousPoint = nextPoint;
- controlPoint = FTPoint( contour[pointIndex]);
- nextPoint = ( pointIndex == numberOfPoints - 1)
- ? pointList[0]
- : FTPoint( contour[pointIndex + 1]);
- nextPointTag = ( pointIndex == numberOfPoints - 1)
- ? pointTags[0]
- : pointTags[pointIndex + 1];
+ next = (cur + next) * 0.5f;
+
+ evaluateQuadraticCurve(prev, cur, next);
+ ++i;
+
+ prev = next;
+ cur = FTPoint(contour[i]);
+ next = (i == n - 1)
+ ? pointList[0]
+ : FTPoint(contour[i + 1]);
}
-
- 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();
+
+ evaluateQuadraticCurve(prev, cur, next);
continue;
}
- if( pointTag == FT_Curve_Tag_Cubic)
+ if(tags[i] == FT_Curve_Tag_Cubic)
{
- FTPoint controlPoint2 = nextPoint;
-
- FTPoint nextPoint = ( pointIndex == numberOfPoints - 2)
- ? pointList[0]
- : FTPoint( contour[pointIndex + 2]);
-
- 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;
+ FTPoint cur2 = next;
+
+ FTPoint next = (i == n - 2)
+ ? pointList[0]
+ : FTPoint(contour[i + 2]);
+
+ evaluateCubicCurve(prev, cur, cur2, next);
+ ++i;
continue;
}
}
}
+