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.
249 lines
6.4 KiB
C
249 lines
6.4 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <gmodule.h>
|
|
#include <clutter/clutter.h>
|
|
|
|
typedef struct
|
|
{
|
|
ClutterActor *stage;
|
|
ClutterActor *label;
|
|
ClutterActor *progress;
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
volatile gboolean cancelled;
|
|
} TestThreadData;
|
|
|
|
static TestThreadData *
|
|
test_thread_data_new (void)
|
|
{
|
|
TestThreadData *data;
|
|
|
|
data = g_new0 (TestThreadData, 1);
|
|
|
|
return data;
|
|
}
|
|
|
|
static void
|
|
test_thread_data_free (TestThreadData *data)
|
|
{
|
|
g_object_unref (data->progress);
|
|
g_object_unref (data->label);
|
|
g_object_unref (data->stage);
|
|
g_object_unref (data->timeline);
|
|
|
|
g_free (data);
|
|
}
|
|
|
|
static gboolean
|
|
test_thread_done_idle (gpointer user_data)
|
|
{
|
|
TestThreadData *data = user_data;
|
|
|
|
g_print ("Thread completed\n");
|
|
|
|
clutter_label_set_text (CLUTTER_LABEL (data->label), "Completed");
|
|
clutter_timeline_stop (data->timeline);
|
|
|
|
test_thread_data_free (data);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static GStaticPrivate test_thread_data = G_STATIC_PRIVATE_INIT;
|
|
|
|
typedef struct
|
|
{
|
|
gint count;
|
|
TestThreadData *thread_data;
|
|
} TestUpdate;
|
|
|
|
static gboolean
|
|
update_label_idle (gpointer data)
|
|
{
|
|
TestUpdate *update = data;
|
|
guint width;
|
|
gchar *text;
|
|
|
|
text = g_strdup_printf ("Count to %d", update->count);
|
|
|
|
clutter_label_set_text (CLUTTER_LABEL (update->thread_data->label), text);
|
|
clutter_actor_set_width (update->thread_data->label, -1);
|
|
|
|
if (update->count == 0)
|
|
width = 0;
|
|
else if (update->count == 100)
|
|
width = 350;
|
|
else
|
|
width = (guint) (update->count / 100.0 * 350.0);
|
|
|
|
clutter_actor_set_width (update->thread_data->progress, width);
|
|
|
|
g_free (text);
|
|
g_free (update);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
do_something_very_slow (void)
|
|
{
|
|
TestThreadData *data;
|
|
gint i;
|
|
|
|
data = (TestThreadData *) g_static_private_get (&test_thread_data);
|
|
if (data->cancelled)
|
|
return;
|
|
|
|
for (i = 0; i < 100; i++)
|
|
{
|
|
gint msecs;
|
|
|
|
msecs = 1 + (int) (100.0 * rand () / ((RAND_MAX + 1.0) / 3));
|
|
|
|
/* sleep for a while */
|
|
g_usleep (msecs * 1000);
|
|
|
|
if ((i % 10) == 0)
|
|
{
|
|
TestUpdate *update;
|
|
|
|
update = g_new (TestUpdate, 1);
|
|
update->count = i;
|
|
update->thread_data = data;
|
|
|
|
clutter_threads_add_idle_full (G_PRIORITY_DEFAULT + 30,
|
|
update_label_idle,
|
|
update, NULL);
|
|
}
|
|
}
|
|
}
|
|
|
|
static gpointer
|
|
test_thread_func (gpointer user_data)
|
|
{
|
|
TestThreadData *data;
|
|
|
|
data = user_data;
|
|
g_static_private_set (&test_thread_data, data, NULL);
|
|
|
|
do_something_very_slow ();
|
|
|
|
clutter_threads_add_idle_full (G_PRIORITY_DEFAULT + 30,
|
|
test_thread_done_idle,
|
|
data, NULL);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static ClutterTimeline *timeline = NULL;
|
|
static ClutterActor *count_label = NULL;
|
|
static ClutterActor *help_label = NULL;
|
|
static ClutterActor *progress_rect = NULL;
|
|
|
|
static void
|
|
on_key_press_event (ClutterStage *stage,
|
|
ClutterKeyEvent *event,
|
|
gpointer user_data)
|
|
{
|
|
TestThreadData *data;
|
|
|
|
switch (clutter_key_event_symbol (event))
|
|
{
|
|
case CLUTTER_s:
|
|
clutter_label_set_text (CLUTTER_LABEL (help_label), "Press 'q' to quit");
|
|
|
|
clutter_timeline_start (timeline);
|
|
|
|
data = test_thread_data_new ();
|
|
data->stage = g_object_ref (stage);
|
|
data->label = g_object_ref (count_label);
|
|
data->progress = g_object_ref (progress_rect);
|
|
data->timeline = g_object_ref (timeline);
|
|
g_thread_create (test_thread_func, data, FALSE, NULL);
|
|
break;
|
|
case CLUTTER_q:
|
|
clutter_main_quit ();
|
|
break;
|
|
}
|
|
}
|
|
|
|
G_MODULE_EXPORT int
|
|
test_threads_main (int argc, char *argv[])
|
|
{
|
|
ClutterActor *stage;
|
|
ClutterActor *rect;
|
|
ClutterColor stage_color = { 0xcc, 0xcc, 0xcc, 0xff };
|
|
ClutterColor rect_color = { 0xee, 0x55, 0x55, 0x99 };
|
|
ClutterColor progress_color = { 0x55, 0xee, 0x55, 0xbb };
|
|
ClutterBehaviour *r_behaviour, *p_behaviour;
|
|
const ClutterKnot knots[] = {
|
|
{ 75, 150 },
|
|
{ 400, 150 }
|
|
};
|
|
|
|
g_thread_init (NULL);
|
|
clutter_threads_init ();
|
|
clutter_init (&argc, &argv);
|
|
|
|
stage = clutter_stage_get_default ();
|
|
clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
|
|
clutter_actor_set_size (stage, 600, 300);
|
|
|
|
count_label = clutter_label_new_with_text ("Mono 12", "Counter");
|
|
clutter_actor_set_position (count_label, 350, 50);
|
|
|
|
help_label = clutter_label_new_with_text ("Mono 12", "Press 's' to start");
|
|
clutter_actor_set_position (help_label, 50, 50);
|
|
|
|
rect = clutter_rectangle_new_with_color (&rect_color);
|
|
clutter_actor_set_position (rect, 75, 150);
|
|
clutter_actor_set_size (rect, 50, 50);
|
|
clutter_actor_set_anchor_point (rect, 25, 25);
|
|
|
|
progress_rect = clutter_rectangle_new_with_color (&progress_color);
|
|
clutter_actor_set_position (progress_rect, 50, 225);
|
|
clutter_actor_set_size (progress_rect, 350, 50);
|
|
|
|
clutter_container_add (CLUTTER_CONTAINER (stage),
|
|
count_label, help_label,
|
|
rect, progress_rect,
|
|
NULL);
|
|
|
|
timeline = clutter_timeline_new (150, 50);
|
|
clutter_timeline_set_loop (timeline, TRUE);
|
|
r_behaviour = clutter_behaviour_rotate_new (clutter_alpha_new_full (timeline,
|
|
clutter_ramp_inc_func,
|
|
NULL, NULL),
|
|
CLUTTER_Z_AXIS,
|
|
CLUTTER_ROTATE_CW,
|
|
0.0, 360.0);
|
|
clutter_behaviour_apply (r_behaviour, rect);
|
|
|
|
p_behaviour = clutter_behaviour_path_new (clutter_alpha_new_full (timeline,
|
|
clutter_ramp_inc_func,
|
|
NULL, NULL),
|
|
knots,
|
|
G_N_ELEMENTS (knots));
|
|
clutter_behaviour_apply (p_behaviour, rect);
|
|
|
|
g_signal_connect (stage,
|
|
"button-press-event", G_CALLBACK (clutter_main_quit),
|
|
NULL);
|
|
g_signal_connect (stage,
|
|
"key-press-event", G_CALLBACK (on_key_press_event),
|
|
NULL);
|
|
|
|
clutter_actor_show (stage);
|
|
|
|
clutter_threads_enter ();
|
|
clutter_main ();
|
|
clutter_threads_leave ();
|
|
|
|
g_object_unref (p_behaviour);
|
|
g_object_unref (r_behaviour);
|
|
g_object_unref (timeline);
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|