1a63414966
* clutter/clutter-path.h: * clutter/clutter-path.c: Implementation of new ClutterPath object to represent a path combining straight line and bezier curve elements. * clutter/clutter.h: Include clutter-path.h and remove clutter-behaviour-bspline.h * tests/interactive/test-threads.c (test_threads_main): * tests/interactive/test-script.c: * tests/interactive/test-behave.c (test_behave_main): Use new path API * clutter/clutter-effect.c: Use the new ClutterBehaviourPath API. * clutter/clutter-bezier.h: * clutter/clutter-bezier.c: Moved bezier curve handling code out from clutter-behaviour-bspline.c to a separate file. * clutter/clutter-behaviour-path.h: * clutter/clutter-behaviour-path.c: Reimplemented to work with a ClutterPath * clutter/clutter-behaviour-bspline.h: * clutter/clutter-behaviour-bspline.c: Removed * clutter/Makefile.am: Add clutter-path and clutter-bezier, remove clutter-behaviour-bspline. * tests/conform/test-path.c: New automatic test for ClutterPath consistency * tests/conform/test-conform-main.c (main): Add test_path * tests/conform/Makefile.am (test_conformance_SOURCES): Add test-path.c * clutter/clutter-sections.txt: Add ClutterPath docs * clutter/clutter.types: * clutter/clutter-docs.xml: * doc/reference/clutter/clutter-animation-tutorial.xml: Remove mention of ClutterBehaviourBspline * clutter/clutter-marshal.list: Add VOID:UINT
174 lines
4.3 KiB
C
174 lines
4.3 KiB
C
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
|
|
#include <glib.h>
|
|
#include <gmodule.h>
|
|
|
|
#include <clutter/clutter.h>
|
|
|
|
static ClutterScript *script = NULL;
|
|
static guint merge_id = 0;
|
|
|
|
static const gchar *test_unmerge =
|
|
"["
|
|
" {"
|
|
" \"id\" : \"main-stage\","
|
|
" \"type\" : \"ClutterStage\","
|
|
" \"children\" : [ \"blue-button\" ]"
|
|
" },"
|
|
" {"
|
|
" \"id\" : \"blue-button\","
|
|
" \"type\" : \"ClutterRectangle\","
|
|
" \"color\" : \"#0000ffff\","
|
|
" \"x\" : 350,"
|
|
" \"y\" : 50,"
|
|
" \"width\" : 100,"
|
|
" \"height\" : 100,"
|
|
" \"visible\" : true,"
|
|
" \"reactive\" : true"
|
|
" }"
|
|
"]";
|
|
|
|
static const gchar *test_behaviour =
|
|
"["
|
|
" {"
|
|
" \"id\" : \"main-timeline\","
|
|
" \"type\" : \"ClutterTimeline\","
|
|
" \"duration\" : 5000,"
|
|
" \"loop\" : true"
|
|
" },"
|
|
" {"
|
|
" \"id\" : \"path-behaviour\","
|
|
" \"type\" : \"ClutterBehaviourPath\","
|
|
" \"path\" : \"M 50 50 L 100 100\","
|
|
" \"alpha\" : {"
|
|
" \"timeline\" : \"main-timeline\","
|
|
" \"function\" : \"ramp\""
|
|
" }"
|
|
" },"
|
|
" {"
|
|
" \"id\" : \"rotate-behaviour\","
|
|
" \"type\" : \"ClutterBehaviourRotate\","
|
|
" \"angle-start\" : 0.0,"
|
|
" \"angle-end\" : 360.0,"
|
|
" \"axis\" : \"y-axis\","
|
|
" \"alpha\" : {"
|
|
" \"timeline\" : \"main-timeline\","
|
|
" \"function\" : \"sine\""
|
|
" }"
|
|
" },"
|
|
" {"
|
|
" \"id\" : \"fade-behaviour\","
|
|
" \"type\" : \"ClutterBehaviourOpacity\","
|
|
" \"opacity-start\" : 255,"
|
|
" \"opacity-end\" : 0,"
|
|
" \"alpha\" : {"
|
|
" \"timeline\" : \"main-timeline\","
|
|
" \"function\" : \"ramp-inc\""
|
|
" }"
|
|
" }"
|
|
"]";
|
|
|
|
static gboolean
|
|
blue_button_press (ClutterActor *actor,
|
|
ClutterButtonEvent *event,
|
|
gpointer data)
|
|
{
|
|
g_print ("[*] Pressed `%s'\n", clutter_get_script_id (G_OBJECT (actor)));
|
|
g_print ("[*] Unmerging objects with merge id: %d\n", merge_id);
|
|
|
|
clutter_script_unmerge_objects (script, merge_id);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
red_button_press (ClutterActor *actor,
|
|
ClutterButtonEvent *event,
|
|
gpointer data)
|
|
{
|
|
GObject *timeline;
|
|
|
|
g_print ("[*] Pressed `%s'\n", clutter_get_script_id (G_OBJECT (actor)));
|
|
|
|
timeline = clutter_script_get_object (script, "main-timeline");
|
|
g_assert (CLUTTER_IS_TIMELINE (timeline));
|
|
|
|
if (!clutter_timeline_is_playing (CLUTTER_TIMELINE (timeline)))
|
|
clutter_timeline_start (CLUTTER_TIMELINE (timeline));
|
|
else
|
|
clutter_timeline_pause (CLUTTER_TIMELINE (timeline));
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
G_MODULE_EXPORT int
|
|
test_script_main (int argc, char *argv[])
|
|
{
|
|
GObject *stage, *blue_button, *red_button;
|
|
GError *error = NULL;
|
|
gint res;
|
|
|
|
clutter_init (&argc, &argv);
|
|
|
|
script = clutter_script_new ();
|
|
g_assert (CLUTTER_IS_SCRIPT (script));
|
|
|
|
clutter_script_load_from_data (script, test_behaviour, -1, &error);
|
|
if (error)
|
|
{
|
|
g_print ("*** Error:\n"
|
|
"*** %s\n", error->message);
|
|
g_error_free (error);
|
|
g_object_unref (script);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
clutter_script_load_from_file (script, "test-script.json", &error);
|
|
if (error)
|
|
{
|
|
g_print ("*** Error:\n"
|
|
"*** %s\n", error->message);
|
|
g_error_free (error);
|
|
g_object_unref (script);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
merge_id = clutter_script_load_from_data (script, test_unmerge, -1, &error);
|
|
if (error)
|
|
{
|
|
g_print ("*** Error:\n"
|
|
"*** %s\n", error->message);
|
|
g_error_free (error);
|
|
g_object_unref (script);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
clutter_script_connect_signals (script, NULL);
|
|
|
|
res = clutter_script_get_objects (script,
|
|
"main-stage", &stage,
|
|
"red-button", &red_button,
|
|
"blue-button", &blue_button,
|
|
NULL);
|
|
g_assert (res == 3);
|
|
|
|
clutter_actor_show (CLUTTER_ACTOR (stage));
|
|
|
|
g_signal_connect (red_button,
|
|
"button-press-event",
|
|
G_CALLBACK (red_button_press),
|
|
NULL);
|
|
|
|
g_signal_connect (blue_button,
|
|
"button-press-event",
|
|
G_CALLBACK (blue_button_press),
|
|
NULL);
|
|
|
|
clutter_main ();
|
|
|
|
g_object_unref (script);
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|