X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.hh;h=1bb557633c6d73581d3d91b2336d7e5c2120cc8e;hp=59f0631a964dcf391de2aff2bdfbf45ffaf976a2;hb=382626aad0a683ed8642a6a807eea743db45f7f8;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f

diff --git a/src/Hud.hh b/src/Hud.hh
index 59f0631..1bb5576 100644
--- a/src/Hud.hh
+++ b/src/Hud.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- 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.
+*
+**************************************************************************/
 
 #ifndef _HUD_HH_
 #define _HUD_HH_
@@ -34,62 +17,65 @@
  * Heads-up Display
  */
 
-#include <Moof/Drawable.hh>
-#include <Moof/Layer.hh>
-#include <Moof/Math.hh>
-#include <Moof/Rectangle.hh>
+#include <moof/drawable.hh>
+#include <moof/math.hh>
+//#include <moof/rectangle.hh>
+#include <moof/sprite.hh>
+#include <moof/view.hh>
 
-#include "Tilemap.hh"
+#include "GameState.hh"
 
 
+class rectangle;
+
 // TODO this stuff is still just hacked up
 
-class ProgressBar : public Mf::Drawable
+class ProgressBar : public moof::drawable
 {
 public:
 
-	ProgressBar(const Tilemap& tilemap, Tilemap::Index index);
+	ProgressBar(const moof::sprite& tilemap, int index);
 
-	void resize(const Mf::Rectangle& rect);
+	void resize(const moof::rectangle& rect);
 
-	void setProgress(Mf::Scalar progress);
+	void setProgress(moof::scalar progress);
 
-	void draw(Mf::Scalar alpha = 0.0) const;
+	void draw(moof::scalar alpha = 0.0) const;
 
 private:
 
-	Mf::Scalar	mProgress;
+	moof::scalar	mProgress;
 
-	Mf::Vector2	mVertices[8];
-	Mf::Scalar	mWidth;
+	moof::vector2	mVertices[8];
+	moof::scalar	mWidth;
 
-	Tilemap		mTilemap;
-	Mf::Scalar	mTexCoords[8];
-	Mf::Scalar	mMidCoords[2];
+	moof::sprite	mTilemap;
+	moof::scalar	mTexCoords[8];
+	moof::scalar	mMidCoords[2];
 };
 
 
 class Hud;
 typedef boost::shared_ptr<Hud> HudP;
 
-class Hud : public Mf::Layer
+class Hud : public moof::view
 {
 public:
 
-	Hud();
-
-	static HudP alloc()
+	static HudP alloc(GameState& state)
 	{
-		return HudP(new Hud);
+		return HudP(new Hud(state));
 	}
+	Hud(GameState& state);
+
 
-	void setBar1Progress(Mf::Scalar progress)
+	void setBar1Progress(moof::scalar progress)
 	{
 		// pass through
 		mBar1.setProgress(progress);
 	}
 
-	void setBar2Progress(Mf::Scalar progress)
+	void setBar2Progress(moof::scalar progress)
 	{
 		// pass through
 		mBar2.setProgress(progress);
@@ -99,22 +85,23 @@ public:
 
 	void resize(int width, int height);
 
-	void draw(Mf::Scalar alpha = 0.0) const;
-	bool handleEvent(Mf::Event& event);
+	void update(moof::scalar t, moof::scalar dt);
+	void draw(moof::scalar alpha = 0.0) const;
+	bool handle_event(const moof::event& event);
 
 private:
 
+	GameState&	state_;
+
 	ProgressBar	mBar1;
 	ProgressBar	mBar2;
 
 	unsigned	mNumber;
-	Tilemap		mFont;
+	moof::sprite	mFont;
 
-	Mf::Matrix4	mProjection;
+	moof::matrix4	mProjection;
 };
 
 
 #endif // _HUD_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-