From ac7ca3265ea692a34ad80216843043d51564093c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 27 Feb 2019 16:39:14 -0500 Subject: [PATCH] clutter: Remove tests/interactive/test-{depth,multistage.c} These are the only consumers of deprecated/clutter-behaviour-rotate. https://gitlab.gnome.org/GNOME/mutter/merge_requests/461 --- clutter/tests/interactive/meson.build | 1 - clutter/tests/interactive/test-depth.c | 211 -------------------- clutter/tests/interactive/test-multistage.c | 152 -------------- 3 files changed, 364 deletions(-) delete mode 100644 clutter/tests/interactive/test-depth.c delete mode 100644 clutter/tests/interactive/test-multistage.c diff --git a/clutter/tests/interactive/meson.build b/clutter/tests/interactive/meson.build index c1e90d3e1..bb18d3c95 100644 --- a/clutter/tests/interactive/meson.build +++ b/clutter/tests/interactive/meson.build @@ -29,7 +29,6 @@ clutter_tests_interactive_test_sources = [ 'test-cogl-shader-glsl.c', 'test-state.c', 'test-fbo.c', - 'test-multistage.c', 'test-cogl-tex-tile.c', 'test-cogl-tex-convert.c', 'test-cogl-tex-foreign.c', diff --git a/clutter/tests/interactive/test-depth.c b/clutter/tests/interactive/test-depth.c deleted file mode 100644 index ce3eeb91a..000000000 --- a/clutter/tests/interactive/test-depth.c +++ /dev/null @@ -1,211 +0,0 @@ -#include -#include -#include - -/* each time the timeline animating the label completes, swap the direction */ -static void -timeline_completed (ClutterTimeline *timeline, - gpointer user_data) -{ - clutter_timeline_set_direction (timeline, - !clutter_timeline_get_direction (timeline)); - clutter_timeline_start (timeline); -} - -static ClutterActor *raise_actor[2]; -static gboolean raise_no = 0; - -static gboolean -raise_top (gpointer ignored G_GNUC_UNUSED) -{ - ClutterActor *parent = clutter_actor_get_parent (raise_actor[raise_no]); - - clutter_actor_set_child_above_sibling (parent, raise_actor[raise_no], NULL); - raise_no = !raise_no; - - return G_SOURCE_CONTINUE; -} - -static ClutterActor * -clone_box (ClutterActor *original) -{ - gfloat width, height; - ClutterActor *group; - ClutterActor *clone; - - clutter_actor_get_size (original, &width, &height); - - group = clutter_actor_new (); - clone = clutter_clone_new (original); - clutter_actor_add_child (group, clone); - clutter_actor_set_depth (clone, width / 2); - - clone = clutter_clone_new (original); - clutter_actor_add_child (group, clone); - clutter_actor_set_rotation (clone, CLUTTER_Y_AXIS, 180, width / 2, 0, 0); - clutter_actor_set_depth (clone, -width / 2); - - clone = clutter_clone_new (original); - clutter_actor_add_child (group, clone); - clutter_actor_set_rotation (clone, CLUTTER_Y_AXIS, 90, 0, 0, 0); - clutter_actor_set_depth (clone, width / 2); - clutter_actor_set_position (clone, 0, 0); - - clone = clutter_clone_new (original); - clutter_actor_add_child (group, clone); - clutter_actor_set_rotation (clone, CLUTTER_Y_AXIS, 90, 0, 0, 0); - clutter_actor_set_depth (clone, width / 2); - clutter_actor_set_position (clone, width, 0); - - clone = clutter_clone_new (original); - clutter_actor_add_child (group, clone); - clutter_actor_set_rotation (clone, CLUTTER_X_AXIS, 90, 0, 0, 0); - clutter_actor_set_depth (clone, -width / 2); - clutter_actor_set_position (clone, 0, height); - - clone = clutter_clone_new (original); - clutter_actor_add_child (group, clone); - clutter_actor_set_rotation (clone, CLUTTER_X_AXIS, 90, 0, 0, 0); - clutter_actor_set_depth (clone, -width / 2); - clutter_actor_set_position (clone, 0, 0); - - return group; -} - -static ClutterActor * -janus_group (const gchar *front_text, - const gchar *back_text) -{ - ClutterActor *group, *rectangle, *front, *back; - gfloat width, height; - gfloat width2, height2; - - group = clutter_actor_new (); - rectangle = clutter_actor_new (); - clutter_actor_set_background_color (rectangle, CLUTTER_COLOR_White); - front = clutter_text_new_with_text ("Sans 50px", front_text); - back = clutter_text_new_with_text ("Sans 50px", back_text); - clutter_text_set_color (CLUTTER_TEXT (front), CLUTTER_COLOR_Red); - clutter_text_set_color (CLUTTER_TEXT (back), CLUTTER_COLOR_Green); - - clutter_actor_get_size (front, &width, &height); - clutter_actor_get_size (back, &width2, &height2); - - if (width2 > width) - width = width2; - - if (height2 > height) - height = height2; - - clutter_actor_set_size (rectangle, width, height); - clutter_actor_set_rotation (back, CLUTTER_Y_AXIS, 180, width / 2, 0, 0); - - clutter_actor_add_child (group, back); - clutter_actor_add_child (group, rectangle); - clutter_actor_add_child (group, front); - - return group; -} - -G_MODULE_EXPORT gint -test_depth_main (int argc, char *argv[]) -{ - ClutterTimeline *timeline; - ClutterBehaviour *d_behave; - ClutterBehaviour *r_behave; - ClutterActor *stage; - ClutterActor *group, *hand, *label, *rect, *janus, *box; - GError *error; - - if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) - return EXIT_FAILURE; - - stage = clutter_stage_new (); - clutter_stage_set_title (CLUTTER_STAGE (stage), "Depth Test"); - clutter_actor_set_background_color (stage, CLUTTER_COLOR_Aluminium2); - g_signal_connect (stage, - "destroy", G_CALLBACK (clutter_main_quit), - NULL); - g_signal_connect (stage, - "button-press-event", G_CALLBACK (clutter_main_quit), - NULL); - - group = clutter_actor_new (); - clutter_actor_add_child (stage, group); - - label = clutter_text_new_with_text ("Mono 26", "Clutter"); - clutter_actor_set_position (label, 120, 200); - clutter_actor_add_child (stage, label); - - error = NULL; - hand = clutter_texture_new_from_file (TESTS_DATADIR - G_DIR_SEPARATOR_S - "redhand.png", - &error); - if (error) - g_error ("Unable to load redhand.png: %s", error->message); - clutter_actor_set_position (hand, 240, 100); - - rect = clutter_rectangle_new_with_color (CLUTTER_COLOR_Black); - clutter_actor_set_position (rect, 340, 100); - clutter_actor_set_size (rect, 200, 200); - clutter_actor_set_opacity (rect, 128); - - clutter_actor_add_child (group, hand); - clutter_actor_add_child (group, rect); - - timeline = clutter_timeline_new (3000); - g_signal_connect (timeline, - "completed", G_CALLBACK (timeline_completed), - NULL); - - d_behave = - clutter_behaviour_depth_new (clutter_alpha_new_full (timeline, - CLUTTER_LINEAR), - -100, 100); - clutter_behaviour_apply (d_behave, label); - - /* add two faced actor */ - janus = janus_group ("GREEN", "RED"); - clutter_container_add_actor (CLUTTER_CONTAINER (stage), janus); - clutter_actor_set_position (janus, 300, 350); - - r_behave = - clutter_behaviour_rotate_new (clutter_alpha_new_full (timeline, - CLUTTER_LINEAR), - CLUTTER_Y_AXIS, - CLUTTER_ROTATE_CW, - 0, 360); - clutter_behaviour_apply (r_behave, janus); - - /* add hand box */ - box = clone_box (hand); - clutter_actor_add_child (stage, box); - clutter_actor_set_position (box, 200, 250); - clutter_actor_set_scale (box, 0.5, 0.5); - clutter_actor_set_rotation (box, CLUTTER_X_AXIS, 45, 0, 0, 0); - clutter_actor_set_opacity (box, 0x44); - - r_behave = - clutter_behaviour_rotate_new (clutter_alpha_new_full (timeline, - CLUTTER_LINEAR), - CLUTTER_Y_AXIS, - CLUTTER_ROTATE_CW, - 0, 360); - clutter_behaviour_apply (r_behave, box); - - clutter_actor_show (stage); - - clutter_timeline_start (timeline); - - raise_actor[0] = rect; - raise_actor[1] = hand; - clutter_threads_add_timeout (2000, raise_top, NULL); - - clutter_main (); - - g_object_unref (d_behave); - g_object_unref (timeline); - - return EXIT_SUCCESS; -} diff --git a/clutter/tests/interactive/test-multistage.c b/clutter/tests/interactive/test-multistage.c deleted file mode 100644 index b870c9e25..000000000 --- a/clutter/tests/interactive/test-multistage.c +++ /dev/null @@ -1,152 +0,0 @@ -#include -#include - -static GList *stages = NULL; -static gint n_stages = 1; - -int -test_multistage_main (int argc, char *argv[]); - -static gboolean -tex_button_cb (ClutterActor *actor, - ClutterEvent *event, - gpointer data) -{ - clutter_actor_hide (actor); - - return TRUE; -} - -static void -on_destroy (ClutterActor *actor) -{ - stages = g_list_remove (stages, actor); -} - -static gboolean -on_button_press (ClutterActor *actor, - ClutterEvent *event, - gpointer data) -{ - ClutterActor *new_stage; - ClutterActor *label, *tex; - gint width, height; - gchar *stage_label, *stage_name; - ClutterTimeline *timeline; - ClutterAlpha *alpha; - ClutterBehaviour *r_behave; - - new_stage = clutter_stage_new (); - if (new_stage == NULL) - return FALSE; - - stage_name = g_strdup_printf ("Stage [%d]", ++n_stages); - - clutter_stage_set_title (CLUTTER_STAGE (new_stage), stage_name); - clutter_actor_set_background_color (new_stage, - CLUTTER_COLOR_DarkScarletRed); - clutter_actor_set_size (new_stage, 320, 240); - clutter_actor_set_name (new_stage, stage_name); - - g_signal_connect (new_stage, "destroy", G_CALLBACK (on_destroy), NULL); - - tex = clutter_texture_new_from_file (TESTS_DATADIR - G_DIR_SEPARATOR_S - "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_strconcat ("", stage_name, "", NULL); - label = clutter_text_new_with_text ("Mono 12", stage_label); - - clutter_text_set_color (CLUTTER_TEXT (label), CLUTTER_COLOR_White); - clutter_text_set_use_markup (CLUTTER_TEXT (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); - */ - - timeline = clutter_timeline_new (2000); - clutter_timeline_set_repeat_count (timeline, -1); - - alpha = clutter_alpha_new_full (timeline, CLUTTER_LINEAR); - 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); - - stages = g_list_prepend (stages, new_stage); - - g_free (stage_name); - - return TRUE; -} - -G_MODULE_EXPORT int -test_multistage_main (int argc, char *argv[]) -{ - ClutterActor *stage_default; - ClutterActor *label; - gint width, height; - - if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) - return 1; - - stage_default = clutter_stage_new (); - clutter_stage_set_title (CLUTTER_STAGE (stage_default), "Default Stage"); - clutter_actor_set_name (stage_default, "Default Stage"); - g_signal_connect (stage_default, "destroy", - G_CALLBACK (clutter_main_quit), - NULL); - g_signal_connect (stage_default, "button-press-event", - G_CALLBACK (on_button_press), - NULL); - - label = clutter_text_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); - - clutter_actor_show (stage_default); - - clutter_main (); - - g_list_foreach (stages, (GFunc) clutter_actor_destroy, NULL); - g_list_free (stages); - - return 0; -}