X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=c6a47f9c9ed1f5e605e42b23d6d7fcbfc8702286;hp=c5d48385c8793bc71db777f4e3416bc4dabe3909;hb=HEAD;hpb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f

diff --git a/src/Character.cc b/src/Character.cc
index c5d4838..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 <iostream>
 
@@ -42,6 +40,7 @@ private:
 	moof::vector2 location;
 };
 
+
 class ResistanceForce
 {
 public:
@@ -74,18 +73,17 @@ Character::Character(const std::string& name) :
 	// forces
 	state_.force = moof::vector2(0.0, 0.0);
 	//state_.forces.push_back(SpringForce(moof::vector2(5.0, 4.0)));
-	state_.forces.push_back(ResistanceForce(2.0));
+	//state_.forces.push_back(ResistanceForce(2.0));
 	//state_.forces.push_back(moof::linear_state<2>::gravity_force(-9.8));
 
 	// starting position
 	state_.position = moof::vector2(5.0, 5.0);
-	state_.momentum = moof::vector2(1.0, 0.0);
+	state_.momentum = moof::vector2(3.0, 0.0);
 	state_.recalculate();
 
 	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;