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

Fixed CCW rotation in rotate behaviour (bug 483); fixed overall path length calculation for angles > 360 in rotate and ellipse.

Browse Source
This commit is contained in:
Tomas Frydrych
2007-08-22 10:33:26 +00:00
parent 86ff4e0cac
commit a40f50fffa
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
clutter/clutter-behaviour-ellipse.c
View File

@ -205,21 +205,23 @@ clutter_behaviour_ellipse_alpha_notify (ClutterBehaviour *behave,
priv->direction == CLUTTER_ROTATE_CCW)
{
ClutterAngle diff;
ClutterAngle angle_begin = priv->angle_begin + 256;
ClutterAngle angle_end = priv->angle_end + 256;
/* Work out the angular length of the arch represented by the
* end angle in CCW direction
*/
if (priv->angle_end > 1024)
if (angle_end >= 1024)
{
gint rounds = priv->angle_end / 1024;
gint rounds = angle_end / 1024;
ClutterAngle a1 = rounds * 1024;
ClutterAngle a2 = 1024 - (priv->angle_end - a1);
ClutterAngle a2 = - (angle_end - a1);
diff = a1 + a2 + priv->angle_begin;
diff = a1 + a2 + angle_begin;
}
else
{
diff = 1024 - priv->angle_end + priv->angle_begin;
diff = 1024 - angle_end + angle_begin;
}
angle = priv->angle_begin - (diff * alpha / CLUTTER_ALPHA_MAX_ALPHA);
@ -228,23 +230,25 @@ clutter_behaviour_ellipse_alpha_notify (ClutterBehaviour *behave,
priv->direction == CLUTTER_ROTATE_CW)
{
ClutterAngle diff;
ClutterAngle angle_begin = priv->angle_begin + 256;
ClutterAngle angle_end = priv->angle_end + 256;
/* Work out the angular length of the arch represented by the
* begin angle in CW direction
*/
if (priv->angle_begin > 1024)
if (angle_begin >= 1024)
{
gint rounds = priv->angle_begin/ 1024;
gint rounds = angle_begin / 1024;
ClutterAngle a1 = rounds * 1024;
ClutterAngle a2 = 1024 - (priv->angle_begin - a1);
ClutterAngle a2 = - (angle_begin - a1);
diff = a1 + a2 + priv->angle_end;
diff = a1 + a2 + angle_end;
}
else
{
diff = 1024 - priv->angle_begin + priv->angle_end;
diff = 1024 - angle_begin + angle_end;
}
angle = priv->angle_begin + (diff * alpha / CLUTTER_ALPHA_MAX_ALPHA);
}