62844d5f04
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.
95 lines
2.6 KiB
C
95 lines
2.6 KiB
C
#include <stdlib.h>
|
|
#include <gmodule.h>
|
|
#include <clutter/clutter.h>
|
|
|
|
static gboolean is_expanded = FALSE;
|
|
|
|
static void
|
|
on_animation_complete (ClutterAnimation *animation,
|
|
ClutterActor *actor)
|
|
{
|
|
is_expanded = !is_expanded;
|
|
|
|
g_print ("Animation complete\n");
|
|
|
|
clutter_actor_set_reactive (actor, TRUE);
|
|
}
|
|
|
|
static gboolean
|
|
on_button_press (ClutterActor *actor,
|
|
ClutterButtonEvent *event,
|
|
gpointer dummy)
|
|
{
|
|
ClutterAnimation *animation;
|
|
gint old_x, old_y, new_x, new_y;
|
|
gint old_width, old_height, new_width, new_height;
|
|
guint8 old_op, new_op;
|
|
|
|
clutter_actor_get_position (actor, &old_x, &old_y);
|
|
clutter_actor_get_size (actor, &old_width, &old_height);
|
|
old_op = clutter_actor_get_opacity (actor);
|
|
|
|
if (!is_expanded)
|
|
{
|
|
new_x = old_x - 100;
|
|
new_y = old_y - 100;
|
|
new_width = old_width + 200;
|
|
new_height = old_height + 200;
|
|
new_op = 255;
|
|
}
|
|
else
|
|
{
|
|
new_x = old_x + 100;
|
|
new_y = old_y + 100;
|
|
new_width = old_width - 200;
|
|
new_height = old_height - 200;
|
|
new_op = 128;
|
|
}
|
|
|
|
animation =
|
|
clutter_actor_animate (actor, CLUTTER_EASE_IN, 2000,
|
|
"x", new_x,
|
|
"y", new_y,
|
|
"width", new_width,
|
|
"height", new_height,
|
|
"opacity", new_op,
|
|
"fixed::reactive", FALSE,
|
|
NULL);
|
|
g_signal_connect (animation,
|
|
"completed", G_CALLBACK (on_animation_complete),
|
|
actor);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
G_MODULE_EXPORT int
|
|
test_animation_main (int argc, char *argv[])
|
|
{
|
|
ClutterActor *stage, *rect;
|
|
ClutterColor stage_color = { 0x66, 0x66, 0xdd, 0xff };
|
|
ClutterColor rect_color = { 0x44, 0xdd, 0x44, 0xff };
|
|
|
|
clutter_init (&argc, &argv);
|
|
|
|
stage = clutter_stage_get_default ();
|
|
clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
|
|
|
|
rect = clutter_rectangle_new_with_color (&rect_color);
|
|
clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);
|
|
clutter_actor_set_size (rect, 50, 50);
|
|
clutter_actor_set_anchor_point (rect, 25, 25);
|
|
clutter_actor_set_position (rect,
|
|
clutter_actor_get_width (stage) / 2,
|
|
clutter_actor_get_height (stage) / 2);
|
|
clutter_actor_set_opacity (rect, 0x88);
|
|
clutter_actor_set_reactive (rect, TRUE);
|
|
g_signal_connect (rect,
|
|
"button-press-event", G_CALLBACK (on_button_press),
|
|
NULL);
|
|
|
|
clutter_actor_show (stage);
|
|
|
|
clutter_main ();
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|