update video methods

[chaz/yoink] / src / Hud.cc

diff --git a/src/Hud.cc b/src/Hud.cc
index 58bc7210422e54b0b0a98fb03b1835277db8e90e..5687ac88bdb1c27ab2f998775662ef951255c670 100644 (file)
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -1,16 +1,14 @@
 
-/*]  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 <moof/aabb.hh>
-#include <moof/log.hh>
+#include <moof/debug.hh>
 #include <moof/opengl.hh>
 #include <moof/video.hh>
 
@@ -62,11 +60,8 @@ void ProgressBar::setProgress(moof::scalar progress)
 
 void ProgressBar::draw(moof::scalar alpha) const
 {
-       if (moof::is_equal(mProgress, 0.0))
-       {
-               // don't draw anything if the progress is 0%
-               return;
-       }
+       if (moof::is_equal(mProgress, 0.0)) return;
+       // don't draw anything if the progress is 0%
 
        glColor4f(1.0f, 1.0f, 1.0f, 0.85f);
        mTilemap.bind();
@@ -108,18 +103,17 @@ Hud::Hud(GameState& state) :
        mBar2(moof::sprite("StatusBars"), 2),
        mFont("Font")
 {
-       moof::video* video = moof::video::current();
-       ASSERT(video && "a current video context should be set");
-       resize(video->width(), video->height());
+       ASSERT(moof::video::ready() && "a current video context should be set");
+       moof::video& video = moof::video::current();
+       resize(video.width(), video.height());
 }
 
-
 void Hud::resize(int width, int height)
 {
        moof::matrix_orthographic_RH(mProjection, SCALAR(0.0), 
-                                                                moof::scalar(width), SCALAR(0.0),
-                                                                moof::scalar(height),
-                                                                SCALAR(1.0), SCALAR(-1.0), moof::z_clip_neg_one);
+                       moof::scalar(width), SCALAR(0.0),
+                       moof::scalar(height), SCALAR(1.0),
+                       SCALAR(-1.0), moof::z_clip_neg_one);
 
        // position the two progress bars at the top-left of the screen
        mBar1.resize(moof::rectangle(20, height - 51, 0.7 * width, height - 3));
@@ -129,7 +123,6 @@ void Hud::resize(int width, int height)
        setBar2Progress(0.0);
 }
 
-
 void Hud::update(moof::scalar t, moof::scalar dt)
 {
        state_.interp.update(t, dt);
@@ -167,20 +160,20 @@ bool Hud::handle_event(const moof::event& event)
 {
        switch (event.type)
        {
-               case SDL_KEYUP:
-                       if (event.key.keysym.sym == SDLK_h)
-                       {
-                               // don't want the hud anymore
-                               parent().remove_child(this);
-
-                               moof::log_warning("okay bye bye hud");
-                               return true;
-                       }
-                       break;
-
-               case SDL_VIDEORESIZE:
-                       resize(event.resize.w, event.resize.h);
-                       break;
+       case SDL_KEYUP:
+               if (event.key.keysym.sym == SDLK_h)
+               {
+                       // don't want the hud anymore
+                       //parent().remove_child(this);
+
+                       moof::log_warning("okay bye bye hud");
+                       return true;
+               }
+               break;
+
+       case SDL_VIDEORESIZE:
+               resize(event.resize.w, event.resize.h);
+               break;
        }
 
        return false;