#include <boost/shared_ptr.hpp>
-#include <Moof/Animation.hh>
#include <Moof/Entity.hh>
#include <Moof/Event.hh>
#include <Moof/Math.hh>
-#include <Moof/Octree.hh>
#include <Moof/RK4.hh>
-#include <Moof/Tilemap.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
struct Character;
struct Character : public Mf::Entity
{
+ /*
struct Derivative
{
Mf::Vector2 velocity;
//derivative.force = Mf::Vector2(0.0, 0.0);
derivative.velocity = velocity;
derivative.force = force;
+
+ //Mf::Vector2 x = position - Mf::Vector2(500.0, 200.0);
+ //derivative.force += -15.0 * x - 1.5 * velocity;
}
void applyDerivative(const Derivative& derivative, Mf::Scalar dt)
return newState;
}
};
+*/
- State previous;
- State current;
-
- Mf::OctreeNodeP treeNode;
+ Mf::State2 previous;
+ Mf::State2 current;
private:
static const Mf::Scalar z = 96.0;
- Mf::Vector2 userForce;
-
- Mf::Tilemap tilemap_;
- Mf::Animation animation_;
+protected:
- void updateContainers();
+ Mf::Vector2 userForce;
public:
- static CharacterP alloc(const std::string& name)
- {
- return CharacterP(new Character(name));
- }
-
Character(const std::string& name);
virtual ~Character() {}
- void update(Mf::Scalar t, Mf::Scalar dt);
- void handleEvent(const Mf::Event& event);
- void draw(Mf::Scalar alpha) const;
-
- Mf::Tilemap& getTilemap();
- Mf::Animation& getAnimation();
-};
+ virtual void update(Mf::Scalar t, Mf::Scalar dt);
+ virtual void draw(Mf::Scalar alpha) const;
-//inline Character::State operator*(Mf::Scalar scalar,
- //const Character::State& state)
-//{
- //Character::State newState = state;
- //newState.position *= scalar;
- //newState.momentum *= scalar;
- //newState.recalculate();
- //return newState;
-//}
+ Tilemap tilemap;
+ Animation animation;
+};
#endif // _CHARACTER_HH_