preliminary cleanup of character class

[chaz/yoink] / src / Character.cc

diff --git a/src/Character.cc b/src/Character.cc
index b26f2d4f06b2432da563d7c791594d26ecdc6530..a29e63d792fd50d17935f6dc1d3bb82067cc2903 100644 (file)
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -56,17 +56,21 @@ private:
        Mf::Vector2 location;
 };
 
-struct WindResistenceForce
+struct ResistanceForce
 {
+       explicit ResistanceForce(Mf::Scalar scale = 1.0) :
+               k(scale) {}
+
        const Mf::Vector2& operator () (const Mf::LinearState<2>& state)
        {
-               force = -2.0 * state.velocity;
+               force = -k * state.velocity;
                return force;
        }
 
 private:
 
-       Mf::Vector2 force;
+       Mf::Vector2     force;
+       Mf::Scalar      k;
 };
 
 
@@ -82,7 +86,7 @@ Character::Character(const std::string& name) :
        // gravity
        current.force = Mf::Vector2(0.0, 000.0);
        current.forces.push_back(SpringForce(Mf::Vector2(500.0, 200.0)));
-       current.forces.push_back(WindResistenceForce());
+       current.forces.push_back(ResistanceForce(4.0));
        current.forces.push_back(Mf::LinearState<2>::GravityForce(-2000.0));
 
        // starting position
@@ -114,10 +118,7 @@ void Character::update(Mf::Scalar t, Mf::Scalar dt)
 
        //Mf::euler<State,Derivative>(current, t, dt);
 
-       //current.force = Mf::Vector2(0.0, -2000.0);
-       current.force = userForce;
        current.integrate(t, dt);
-
        animation.update(t, dt);
 }