Made Bezier code slightly more easy to read

kintel · kintel · commit c2cb2377f5dc · 2015-03-12T19:34:36.000-04:00
diff --git a/src/DrawingCallback.cc b/src/DrawingCallback.cc
@@ -95,24 +95,27 @@ void DrawingCallback::line_to(Vector2d to)
 	pen = to;
 }
 
+// Quadric Bezier curve
 void DrawingCallback::curve_to(Vector2d c1, Vector2d to)
 {
 	for (unsigned long idx = 1;idx <= fn;idx++) {
 		const double a = idx * (1.0 / (double)fn);
-		const double x = pen[0] * t(a, 2) + c1[0] * 2 * t(a, 1) * a + to[0] * a * a;
-		const double y = pen[1] * t(a, 2) + c1[1] * 2 * t(a, 1) * a + to[1] * a * a;
-		add_vertex(Vector2d(x, y));
+		add_vertex(pen * pow(1-a, 2) + 
+							 c1 * 2 * pow(1-a, 1) * a + 
+							 to * pow(a, 2));
 	}
 	pen = to;
 }
 
+// Cubic Bezier curve
 void DrawingCallback::curve_to(Vector2d c1, Vector2d c2, Vector2d to)
 {
 	for (unsigned long idx = 1;idx <= fn;idx++) {
 		const double a = idx * (1.0 / (double)fn);
-		const double x = pen[0] * t(a, 3) + c1[0] * 3 * t(a, 2) * a + c2[0] * 3 * t(a, 1) * a * a + to[0] * a * a * a;
-		const double y = pen[1] * t(a, 3) + c1[1] * 3 * t(a, 2) * a + c2[1] * 3 * t(a, 1) * a * a + to[1] * a * a * a;
-		add_vertex(Vector2d(x, y));
+		add_vertex(pen * pow(1-a, 3) + 
+							 c1 * 3 * pow(1-a, 2) * a + 
+							 c2 * 3 * pow(1-a, 1) * pow(a, 2) + 
+							 to * pow(a, 3));
 	}
 	pen = to;
 }
diff --git a/src/DrawingCallback.h b/src/DrawingCallback.h
@@ -56,8 +56,4 @@ class DrawingCallback {
 	std::vector<const class Geometry *> polygons;
     
     void add_vertex(Vector2d v);
-    
-    inline double t(double t, int exp) const {
-	return pow(1.0 - t, exp);
-    }
 };

Original file line number	Diff line number	Diff line change
`@@ -95,24 +95,27 @@ void DrawingCallback::line_to(Vector2d to)`
`95`	`95`	`pen = to;`
`96`	`96`	`}`
`97`	`97`
	`98`	`+// Quadric Bezier curve`
`98`	`99`	`void DrawingCallback::curve_to(Vector2d c1, Vector2d to)`
`99`	`100`	`{`
`100`	`101`	`for (unsigned long idx = 1;idx <= fn;idx++) {`
`101`	`102`	`const double a = idx * (1.0 / (double)fn);`
`102`		`- const double x = pen[0] * t(a, 2) + c1[0] * 2 * t(a, 1) * a + to[0] * a * a;`
`103`		`- const double y = pen[1] * t(a, 2) + c1[1] * 2 * t(a, 1) * a + to[1] * a * a;`
`104`		`- add_vertex(Vector2d(x, y));`
	`103`	`+ add_vertex(pen * pow(1-a, 2) +`
	`104`	`+ c1 * 2 * pow(1-a, 1) * a +`
	`105`	`+ to * pow(a, 2));`
`105`	`106`	`}`
`106`	`107`	`pen = to;`
`107`	`108`	`}`
`108`	`109`
	`110`	`+// Cubic Bezier curve`
`109`	`111`	`void DrawingCallback::curve_to(Vector2d c1, Vector2d c2, Vector2d to)`
`110`	`112`	`{`
`111`	`113`	`for (unsigned long idx = 1;idx <= fn;idx++) {`
`112`	`114`	`const double a = idx * (1.0 / (double)fn);`
`113`		`- const double x = pen[0] * t(a, 3) + c1[0] * 3 * t(a, 2) * a + c2[0] * 3 * t(a, 1) * a * a + to[0] * a * a * a;`
`114`		`- const double y = pen[1] * t(a, 3) + c1[1] * 3 * t(a, 2) * a + c2[1] * 3 * t(a, 1) * a * a + to[1] * a * a * a;`
`115`		`- add_vertex(Vector2d(x, y));`
	`115`	`+ add_vertex(pen * pow(1-a, 3) +`
	`116`	`+ c1 * 3 * pow(1-a, 2) * a +`
	`117`	`+ c2 * 3 * pow(1-a, 1) * pow(a, 2) +`
	`118`	`+ to * pow(a, 3));`
`116`	`119`	`}`
`117`	`120`	`pen = to;`
`118`	`121`	`}`