Commit 4473227876bf3c85f339c5540f442bc8068c6a3b
2002-12-15T08:51:54
Got rid of ctrlPtArray
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
diff --git a/include/FTContour.h b/include/FTContour.h
index 3cb06e0..b3a8302 100644
--- a/include/FTContour.h
+++ b/include/FTContour.h
@@ -86,7 +86,6 @@ class FTGL_EXPORT FTContour
*/
// Magic numbers -- #define MAX_DEG 4
float bValues[4][4][2]; //3D array storing values of de Casteljau algorithm.
- float ctrlPtArray[4][2]; // Magic numbers
};
#endif // __FTContour__
diff --git a/src/FTContour.cpp b/src/FTContour.cpp
index 6863d51..3564e7d 100644
--- a/src/FTContour.cpp
+++ b/src/FTContour.cpp
@@ -38,9 +38,9 @@ FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOf
static_cast<float>( controlPoint.y + nextPoint.y) * 0.5f,
0);
- ctrlPtArray[0][0] = previousPoint.x; ctrlPtArray[0][1] = previousPoint.y;
- ctrlPtArray[1][0] = controlPoint.x; ctrlPtArray[1][1] = controlPoint.y;
- ctrlPtArray[2][0] = nextPoint.x; ctrlPtArray[2][1] = nextPoint.y;
+ bValues[0][0][0] = previousPoint.x; bValues[0][0][1] = previousPoint.y;
+ bValues[0][1][0] = controlPoint.x; bValues[0][1][1] = controlPoint.y;
+ bValues[0][2][0] = nextPoint.x; bValues[0][2][1] = nextPoint.y;
evaluateCurve( SECOND_ORDER_CURVE);
++pointIndex;
@@ -55,9 +55,9 @@ FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOf
: pointTags[pointIndex + 1];
}
- ctrlPtArray[0][0] = previousPoint.x; ctrlPtArray[0][1] = previousPoint.y;
- ctrlPtArray[1][0] = controlPoint.x; ctrlPtArray[1][1] = controlPoint.y;
- ctrlPtArray[2][0] = nextPoint.x; ctrlPtArray[2][1] = nextPoint.y;
+ bValues[0][0][0] = previousPoint.x; bValues[0][0][1] = previousPoint.y;
+ bValues[0][1][0] = controlPoint.x; bValues[0][1][1] = controlPoint.y;
+ bValues[0][2][0] = nextPoint.x; bValues[0][2][1] = nextPoint.y;
evaluateCurve( SECOND_ORDER_CURVE);
continue;
@@ -71,10 +71,10 @@ FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOf
? pointList[0]
: FTPoint( contour[pointIndex + 2]);
- ctrlPtArray[0][0] = previousPoint.x; ctrlPtArray[0][1] = previousPoint.y;
- ctrlPtArray[1][0] = controlPoint.x; ctrlPtArray[1][1] = controlPoint.y;
- ctrlPtArray[2][0] = controlPoint2.x; ctrlPtArray[2][1] = controlPoint2.y;
- ctrlPtArray[3][0] = nextPoint.x; ctrlPtArray[3][1] = nextPoint.y;
+ bValues[0][0][0] = previousPoint.x; bValues[0][0][1] = previousPoint.y;
+ bValues[0][1][0] = controlPoint.x; bValues[0][1][1] = controlPoint.y;
+ bValues[0][2][0] = controlPoint2.x; bValues[0][2][1] = controlPoint2.y;
+ bValues[0][3][0] = nextPoint.x; bValues[0][3][1] = nextPoint.y;
evaluateCurve( THIRD_ORDER_CURVE);
++pointIndex;
@@ -111,13 +111,6 @@ void FTContour::deCasteljau( const float t, const int n)
void FTContour::evaluateCurve( const int n)
{
- // setting the b(0) equal to the control points
- for( int i = 0; i <= n; i++)
- {
- bValues[0][i][0] = ctrlPtArray[i][0];
- bValues[0][i][1] = ctrlPtArray[i][1];
- }
-
float t; //parameter for curve point calc. [0.0, 1.0]
for( int m = 0; m <= ( 1 / BEZIER_STEP_SIZE); m++)