mirror of
https://github.com/brl/mutter.git
synced 2024-11-30 12:00:44 -05:00
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.
133 lines
3.9 KiB
C
133 lines
3.9 KiB
C
#include <gmodule.h>
|
|
#include <clutter/clutter.h>
|
|
|
|
static gint n_stages = 1;
|
|
|
|
static gboolean
|
|
tex_button_cb (ClutterActor *actor,
|
|
ClutterEvent *event,
|
|
gpointer data)
|
|
{
|
|
clutter_actor_hide (actor);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
on_button_press (ClutterActor *actor,
|
|
ClutterEvent *event,
|
|
gpointer data)
|
|
{
|
|
ClutterActor *new_stage;
|
|
ClutterActor *label, *tex;
|
|
gint width, height;
|
|
gchar *stage_label, *win_title;
|
|
ClutterColor color = { 0xdd, 0x33, 0xdd, 0xff };
|
|
ClutterColor white = { 0x99, 0x99, 0x99, 0xff };
|
|
ClutterTimeline *timeline;
|
|
ClutterAlpha *alpha;
|
|
ClutterBehaviour *r_behave;
|
|
|
|
new_stage = clutter_stage_new ();
|
|
if (!new_stage)
|
|
return FALSE;
|
|
|
|
/* FIXME: below should really be automatic */
|
|
/* clutter_stage_ensure_cogl_context (CLUTTER_STAGE(new_stage)); */
|
|
|
|
clutter_stage_set_color (CLUTTER_STAGE (new_stage), &color);
|
|
clutter_actor_set_size (new_stage, 320, 240);
|
|
|
|
tex = clutter_texture_new_from_file ("redhand.png", NULL);
|
|
|
|
if (!tex)
|
|
g_error ("pixbuf load failed");
|
|
|
|
clutter_actor_set_reactive (tex, TRUE);
|
|
g_signal_connect (tex, "button-press-event",
|
|
G_CALLBACK (tex_button_cb), NULL);
|
|
|
|
clutter_container_add_actor (CLUTTER_CONTAINER (new_stage), tex);
|
|
|
|
stage_label = g_strdup_printf ("<b>Stage: %d</b>", ++n_stages);
|
|
label = clutter_label_new_with_text ("Mono 12", stage_label);
|
|
|
|
clutter_label_set_color (CLUTTER_LABEL (label), &white);
|
|
clutter_label_set_use_markup (CLUTTER_LABEL (label), TRUE);
|
|
width = (clutter_actor_get_width (new_stage)
|
|
- clutter_actor_get_width (label)) / 2;
|
|
height = (clutter_actor_get_height (new_stage)
|
|
- clutter_actor_get_height (label)) / 2;
|
|
clutter_actor_set_position (label, width, height);
|
|
clutter_container_add_actor (CLUTTER_CONTAINER (new_stage), label);
|
|
clutter_actor_show (label);
|
|
g_free (stage_label);
|
|
|
|
/*
|
|
g_signal_connect (new_stage, "button-press-event",
|
|
G_CALLBACK (clutter_actor_destroy),
|
|
NULL);
|
|
*/
|
|
|
|
win_title = g_strdup_printf ("Stage:%p", new_stage);
|
|
clutter_stage_set_title (CLUTTER_STAGE(new_stage), win_title);
|
|
|
|
timeline = clutter_timeline_new_for_duration (2000);
|
|
g_object_set (timeline, "loop", TRUE, NULL);
|
|
|
|
alpha = clutter_alpha_new_for_mode (CLUTTER_LINEAR);
|
|
clutter_alpha_set_timeline (alpha, timeline);
|
|
r_behave = clutter_behaviour_rotate_new (alpha,
|
|
CLUTTER_Y_AXIS,
|
|
CLUTTER_ROTATE_CW,
|
|
0.0, 360.0);
|
|
|
|
clutter_behaviour_rotate_set_center (CLUTTER_BEHAVIOUR_ROTATE (r_behave),
|
|
clutter_actor_get_width (label)/2,
|
|
0,
|
|
0);
|
|
|
|
clutter_behaviour_apply (r_behave, label);
|
|
clutter_timeline_start (timeline);
|
|
|
|
clutter_actor_show_all (new_stage);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
G_MODULE_EXPORT int
|
|
test_multistage_main (int argc, char *argv[])
|
|
{
|
|
ClutterActor *stage_default;
|
|
ClutterActor *label;
|
|
gint width, height;
|
|
gchar *win_title;
|
|
|
|
clutter_init (&argc, &argv);
|
|
|
|
stage_default = clutter_stage_get_default ();
|
|
g_signal_connect (stage_default, "button-press-event",
|
|
G_CALLBACK (on_button_press),
|
|
NULL);
|
|
|
|
label = clutter_label_new_with_text ("Mono 16", "Default stage");
|
|
width = (clutter_actor_get_width (stage_default)
|
|
- clutter_actor_get_width (label))
|
|
/ 2;
|
|
height = (clutter_actor_get_height (stage_default)
|
|
- clutter_actor_get_height (label))
|
|
/ 2;
|
|
clutter_actor_set_position (label, width, height);
|
|
clutter_container_add_actor (CLUTTER_CONTAINER (stage_default), label);
|
|
clutter_actor_show (label);
|
|
|
|
win_title = g_strdup_printf ("Stage:%p", stage_default);
|
|
clutter_stage_set_title (CLUTTER_STAGE(stage_default), win_title);
|
|
|
|
clutter_actor_show (stage_default);
|
|
|
|
clutter_main ();
|
|
|
|
return 0;
|
|
}
|