diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c index 615af0e1c..4fab3426a 100644 --- a/clutter/clutter-alpha.c +++ b/clutter/clutter-alpha.c @@ -59,6 +59,11 @@ * #ClutterAlpha is used to "drive" a #ClutterBehaviour instance, and it * is internally used by the #ClutterAnimation API. * + *
+ * Easing modes provided by Clutter + * + *
+ * * Since: 0.2 */ diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am index d03a283d0..e396ad68d 100644 --- a/doc/reference/clutter/Makefile.am +++ b/doc/reference/clutter/Makefile.am @@ -91,7 +91,7 @@ EXTRA_HFILES=\ # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png HTML_IMAGES=\ actor-box.png \ - alpha-func.png \ + easing-modes.png \ event-flow.png \ path-alpha-func.png @@ -132,6 +132,7 @@ include $(top_srcdir)/gtk-doc.make EXTRA_DIST += \ version.xml.in \ actor-box.png \ - alpha-func.png \ + easing-modes.png \ + easing-modes.svg \ event-flow.png \ path-alpha-func.png diff --git a/doc/reference/clutter/alpha-func.png b/doc/reference/clutter/alpha-func.png deleted file mode 100644 index 292d49325..000000000 Binary files a/doc/reference/clutter/alpha-func.png and /dev/null differ diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt index dfc898d0e..7cbb297a9 100644 --- a/doc/reference/clutter/clutter-sections.txt +++ b/doc/reference/clutter/clutter-sections.txt @@ -100,46 +100,24 @@ clutter_behaviour_get_type ClutterAlpha ClutterAlpha ClutterAlphaClass +ClutterAlphaFunc clutter_alpha_new clutter_alpha_new_full clutter_alpha_new_with_func -clutter_alpha_get_alpha -CLUTTER_ALPHA_MAX_ALPHA -ClutterAlphaFunc -clutter_alpha_set_func -clutter_alpha_set_closure clutter_alpha_set_timeline clutter_alpha_get_timeline clutter_alpha_set_mode clutter_alpha_get_mode +clutter_alpha_get_alpha + + +clutter_alpha_set_func +clutter_alpha_set_closure clutter_alpha_register_closure clutter_alpha_register_func - -clutter_ramp_inc_func -clutter_ramp_dec_func -clutter_ramp_func -clutter_sine_func -clutter_sine_inc_func -clutter_sine_dec_func -clutter_sine_half_func -clutter_sine_in_func -clutter_sine_out_func -clutter_sine_in_out_func -clutter_square_func -clutter_smoothstep_inc_func -clutter_smoothstep_dec_func -clutter_exp_inc_func -clutter_exp_dec_func -clutter_exp_in_func -clutter_exp_out_func -clutter_exp_in_out_func -clutter_ease_in_func -clutter_ease_out_func -clutter_ease_in_out_func - CLUTTER_ALPHA CLUTTER_IS_ALPHA diff --git a/doc/reference/clutter/easing-modes.png b/doc/reference/clutter/easing-modes.png new file mode 100644 index 000000000..c1cbe1460 Binary files /dev/null and b/doc/reference/clutter/easing-modes.png differ diff --git a/doc/reference/clutter/easing-modes.svg b/doc/reference/clutter/easing-modes.svg new file mode 100644 index 000000000..34e0b34a3 --- /dev/null +++ b/doc/reference/clutter/easing-modes.svg @@ -0,0 +1,920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +