isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-29 14:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace fixes for BehaviourEllipse

Browse Source 
Simple fallout from the automated conversion scripts that
switched from ClutterFixed to float.
This commit is contained in:
Emmanuele Bassi 2009-01-23 16:50:17 +00:00
parent 171a7647b9
commit cdb360107b
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,14 +83,14 @@ struct _ClutterBehaviourEllipsePrivate
{ {
ClutterKnot center; ClutterKnot center;
gint a; gint a;
gint b; gint b;
float angle_start; gfloat angle_start;
float angle_end; gfloat angle_end;
float angle_tilt_x; gfloat angle_tilt_x;
float angle_tilt_y; gfloat angle_tilt_y;
float angle_tilt_z; gfloat angle_tilt_z;
ClutterRotateDirection direction; ClutterRotateDirection direction;
}; };
@ -110,8 +110,8 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
ClutterBehaviourEllipsePrivate *priv = e->priv; ClutterBehaviourEllipsePrivate *priv = e->priv;
gint x, y, z; gint x, y, z;
x = (priv->a * cosf (angle * (G_PI/180.0))); x = priv->a * cosf (angle * (G_PI / 180.0));
y = (priv->b * sinf (angle * (G_PI/180.0))); y = priv->b * sinf (angle * (G_PI / 180.0));
z = 0; z = 0;
if (priv->angle_tilt_z) if (priv->angle_tilt_z)
@ -124,13 +124,13 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
* sin (a + b) and cos (a + b) * sin (a + b) and cos (a + b)
* *
*/ */
ClutterFixed x2, y2; gfloat x2, y2;
x2 = x * cosf (priv->angle_tilt_z * (G_PI/180.0)) x2 = x * cosf (priv->angle_tilt_z * (G_PI / 180.0))
- y * sinf (priv->angle_tilt_z * (G_PI/180.0)); - y * sinf (priv->angle_tilt_z * (G_PI / 180.0));
y2 = y * cosf (priv->angle_tilt_z * (G_PI/180.0)) y2 = y * cosf (priv->angle_tilt_z * (G_PI / 180.0))
+ x * sinf (priv->angle_tilt_z * (G_PI/180.0)); + x * sinf (priv->angle_tilt_z * (G_PI / 180.0));
x = (x2); x = (x2);
y = (y2); y = (y2);
@ -138,28 +138,27 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
if (priv->angle_tilt_x) if (priv->angle_tilt_x)
{ {
ClutterFixed z2, y2; gfloat z2, y2;
z2 = - y * sinf (priv->angle_tilt_x * (G_PI/180.0)); z2 = - y * sinf (priv->angle_tilt_x * (G_PI / 180.0));
y2 = y * cosf (priv->angle_tilt_x * (G_PI / 180.0));
y2 = y * cosf (priv->angle_tilt_x * (G_PI/180.0)); z = z2;
y = y2;
z = (z2);
y = (y2);
} }
if (priv->angle_tilt_y) if (priv->angle_tilt_y)
{ {
ClutterFixed x2, z2; gfloat x2, z2;
x2 = x * cosf (priv->angle_tilt_y * (G_PI/180.0)) x2 = x * cosf (priv->angle_tilt_y * (G_PI / 180.0))
- z * sinf (priv->angle_tilt_y * (G_PI/180.0)); - z * sinf (priv->angle_tilt_y * (G_PI / 180.0));
z2 = z * cosf (priv->angle_tilt_y * (G_PI/180.0)) z2 = z * cosf (priv->angle_tilt_y * (G_PI / 180.0))
+ x * sinf (priv->angle_tilt_y * (G_PI/180.0)); + x * sinf (priv->angle_tilt_y * (G_PI / 180.0));
x = (x2); x = x2;
z = (z2); z = z2;
} }
knot->x = x; knot->x = x;
@ -178,11 +177,13 @@ actor_apply_knot_foreach (ClutterBehaviour *behave,
ClutterActor *actor, ClutterActor *actor,
gpointer data) gpointer data)
{ {
ClutterBehaviourEllipsePrivate *priv ClutterBehaviourEllipsePrivate *priv;
= ((ClutterBehaviourEllipse *) behave)->priv;
knot3d *knot = data; knot3d *knot = data;
priv = ((ClutterBehaviourEllipse *) behave)->priv;
clutter_actor_set_position (actor, knot->x, knot->y); clutter_actor_set_position (actor, knot->x, knot->y);
if (priv->angle_tilt_x != 0 || priv->angle_tilt_y != 0) if (priv->angle_tilt_x != 0 || priv->angle_tilt_y != 0)
clutter_actor_set_depth (actor, knot->z); clutter_actor_set_depth (actor, knot->z);
} }
@ -205,9 +206,9 @@ clutter_behaviour_ellipse_alpha_notify (ClutterBehaviour *behave,
{ {
ClutterBehaviourEllipse *self = CLUTTER_BEHAVIOUR_ELLIPSE (behave); ClutterBehaviourEllipse *self = CLUTTER_BEHAVIOUR_ELLIPSE (behave);
ClutterBehaviourEllipsePrivate *priv = self->priv; ClutterBehaviourEllipsePrivate *priv = self->priv;
float start, end; gfloat start, end;
gfloat angle = 0;
knot3d knot; knot3d knot;
float angle = 0;
start = priv->angle_start; start = priv->angle_start;
end = priv->angle_end; end = priv->angle_end;