simplified win32 installer build script

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index c9cf11a0542635798f2eeba1b18ea92e6058a680..6507906d067cf9c3d78162dd6a32916fafa9b76e 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -29,36 +29,46 @@
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
 
-#include "resource.hh"
-#include "drawable.hh"
-#include "animation.hh"
-#include "tilemap.hh"
+#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 "Animation.hh"
+#include "Tilemap.hh"
+
+
+
+class Character;
+typedef boost::shared_ptr<Character> CharacterP;
 
 
 /**
- * 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::drawable
+class Character : public Mf::RigidBody2
 {
 public:
-       struct exception : public std::runtime_error
-       {
-               explicit exception(const std::string& what_arg) :
-                       std::runtime_error(what_arg) {}
-       };
 
        Character(const std::string& name);
-       ~Character();
+       virtual ~Character() {}
+
+       virtual void update(Mf::Scalar t, Mf::Scalar dt);
+       virtual void draw(Mf::Scalar alpha) const;
 
-       void draw(dc::scalar alpha);
+       void addImpulse(Mf::Vector2 impulse);
+       void addForce(Mf::Vector2 force);
+       void setPosition(Mf::Vector2 position);
 
-       dc::tilemap& getTilemap();
-       dc::animation& getAnimation();
+       //virtual int getOctant(const Mf::Aabb<3>& aabb) const;
 
-private:
-       dc::tilemap texture;
-       dc::animation anim;
+       Tilemap         tilemap;
+       Animation       animation;
 };