[glide] Add all the old animations to the new animation system



commit f98de9f2a082b67dcdc571ec26ce88052f77bd49
Author: Robert Carr <racarr Valentine localdomain>
Date:   Tue Apr 27 02:07:17 2010 -0400

    Add all the old animations to the new animation system

 src/glide-animation-manager.c |   39 ++++++++-------------------------------
 src/glide-animations.c        |   32 ++++++++++++++++----------------
 src/glide-animations.h        |   15 ++++++++-------
 3 files changed, 32 insertions(+), 54 deletions(-)
---
diff --git a/src/glide-animation-manager.c b/src/glide-animation-manager.c
index d249bd7..41d31b2 100644
--- a/src/glide-animation-manager.c
+++ b/src/glide-animation-manager.c
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "glide-animation-manager.h"
+#include "glide-animations.h"
 
 
 static GList *animations = NULL;
@@ -285,38 +286,14 @@ glide_param_spec_animation_info (const gchar *name,
   return G_PARAM_SPEC (aspec);
 }
 
-static void
-glide_animation_fade_completed (ClutterTimeline *t,
-				gpointer user_data)
-{
-  ClutterActor *a = (ClutterActor *)user_data;
-  
-  clutter_actor_set_opacity (a, 0xff);
-  clutter_actor_hide (a);
-}
-
-static ClutterTimeline *
-glide_animation_fade (const GlideAnimationInfo *info,
-		      ClutterActor *a,
-		      ClutterActor *b)
-{
-  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
-  
-  clutter_actor_set_opacity (b, 0x00);
-  clutter_actor_show_all (b);
-  
-  clutter_actor_raise (b, a);
-  
-  clutter_actor_animate_with_timeline (b, CLUTTER_LINEAR,
-				       timeline, "opacity", 0xff, NULL);
-  
-  g_signal_connect (timeline, "completed", G_CALLBACK (glide_animation_fade_completed), a);
-  
-  return timeline;
-}
-
 void 
 glide_animation_manager_register_animations ()
 {
-  glide_animation_manager_register_animation (glide_animation_fade, "Fade");
+  glide_animation_manager_register_animation (glide_animations_animate_fade, "Fade");
+  glide_animation_manager_register_animation (glide_animations_animate_drop, "Drop");
+  glide_animation_manager_register_animation (glide_animations_animate_zoom, "Zoom");
+  glide_animation_manager_register_animation (glide_animations_animate_zoom_contents, "Zoom Contents");
+  glide_animation_manager_register_animation (glide_animations_animate_pivot, "Pivot");
+  glide_animation_manager_register_animation (glide_animations_animate_slide, "Slide");
+  glide_animation_manager_register_animation (glide_animations_animate_doorway, "Doorway");
 }
diff --git a/src/glide-animations.c b/src/glide-animations.c
index d75d7ab..12aa69d 100644
--- a/src/glide-animations.c
+++ b/src/glide-animations.c
@@ -31,9 +31,9 @@ glide_animations_fade_completed (ClutterTimeline *t, gpointer user_data)
 
 
 ClutterTimeline *
-glide_animations_animate_fade (ClutterActor *a, ClutterActor *b, guint duration)
+glide_animations_animate_fade (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b)
 {
-  ClutterTimeline *timeline = clutter_timeline_new (duration);
+  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
 
   clutter_actor_set_opacity (b, 0x00);
   clutter_actor_show_all (b);
@@ -60,9 +60,9 @@ glide_animations_slide_completed (ClutterTimeline *t, gpointer user_data)
 }
 
 ClutterTimeline *
-glide_animations_animate_slide (ClutterActor *a, ClutterActor *b, guint duration)
+glide_animations_animate_slide (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b)
 {
-  ClutterTimeline *timeline = clutter_timeline_new (duration);
+  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
   ClutterActor *stage = clutter_actor_get_stage (a);
   gfloat width, height;
   
@@ -86,9 +86,9 @@ glide_animations_animate_slide (ClutterActor *a, ClutterActor *b, guint duration
 }
 
 ClutterTimeline *
-glide_animations_animate_pivot (ClutterActor *a, ClutterActor *b, guint duration)
+glide_animations_animate_pivot (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b)
 {
-  ClutterTimeline *timeline = clutter_timeline_new (duration);
+  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
 
   clutter_actor_show_all (b);
 
@@ -104,9 +104,9 @@ glide_animations_animate_pivot (ClutterActor *a, ClutterActor *b, guint duration
 }
 
 ClutterTimeline *
-glide_animations_animate_zoom (ClutterActor *a, ClutterActor *b, guint duration)
+glide_animations_animate_zoom (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b)
 {
-  ClutterTimeline *timeline = clutter_timeline_new (duration);
+  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
   ClutterActor *stage = clutter_actor_get_stage (a);
   gfloat width, height;
   
@@ -128,9 +128,9 @@ glide_animations_animate_zoom (ClutterActor *a, ClutterActor *b, guint duration)
 }
 
 ClutterTimeline *
-glide_animations_animate_drop (ClutterActor *a, ClutterActor *b, guint duration)
+glide_animations_animate_drop (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b)
 {
-  ClutterTimeline *timeline = clutter_timeline_new (duration);
+  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
   ClutterActor *stage = clutter_actor_get_stage (a);
   
   clutter_actor_show_all (b);
@@ -148,10 +148,10 @@ glide_animations_animate_drop (ClutterActor *a, ClutterActor *b, guint duration)
 
 
 ClutterTimeline *
-glide_animations_animate_zoom_contents (ClutterActor *a, ClutterActor *b, guint duration)
+glide_animations_animate_zoom_contents (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b)
 {
 
-  ClutterTimeline *timeline = clutter_timeline_new (duration);
+  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
   ClutterActor *stage = clutter_actor_get_stage (a);
   ClutterActor *ac, *bc;
   gfloat width, height;
@@ -181,9 +181,9 @@ glide_animations_animate_zoom_contents (ClutterActor *a, ClutterActor *b, guint
 }
 
 ClutterTimeline *
-glide_animations_animate_pivot_contents (ClutterActor *a, ClutterActor *b, guint duration)
+glide_animations_animate_pivot_contents (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b)
 {
-  ClutterTimeline *timeline = clutter_timeline_new (duration);
+  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
   ClutterActor *stage = clutter_actor_get_stage (a);
   ClutterActor *ac, *bc;
   gfloat width, height;
@@ -244,9 +244,9 @@ glide_animations_doorway_completed (ClutterTimeline *t, gpointer user_data)
 }
 
 ClutterTimeline *
-glide_animations_animate_doorway (ClutterActor *a, ClutterActor *b, guint duration)
+glide_animations_animate_doorway (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b)
 {
-  ClutterTimeline *timeline = clutter_timeline_new (duration);
+  ClutterTimeline *timeline = clutter_timeline_new (info->duration);
   ClutterActor *stage = clutter_actor_get_stage (a);
   ClutterActor *left, *right, *reflection;
   ClutterVertex rotation_center;
diff --git a/src/glide-animations.h b/src/glide-animations.h
index bbf7f9e..99504ce 100644
--- a/src/glide-animations.h
+++ b/src/glide-animations.h
@@ -21,13 +21,14 @@
 #define __GLIDE_ANIMATIONS_H__
 
 #include <clutter/clutter.h>
+#include "glide-animation-manager.h"
 
-ClutterTimeline *glide_animations_animate_fade (ClutterActor *a, ClutterActor *b, guint duration);
-ClutterTimeline *glide_animations_animate_drop (ClutterActor *a, ClutterActor *b, guint duration);
-ClutterTimeline *glide_animations_animate_zoom (ClutterActor *a, ClutterActor *b, guint duration);
-ClutterTimeline *glide_animations_animate_zoom_contents (ClutterActor *a, ClutterActor *b, guint duration);
-ClutterTimeline *glide_animations_animate_pivot (ClutterActor *a, ClutterActor *b, guint duration);
-ClutterTimeline *glide_animations_animate_slide (ClutterActor *a, ClutterActor *b, guint duration);
-ClutterTimeline *glide_animations_animate_doorway (ClutterActor *a, ClutterActor *b, guint duration);
+ClutterTimeline *glide_animations_animate_fade (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b);
+ClutterTimeline *glide_animations_animate_drop (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b);
+ClutterTimeline *glide_animations_animate_zoom (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b);
+ClutterTimeline *glide_animations_animate_zoom_contents (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b);
+ClutterTimeline *glide_animations_animate_pivot (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b);
+ClutterTimeline *glide_animations_animate_slide (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b);
+ClutterTimeline *glide_animations_animate_doorway (const GlideAnimationInfo *info, ClutterActor *a, ClutterActor *b);
 
 #endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]