Changeset 57

Timestamp:

10/22/09 18:22:03 (3 years ago)

Author:

mirko

Message:

Updated clutter experiments to work with clutter-1.0.

Location:

branches/clutter-experiments

Files:

• Makefile (modified) (1 diff)
• main.cc (modified) (1 diff)
• pdfcube.hh (modified) (7 diffs)

branches/clutter-experiments/Makefile

@@ -1 +1 @@
 CXXFLAGS=-O3 -g -Wall -Weffc++
-LIBS=`pkg-config --libs clutter-0.9 poppler-glib`
-INCS=`pkg-config --cflags clutter-0.9 poppler-glib`
+LIBS=`pkg-config --libs clutter-1.0 poppler-glib`
+INCS=`pkg-config --cflags clutter-1.0 poppler-glib`
 
 .c.o:

branches/clutter-experiments/main.cc

@@ -59 +59 @@
 on_stage_button_press (ClutterStage *stage, ClutterEvent *event, gpointer data)
 {
-  gint x, y;
+  gfloat x, y;
   clutter_event_get_coords (event, &x, &y);
   g_print ("Stage clicked at (%d, %d)\n", x, y);

branches/clutter-experiments/pdfcube.hh

@@ -50 +50 @@
       the_stage_m = clutter_stage_get_default();
       clutter_actor_set_size(the_stage_m, 1024, 768);
-      clutter_color_parse("Black", &stage_color);
+      clutter_color_from_string(&stage_color, "Black");
       clutter_stage_set_color(CLUTTER_STAGE(the_stage_m), &stage_color);
       return true;
@@ -83 +83 @@
       progress_label_m = 
         clutter_text_new_full("Mono 36", "0%", &label_color);
-      guint screen_w, screen_h;
+      gfloat screen_w, screen_h;
       clutter_actor_get_size(CLUTTER_ACTOR(the_stage_m), 
                              &screen_w, &screen_h);
       clutter_actor_set_position(progress_label_m, 
-                                 screen_w>>1, screen_h>>1);
+                                 screen_w/2.0, screen_h/2.0);
       clutter_actor_set_anchor_point_from_gravity(progress_label_m, 
                                                   CLUTTER_GRAVITY_CENTER);
-      clutter_group_add_many(CLUTTER_GROUP(the_stage_m), 
-                             progress_label_m, NULL);
+      clutter_container_add_actor(CLUTTER_CONTAINER(the_stage_m), 
+                                  progress_label_m);
       clutter_actor_show(the_stage_m);
       g_thread_create(render_thread, this, FALSE, NULL);
@@ -116 +116 @@
     {
       app* me = static_cast<app*>(data);
-      guint screen_w, screen_h;
+      gfloat screen_w, screen_h;
       clutter_actor_get_size(CLUTTER_ACTOR(me->the_stage_m), 
                              &screen_w, &screen_h);
@@ -124 +124 @@
                                                   CLUTTER_GRAVITY_CENTER);
       clutter_actor_set_position(me->progress_label_m, 
-                                 screen_w>>1, screen_h>>1);
+                                 screen_w/2.0, screen_h/2.0);
       return FALSE;
     }
@@ -132 +132 @@
     {
       app* me = static_cast<app*>(data);
-      clutter_group_remove(CLUTTER_GROUP(me->the_stage_m), 
-                                         me->progress_label_m);
+      clutter_container_remove_actor(CLUTTER_CONTAINER(me->the_stage_m), 
+                               me->progress_label_m);
       g_object_unref(me->progress_label_m);
 
@@ -152 +152 @@
          &error);
 
-      guint screen_w, screen_h;
+      gfloat screen_w, screen_h;
       clutter_actor_get_size(CLUTTER_ACTOR(me->the_stage_m), 
                              &screen_w, &screen_h);
@@ -173 +173 @@
       
       clutter_actor_set_size(me->current_page_m, w, h);
-      clutter_group_add_many(CLUTTER_GROUP(me->the_stage_m), 
-                             me->current_page_m, NULL);
+      clutter_container_add_actor(CLUTTER_CONTAINER(me->the_stage_m), 
+                            me->current_page_m);
       return FALSE;
     }