2008-02-06 Matthew Allum <mallum@openedhand.com>

        * clutter/clutter-texture.c:
        Minor clean up from last commit.

        * tests/test-fbo.c:
        Swall tweak (rotate offscreen, rather than resize

diff --git a/ChangeLog b/ChangeLog
index ba51c9c..35a0cd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 2008-02-06  Matthew Allum  <mallum@openedhand.com>
 
        * clutter/clutter-texture.c:
+        Minor clean up from last commit. 
+
+       * tests/test-fbo.c:
+        Swall tweak (rotate offscreen, rather than resize)
+
+2008-02-06  Matthew Allum  <mallum@openedhand.com>
+
+       * clutter/clutter-texture.c:
         Initial attempt at handling resizing/tranformed source textures.
 
        * clutter/pango/pangoclutter-render.c: (draw_glyph):

diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 5cdf61f..7983bab 100644 (file)
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -2250,12 +2250,7 @@ clutter_texture_new_from_actor (ClutterActor *actor)
        return NULL;
     }
 
-  /* FIXME abs size - usually fails with 0,0 */
   clutter_actor_get_abs_size (actor, &w, &h);
-  // printf("abs size is %ix%i\n", w, h);
-
-  /* Wont work with any kind of transform on actor */
-  //clutter_actor_get_size (actor, &w, &h); 
 
   if (w == 0 || h == 0)
     return NULL;

diff --git a/tests/test-fbo.c b/tests/test-fbo.c
index 6b961a0..ad36487 100644 (file)
--- a/tests/test-fbo.c
+++ b/tests/test-fbo.c
@@ -132,12 +132,6 @@ main (gint   argc,
   clutter_actor_show_all (trans_source); /* need to show() offscreen */
 
   clutter_actor_set_scale (trans_source, 2.5, 2.5);
-#if 0
-  /* Rotate about center by 90 degrees - FIXME: fbo seems to get nothing*/
-  clutter_actor_move_anchor_point_from_gravity (trans_source, 
-                                               CLUTTER_GRAVITY_CENTER);
-  clutter_actor_set_rotation (trans_source, CLUTTER_Z_AXIS, 90.0, 0, 0, 0);
-#endif
 
   if ((fbo = clutter_texture_new_from_actor (trans_source)) == NULL)
     g_error("transformed fbo creation failed");
@@ -153,7 +147,11 @@ main (gint   argc,
   if ((fbo = clutter_texture_new_from_actor (trans_source)) == NULL)
     g_error("transformed fbo creation failed");
 
-  clutter_actor_set_width (trans_source, 2*padx);
+  /* rotate after */
+  clutter_actor_move_anchor_point_from_gravity (trans_source, 
+                                               CLUTTER_GRAVITY_CENTER);
+  clutter_actor_set_rotation (trans_source, CLUTTER_Z_AXIS, 90.0, 0, 0, 0);
+
   clutter_actor_set_position (fbo, padx, pady);
   clutter_group_add (stage, fbo);