Revert changes to test-cogl-primitives.c from 272e227109
These changes caused the test to try to load redhand.png but this no longer works since the TESTS_DATADIR changes in 0b4899ef23. The only use of the hand is commented out anyway so it looks like the changes were intended for temporary debugging.
This commit is contained in:
parent
ac9f65cb92
commit
2671c42589
@ -6,7 +6,6 @@
|
|||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
|
|
||||||
typedef void (*PaintFunc) (void);
|
typedef void (*PaintFunc) (void);
|
||||||
CoglHandle hand;
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
test_paint_line ()
|
test_paint_line ()
|
||||||
@ -95,7 +94,6 @@ paint_cb (ClutterActor *self, ClutterTimeline *tl)
|
|||||||
|
|
||||||
cogl_translate (150, 0, 0);
|
cogl_translate (150, 0, 0);
|
||||||
cogl_set_source_color4ub (200, 0, 0, 255);
|
cogl_set_source_color4ub (200, 0, 0, 255);
|
||||||
//cogl_set_source_texture (hand);
|
|
||||||
cogl_path_fill ();
|
cogl_path_fill ();
|
||||||
|
|
||||||
cogl_pop_matrix();
|
cogl_pop_matrix();
|
||||||
@ -107,21 +105,9 @@ test_cogl_primitives_main (int argc, char *argv[])
|
|||||||
ClutterActor *stage;
|
ClutterActor *stage;
|
||||||
ClutterActor *coglbox;
|
ClutterActor *coglbox;
|
||||||
ClutterTimeline *tl;
|
ClutterTimeline *tl;
|
||||||
GError *error = NULL;
|
|
||||||
|
|
||||||
clutter_init(&argc, &argv);
|
clutter_init(&argc, &argv);
|
||||||
|
|
||||||
hand =cogl_texture_new_from_file ("redhand.png",
|
|
||||||
COGL_TEXTURE_NONE,
|
|
||||||
COGL_PIXEL_FORMAT_ANY,
|
|
||||||
&error);
|
|
||||||
if (error)
|
|
||||||
{
|
|
||||||
g_critical ("Failed to load redhand.png: %s", error->message);
|
|
||||||
g_error_free (error);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
tl = clutter_timeline_new (G_N_ELEMENTS (paint_func) * 1000);
|
tl = clutter_timeline_new (G_N_ELEMENTS (paint_func) * 1000);
|
||||||
clutter_timeline_set_loop (tl, TRUE);
|
clutter_timeline_set_loop (tl, TRUE);
|
||||||
clutter_timeline_start (tl);
|
clutter_timeline_start (tl);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user