minor refactoring and state progress

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 50c3da51a6418582569a88145be462acc5b017d6..5dfde01922860cbbbe6759f00eacc5a13b1f2bee 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -35,7 +35,7 @@
 #include <Moof/Entity.hh>
 #include <Moof/Math.hh>
 #include <Moof/Octree.hh>
-#include <Moof/Physics.hh>
+#include <Moof/RigidBody.hh>
 #include <Moof/Sphere.hh>
 
 #include "Animation.hh"
@@ -52,12 +52,8 @@ typedef boost::shared_ptr<Character> CharacterP;
  * includes the heroine herself and the bad guys.
  */
 
-struct Character : public Mf::Entity, public Mf::OctreeInsertable
+class Character : public Mf::RigidBody2, public Mf::OctreeInsertable
 {
-protected:
-
-       Mf::Vector2 userForce;
-
 public:
 
        Character(const std::string& name);
@@ -66,17 +62,10 @@ public:
        virtual void update(Mf::Scalar t, Mf::Scalar dt);
        virtual void draw(Mf::Scalar alpha) const;
 
-       virtual bool isInsideAabb(const Mf::Aabb& aabb) const;
        virtual int getOctant(const Mf::Aabb& aabb) const;
 
-       Mf::State2              previous;
-       Mf::State2              current;
-
-       Tilemap                 tilemap;
-       Animation               animation;
-
-       Mf::Aabb                aabb_;
-       Mf::Sphere              sphere_;
+       Tilemap         tilemap;
+       Animation       animation;
 
 private: