From 9bd77e25b2a87363da3aaae3d00400d387f9718e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 17 Jan 2007 13:51:14 +0000 Subject: [PATCH] 2007-01-17 Emmanuele Bassi * clutter/clutter-feature.h: * clutter/clutter-feature.c: Move the GL headers from the header file to the body. * clutter/clutter-fixed.h: * clutter/clutter-fixed.c: Fix apidoc. * clutter/clutter-color.h: * clutter/clutter-color.c: Ditto. --- ChangeLog | 12 +++++++++++ clutter/clutter-color.c | 10 ++++++--- clutter/clutter-color.h | 2 +- clutter/clutter-feature.c | 3 +++ clutter/clutter-feature.h | 2 -- clutter/clutter-fixed.c | 4 ++-- clutter/clutter-fixed.h | 4 ++-- doc/reference/clutter-sections.txt | 12 ++++++----- doc/reference/tmpl/clutter-fixed.sgml | 39 ++++++++++++++++++++++++----------- 9 files changed, 61 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a2dde4..36f8dc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-01-17 Emmanuele Bassi + + * clutter/clutter-feature.h: + * clutter/clutter-feature.c: Move the GL headers from the + header file to the body. + + * clutter/clutter-fixed.h: + * clutter/clutter-fixed.c: Fix apidoc. + + * clutter/clutter-color.h: + * clutter/clutter-color.c: Ditto. + 2007-01-17 Tomas Frydrych * clutter/clutter-fixed.h: diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c index 1445421..c29a542 100644 --- a/clutter/clutter-color.c +++ b/clutter/clutter-color.c @@ -311,19 +311,23 @@ clutter_color_from_hls (ClutterColor *dest, void clutter_color_shade (const ClutterColor *src, ClutterColor *dest, - gdouble shade) + gdouble shade) { clutter_color_shadex (src, dest, CLUTTER_FLOAT_TO_FIXED (shade)); } /** - * clutter_color_shade: + * clutter_color_shadex: * @src: a #ClutterColor * @dest: return location for the shaded color * @shade: #ClutterFixed the shade factor to apply * + * Fixed point version of clutter_color_shade(). + * * Shades @src by the factor of @shade and saves the modified * color into @dest. + * + * Since: 0.2 */ void clutter_color_shadex (const ClutterColor *src, @@ -471,7 +475,7 @@ clutter_color_to_string (const ClutterColor *color) * * Compares two #ClutterColors and checks if they are the same. * - * Return: %TRUE if the two colors are the same. + * Return value: %TRUE if the two colors are the same. * * Since: 0.2 */ diff --git a/clutter/clutter-color.h b/clutter/clutter-color.h index 9fdc848..c85ee8a 100644 --- a/clutter/clutter-color.h +++ b/clutter/clutter-color.h @@ -67,7 +67,7 @@ void clutter_color_darken (const ClutterColor *src, void clutter_color_shade (const ClutterColor *src, ClutterColor *dest, gdouble shade); -void clutter_color_shadex (const ClutterColor *src, +void clutter_color_shadex (const ClutterColor *src, ClutterColor *dest, ClutterFixed shade); diff --git a/clutter/clutter-feature.c b/clutter/clutter-feature.c index dae3ce7..95005bd 100644 --- a/clutter/clutter-feature.c +++ b/clutter/clutter-feature.c @@ -40,6 +40,9 @@ #include #include +#include +#include + #include #include "clutter-feature.h" diff --git a/clutter/clutter-feature.h b/clutter/clutter-feature.h index 2ef4d37..784cac6 100644 --- a/clutter/clutter-feature.h +++ b/clutter/clutter-feature.h @@ -34,8 +34,6 @@ #define _HAVE_CLUTTER_FEATURE_H #include -#include -#include G_BEGIN_DECLS diff --git a/clutter/clutter-fixed.c b/clutter/clutter-fixed.c index af2aa48..217fb21 100644 --- a/clutter/clutter-fixed.c +++ b/clutter/clutter-fixed.c @@ -455,8 +455,8 @@ clutter_sqrtx (ClutterFixed x) * * Since: 0.2 */ -int -clutter_sqrti (int x) +gint +clutter_sqrti (gint x) { int t = 0; int sh = 0; diff --git a/clutter/clutter-fixed.h b/clutter/clutter-fixed.h index 9539f0e..c511052 100644 --- a/clutter/clutter-fixed.h +++ b/clutter/clutter-fixed.h @@ -85,7 +85,7 @@ typedef gint32 ClutterAngle; /* angle such that 1024 == 2*PI */ #define CFX_DIV CLUTTER_FIXED_DIV /* Fixed point math routines */ -ClutterFixed clutter_sinx (ClutterFixed anx); +ClutterFixed clutter_sinx (ClutterFixed angle); ClutterFixed clutter_sini (ClutterAngle angle); /* convenience macros for the cos functions */ @@ -93,7 +93,7 @@ ClutterFixed clutter_sini (ClutterAngle angle); #define clutter_cosi(x) clutter_sini((x) - 256) ClutterFixed clutter_sqrtx (ClutterFixed x); -int clutter_sqrti (int x); +gint clutter_sqrti (gint x); G_END_DECLS diff --git a/doc/reference/clutter-sections.txt b/doc/reference/clutter-sections.txt index fc4e3ef..b2f56b3 100644 --- a/doc/reference/clutter-sections.txt +++ b/doc/reference/clutter-sections.txt @@ -467,10 +467,10 @@ CFX_180 CFX_240 CFX_360 CFX_60 +CFX_255 CFX_DIV CFX_INT CFX_MUL -clutter_color_shadex CLUTTER_FIXED_TO_FLOAT CLUTTER_FIXED_TO_DOUBLE CLUTTER_FLOAT_TO_FIXED @@ -481,10 +481,12 @@ CLUTTER_FIXED_FLOOR CLUTTER_FIXED_CEIL CLUTTER_FIXED_MUL CLUTTER_FIXED_DIV -clutter_fixed_cos -clutter_fixed_sin -clutter_angle_cos -clutter_angle_sin +clutter_cosi +clutter_cosx +clutter_sini +clutter_sinx +clutter_sqrti +clutter_sqrtx
diff --git a/doc/reference/tmpl/clutter-fixed.sgml b/doc/reference/tmpl/clutter-fixed.sgml index 36e2630..01ff19b 100644 --- a/doc/reference/tmpl/clutter-fixed.sgml +++ b/doc/reference/tmpl/clutter-fixed.sgml @@ -131,35 +131,32 @@ floating-to-fixed conversion. - + - + - + - + -@src: -@dest: -@shade: @@ -244,7 +241,15 @@ floating-to-fixed conversion. @y: - + + + + + +@x: + + + @@ -252,7 +257,16 @@ floating-to-fixed conversion. @x: - + + + + + +@angle: +@Returns: + + + @@ -261,20 +275,21 @@ floating-to-fixed conversion. @Returns: - + @x: +@Returns: - + -@angle: +@x: @Returns: -- 2.7.4