game loop tweaks; shapes hierarchy defined

[chaz/yoink] / src / Character.cc

diff --git a/src/Character.cc b/src/Character.cc
index 6a7c69883ea6ddeeda7f8ec77f9c806f0b76c080..840099c8fcd97cd1cffb17d7a9010a635d0c383f 100644 (file)
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -30,8 +30,7 @@ public:
 
                // spring:
                //mState.force += -15.0 * x - 1.5 * mState.velocity;
-               force = SCALAR(-10.0) * (mag - d) * (x / mag) -
-                               SCALAR(2.0) * state.velocity;
+               force = SCALAR(-10.0) * (mag - d) * (x / mag);// - SCALAR(2.0) * state.velocity;
 
                return force;
        }
@@ -73,8 +72,8 @@ Character::Character(const std::string& name) :
 
        // forces
        mState.force = Mf::Vector2(0.0, 0.0);
-       //mState.forces.push_back(SpringForce(Mf::Vector2(20.0, 4.0)));
-       mState.forces.push_back(ResistanceForce(2.0));
+       //mState.forces.push_back(SpringForce(Mf::Vector2(5.0, 4.0)));
+       //mState.forces.push_back(ResistanceForce(2.0));
        //mState.forces.push_back(Mf::LinearState<2>::GravityForce(-9.8));
 
        // starting position