mirror of
https://github.com/brl/mutter.git
synced 2025-08-04 15:45:54 +00:00
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements * clutter/Makefile.am: * clutter/clutter.h: Update the build * clutter/clutter-types.h: Add AnimationMode, an enumeration for easing functions. * clutter/clutter-alpha.[ch]: Add the :mode property to control the function bound to an Alpha instance using an enumeration value. Also add six new alpha functions: - ease-in, ease-out, ease-in-out - sine-in, sine-out, sine-in-out * clutter/clutter-deprecated.h: Deprecate the #defines for the alpha functions. They will be replaced by entries in the ClutterAnimationMode. * clutter/clutter-interval.[ch]: Add ClutterInterval, an object for defining, validating and computing an interval between two values. * clutter/clutter-animation.[ch]: Add ClutterAnimation, an object responsible for animation the properties of a single actor along an interval of values. ClutterAnimation memory management is automatic. A simple wrapper method for ClutterActor is provided: clutter_actor_animate() which will create, or update, an animation for the passed actor. * clutter/clutter-debug.h: * clutter/clutter-main.c: Add a new 'animation' debug note. * clutter/clutter-script.c: Clean up the alpha functions whitelist, and add the new functions. * doc/reference/clutter/Makefile.am: * doc/reference/clutter/clutter-sections.txt: Update the API reference. * doc/reference/clutter/clutter-animation.xml: Renamed to doc/reference/clutter/clutter-animation-tutorial.xml to avoid clashes with the ClutterAnimation section. * doc/reference/clutter/clutter-docs.sgml: Renamed to doc/reference/clutter/clutter-docs.xml, as it was an XML file and not a SGML file. * tests/Makefile.am: * tests/interactive/Makefile.am: * tests/interactive/test-animation.c: * tests/interactive/test-easing.c: Add two tests for the new simple animation API and the easing functions. * tests/interactive/test-actors.c: * tests/interactive/test-behave.c: * tests/interactive/test-depth.c: * tests/interactive/test-effects.c: * tests/interactive/test-layout.c: * tests/interactive/test-multistage.c: * tests/interactive/test-paint-wrapper.c: * tests/interactive/test-rotate.c: * tests/interactive/test-scale.c: * tests/interactive/test-texture-quality.c: * tests/interactive/test-threads.c: * tests/interactive/test-viewport.c: Update interactive tests to the deprecations and new alpha API.
This commit is contained in:
@@ -526,66 +526,26 @@ static const struct
|
||||
const gchar *short_name;
|
||||
ClutterAlphaFunc symbol;
|
||||
} clutter_alphas[] = {
|
||||
{
|
||||
"clutter_ramp_inc_func",
|
||||
"ramp-inc",
|
||||
CLUTTER_ALPHA_RAMP_INC
|
||||
},
|
||||
{
|
||||
"clutter_ramp_dec_func",
|
||||
"ramp-dec",
|
||||
CLUTTER_ALPHA_RAMP_DEC
|
||||
},
|
||||
{
|
||||
"clutter_ramp_func",
|
||||
"ramp",
|
||||
CLUTTER_ALPHA_RAMP
|
||||
},
|
||||
{
|
||||
"clutter_sine_inc_func",
|
||||
"sine-inc",
|
||||
CLUTTER_ALPHA_SINE_INC
|
||||
},
|
||||
{
|
||||
"clutter_sine_dec_func",
|
||||
"sine-dec",
|
||||
CLUTTER_ALPHA_SINE_DEC
|
||||
},
|
||||
{
|
||||
"clutter_sine_half_func",
|
||||
"sine-half",
|
||||
CLUTTER_ALPHA_SINE_HALF
|
||||
},
|
||||
{
|
||||
"clutter_sine_func",
|
||||
"sine",
|
||||
CLUTTER_ALPHA_SINE
|
||||
},
|
||||
{
|
||||
"clutter_square_func",
|
||||
"square",
|
||||
CLUTTER_ALPHA_SQUARE
|
||||
},
|
||||
{
|
||||
"clutter_smoothstep_inc_func",
|
||||
"smoothstep-inc",
|
||||
CLUTTER_ALPHA_SMOOTHSTEP_INC
|
||||
},
|
||||
{
|
||||
"clutter_smoothstep_dec_func",
|
||||
"smoothstep-dec",
|
||||
CLUTTER_ALPHA_SMOOTHSTEP_DEC
|
||||
},
|
||||
{
|
||||
"clutter_exp_inc_func",
|
||||
"exp-inc",
|
||||
CLUTTER_ALPHA_EXP_INC
|
||||
},
|
||||
{
|
||||
"clutter_exp_dec_func",
|
||||
"exp-dec",
|
||||
CLUTTER_ALPHA_EXP_DEC
|
||||
}
|
||||
#define ALPHA_FUNC(func,nick) { #func, nick, func }
|
||||
ALPHA_FUNC (clutter_ramp_inc_func, "ramp-inc"),
|
||||
ALPHA_FUNC (clutter_ramp_dec_func, "ramp-dec"),
|
||||
ALPHA_FUNC (clutter_ramp_func, "ramp"),
|
||||
ALPHA_FUNC (clutter_sine_inc_func, "sine-inc"),
|
||||
ALPHA_FUNC (clutter_sine_dec_func, "sine-dec"),
|
||||
ALPHA_FUNC (clutter_sine_half_func, "sine-half"),
|
||||
ALPHA_FUNC (clutter_sine_in_func, "sine-in"),
|
||||
ALPHA_FUNC (clutter_sine_out_func, "sine-out"),
|
||||
ALPHA_FUNC (clutter_sine_in_out_func, "sine-in-out"),
|
||||
ALPHA_FUNC (clutter_sine_func, "sine"),
|
||||
ALPHA_FUNC (clutter_square_func, "square"),
|
||||
ALPHA_FUNC (clutter_smoothstep_inc_func, "smoothstep-inc"),
|
||||
ALPHA_FUNC (clutter_smoothstep_dec_func, "smoothstep-dec"),
|
||||
ALPHA_FUNC (clutter_exp_inc_func, "exp-inc"),
|
||||
ALPHA_FUNC (clutter_exp_dec_func, "exp-dec"),
|
||||
ALPHA_FUNC (clutter_ease_in_func, "ease-in"),
|
||||
ALPHA_FUNC (clutter_ease_out_func, "ease-out"),
|
||||
ALPHA_FUNC (clutter_ease_in_out_func, "ease-in-out")
|
||||
#undef ALPHA_FUNC
|
||||
};
|
||||
|
||||
static const gint n_clutter_alphas = G_N_ELEMENTS (clutter_alphas);
|
||||
|
Reference in New Issue
Block a user