*
**************************************************************************/
-#include <Moof/Core.hh>
+#include <Moof/Aabb.hh>
+#include <Moof/Log.hh>
#include <Moof/OpenGL.hh>
#include <Moof/Video.hh>
void ProgressBar::resize(const Mf::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;
mWidth = rect.max[0] - rect.min[0] - height;
- // assert width > 0
+ ASSERT(mWidth > 0);
mVertices[0] = rect.min;
mVertices[1] = Mf::Vector2(rect.min[0] + halfHeight, rect.min[1]);
mBar2(Mf::Texture("StatusBars"), 2),
mFont("Font")
{
- ASSERT(Mf::video &&
- "no current video context from which to get dimensions");
- resize(Mf::video->getWidth(), Mf::video->getHeight());
+ Mf::Video* video = Mf::Video::current();
+ ASSERT(video && "a current video context should be set");
+ resize(video->getWidth(), video->getHeight());
}
SCALAR(1.0), SCALAR(-1.0), cml::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(Mf::Rectangle(20, height - 51, 0.7 * width, height - 3));
+ mBar2.resize(Mf::Rectangle(20, height - 28, 0.7 * width, height - 70));
setBar1Progress(0.05);
setBar2Progress(0.0);
if (event.key.keysym.sym == SDLK_h)
{
// don't want the hud anymore
- Mf::core.pop(this);
+ parent().removeChild(this);
+
+ Mf::logWarning("okay bye bye hud");
return true;
}
break;