gnomemm r1880 - in cluttermm/trunk: . examples tests

[daniel svn gnome org]

Author: daniel
Date: Thu Dec 18 12:17:08 2008
New Revision: 1880
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1880&view=rev

Log:
* tests/test-actors.cc: Adapt to new syntax of Clutter::Alpha
convenience functions.
* tests/test-alpha-creation.cc: ditto,
* examples/effect.cc: ditto.

Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/examples/effect.cc
   cluttermm/trunk/examples/test-actors.cc
   cluttermm/trunk/tests/test-alpha-creation.cc

Modified: cluttermm/trunk/examples/effect.cc
==============================================================================
--- cluttermm/trunk/examples/effect.cc	(original)
+++ cluttermm/trunk/examples/effect.cc	Thu Dec 18 12:17:08 2008
@@ -2,37 +2,38 @@
 #include <cluttermm/init.h>
 #include <iostream>
 
-void on_move_finished(const Glib::RefPtr<Clutter::Actor>& actor, const Glib::RefPtr<Clutter::EffectTemplate>& effect)
+void on_move_finished(const Glib::RefPtr<Clutter::Actor>& actor,
+                      const Glib::RefPtr<Clutter::EffectTemplate>& effect)
 {
   // Restart
-  effect->move(actor, 450, 450, sigc::bind(sigc::ptr_fun(on_move_finished), effect));
+  effect->move(actor, 450, 450, sigc::bind(sigc::ptr_fun(&on_move_finished), effect));
 }
 
-int
-main (int argc, char *argv[])
+int main(int argc, char** argv)
 {
   // Initialize the C++ wrapper types:
   Clutter::init(&argc, &argv);
 
   Clutter::Color stage_color (0x61, 0x64, 0x8c, 0xff);
-  Glib::RefPtr<Clutter::Stage> stage = Clutter::Stage::get_default ();
-  stage->set_size (800, 600);
+  Glib::RefPtr<Clutter::Stage> stage = Clutter::Stage::get_default();
+  stage->set_size(800, 600);
 
-  stage->set_title ("Effect Test");
-  stage->set_color (stage_color);
+  stage->set_title("Effect Test");
+  stage->set_color(stage_color);
 
   Glib::RefPtr<Clutter::Timeline> timeline =
-    Clutter::Timeline::create (360, 60); // num frames, fps
-  Glib::RefPtr<Clutter::EffectTemplate> effect = Clutter::EffectTemplate::create(timeline, Clutter::ALPHA_RAMP);
+    Clutter::Timeline::create(360, 60); // num frames, fps
+  Glib::RefPtr<Clutter::EffectTemplate> effect =
+    Clutter::EffectTemplate::create(timeline, &Clutter::Alpha::ramp_func);
 
-  Glib::RefPtr<Clutter::Texture> texture(Clutter::Texture::create());
+  Glib::RefPtr<Clutter::Texture> texture = Clutter::Texture::create();
   texture->set_from_file("actor.png");
 
   stage->add_actor(texture);
   stage->show_all();
 
   timeline->start();
-  effect->move(texture, 450, 450, sigc::bind(sigc::ptr_fun(on_move_finished), effect));
+  effect->move(texture, 450, 450, sigc::bind(sigc::ptr_fun(&on_move_finished), effect));
 
   Clutter::main();
   return 0;

Modified: cluttermm/trunk/examples/test-actors.cc
==============================================================================
--- cluttermm/trunk/examples/test-actors.cc	(original)
+++ cluttermm/trunk/examples/test-actors.cc	Thu Dec 18 12:17:08 2008
@@ -128,7 +128,7 @@
 
   // Set up some behaviours to handle scaling
   Glib::RefPtr<Clutter::Alpha> alpha =
-    Clutter::Alpha::create(timeline, Clutter::ALPHA_SINE);
+    Clutter::Alpha::create(timeline, &Clutter::Alpha::sine_func);
 
   Glib::RefPtr<Clutter::BehaviourScale> scaler_1 =
     Clutter::BehaviourScale::create(alpha,

Modified: cluttermm/trunk/tests/test-alpha-creation.cc
==============================================================================
--- cluttermm/trunk/tests/test-alpha-creation.cc	(original)
+++ cluttermm/trunk/tests/test-alpha-creation.cc	Thu Dec 18 12:17:08 2008
@@ -20,7 +20,7 @@
     //Causes a Gobject (refcount?) warning: Glib::RefPtr<Clutter::Alpha> alpha =
     //    Clutter::Alpha::create (timeline, Clutter::ALPHA_SINE);
     Glib::RefPtr<Clutter::Alpha> alpha =
-        Clutter::Alpha::create (timeline, CLUTTER_ALPHA_SINE);
+        Clutter::Alpha::create(timeline, &Clutter::Alpha::sine_func);
 
     Glib::RefPtr<Clutter::BehaviourScale> scaler_1 =
         Clutter::BehaviourScale::create (alpha,