-/*] 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/Core.hh>
-#include <Moof/Log.hh>
-#include <Moof/OpenGL.hh>
-#include <Moof/Video.hh>
+#include <moof/aabb.hh>
+#include <moof/debug.hh>
+#include <moof/opengl.hh>
+#include <moof/video.hh>
#include "Hud.hh"
-ProgressBar::ProgressBar(const Mf::Texture& tilemap,
- Mf::Texture::TileIndex index) :
+ProgressBar::ProgressBar(const moof::sprite& tilemap, int index) :
mProgress(0.0),
- mTilemap(tilemap)
+ mTilemap(tilemap, index)
{
- tilemap.getTileCoords(index, mTexCoords);
-
- Mf::Scalar half = (mTexCoords[2] - mTexCoords[0]) / 2.0 + mTexCoords[0];
+ // 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::resize(const Mf::Rectangle& rect)
+void ProgressBar::resize(const moof::rectangle& rect)
{
- Mf::logInfo << "rect: " << rect.min << ", " << rect.max << std::endl;
- Mf::Scalar height = rect.max[1] - rect.min[1];
- Mf::Scalar halfHeight = height / 2.0;
+ moof::log_info << "rect: " << rect.min << ", " << rect.max << std::endl;
+ moof::scalar height = rect.max[1] - rect.min[1];
+ moof::scalar halfHeight = height / 2.0;
mWidth = rect.max[0] - rect.min[0] - height;
ASSERT(mWidth > 0);
mVertices[0] = rect.min;
- mVertices[1] = Mf::Vector2(rect.min[0] + halfHeight, rect.min[1]);
+ mVertices[1] = moof::vector2(rect.min[0] + halfHeight, rect.min[1]);
mVertices[2] = mVertices[1];
- mVertices[3] = Mf::Vector2(rect.min[0] + height, rect.min[1]);
- mVertices[4] = Mf::Vector2(rect.min[0] + height, rect.max[1]);
- mVertices[5] = Mf::Vector2(rect.min[0] + halfHeight, rect.max[1]);
+ mVertices[3] = moof::vector2(rect.min[0] + height, rect.min[1]);
+ mVertices[4] = moof::vector2(rect.min[0] + height, rect.max[1]);
+ mVertices[5] = moof::vector2(rect.min[0] + halfHeight, rect.max[1]);
mVertices[6] = mVertices[5];
- mVertices[7] = Mf::Vector2(rect.min[0], rect.max[1]);
+ mVertices[7] = moof::vector2(rect.min[0], rect.max[1]);
setProgress(mProgress);
}
-void ProgressBar::setProgress(Mf::Scalar progress)
+void ProgressBar::setProgress(moof::scalar progress)
{
- Mf::Scalar halfHeight = (mVertices[7][1] - mVertices[0][1]) / 2.0;
+ moof::scalar halfHeight = (mVertices[7][1] - mVertices[0][1]) / 2.0;
mVertices[2][0] = mVertices[1][0] + progress * mWidth;
mVertices[3][0] = mVertices[1][0] + progress * mWidth + halfHeight;
mProgress = progress;
}
-void ProgressBar::draw(Mf::Scalar alpha) const
+void ProgressBar::draw(moof::scalar alpha) const
{
- if (Mf::isEqual(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) :
- mState(state),
- mBar1(Mf::Texture("StatusBars"), 0),
- mBar2(Mf::Texture("StatusBars"), 2),
+ state_(state),
+ mBar1(moof::sprite("StatusBars"), 0),
+ mBar2(moof::sprite("StatusBars"), 2),
mFont("Font")
{
- ASSERT(Mf::video &&
- "no current video context from which to get dimensions");
- resize(Mf::video->getWidth(), Mf::video->getHeight());
+ 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)
{
- cml::matrix_orthographic_RH(mProjection,
- SCALAR(0.0),
- Mf::Scalar(width), SCALAR(0.0), Mf::Scalar(height),
- SCALAR(1.0), SCALAR(-1.0), cml::z_clip_neg_one);
+ 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);
// position the two progress bars at the top-left of the screen
- mBar1.resize(Mf::Rectangle(20, height - 51, 0.7 * width, height - 3));
- mBar2.resize(Mf::Rectangle(20, height - 28, 0.7 * width, height - 70));
+ mBar1.resize(moof::rectangle(20, height - 51, 0.7 * width, height - 3));
+ mBar2.resize(moof::rectangle(20, height - 28, 0.7 * width, height - 70));
setBar1Progress(0.05);
setBar2Progress(0.0);
}
-
-void Hud::update(Mf::Scalar t, Mf::Scalar dt)
+void Hud::update(moof::scalar t, moof::scalar dt)
{
- mState.interp.update(t, dt);
- setBar1Progress(mState.interp.getState(dt));
- setBar2Progress(1.0 - mState.interp.getState(dt));
+ state_.interp.update(t, dt);
+ setBar1Progress(state_.interp.state(dt));
+ setBar2Progress(1.0 - state_.interp.state(dt));
}
-void Hud::draw(Mf::Scalar alpha) const
+void Hud::draw(moof::scalar alpha) const
{
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glPopMatrix();
}
-bool Hud::handleEvent(const Mf::Event& event)
+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
- Mf::core.pop(this);
- Mf::logWarning("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;
projects / chaz / yoink / blobdiff