X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.cc;h=28b7c3487f8fbbbd0184bf725bd164f5ae5dafa6;hp=f8f40d91c7ab79a114a9734f4b2a308153b34dcb;hb=c78934a448d0126709fccec3d5a636b3baa87da4;hpb=e973a129b5b83b628ba3f09e8c95682fc74080cd

diff --git a/src/Hud.cc b/src/Hud.cc
index f8f40d9..28b7c34 100644
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -1,39 +1,24 @@
 
-/*******************************************************************************
-
- 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/Core.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/Log.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 Mf::Texture& tilemap,
+						 Mf::Texture::TileIndex index) :
 	mProgress(0.0),
 	mTilemap(tilemap)
 {
@@ -46,11 +31,12 @@ ProgressBar::ProgressBar(const Mf::Texture& tilemap, Mf::Texture::TileIndex inde
 
 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]);
@@ -124,8 +110,9 @@ Hud::Hud(GameState& state) :
 	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());
 }
 
 
@@ -137,10 +124,8 @@ void Hud::resize(int width, int height)
 			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);
@@ -188,7 +173,9 @@ bool Hud::handleEvent(const Mf::Event& event)
 			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;
@@ -201,6 +188,3 @@ bool Hud::handleEvent(const Mf::Event& event)
 	return false;
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-