X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.cc;h=9e40a601a859f15f9a89a4243a008b0879bb3559;hp=3a178f627491699ec3b5d921035e8a817b964a69;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=2d77fb5fb3480f522658f30af6addd5146530517

diff --git a/src/Hud.cc b/src/Hud.cc
index 3a178f6..9e40a60 100644
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -1,39 +1,23 @@
 
-/*******************************************************************************
-
- 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/Core.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)
 {
@@ -118,14 +102,15 @@ void ProgressBar::draw(Mf::Scalar alpha) const
 }
 
 
-Hud::Hud(GameLayer::State& state) :
+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::getInstance().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());
 }
 
 
@@ -147,14 +132,14 @@ void Hud::resize(int width, int height)
 }
 
 
-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();
@@ -180,7 +165,7 @@ void Hud::draw(Mf::Engine& engine, Mf::Scalar alpha) const
 	glPopMatrix();
 }
 
-bool Hud::handleEvent(Mf::Engine& engine, const Mf::Event& event)
+bool Hud::handleEvent(const Mf::Event& event)
 {
 	switch (event.type)
 	{
@@ -188,7 +173,7 @@ bool Hud::handleEvent(Mf::Engine& engine, const Mf::Event& event)
 			if (event.key.keysym.sym == SDLK_h)
 			{
 				// don't want the hud anymore
-				engine.pop(this);
+				Mf::core.pop(this);
 				return true;
 			}
 			break;
@@ -201,6 +186,3 @@ bool Hud::handleEvent(Mf::Engine& engine, const Mf::Event& event)
 	return false;
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-