2007-10-01 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/clutter-fixed.h: Add CLUTTER_FIXED_TO_INT() and
	deprecate CLUTTER_FIXED_INT(), for symmetry with
	CLUTTER_FIXED_FROM_INT().

	* clutter/clutter-alpha.c:
	* clutter/clutter-behaviour-depth.c:
	* clutter/clutter-behaviour-ellipse.c:
	* clutter/clutter-behaviour-path.c:
	* clutter/clutter-fixed.h: Use CLUTTER_FIXED_TO_INT().
This commit is contained in:
Emmanuele Bassi
2007-10-02 14:53:32 +00:00
parent db0ed63c93
commit 4189c66a21
7 changed files with 42 additions and 17 deletions

View File

@ -109,8 +109,8 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
ClutterBehaviourEllipsePrivate *priv = e->priv;
gint x, y, z;
x = CLUTTER_FIXED_INT (priv->a * clutter_cosi (angle));
y = CLUTTER_FIXED_INT (priv->b * clutter_sini (angle));
x = CLUTTER_FIXED_TO_INT (priv->a * clutter_cosi (angle));
y = CLUTTER_FIXED_TO_INT (priv->b * clutter_sini (angle));
z = 0;
if (priv->angle_tilt_z)
@ -131,8 +131,8 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
y2 = y * clutter_cosi (priv->angle_tilt_z)
+ x * clutter_sini (priv->angle_tilt_z);
x = CLUTTER_FIXED_INT (x2);
y = CLUTTER_FIXED_INT (y2);
x = CLUTTER_FIXED_TO_INT (x2);
y = CLUTTER_FIXED_TO_INT (y2);
}
if (priv->angle_tilt_x)
@ -143,8 +143,8 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
y2 = y * clutter_cosi (priv->angle_tilt_x);
z = CLUTTER_FIXED_INT (z2);
y = CLUTTER_FIXED_INT (y2);
z = CLUTTER_FIXED_TO_INT (z2);
y = CLUTTER_FIXED_TO_INT (y2);
}
if (priv->angle_tilt_y)
@ -157,8 +157,8 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
z2 = z * clutter_cosi (priv->angle_tilt_y)
+ x * clutter_sini (priv->angle_tilt_y);
x = CLUTTER_FIXED_INT (x2);
z = CLUTTER_FIXED_INT (z2);
x = CLUTTER_FIXED_TO_INT (x2);
z = CLUTTER_FIXED_TO_INT (z2);
}
knot->x = x;