preliminary physics, sound, hud

[chaz/yoink] / src / Character.cc

diff --git a/src/Character.cc b/src/Character.cc
index f508682944d3a5db96ca210d9a710cd7ef2065d8..97a10b2553d27532cd2631f2a5447ae85ec7f1ca 100644 (file)
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -28,10 +28,25 @@
 
 #include "Character.hh"
 
 
 #include "Character.hh"
 

+#include <iostream>

        
 Character::Character(const std::string& name) :
        
 Character::Character(const std::string& name) :

-       tilemap(name),
-       animation(name) {}
+       tilemap_(name),
+       animation_(name)
+{
+       current.mass = 1.0;
+       current.inverseMass = 1.0 / current.mass;
+
+       current.force = Mf::Vector2(0.0, -120.0);
+
+       current.position = Mf::Vector2(64.0, 64.0);
+       current.momentum = Mf::Vector2(0.0, 0.0);
+       current.recalculate();
+
+       previous = current;
+
+       updateContainers();
+}

 
 Character::~Character()
 {
 
 Character::~Character()
 {


@@ -40,16 +55,115 @@ Character::~Character()
 }
 
 
 }
 
 

-void Character::draw(Mf::Scalar alpha) const {}
+void Character::update(Mf::Scalar t, Mf::Scalar dt)
+{
+       previous = current;
+       Mf::integrate<State,Derivative>(current, t, dt);
+
+       animation_.update(t, dt);
+
+       updateContainers();
+}
+
+void Character::updateContainers()
+{
+       aabb_.init(Mf::Vector3(current.position[0]-16.0, current.position[1]-16.0, z),
+                       Mf::Vector3(current.position[0]+16.0, current.position[1]+16.0, z));
+       sphere_.point = Mf::Vector3(current.position[0], current.position[1], z);
+       sphere_.radius = (aabb_.min - sphere_.point).length();
+}
+
+void Character::handleEvent(const Mf::Event& event)
+{
+       // really just for heroine...
+       
+       Mf::Scalar force = 500.0;
+       
+       Mf::Vector2 left = Mf::Vector2(-force, 0.0);
+       Mf::Vector2 right = Mf::Vector2(force, 0.0);
+       Mf::Vector2 down = Mf::Vector2(0.0, -force);
+       Mf::Vector2 up = Mf::Vector2(0.0, force);
+
+       switch (event.type)
+       {
+               case SDL_KEYDOWN:
+                       if (event.key.keysym.sym == SDLK_a)
+                       {
+                               current.force += left;
+                       }
+                       else if (event.key.keysym.sym == SDLK_d)
+                       {
+                               current.force += right;
+                       }
+                       else if (event.key.keysym.sym == SDLK_s)
+                       {
+                               current.force += down;
+                       }
+                       else if (event.key.keysym.sym == SDLK_w)
+                       {
+                               current.force += up;
+                       }
+                       break;
+
+               case SDL_KEYUP:
+                       if (event.key.keysym.sym == SDLK_a)
+                       {
+                               current.force -= left;
+                       }
+                       else if (event.key.keysym.sym == SDLK_d)
+                       {
+                               current.force -= right;
+                       }
+                       else if (event.key.keysym.sym == SDLK_s)
+                       {
+                               current.force -= down;
+                       }
+                       else if (event.key.keysym.sym == SDLK_w)
+                       {
+                               current.force -= up;
+                       }
+                       break;
+       }
+
+       std::cout << "current force: " << current.force << std::endl;
+}
+
+
+void Character::draw(Mf::Scalar alpha) const
+{
+       State state = cml::lerp(previous, current, alpha);
+
+       glColor3f(1.0f, 1.0f, 1.0f);
+       tilemap_.bind();
+
+       Mf::Tilemap::Index frame = animation_.getFrame();
+
+       Mf::Scalar coords[8];
+       tilemap_.getTileCoords(frame, coords);
+
+       Mf::Scalar s = 16.0;
+
+       glBegin(GL_QUADS);
+               glTexCoord2f(coords[0], coords[1]);
+               glVertex3(state.position[0]-s, state.position[1]-s, z);
+               glTexCoord2f(coords[2], coords[3]);
+               glVertex3(state.position[0]+s, state.position[1]-s, z);
+               glTexCoord2f(coords[4], coords[5]);
+               glVertex3(state.position[0]+s, state.position[1]+s, z);
+               glTexCoord2f(coords[6], coords[7]);
+               glVertex3(state.position[0]-s, state.position[1]+s, z);
+       glEnd();
+}
+

 
 Mf::Tilemap& Character::getTilemap()
 {
 
 Mf::Tilemap& Character::getTilemap()
 {

-       return tilemap;
+       return tilemap_;

 }
 
 Mf::Animation& Character::getAnimation()
 {
 }
 
 Mf::Animation& Character::getAnimation()
 {

-       return animation;
+       return animation_;

 }
 
 
 }