]> Dogcows Code - chaz/yoink/blobdiff - src/Character.cc
fixed documentation about where to find licenses
[chaz/yoink] / src / Character.cc
index ccb2f9776dacc3216e75616235186c2a94665292..c6a47f9c9ed1f5e605e42b23d6d7fcbfc8702286 100644 (file)
@@ -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:
@@ -73,19 +72,18 @@ 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(moof::linear_state<2>::gravity_force(-9.8));
+       //state_.forces.push_back(SpringForce(moof::vector2(5.0, 4.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;
This page took 0.018632 seconds and 4 git commands to generate.