fixed layer bugs; generalized octree

[chaz/yoink] / src / Character.cc

diff --git a/src/Character.cc b/src/Character.cc
index 3a9559f003776ed32a813afd365b9fa0dfec7fab..8e5a4c65e7437ca4f80a8614a8b17c5f1c087454 100644 (file)
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -49,7 +49,7 @@ Character::Character(const std::string& name) :
 
        previous = current;
 
-       updateContainers();
+       //updateContainers();
 }
 
 
@@ -66,91 +66,39 @@ void Character::update(Mf::Scalar t, Mf::Scalar dt)
        current.force += -20.0 * (mag - d) * (x / mag) - 2.0 * current.velocity;
        current.force += userForce;
        current.recalculate();
-       std::cout << "force: " << current.momentum << std::endl;
+       //std::cout << "force: " << current.momentum << std::endl;
 
        Mf::integrate<State,Derivative>(current, t, dt);
 
        animation_.update(t, dt);
 
-       updateContainers();
+       //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 = 4000.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)
-                       {
-                               userForce += left;
-                       }
-                       else if (event.key.keysym.sym == SDLK_d)
-                       {
-                               userForce += right;
-                       }
-                       else if (event.key.keysym.sym == SDLK_s)
-                       {
-                               userForce += down;
-                       }
-                       else if (event.key.keysym.sym == SDLK_w)
-                       {
-                               userForce += up;
-                       }
-                       break;
-
-               case SDL_KEYUP:
-                       if (event.key.keysym.sym == SDLK_a)
-                       {
-                               userForce -= left;
-                       }
-                       else if (event.key.keysym.sym == SDLK_d)
-                       {
-                               userForce -= right;
-                       }
-                       else if (event.key.keysym.sym == SDLK_s)
-                       {
-                               userForce -= down;
-                       }
-                       else if (event.key.keysym.sym == SDLK_w)
-                       {
-                               userForce -= up;
-                       }
-                       break;
-       }
-
-       //Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]);
-       //std::cerr << "current force: " << current.force << std::endl;
-}
+//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::draw(Mf::Scalar alpha) const
 {
        State state = cml::lerp(previous, current, alpha);
 
-       glColor3f(1.0f, 1.0f, 1.0f);
+       //glColor3f(1.0f, 1.0f, 1.0f);
        tilemap_.bind();
 
        Mf::Tilemap::Index frame = animation_.getFrame();
 
+       Mf::Tilemap::Orientation orientation = Mf::Tilemap::NORMAL;
+
+       if (current.velocity[0] < 0.0) orientation = Mf::Tilemap::REVERSE;
+
        Mf::Scalar coords[8];
-       tilemap_.getTileCoords(frame, coords);
+       tilemap_.getTileCoords(frame, coords, orientation);
 
        Mf::Scalar s = 16.0;
 
@@ -165,7 +113,7 @@ void Character::draw(Mf::Scalar alpha) const
                glVertex3(state.position[0]-s, state.position[1]+s, z);
        glEnd();
 
-       glColor3f(0.0f, 0.0f, 0.0f);
+       //glColor3f(0.0f, 0.0f, 0.0f);
        Mf::Texture::resetBind();
 
        glBegin(GL_TRIANGLES);
@@ -174,7 +122,7 @@ void Character::draw(Mf::Scalar alpha) const
                glVertex3(500.0, 210.0, 64.0);
        glEnd();
 
-       glColor3f(1.0f, 1.0f, 1.0f);
+       //glColor3f(1.0f, 1.0f, 1.0f);
 }