X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FCharacter.cc;h=c7de260d6cb61190e5ceaf60b2be6701b455f309;hb=d50942708db230dc5c43b8df89ede45525e1c394;hp=873f9e13c74db5a2103ddb893d27af2ac010f9b1;hpb=5fa5f117f28922a7e539a432367960c1a61f837d;p=chaz%2Fyoink diff --git a/src/Character.cc b/src/Character.cc index 873f9e1..c7de260 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -26,6 +26,8 @@ *******************************************************************************/ +#include + #include "Character.hh" #include "Log.hh" @@ -37,8 +39,10 @@ Character::Character(const std::string& name) : current.mass = 1.0; current.inverseMass = 1.0 / current.mass; + // gravity current.force = Mf::Vector2(0.0, -120.0); + // starting position current.position = Mf::Vector2(64.0, 64.0); current.momentum = Mf::Vector2(0.0, 0.0); current.recalculate(); @@ -48,12 +52,6 @@ Character::Character(const std::string& name) : updateContainers(); } -Character::~Character() -{ - //delete texture; - //delete anim; -} - void Character::update(Mf::Scalar t, Mf::Scalar dt) { @@ -125,7 +123,8 @@ void Character::handleEvent(const Mf::Event& event) break; } - Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]); + //Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]); + //std::cerr << "current force: " << current.force << std::endl; } @@ -143,7 +142,7 @@ void Character::draw(Mf::Scalar alpha) const Mf::Scalar s = 16.0; - glBegin(GL_QUADS); + glBegin(GL_TRIANGLE_FAN); glTexCoord2f(coords[0], coords[1]); glVertex3(state.position[0]-s, state.position[1]-s, z); glTexCoord2f(coords[2], coords[3]);