X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=82d5e548e47beab288d6b262bb8cab9cca3ec66d;hp=6a7c69883ea6ddeeda7f8ec77f9c806f0b76c080;hb=00612586426be6d9a976f141a25ffc1f0d284501;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827 diff --git a/src/Character.cc b/src/Character.cc index 6a7c698..82d5e54 100644 --- 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,7 +72,7 @@ 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(SpringForce(Mf::Vector2(5.0, 4.0))); mState.forces.push_back(ResistanceForce(2.0)); //mState.forces.push_back(Mf::LinearState<2>::GravityForce(-9.8));