preliminary cleanup of character class

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index d1ec2c313713314bf0c3857002e33387c6a85680..19559f38b0f54be1643f31fc29f2949323be977b 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -32,7 +32,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Entity.hh>
-#include <Moof/Event.hh>
 #include <Moof/Math.hh>
 #include <Moof/RK4.hh>
 
@@ -52,101 +51,6 @@ 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 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;
-
 protected:
 
        Mf::Vector2 userForce;