gnomemm r1286 - in cluttermm/trunk: . clutter/src tools/m4

[jjongsma svn gnome org]

Author: jjongsma
Date: Sun Jan 20 03:27:18 2008
New Revision: 1286
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1286&view=rev

Log:
	* clutter/src/behaviour-scale.hg: wrapped new BehaviourScale API and fixed
	up some API changes (constructor, etc)
	* clutter/src/stage.hg: wrapped new Stage API
	* tools/m4/convert_cluttermm.m4: add conversions for Fog



Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/behaviour-scale.hg
   cluttermm/trunk/clutter/src/stage.hg
   cluttermm/trunk/tools/m4/convert_cluttermm.m4

Modified: cluttermm/trunk/clutter/src/behaviour-scale.hg
==============================================================================
--- cluttermm/trunk/clutter/src/behaviour-scale.hg	(original)
+++ cluttermm/trunk/clutter/src/behaviour-scale.hg	Sun Jan 20 03:27:18 2008
@@ -31,20 +31,25 @@
   _CLASS_GOBJECT(BehaviourScale, ClutterBehaviourScale, CLUTTER_BEHAVIOUR_SCALE, Behaviour, ClutterBehaviour)
 
 protected:
-  _WRAP_CTOR(BehaviourScale(const Glib::RefPtr<Alpha>& alpha, double scale_start, double scale_end, Gravity scale_gravity), clutter_behaviour_scale_new)
-  _WRAP_CTOR(BehaviourScale(const Glib::RefPtr<Alpha>& alpha, Fixed scale_start, Fixed scale_end, Gravity scale_gravity), clutter_behaviour_scale_newx)
+  _WRAP_CTOR(BehaviourScale(const Glib::RefPtr<Alpha>& alpha, double x_scale_start, double x_scale_end, double y_scale_start, double y_scale_end, Gravity scale_gravity), clutter_behaviour_scale_new)
+  _WRAP_CTOR(BehaviourScale(const Glib::RefPtr<Alpha>& alpha, Fixed x_scale_start, Fixed x_scale_end, Fixed y_scale_start, Fixed y_scale_end, Gravity scale_gravity), clutter_behaviour_scale_newx)
 
 public:
-  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, double scale_start, double scale_end, Gravity gravity)
-  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, Fixed scale_start, Fixed scale_end, Gravity gravity)
+  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, double x_scale_start, double x_scale_end, double y_scale_start, double y_scale_end, Gravity gravity)
+  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, Fixed x_scale_start, Fixed x_scale_end, Fixed y_scale_start, Fixed y_scale_end, Gravity gravity)
 
+  _WRAP_METHOD(void set_bounds(double x_scale_start, double y_scale_start, double x_scale_end, double y_scale_end), clutter_behaviour_scale_set_bounds)
   _WRAP_METHOD(void get_bounds(double& x_scale_start, double& y_scale_start, double& x_scale_end, double& y_scale_end) const, clutter_behaviour_scale_get_bounds)
-  _WRAP_METHOD(void get_boundsx(Fixed& x_scale_start, Fixed& y_scale_start, Fixed& x_scale_end, Fixed& y_scale_enend const, clutter_behaviour_scale_get_boundsx)
+  _WRAP_METHOD(void set_boundsx(Fixed x_scale_start, Fixed y_scale_start, Fixed x_scale_end, Fixed y_scale_end), clutter_behaviour_scale_set_boundsx)
+  _WRAP_METHOD(void get_boundsx(Fixed& x_scale_start, Fixed& y_scale_start, Fixed& x_scale_end, Fixed& y_scale_end) const, clutter_behaviour_scale_get_boundsx)
+  _WRAP_METHOD(void set_gravity(Gravity gravity), clutter_behaviour_scale_set_gravity)
   _WRAP_METHOD(Gravity get_gravity() const, clutter_behaviour_scale_get_gravity)
 
-  _WRAP_PROPERTY("scale-end", double)
   _WRAP_PROPERTY("scale-gravity", Gravity)
-  _WRAP_PROPERTY("scale-start", double)
+  _WRAP_PROPERTY("x-scale-start", double)
+  _WRAP_PROPERTY("x-scale-end", double)
+  _WRAP_PROPERTY("y-scale-start", double)
+  _WRAP_PROPERTY("y-scale-end", double)
 
 };
 

Modified: cluttermm/trunk/clutter/src/stage.hg
==============================================================================
--- cluttermm/trunk/clutter/src/stage.hg	(original)
+++ cluttermm/trunk/clutter/src/stage.hg	Sun Jan 20 03:27:18 2008
@@ -23,10 +23,11 @@
 _DEFS(cluttermm,clutter)
 _PINCLUDE(cluttermm/private/group_p.h)
 
-
 namespace Clutter
 {
 
+typedef ClutterFog Fog;
+
 class Stage :
   public Group
 {
@@ -64,6 +65,12 @@
   _WRAP_METHOD(Glib::RefPtr<const Actor> get_key_focus() const, clutter_stage_get_key_focus, constversion)
   _WRAP_METHOD(void set_key_focus(const Glib::RefPtr<Actor>& actor), clutter_stage_set_key_focus)
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> snapshot(int x, int y, int width, int height) const, clutter_stage_snapshot)
+  _WRAP_METHOD(bool get_use_fog() const, clutter_stage_get_use_fog)
+  _WRAP_METHOD(void set_use_fog(bool fog), clutter_stage_set_use_fog)
+  _WRAP_METHOD(void set_fog(double density, double z_near, double z_far), clutter_stage_set_fog)
+  _WRAP_METHOD(void get_fog(double& density, double& z_near, double& z_far) const, clutter_stage_get_fog)
+  //_WRAP_METHOD(void set_fogx(const Fog& fog), clutter_stage_set_fogx)
+  //_WRAP_METHOD(void get_fogx(Fog& fog) const, clutter_stage_get_fogx)
   
   _WRAP_METHOD(void stage_event(Event* event), clutter_stage_event);
 

Modified: cluttermm/trunk/tools/m4/convert_cluttermm.m4
==============================================================================
--- cluttermm/trunk/tools/m4/convert_cluttermm.m4	(original)
+++ cluttermm/trunk/tools/m4/convert_cluttermm.m4	Sun Jan 20 03:27:18 2008
@@ -44,6 +44,9 @@
 _CONVERSION(`Fixed&',`ClutterFixed*',`&($3)')
 _EQUAL(ClutterAngle,Angle)
 _CONVERSION(`Angle&',`ClutterAngle*',`&($3)')
+_EQUAL(ClutterFog,Fog)
+_CONVERSION(`Fog&',`ClutterFog*',`&($3)')
+_CONVERSION(`const Fog&',`ClutterFog*',`&($3)')
 
 _EQUAL(ClutterEvent*,Event*)
 _EQUAL(ClutterButtonEvent*,ButtonEvent*)