diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c index 891679604..0a144c476 100644 --- a/clutter/clutter-alpha.c +++ b/clutter/clutter-alpha.c @@ -75,10 +75,10 @@ * * Defining a ClutterAlpha in ClutterScript * The following JSON fragment defines a #ClutterAlpha - * using a #ClutterTimeline with id "timeline-01" and an alpha + * using a #ClutterTimeline with id "sine-timeline" and an alpha * function called my_sine_alpha(). The defined #ClutterAlpha * instance can be reused in multiple #ClutterBehaviour - * definitions. + * definitions or for #ClutterAnimation definitions. * * { * "id" : "sine-alpha", @@ -91,6 +91,10 @@ * } * * + * For the way to define the #ClutterAlpha:mode property + * inside a ClutterScript fragment, see the corresponding section + * in #ClutterAnimation. * * * Since: 0.2 diff --git a/clutter/clutter-animation.c b/clutter/clutter-animation.c index 2e3958ba6..fd8ac468b 100644 --- a/clutter/clutter-animation.c +++ b/clutter/clutter-animation.c @@ -68,6 +68,67 @@ * a #ClutterAnimation instance and animate an actor between its current * state and the specified final state. * + * + * Defining ClutterAnimationMode inside ClutterScript + * When defining a #ClutterAnimation inside a ClutterScript + * file or string the #ClutterAnimation:mode can be defined either + * using the #ClutterAnimationMode enumeration values through their + * "nick" (the short string used inside #GEnumValue), their numeric + * id, or using the following strings: + * + * + * easeInQuad, easeOutQuad, easeInOutQuad + * Corresponding to the quadratic easing + * modes + * + * + * easeInCubic, easeOutCubic, easeInOutCubic + * Corresponding to the cubic easing + * modes + * + * + * easeInQuart, easeOutQuart, easeInOutQuart + * Corresponding to the quartic easing + * modes + * + * + * easeInQuint, easeOutQuint, easeInOutQuint + * Corresponding to the quintic easing + * modes + * + * + * easeInSine, easeOutSine, easeInOutSine + * Corresponding to the sine easing + * modes + * + * + * easeInExpo, easeOutExpo, easeInOutExpo + * Corresponding to the exponential easing + * modes + * + * + * easeInCirc, easeOutCirc, easeInOutCirc + * Corresponding to the circular easing + * modes + * + * + * easeInElastic, easeOutElastic, easeInOutElastic + * Corresponding to the overshooting elastic + * easing modes + * + * + * easeInBack, easeOutBack, easeInOutBack + * Corresponding to the overshooting cubic + * easing modes + * + * + * easeInBounce, easeOutBounce, easeInOutBounce + * Corresponding to the bouncing easing + * modes + * + * + * + * * #ClutterAnimation is available since Clutter 1.0 */