From bd2f5d0e383bdf61a757a9f405f23ed0cf48edcb Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 29 Feb 2012 09:23:40 +0000 Subject: [PATCH] interactive: Remove test-behave ClutterBehaviour and friends are deprecated, there's no point in having an interactive test, and it may be misleading. --- tests/interactive/Makefile.am | 1 - tests/interactive/test-behave.c | 212 -------------------------------- 2 files changed, 213 deletions(-) delete mode 100644 tests/interactive/test-behave.c diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index aa8628e98..44f2a8691 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -8,7 +8,6 @@ UNIT_TESTS = \ test-scale.c \ test-actors.c \ test-actor-clone.c \ - test-behave.c \ test-shader-effects.c \ test-depth.c \ test-threads.c \ diff --git a/tests/interactive/test-behave.c b/tests/interactive/test-behave.c deleted file mode 100644 index 8beb4a5a4..000000000 --- a/tests/interactive/test-behave.c +++ /dev/null @@ -1,212 +0,0 @@ -#include -#include -#include - -#include -#include - -#include - -static gboolean -button_press_cb (ClutterStage *stage, - ClutterButtonEvent *event, - gpointer data) -{ - const gchar *click_type; - - switch (event->click_count) - { - case 2: - click_type = "double"; - break; - case 3: - click_type = "triple"; - break; - default: - click_type = "single"; - break; - } - - g_print ("%s button press event\n", click_type); - - return FALSE; -} - -static gboolean -scroll_event_cb (ClutterStage *stage, - ClutterScrollEvent *event, - gpointer data) -{ - g_print ("scroll direction: %s\n", - event->direction == CLUTTER_SCROLL_UP ? "up" - : "down"); - - return FALSE; -} - -typedef enum { - PATH_POLY, - PATH_ELLIPSE, - PATH_BSPLINE -} path_t; - -G_MODULE_EXPORT int -test_behave_main (int argc, char *argv[]) -{ - ClutterTimeline *timeline; - ClutterAlpha *alpha; - ClutterBehaviour *o_behave, *p_behave; - ClutterActor *stage; - ClutterActor *group, *rect, *hand; - gchar *file; - int i; - path_t path_type = PATH_POLY; - - const char *knots_poly = ("M 0, 0 L 0, 300 L 300, 300 " - "L 300, 0 L 0, 0"); - - /* A spiral created with inkscake */ - const char *knots_bspline = - "M 34.285713,35.219326 " - "C 44.026891,43.384723 28.084874,52.378758 20.714286,51.409804 " - "C 0.7404474,48.783999 -4.6171866,23.967448 1.904757,8.0764719 " - "C 13.570984,-20.348756 49.798303,-26.746504 74.999994,-13.352108 " - "C 111.98449,6.3047056 119.56591,55.259271 99.047626,89.505034 " - "C 71.699974,135.14925 9.6251774,143.91924 -33.571422,116.17172 " - "C -87.929934,81.254291 -97.88804,5.8941057 -62.857155,-46.209236 " - "C -20.430061,-109.31336 68.300385,-120.45954 129.2857,-78.114021 " - "C 201.15479,-28.21129 213.48932,73.938876 163.80954,143.79074 " - "C 106.45226,224.43749 -9.1490153,237.96076 -87.85713,180.93363 " - "C -177.29029,116.13577 -192.00272,-12.937817 -127.61907,-100.49494 " - "C -55.390344,-198.72081 87.170553,-214.62275 183.57141,-142.87593 " - "C 290.59464,-63.223369 307.68641,92.835839 228.57145,198.07645"; - - for (i = 0; i < argc; ++i) - { - if (!strncmp (argv[i], "--path", 6)) - { - if (!strncmp (argv[i] + 7, "poly", 4)) - path_type = PATH_POLY; - else if (!strncmp (argv[i] + 7, "bspline", 7)) - path_type = PATH_BSPLINE; - else if (!strncmp (argv[i] + 7, "ellipse", 7)) - path_type = PATH_ELLIPSE; - } - else if (!strncmp (argv[i], "--help", 6)) - { - printf ("behave [--path=poly|ellipse|bspline]\n"); - exit (0); - } - } - - if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) - return 1; - - stage = clutter_stage_new (); - clutter_stage_set_title (CLUTTER_STAGE (stage), "Behaviours"); - clutter_actor_set_background_color (stage, CLUTTER_COLOR_Aluminium2); - clutter_stage_hide_cursor (CLUTTER_STAGE (stage)); - g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL); - g_signal_connect (stage, "button-press-event", - G_CALLBACK (button_press_cb), - NULL); - g_signal_connect (stage, "scroll-event", - G_CALLBACK (scroll_event_cb), - NULL); - g_signal_connect (stage, "key-press-event", - G_CALLBACK (clutter_main_quit), - NULL); - - /* Make a hand */ - group = clutter_group_new (); - clutter_container_add_actor (CLUTTER_CONTAINER (stage), group); - clutter_actor_show (group); - - file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); - hand = clutter_texture_new_from_file (file, NULL); - if (hand == NULL) - g_error("Unable to load '%s'", file); - - g_free (file); - - clutter_actor_set_position (hand, 0, 0); - clutter_actor_show (hand); - - rect = clutter_rectangle_new (); - clutter_actor_set_position (rect, 0, 0); - clutter_actor_set_size (rect, - clutter_actor_get_width (hand), - clutter_actor_get_height (hand)); - clutter_rectangle_set_color (CLUTTER_RECTANGLE (rect), CLUTTER_COLOR_Transparent); - clutter_rectangle_set_border_width (CLUTTER_RECTANGLE (rect), 10); - clutter_rectangle_set_border_color (CLUTTER_RECTANGLE (rect), - CLUTTER_COLOR_Chameleon); - clutter_actor_show (rect); - - clutter_container_add (CLUTTER_CONTAINER (group), rect, hand, NULL); - - /* Make a timeline */ - timeline = clutter_timeline_new (4000); - clutter_timeline_set_repeat_count (timeline, -1); - clutter_timeline_set_auto_reverse (timeline, TRUE); - - /* Set an alpha func to power behaviour - ramp is constant rise */ - alpha = clutter_alpha_new_full (timeline, CLUTTER_LINEAR); - - /* Create a behaviour for that alpha */ - o_behave = clutter_behaviour_opacity_new (alpha, 0X33, 0xff); - - /* Apply it to our actor */ - clutter_behaviour_apply (o_behave, group); - - /* Make a path behaviour and apply that too */ - switch (path_type) - { - case PATH_POLY: - { - ClutterPath *path = clutter_path_new (); - clutter_path_set_description (path, knots_poly); - p_behave = clutter_behaviour_path_new (alpha, path); - } - break; - case PATH_ELLIPSE: - p_behave = - clutter_behaviour_ellipse_new (alpha, 200, 200, 400, 300, - CLUTTER_ROTATE_CW, - 0.0, 360.0); - - clutter_behaviour_ellipse_set_angle_tilt (CLUTTER_BEHAVIOUR_ELLIPSE (p_behave), - CLUTTER_X_AXIS, - 45.0); - clutter_behaviour_ellipse_set_angle_tilt (CLUTTER_BEHAVIOUR_ELLIPSE (p_behave), - CLUTTER_Z_AXIS, - 45.0); - break; - - case PATH_BSPLINE: - { - ClutterPath *path = clutter_path_new (); - clutter_path_set_description (path, knots_bspline); - p_behave = clutter_behaviour_path_new (alpha, path); - } - break; - - default: - g_assert_not_reached (); - break; - } - - clutter_behaviour_apply (p_behave, group); - - /* start the timeline and thus the animations */ - clutter_timeline_start (timeline); - - clutter_actor_show_all (stage); - - clutter_main(); - - g_object_unref (o_behave); - g_object_unref (p_behave); - - return 0; -}