From cf42e889fbc0c7f745c539bf8874e169c8de7ad9 Mon Sep 17 00:00:00 2001 From: "Gergely POLONKAI (W00d5t0ck)" Date: Tue, 23 Jul 2013 13:47:53 +0200 Subject: [PATCH] Commented out lines for the testing phase --- src/gradix.c | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/src/gradix.c b/src/gradix.c index ad7489c..1ec17db 100644 --- a/src/gradix.c +++ b/src/gradix.c @@ -201,6 +201,7 @@ main(int argc, char *argv[]) return OK; } +/* static gboolean draw_clock (ClutterCanvas *canvas, cairo_t *cr, int width, int height) { @@ -210,7 +211,7 @@ draw_clock (ClutterCanvas *canvas, cairo_t *cr, int width, int height) int smaller = (width < height) ? width : height; - /* get the current time and compute the angles */ + // get the current time and compute the angles now = g_date_time_new_now_local(); seconds = g_date_time_get_second(now) * G_PI / 30; minutes = g_date_time_get_minute(now) * G_PI / 30; @@ -218,9 +219,7 @@ draw_clock (ClutterCanvas *canvas, cairo_t *cr, int width, int height) cairo_save(cr); - /* clear the contents of the canvas, to avoid painting - * over the previous frame - */ + // clear the contents of the canvas, to avoid painting over the previous frame cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR); cairo_paint(cr); @@ -228,19 +227,19 @@ draw_clock (ClutterCanvas *canvas, cairo_t *cr, int width, int height) cairo_set_operator(cr, CAIRO_OPERATOR_OVER); - /* scale the modelview to the size of the surface */ + // scale the modelview to the size of the surface cairo_scale(cr, smaller, smaller); cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); cairo_set_line_width(cr, 0.01); - /* the black rail that holds the seconds indicator */ + // the black rail that holds the seconds indicator clutter_cairo_set_source_color(cr, CLUTTER_COLOR_Black); cairo_translate(cr, 0.5, 0.5); cairo_arc(cr, 0, 0, 0.4, 0, G_PI * 2); cairo_stroke(cr); - /* the seconds indicator */ + // the seconds indicator color = *CLUTTER_COLOR_White; color.alpha = 128; clutter_cairo_set_source_color(cr, &color); @@ -248,7 +247,7 @@ draw_clock (ClutterCanvas *canvas, cairo_t *cr, int width, int height) cairo_arc(cr, sinf(seconds) * 0.4, - cosf(seconds) * 0.4, 0.02, 0, G_PI * 2); cairo_fill(cr); - /* the minutes hand */ + // the minutes hand color = *CLUTTER_COLOR_DarkChameleon; color.alpha = 196; clutter_cairo_set_source_color(cr, &color); @@ -256,14 +255,14 @@ draw_clock (ClutterCanvas *canvas, cairo_t *cr, int width, int height) cairo_line_to(cr, sinf(minutes) * 0.4, - cosf(minutes) * 0.4); cairo_stroke(cr); - /* the hours hand */ + // the hours hand cairo_move_to(cr, 0, 0); cairo_line_to(cr, sinf(hours) * 0.2, - cosf(hours) * 0.2); cairo_stroke(cr); g_date_time_unref(now); - /* we're done drawing */ + // we're done drawing return TRUE; } @@ -275,23 +274,21 @@ idle_resize(gpointer data) ClutterActor *actor = data; float width, height; - /* match the canvas size to the actor's */ + // match the canvas size to the actor's clutter_actor_get_size(actor, &width, &height); clutter_canvas_set_size(CLUTTER_CANVAS(clutter_actor_get_content(actor)), ceilf(width), ceilf(height)); - /* unset the guard */ + // unset the guard idle_resize_id = 0; - /* remove the timeout */ + // remove the timeout return G_SOURCE_REMOVE; } static void on_actor_resize(ClutterActor *actor, const ClutterActorBox *allocation, ClutterAllocationFlags flags, gpointer user_data) { - /* throttle multiple actor allocations to one canvas resize; we use a guard - * variable to avoid queueing multiple resize operations - */ + // throttle multiple actor allocations to one canvas resize; we use a guard variable to avoid queueing multiple resize operations if (idle_resize_id == 0) { idle_resize_id = clutter_threads_add_timeout(1000, idle_resize, actor); } @@ -319,12 +316,12 @@ gradix_clutter_main(int argc, char *argv[]) init_graphics(); - /* initialize Clutter */ + // initialize Clutter if (clutter_init(&argc, &argv) != CLUTTER_INIT_SUCCESS) { return EXIT_FAILURE; } - /* create a resizable stage */ + // create a resizable stage stage = clutter_stage_new(); clutter_stage_set_title(CLUTTER_STAGE (stage), "GRadix"); clutter_stage_set_user_resizable(CLUTTER_STAGE (stage), TRUE); @@ -416,7 +413,7 @@ gradix_clutter_main(int argc, char *argv[]) clutter_actor_add_child(stage, sign_pisces); } - /* our 2D canvas, courtesy of Cairo */ + // our 2D canvas, courtesy of Cairo //canvas = clutter_canvas_new(); //clutter_canvas_set_size(CLUTTER_CANVAS (canvas), 300, 300); @@ -425,29 +422,29 @@ gradix_clutter_main(int argc, char *argv[]) //clutter_actor_set_content_scaling_filters(actor, CLUTTER_SCALING_FILTER_TRILINEAR, CLUTTER_SCALING_FILTER_LINEAR); //clutter_actor_add_child(stage, actor); - /* the actor now owns the canvas */ + // the actor now owns the canvas //g_object_unref(canvas); - /* bind the size of the actor to that of the stage */ + // bind the size of the actor to that of the stage //clutter_actor_add_constraint(actor, clutter_bind_constraint_new(stage, CLUTTER_BIND_SIZE, 0)); - /* resize the canvas whenever the actor changes size */ + // resize the canvas whenever the actor changes size //g_signal_connect(actor, "allocation-changed", G_CALLBACK(on_actor_resize), NULL); - /* quit on destroy */ + // quit on destroy g_signal_connect(stage, "destroy", G_CALLBACK(clutter_main_quit), NULL); - /* connect our drawing code */ + // connect our drawing code //g_signal_connect(canvas, "draw", G_CALLBACK(draw_clock), NULL); - /* invalidate the canvas, so that we can draw before the main loop starts */ + // invalidate the canvas, so that we can draw before the main loop starts //clutter_content_invalidate(canvas); - /* set up a timer that invalidates the canvas every second */ + // set up a timer that invalidates the canvas every second //clutter_threads_add_timeout(1000, invalidate_clock, canvas); clutter_main(); return EXIT_SUCCESS; } - +*/