brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* clutter/cogl/common/cogl-primitives.c: (_cogl_path_arc):

Browse Source 
Draw as expected when end angle is lower than start angle (i.e. do not
        swap the angles). This aligns with cairo behaviour.
This commit is contained in:
Chris Lord 2008-06-10 10:05:12 +00:00
parent 863837baec
commit db518c8736
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-10 Chris Lord <chris@openedhand.com>
* clutter/cogl/common/cogl-primitives.c: (_cogl_path_arc):
Draw as expected when end angle is lower than start angle (i.e. do not
swap the angles). This aligns with cairo behaviour.
2008-06-10 Tommi Komulainen <tommi.komulainen@iki.fi> 2008-06-10 Tommi Komulainen <tommi.komulainen@iki.fi>
Bug#959 - Multiple minor improvements Bug#959 - Multiple minor improvements

34
clutter/cogl/common/cogl-primitives.c
View File

@ -207,7 +207,6 @@ _cogl_path_arc (ClutterFixed center_x,
guint move_first) guint move_first)
{ {
ClutterAngle a = 0x0; ClutterAngle a = 0x0;
ClutterAngle temp = 0x0;
ClutterFixed cosa = 0x0; ClutterFixed cosa = 0x0;
ClutterFixed sina = 0x0; ClutterFixed sina = 0x0;
ClutterFixed px = 0x0; ClutterFixed px = 0x0;
@ -221,16 +220,10 @@ _cogl_path_arc (ClutterFixed center_x,
if (angle_step < 0x0) if (angle_step < 0x0)
angle_step = -angle_step; angle_step = -angle_step;
if (angle_2 < angle_1)
{
temp = angle_1;
angle_1 = angle_2;
angle_2 = temp;
}
/* Walk the arc by given step */ /* Walk the arc by given step */
for (a = angle_1; a < angle_2; a += angle_step) a = angle_1;
while (a != angle_2)
{ {
cosa = clutter_cosi (a); cosa = clutter_cosi (a);
sina = clutter_sini (a); sina = clutter_sini (a);
@ -242,7 +235,30 @@ _cogl_path_arc (ClutterFixed center_x,
cogl_path_move_to (px, py); cogl_path_move_to (px, py);
else else
cogl_path_line_to (px, py); cogl_path_line_to (px, py);
if (G_LIKELY (angle_2 > angle_1))
{
a += angle_step;
if (a > angle_2)
a = angle_2;
}
else
{
a -= angle_step;
if (a < angle_2)
a = angle_2;
}
} }
/* Make sure the final point is drawn */
cosa = clutter_cosi (angle_2);
sina = clutter_sini (angle_2);
px = center_x + CFX_MUL (cosa, radius_x);
py = center_y + CFX_MUL (sina, radius_y);
cogl_path_line_to (px, py);
} }
void void