spring experiments

[chaz/yoink] / src / Character.cc

diff --git a/src/Character.cc b/src/Character.cc
index 97a10b2553d27532cd2631f2a5447ae85ec7f1ca..4ce11052274d0a0d9a23e378e3f5d7302ebd729a 100644 (file)
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -26,9 +26,11 @@
 
 *******************************************************************************/
 
+#include <iostream>
+
 #include "Character.hh"
+#include "Log.hh"
 
-#include <iostream>
        
 Character::Character(const std::string& name) :
        tilemap_(name),
@@ -37,8 +39,10 @@ Character::Character(const std::string& name) :
        current.mass = 1.0;
        current.inverseMass = 1.0 / current.mass;
 
-       current.force = Mf::Vector2(0.0, -120.0);
+       // 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,16 +52,27 @@ Character::Character(const std::string& name) :
        updateContainers();
 }
 
-Character::~Character()
-{
-       //delete texture;
-       //delete anim;
-}
-
 
 void Character::update(Mf::Scalar t, Mf::Scalar dt)
 {
        previous = current;
+
+       Mf::Scalar epsilon = 100.0;
+
+       //current.momentum = Mf::Vector2(0.0, -120.0);
+       current.momentum = -5 * (current.position - Mf::Vector2(500.0, 200.0))
+               - 2.0 * current.velocity;
+       current.recalculate();
+       std::cout << "force: " << current.momentum << std::endl;
+
+       //if (std::abs(current.force[0]) < epsilon && std::abs(current.force[1]) < epsilon &&
+               //std::abs(current.velocity[0]) < epsilon && std::abs(current.velocity[1]) < epsilon)
+       //{
+               //current.force = Mf::Vector2(0.0, 0.0);
+               //current.velocity = Mf::Vector2(0.0, 0.0);
+               //current.momentum = Mf::Vector2(0.0, 0.0);
+       //}
+
        Mf::integrate<State,Derivative>(current, t, dt);
 
        animation_.update(t, dt);
@@ -125,7 +140,8 @@ void Character::handleEvent(const Mf::Event& event)
                        break;
        }
 
-       std::cout << "current force: " << current.force << std::endl;
+       //Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]);
+       //std::cerr << "current force: " << current.force << std::endl;
 }
 
 
@@ -143,7 +159,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]);