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

diff --git a/src/Hud.hh b/src/Hud.hh
index 813e67f..59f0631 100644
--- a/src/Hud.hh
+++ b/src/Hud.hh
@@ -35,16 +35,20 @@
  */
 
 #include <Moof/Drawable.hh>
+#include <Moof/Layer.hh>
 #include <Moof/Math.hh>
 #include <Moof/Rectangle.hh>
-#include <Moof/Tilemap.hh>
 
+#include "Tilemap.hh"
+
+
+// TODO this stuff is still just hacked up
 
 class ProgressBar : public Mf::Drawable
 {
 public:
 
-	ProgressBar(const Mf::Tilemap& tilemap, Mf::Tilemap::Index index);
+	ProgressBar(const Tilemap& tilemap, Tilemap::Index index);
 
 	void resize(const Mf::Rectangle& rect);
 
@@ -54,33 +58,41 @@ public:
 
 private:
 
-	Mf::Scalar	progress_;
+	Mf::Scalar	mProgress;
 
-	Mf::Vector2	vertices_[8];
-	Mf::Scalar	width_;
+	Mf::Vector2	mVertices[8];
+	Mf::Scalar	mWidth;
 
-	Mf::Tilemap	tilemap_;
-	Mf::Scalar	texCoords_[8];
-	Mf::Scalar	midCoords_[2];
+	Tilemap		mTilemap;
+	Mf::Scalar	mTexCoords[8];
+	Mf::Scalar	mMidCoords[2];
 };
 
 
-class Hud : public Mf::Drawable
+class Hud;
+typedef boost::shared_ptr<Hud> HudP;
+
+class Hud : public Mf::Layer
 {
 public:
 
 	Hud();
 
-	inline void setBar1Progress(Mf::Scalar progress)
+	static HudP alloc()
+	{
+		return HudP(new Hud);
+	}
+
+	void setBar1Progress(Mf::Scalar progress)
 	{
 		// pass through
-		bar1_.setProgress(progress);
+		mBar1.setProgress(progress);
 	}
 
-	inline void setBar2Progress(Mf::Scalar progress)
+	void setBar2Progress(Mf::Scalar progress)
 	{
 		// pass through
-		bar2_.setProgress(progress);
+		mBar2.setProgress(progress);
 	}
 
 	void setNumber(unsigned value);
@@ -88,16 +100,17 @@ public:
 	void resize(int width, int height);
 
 	void draw(Mf::Scalar alpha = 0.0) const;
+	bool handleEvent(Mf::Event& event);
 
 private:
 
-	ProgressBar	bar1_;
-	ProgressBar	bar2_;
+	ProgressBar	mBar1;
+	ProgressBar	mBar2;
 
-	unsigned	number_;
-	Mf::Tilemap	font_;
+	unsigned	mNumber;
+	Tilemap		mFont;
 
-	Mf::Matrix4	projection_;
+	Mf::Matrix4	mProjection;
 };