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

diff --git a/src/Hud.cc b/src/Hud.cc
index a7e141e..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.
-
-*******************************************************************************/
-
+/*]  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"
 
-#include <iostream>
-
 
-ProgressBar::ProgressBar(const Tilemap& tilemap, Tilemap::Index index) :
+ProgressBar::ProgressBar(const Mf::Texture& tilemap,
+						 Mf::Texture::TileIndex index) :
 	mProgress(0.0),
 	mTilemap(tilemap)
 {
@@ -88,42 +72,45 @@ void ProgressBar::draw(Mf::Scalar alpha) const
 	mTilemap.bind();
 
 	glBegin(GL_QUADS);
-		glTexCoord2(mTexCoords[0], mTexCoords[1]);
-		glVertex2v(mVertices[0].data());
-		glTexCoord2(mMidCoords[0], mTexCoords[3]);
-		glVertex2v(mVertices[1].data());
-		glTexCoord2(mMidCoords[0], mTexCoords[5]);
-		glVertex2v(mVertices[6].data());
-		glTexCoord2(mTexCoords[6], mTexCoords[7]);
-		glVertex2v(mVertices[7].data());
-
-		glTexCoord2(mMidCoords[0], mTexCoords[1]);
-		glVertex2v(mVertices[1].data());
-		glTexCoord2(mMidCoords[1], mTexCoords[3]);
-		glVertex2v(mVertices[2].data());
-		glTexCoord2(mMidCoords[1], mTexCoords[5]);
-		glVertex2v(mVertices[5].data());
-		glTexCoord2(mMidCoords[0], mTexCoords[7]);
-		glVertex2v(mVertices[6].data());
-
-		glTexCoord2(mMidCoords[1], mTexCoords[1]);
-		glVertex2v(mVertices[2].data());
-		glTexCoord2(mTexCoords[2], mTexCoords[3]);
-		glVertex2v(mVertices[3].data());
-		glTexCoord2(mTexCoords[4], mTexCoords[5]);
-		glVertex2v(mVertices[4].data());
-		glTexCoord2(mMidCoords[1], mTexCoords[7]);
-		glVertex2v(mVertices[5].data());
+		glTexCoord(mTexCoords[0], mTexCoords[1]);
+		glVertex(mVertices[0]);
+		glTexCoord(mMidCoords[0], mTexCoords[3]);
+		glVertex(mVertices[1]);
+		glTexCoord(mMidCoords[0], mTexCoords[5]);
+		glVertex(mVertices[6]);
+		glTexCoord(mTexCoords[6], mTexCoords[7]);
+		glVertex(mVertices[7]);
+
+		glTexCoord(mMidCoords[0], mTexCoords[1]);
+		glVertex(mVertices[1]);
+		glTexCoord(mMidCoords[1], mTexCoords[3]);
+		glVertex(mVertices[2]);
+		glTexCoord(mMidCoords[1], mTexCoords[5]);
+		glVertex(mVertices[5]);
+		glTexCoord(mMidCoords[0], mTexCoords[7]);
+		glVertex(mVertices[6]);
+
+		glTexCoord(mMidCoords[1], mTexCoords[1]);
+		glVertex(mVertices[2]);
+		glTexCoord(mTexCoords[2], mTexCoords[3]);
+		glVertex(mVertices[3]);
+		glTexCoord(mTexCoords[4], mTexCoords[5]);
+		glVertex(mVertices[4]);
+		glTexCoord(mMidCoords[1], mTexCoords[7]);
+		glVertex(mVertices[5]);
 	glEnd();
 }
 
 
-Hud::Hud() :
-	mBar1(Tilemap("StatusBars"), 0),
-	mBar2(Tilemap("StatusBars"), 2),
+Hud::Hud(GameState& state) :
+	mState(state),
+	mBar1(Mf::Texture("StatusBars"), 0),
+	mBar2(Mf::Texture("StatusBars"), 2),
 	mFont("Font")
 {
-	resize(800, 600);
+	ASSERT(Mf::video &&
+		   "no current video context from which to get dimensions");
+	resize(Mf::video->getWidth(), Mf::video->getHeight());
 }
 
 
@@ -145,6 +132,13 @@ void Hud::resize(int width, int height)
 }
 
 
+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::Scalar alpha) const
 {
 	glMatrixMode(GL_PROJECTION);
@@ -171,10 +165,19 @@ void Hud::draw(Mf::Scalar alpha) const
 	glPopMatrix();
 }
 
-bool Hud::handleEvent(Mf::Event& event)
+bool Hud::handleEvent(const Mf::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);
+				return true;
+			}
+			break;
+
 		case SDL_VIDEORESIZE:
 			resize(event.resize.w, event.resize.h);
 			break;
@@ -183,6 +186,3 @@ bool Hud::handleEvent(Mf::Event& event)
 	return false;
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-