X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=6507906d067cf9c3d78162dd6a32916fafa9b76e;hp=19559f38b0f54be1643f31fc29f2949323be977b;hb=b357615aba1dbde81e3c6999366604e6001010a7;hpb=bc2bc12125d6c223d2935557e01926fe21166e38

diff --git a/src/Character.hh b/src/Character.hh
index 19559f3..6507906 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -31,16 +31,18 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <Moof/Aabb.hh>
 #include <Moof/Entity.hh>
 #include <Moof/Math.hh>
-#include <Moof/RK4.hh>
+#include <Moof/RigidBody.hh>
+#include <Moof/Sphere.hh>
 
 #include "Animation.hh"
 #include "Tilemap.hh"
 
 
 
-struct Character;
+class Character;
 typedef boost::shared_ptr<Character> CharacterP;
 
 
@@ -49,12 +51,8 @@ typedef boost::shared_ptr<Character> CharacterP;
  * includes the heroine herself and the bad guys.
  */
 
-struct Character : public Mf::Entity
+class Character : public Mf::RigidBody2
 {
-protected:
-
-	Mf::Vector2 userForce;
-
 public:
 
 	Character(const std::string& name);
@@ -63,6 +61,11 @@ public:
 	virtual void update(Mf::Scalar t, Mf::Scalar dt);
 	virtual void draw(Mf::Scalar alpha) const;
 
+	void addImpulse(Mf::Vector2 impulse);
+	void addForce(Mf::Vector2 force);
+	void setPosition(Mf::Vector2 position);
+
+	//virtual int getOctant(const Mf::Aabb<3>& aabb) const;
 
 	Tilemap		tilemap;
 	Animation	animation;