minor refactoring and state progress

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 2f175ad65d3b7c90aeafaa03a7f6f6de3ba9c5b6..5dfde01922860cbbbe6759f00eacc5a13b1f2bee 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -29,29 +29,51 @@
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
 
+#include <boost/shared_ptr.hpp>
+
+#include <Moof/Aabb.hh>
+#include <Moof/Entity.hh>
+#include <Moof/Math.hh>
+#include <Moof/Octree.hh>
+#include <Moof/RigidBody.hh>
+#include <Moof/Sphere.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
+
+
+struct Character;
+typedef boost::shared_ptr<Character> CharacterP;
+
+
 /**
- * @file Character.hh
- * Parent class of animate objects with "personalities."
+ * Parent class of animate objects with "personalities."  This basically
+ * includes the heroine herself and the bad guys.
  */
 
-
-class Character : public dc::resource, public dc::drawable
+class Character : public Mf::RigidBody2, public Mf::OctreeInsertable
 {
 public:
-       struct exception : public std::runtime_error
-       {
-               explicit exception(const std::string& what_arg) :
-                       std::runtime_error(what_arg) {}
-       };
 
        Character(const std::string& name);
+       virtual ~Character() {}
+
+       virtual void update(Mf::Scalar t, Mf::Scalar dt);
+       virtual void draw(Mf::Scalar alpha) const;
 
-       void draw(dc::scalar alpha);
+       virtual int getOctant(const Mf::Aabb& aabb) const;
 
-       dc::tilemap* texture;
-       dc::animation* anim;
+       Tilemap         tilemap;
+       Animation       animation;
+
+private:
+
+       static const Mf::Scalar z = 96.0;
 };
 
 
 #endif // _CHARACTER_HH_
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+