From c2365c63cfd2d9e0c6116a39c7a50defc193c482 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 16 Dec 2010 15:25:29 +0000 Subject: [PATCH] interactive: Remove test-viewport The test-viewport interactive test is exercising the clip code - a job better done by the conformance test suite and by the test-clip interactive test. --- tests/interactive/Makefile.am | 1 - tests/interactive/test-viewport.c | 69 ------------------------------- 2 files changed, 70 deletions(-) delete mode 100644 tests/interactive/test-viewport.c diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 69ed137a7..e73638c68 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -23,7 +23,6 @@ UNIT_TESTS = \ test-state.c \ test-state-animator.c \ test-unproject.c \ - test-viewport.c \ test-fbo.c \ test-multistage.c \ test-cogl-primitives.c \ diff --git a/tests/interactive/test-viewport.c b/tests/interactive/test-viewport.c deleted file mode 100644 index 6eac4b839..000000000 --- a/tests/interactive/test-viewport.c +++ /dev/null @@ -1,69 +0,0 @@ -#include -#include -#include - -#include -#include - -#undef CLUTTER_DISABLE_DEPRECATED -#include - -G_MODULE_EXPORT int -test_viewport_main (int argc, char *argv[]) -{ - ClutterTimeline *timeline; - ClutterAlpha *alpha; - ClutterBehaviour *r_behave; - ClutterActor *stage; - ClutterActor *hand; - ClutterColor stage_color = { 0xcc, 0xcc, 0xcc, 0xff }; - gchar *file; - - clutter_init (&argc, &argv); - - stage = clutter_stage_get_default (); - - clutter_stage_set_color (CLUTTER_STAGE (stage), - &stage_color); - - /* Make a hand */ - file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); - hand = clutter_texture_new_from_file (file, NULL); - if (!hand) - g_error("Unable to load image '%s'", file); - - g_free (file); - - clutter_actor_set_position (hand, 300, 200); - clutter_actor_set_clip (hand, 20, 21, 132, 170); - clutter_actor_set_anchor_point (hand, 86, 125); - clutter_actor_show (hand); - clutter_container_add_actor (CLUTTER_CONTAINER (stage), hand); - - /* Make a timeline */ - timeline = clutter_timeline_new (7692); - clutter_timeline_set_loop (timeline, TRUE); - - /* Set an alpha func to power behaviour */ - alpha = clutter_alpha_new_full (timeline, CLUTTER_LINEAR); - - /* Create a behaviour for that alpha */ - r_behave = clutter_behaviour_rotate_new (alpha, - CLUTTER_Z_AXIS, - CLUTTER_ROTATE_CW, - 0.0, 360.0); - - /* Apply it to our actor */ - clutter_behaviour_apply (r_behave, hand); - - /* start the timeline and thus the animations */ - clutter_timeline_start (timeline); - - clutter_actor_show_all (stage); - - clutter_main(); - - g_object_unref (r_behave); - - return 0; -}