the massive refactoring effort

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 4140d17249e2b8d822a31c8e8893e09737ef78b4..651cc885c4f239f10a6779c94481e1060d5b335a 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -16,12 +16,12 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Aabb.hh>
-#include <Moof/Entity.hh>
-#include <Moof/Math.hh>
-#include <Moof/RigidBody.hh>
-#include <Moof/Sphere.hh>
-#include <Moof/Texture.hh>
+#include <moof/aabb.hh>
+#include <moof/entity.hh>
+#include <moof/math.hh>
+#include <moof/rigid_body.hh>
+#include <moof/sphere.hh>
+#include <moof/texture.hh>
 
 #include "Animation.hh"
 
@@ -35,23 +35,23 @@ typedef boost::shared_ptr<Character> CharacterP;
  * includes the heroine herself and the bad guys.
  */
 
-class Character : public Mf::RigidBody2
+class Character : public moof::rigid_body2
 {
 public:
 
        Character(const std::string& name);
        virtual ~Character() {}
 
-       virtual void update(Mf::Scalar t, Mf::Scalar dt);
-       virtual void draw(Mf::Scalar alpha) const;
+       virtual void update(moof::scalar t, moof::scalar dt);
+       virtual void draw(moof::scalar alpha) const;
 
-       void addImpulse(Mf::Vector2 impulse);
-       void addForce(Mf::Vector2 force);
-       void setPosition(Mf::Vector2 position);
+       void addImpulse(moof::vector2 impulse);
+       void addForce(moof::vector2 force);
+       void setPosition(moof::vector2 position);
 
-       //virtual int getOctant(const Mf::Aabb<3>& aabb) const;
+       //virtual int getOctant(const moof::Aabb<3>& aabb) const;
 
-       Mf::Texture     tilemap;
+       moof::texture   tilemap;
        Animation       animation;
 };