[clutter-box2dmm] Use clutter-box2d-0.10.

[Murray Cumming <murrayc src gnome org>]

commit 3b961378c901801fa76e8e150f9a0731896c1334
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Aug 26 13:40:27 2009 +0200

    Use clutter-box2d-0.10.
    
    * clutter-box2d/clutter-box2dmm.pc.in:
    * configure.in: Use clutter-box2d-0.10 rather than clutter-box2d-0.8.
    * examples/bridge/main.cc:
    * examples/chain/main.cc:
    * examples/distance_joint/main.cc: Remove uses of CLUTTER_UNITS_FROM_FLOAT,
    as in clutter-box2d itself.

 ChangeLog                           |   11 +++++++++++
 clutter-box2d/clutter-box2dmm.pc.in |    2 +-
 configure.in                        |    8 ++++----
 examples/bridge/main.cc             |    4 ++--
 examples/chain/main.cc              |    4 ++--
 examples/distance_joint/main.cc     |    4 ++--
 6 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8df9f7b..b2c9c94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-08-26  Murray Cumming  <murrayc murrayc com>
+
+	Use clutter-box2d-0.10.
+	
+	* clutter-box2d/clutter-box2dmm.pc.in:
+	* configure.in: Use clutter-box2d-0.10 rather than clutter-box2d-0.8.
+	* examples/bridge/main.cc:
+	* examples/chain/main.cc:
+	* examples/distance_joint/main.cc: Remove uses of CLUTTER_UNITS_FROM_FLOAT, 
+	as in clutter-box2d itself.
+
 2009-01-24  Deng Xiyue  <manphiz gmail com>
 
 	* Change license header to mention Lesser General Public License
diff --git a/clutter-box2d/clutter-box2dmm.pc.in b/clutter-box2d/clutter-box2dmm.pc.in
index 39bf2af..451e2a7 100644
--- a/clutter-box2d/clutter-box2dmm.pc.in
+++ b/clutter-box2d/clutter-box2dmm.pc.in
@@ -5,7 +5,7 @@ includedir= includedir@
 
 Name: clutter-box2dmm
 Description: C++ wrapper for clutter
-Requires: clutter-box2d- API_VER@ cluttermm- API_VER@
+Requires: clutter-box2d-0.10 cluttermm- API_VER@
 Version: @VERSION@
 Libs: -L${libdir} -lclutter-box2dmm- API_VER@
 Cflags: -I${includedir}/clutter-box2dmm- API_VER@
diff --git a/configure.in b/configure.in
index 1d514e8..c643d0b 100644
--- a/configure.in
+++ b/configure.in
@@ -4,8 +4,8 @@ AC_INIT(clutter-box2d/clutter-box2dmm-config.h.in)
 #  Version and initialization
 #########################################################################
 CLUTTER_BOX2DMM_MAJOR_VERSION=0
-CLUTTER_BOX2DMM_MINOR_VERSION=7
-CLUTTER_BOX2DMM_MICRO_VERSION=4
+CLUTTER_BOX2DMM_MINOR_VERSION=9
+CLUTTER_BOX2DMM_MICRO_VERSION=1
 
 #
 # +1 : ? : +1  == new interface that does not break old one
@@ -72,8 +72,8 @@ AC_CHECK_PROGS(PERL, perl5 perl)
 #########################################################################
 
 PKG_CHECK_MODULES(CLUTTER_BOX2DMM,
-                  [cluttermm-0.8
-                   clutter-box2d-0.8])
+                  [cluttermm-0.9
+                   clutter-box2d-0.10])
 
 
 # the API version of the library.  Libraries and pkg-config files will have this
diff --git a/examples/bridge/main.cc b/examples/bridge/main.cc
index a862a49..14f4994 100644
--- a/examples/bridge/main.cc
+++ b/examples/bridge/main.cc
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
     box2d->set_child_manipulatable(box, true);
     box2d->set_child_mode(box, Clutter::Box2D::BOX2D_DYNAMIC);
 
-    Clutter::Vertex anchor( CLUTTER_UNITS_FROM_FLOAT (20 + 20 * i), CLUTTER_UNITS_FROM_FLOAT (y), 0 );
+    Clutter::Vertex anchor(20 + 20 * i, y, 0 );
     box2d->add_revolute_joint(prev_actor, box, anchor);
    
     prev_actor = box;
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 
   box2d->set_child_mode(box, Clutter::Box2D::BOX2D_STATIC);
 
-  Clutter::Vertex anchor( CLUTTER_UNITS_FROM_FLOAT (20 + 20 * num_planks), CLUTTER_UNITS_FROM_FLOAT (y), 0 );
+  Clutter::Vertex anchor( 20 + 20 * num_planks, y, 0 );
   box2d->add_revolute_joint(prev_actor, box, anchor);
 
   box2d->set_simulating();
diff --git a/examples/chain/main.cc b/examples/chain/main.cc
index 9c88335..0b41649 100644
--- a/examples/chain/main.cc
+++ b/examples/chain/main.cc
@@ -85,8 +85,8 @@ int main(int argc, char *argv[])
     box2d->set_child_manipulatable(box);
     box2d->set_child_mode(box, Clutter::Box2D::BOX2D_DYNAMIC);
 
-    Clutter::Vertex anchor1( CLUTTER_UNITS_FROM_FLOAT (18), CLUTTER_UNITS_FROM_FLOAT (0.0), 0 );
-    Clutter::Vertex anchor2( CLUTTER_UNITS_FROM_FLOAT (0.0), CLUTTER_UNITS_FROM_FLOAT (0.0), 0);
+    Clutter::Vertex anchor1( 0.0, 0 );
+    Clutter::Vertex anchor2( 0.0, 0.0, 0);
     box2d->add_revolute_joint(prev_actor, box, anchor1, anchor2, 0.0);
    
     prev_actor = box;
diff --git a/examples/distance_joint/main.cc b/examples/distance_joint/main.cc
index 1e24154..cc95924 100644
--- a/examples/distance_joint/main.cc
+++ b/examples/distance_joint/main.cc
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
   //Add a distance joint, with points in the middle of each actor.
   //The dynamic actor will then move in a circle around the static one,
   //when manipulated with the mouse:
-  Clutter::Vertex anchor1( CLUTTER_UNITS_FROM_FLOAT(rect->get_width()/2), CLUTTER_UNITS_FROM_FLOAT(rect->get_height()/2), 0 );
-  Clutter::Vertex anchor2( CLUTTER_UNITS_FROM_FLOAT(texture->get_width()/2), CLUTTER_UNITS_FROM_FLOAT(texture->get_height()/2), 0);
+  Clutter::Vertex anchor1( rect->get_width()/2, rect->get_height()/2, 0 );
+  Clutter::Vertex anchor2( texture->get_width()/2, texture->get_height()/2, 0);
   box2d->add_distance_joint(rect, texture, anchor1, anchor2, 200.0);
 
   box2d->property_gravity() = Clutter::Vertex(0, 0, 0);