starting to move to a generic state structure

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 2894c5ebcd35f0591840b9cf33a6514a915358f4..090e7cb97a1d308e124735f01190f21751e785e0 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -29,30 +29,139 @@
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
 
+#include <boost/shared_ptr.hpp>
+
 #include <Moof/Animation.hh>
-#include <Moof/Drawable.hh>
-#include <Moof/Resource.hh>
+#include <Moof/Entity.hh>
+#include <Moof/Event.hh>
+#include <Moof/Math.hh>
+#include <Moof/RK4.hh>
 #include <Moof/Tilemap.hh>
 
 
+struct 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 Mf::Drawable
+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 recalculate()
+               {
+                       velocity = momentum * 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;
+
+                       //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)
+               {
+                       position += dt * derivative.velocity;
+                       momentum += dt * derivative.force;
+                       recalculate();
+               }
+
+               // these two operator overloads all using the state in generic
+               // interpolator implementations
+
+               State operator*(Mf::Scalar scalar) const
+               {
+                       State state = *this;
+                       state.position *= scalar;
+                       state.momentum *= scalar;
+                       state.recalculate();
+                       return state;
+               }
+
+               State operator+(const State& state) const
+               {
+                       State newState = *this;
+                       newState.position +=  state.position;
+                       newState.momentum +=  state.momentum;
+                       newState.recalculate();
+                       return newState;
+               }
+       };
+*/
+
+       Mf::State2              previous;
+       Mf::State2              current;
+
+
+private:
+
+       static const Mf::Scalar z = 96.0;
+
+       Mf::Tilemap             tilemap_;
+       Mf::Animation   animation_;
+
+protected:
+
+       Mf::Vector2 userForce;
+
 public:
+
        Character(const std::string& name);
-       ~Character();
+       virtual ~Character() {}
 
-       void draw(Mf::Scalar alpha);
+       virtual void update(Mf::Scalar t, Mf::Scalar dt);
+       virtual void draw(Mf::Scalar alpha) const;
 
        Mf::Tilemap& getTilemap();
        Mf::Animation& getAnimation();
-
-private:
-       Mf::Tilemap tilemap;
-       Mf::Animation animation;
 };