X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;fp=src%2FCharacter.cc;h=c6a47f9c9ed1f5e605e42b23d6d7fcbfc8702286;hp=3cae68009e4b998bf8b4b823538204bf6c803a66;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=6c9943707d4f33035830eba0587a61a34eaecbc2 diff --git a/src/Character.cc b/src/Character.cc index 3cae680..c6a47f9 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -1,13 +1,11 @@ -/*] Copyright (c) 2009-2010, Charles McGarvey [************************** +/*] Copyright (c) 2009-2011, Charles McGarvey [***************************** **] All rights reserved. * -* vi:ts=4 sw=4 tw=75 -* * Distributable under the terms and conditions of the 2-clause BSD license; * see the file COPYING for a complete text of the license. * -**************************************************************************/ +*****************************************************************************/ #include @@ -42,6 +40,7 @@ private: moof::vector2 location; }; + class ResistanceForce { public: @@ -85,7 +84,6 @@ Character::Character(const std::string& name) : prev_state_ = state_; } - void Character::update(moof::scalar t, moof::scalar dt) { moof::rigid_body2::update(t, dt); // update physics @@ -103,7 +101,6 @@ void Character::update(moof::scalar t, moof::scalar dt) tilemap.tile(frame); } - void Character::draw(moof::scalar alpha) const { moof::state2 state = moof::rigid_body2::state(alpha); @@ -121,7 +118,6 @@ void Character::draw(moof::scalar alpha) const tilemap.draw(coords); } - /*int Character::getOctant(const moof::Aabb<3>& aabb) const { int octantNum = -1; @@ -232,7 +228,6 @@ void Character::draw(moof::scalar alpha) const } */ - void Character::addImpulse(moof::vector2 impulse) { state_.momentum += impulse;