-/*] 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>
#include "Hud.hh"
-ProgressBar::ProgressBar(const moof::texture& tilemap, int index) :
+ProgressBar::ProgressBar(const moof::sprite& tilemap, int index) :
mProgress(0.0),
- mTilemap(tilemap)
+ mTilemap(tilemap, index)
{
- tilemap.tile_coordinates(index, mTexCoords);
-
+ // TODO this is now broken
moof::scalar half = (mTexCoords[2] - mTexCoords[0]) / 2.0 + mTexCoords[0];
mMidCoords[0] = half - 0.01;
mMidCoords[1] = half + 0.01;
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();
Hud::Hud(GameState& state) :
state_(state),
- mBar1(moof::texture("StatusBars"), 0),
- mBar2(moof::texture("StatusBars"), 2),
+ mBar1(moof::sprite("StatusBars"), 0),
+ mBar2(moof::sprite("StatusBars"), 2),
mFont("Font")
{
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));
setBar2Progress(0.0);
}
-
void Hud::update(moof::scalar t, moof::scalar dt)
{
state_.interp.update(t, dt);
{
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;