experimental shapes hierarchy and raycasting

[chaz/yoink] / src / Hud.cc

diff --git a/src/Hud.cc b/src/Hud.cc
index a7e141e1ef8a7d57138ffb1fc9a2dff80421e2e7..3a178f627491699ec3b5d921035e8a817b964a69 100644 (file)
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -26,12 +26,12 @@
 
 *******************************************************************************/
 
+#include <Moof/Engine.hh>
 #include <Moof/OpenGL.hh>
+#include <Moof/Video.hh>
 
 #include "Hud.hh"
 
-#include <iostream>
-
 
 ProgressBar::ProgressBar(const Tilemap& tilemap, Tilemap::Index index) :
        mProgress(0.0),
@@ -88,42 +88,44 @@ void ProgressBar::draw(Mf::Scalar alpha) const
        mTilemap.bind();
 
        glBegin(GL_QUADS);
-               glTexCoord2(mTexCoords[0], mTexCoords[1]);
-               glVertex2v(mVertices[0].data());
-               glTexCoord2(mMidCoords[0], mTexCoords[3]);
-               glVertex2v(mVertices[1].data());
-               glTexCoord2(mMidCoords[0], mTexCoords[5]);
-               glVertex2v(mVertices[6].data());
-               glTexCoord2(mTexCoords[6], mTexCoords[7]);
-               glVertex2v(mVertices[7].data());
-
-               glTexCoord2(mMidCoords[0], mTexCoords[1]);
-               glVertex2v(mVertices[1].data());
-               glTexCoord2(mMidCoords[1], mTexCoords[3]);
-               glVertex2v(mVertices[2].data());
-               glTexCoord2(mMidCoords[1], mTexCoords[5]);
-               glVertex2v(mVertices[5].data());
-               glTexCoord2(mMidCoords[0], mTexCoords[7]);
-               glVertex2v(mVertices[6].data());
-
-               glTexCoord2(mMidCoords[1], mTexCoords[1]);
-               glVertex2v(mVertices[2].data());
-               glTexCoord2(mTexCoords[2], mTexCoords[3]);
-               glVertex2v(mVertices[3].data());
-               glTexCoord2(mTexCoords[4], mTexCoords[5]);
-               glVertex2v(mVertices[4].data());
-               glTexCoord2(mMidCoords[1], mTexCoords[7]);
-               glVertex2v(mVertices[5].data());
+               glTexCoord(mTexCoords[0], mTexCoords[1]);
+               glVertex(mVertices[0]);
+               glTexCoord(mMidCoords[0], mTexCoords[3]);
+               glVertex(mVertices[1]);
+               glTexCoord(mMidCoords[0], mTexCoords[5]);
+               glVertex(mVertices[6]);
+               glTexCoord(mTexCoords[6], mTexCoords[7]);
+               glVertex(mVertices[7]);
+
+               glTexCoord(mMidCoords[0], mTexCoords[1]);
+               glVertex(mVertices[1]);
+               glTexCoord(mMidCoords[1], mTexCoords[3]);
+               glVertex(mVertices[2]);
+               glTexCoord(mMidCoords[1], mTexCoords[5]);
+               glVertex(mVertices[5]);
+               glTexCoord(mMidCoords[0], mTexCoords[7]);
+               glVertex(mVertices[6]);
+
+               glTexCoord(mMidCoords[1], mTexCoords[1]);
+               glVertex(mVertices[2]);
+               glTexCoord(mTexCoords[2], mTexCoords[3]);
+               glVertex(mVertices[3]);
+               glTexCoord(mTexCoords[4], mTexCoords[5]);
+               glVertex(mVertices[4]);
+               glTexCoord(mMidCoords[1], mTexCoords[7]);
+               glVertex(mVertices[5]);
        glEnd();
 }
 
 
-Hud::Hud() :
+Hud::Hud(GameLayer::State& state) :
+       mState(state),
        mBar1(Tilemap("StatusBars"), 0),
        mBar2(Tilemap("StatusBars"), 2),
        mFont("Font")
 {
-       resize(800, 600);
+       Mf::VideoP video = Mf::Engine::getInstance().getVideo();
+       resize(video->getWidth(), video->getHeight());
 }
 
 
@@ -145,7 +147,14 @@ void Hud::resize(int width, int height)
 }
 
 
-void Hud::draw(Mf::Scalar alpha) const
+void Hud::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt)
+{
+       mState.interp.update(t, dt);
+       setBar1Progress(mState.interp.getState(dt));
+       setBar2Progress(1.0 - mState.interp.getState(dt));
+}
+
+void Hud::draw(Mf::Engine& engine, Mf::Scalar alpha) const
 {
        glMatrixMode(GL_PROJECTION);
        glPushMatrix();
@@ -171,10 +180,19 @@ void Hud::draw(Mf::Scalar alpha) const
        glPopMatrix();
 }
 
-bool Hud::handleEvent(Mf::Event& event)
+bool Hud::handleEvent(Mf::Engine& engine, const Mf::Event& event)
 {
        switch (event.type)
        {
+               case SDL_KEYUP:
+                       if (event.key.keysym.sym == SDLK_h)
+                       {
+                               // don't want the hud anymore
+                               engine.pop(this);
+                               return true;
+                       }
+                       break;
+
                case SDL_VIDEORESIZE:
                        resize(event.resize.w, event.resize.h);
                        break;