preliminary cleanup of character class

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index b72e8c87e58910d6296218b2eff58696e8ac2ab1..19559f38b0f54be1643f31fc29f2949323be977b 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -31,13 +31,13 @@
 
 #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/Physics.hh>
-#include <Moof/Tilemap.hh>
+#include <Moof/RK4.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
 
 
 struct Character;
@@ -51,127 +51,22 @@ typedef boost::shared_ptr<Character> CharacterP;
 
 struct Character : public Mf::Entity
 {
-       struct Derivative
-       {
-               Mf::Vector2 velocity;
-               Mf::Vector2 force;
-
-               Derivative operator*(Mf::Scalar dt) const
-               {
-                       Derivative derivative;
-                       derivative.velocity = dt * velocity;
-                       derivative.force = dt * force;
-                       return derivative;
-               }
-
-               Derivative operator+(const Derivative& other) const
-               {
-                       Derivative derivative;
-                       derivative.velocity = velocity + other.velocity;
-                       derivative.force = force + other.force;
-                       return derivative;
-               }
-       };
-
-       struct State
-       {
-               // primary
-               
-               Mf::Vector2 position;
-               Mf::Vector2 momentum;
-               Mf::Vector2 force;
-
-               // secondary
-
-               Mf::Vector2 velocity;
-
-               // constant
-               
-               Mf::Scalar      mass;
-               Mf::Scalar      inverseMass;
-
-
-               void getDerivative(Derivative& derivative, Mf::Scalar t) const
-               {
-                       //derivative.velocity = Mf::Vector2(0.0, 0.0);
-                       //derivative.force = Mf::Vector2(0.0, 0.0);
-                       derivative.velocity = velocity;
-                       derivative.force = force;
-               }
-
-               void recalculate()
-               {
-                       velocity = momentum * inverseMass;
-               }
-
-               void applyDerivative(const Derivative& derivative, Mf::Scalar dt)
-               {
-                       position += dt * derivative.velocity;
-                       momentum += dt * derivative.force;
-                       recalculate();
-               }
-
-               State operator*(Mf::Scalar scalar) const
-               {
-                       State state = *this;
-                       state.position *= scalar;
-                       state.momentum *= scalar;
-                       state.recalculate();
-                       return state;
-               }
-
-               State operator+(State state) const
-               {
-                       State newState = *this;
-                       newState.position +=  state.position;
-                       newState.momentum +=  state.momentum;
-                       newState.recalculate();
-                       return newState;
-               }
-       };
-
-       State                   previous;
-       State                   current;
-
-       stlplus::ntree<Mf::OctreeNode>::iterator treeNode;
-
-
-private:
-
-       static const Mf::Scalar z = 96.0;
-
-       Mf::Tilemap             tilemap_;
-       Mf::Animation   animation_;
-
-       void updateContainers();
+protected:
 
-public:
+       Mf::Vector2 userForce;
 
-       inline static CharacterP alloc(const std::string& name)
-       {
-               return CharacterP(new Character(name));
-       }
+public:
 
        Character(const std::string& name);
-       virtual ~Character();
+       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_