-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include <Moof/Engine.hh>
+/*] Copyright (c) 2009-2010, 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 "Hud.hh"
-ProgressBar::ProgressBar(const Tilemap& tilemap, Tilemap::Index index) :
+ProgressBar::ProgressBar(const Mf::Texture& tilemap,
+ Mf::Texture::TileIndex index) :
mProgress(0.0),
mTilemap(tilemap)
{
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]);
Hud::Hud(GameState& state) :
mState(state),
- mBar1(Tilemap("StatusBars"), 0),
- mBar2(Tilemap("StatusBars"), 2),
+ mBar1(Mf::Texture("StatusBars"), 0),
+ mBar2(Mf::Texture("StatusBars"), 2),
mFont("Font")
{
- Mf::VideoP video = Mf::engine.getVideo();
- resize(video->getWidth(), video->getHeight());
+ ASSERT(Mf::video &&
+ "no current video context from which to get dimensions");
+ resize(Mf::video->getWidth(), Mf::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);
}
-void Hud::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt)
+void Hud::update(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
+void Hud::draw(Mf::Scalar alpha) const
{
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glPopMatrix();
}
-bool Hud::handleEvent(Mf::Engine& engine, const Mf::Event& event)
+bool Hud::handleEvent(const Mf::Event& event)
{
switch (event.type)
{
if (event.key.keysym.sym == SDLK_h)
{
// don't want the hud anymore
- engine.pop(this);
+ Mf::core.pop(this);
+ Mf::logWarning("okay bye bye hud");
return true;
}
break;
return false;
}
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-