the massive refactoring effort

[chaz/yoink] / src / Hud.hh

diff --git a/src/Hud.hh b/src/Hud.hh
index 0bc0a4676b12aad08a58053cb99fda89e1147418..7cf2504b7d4a376fe1888d25c3b76acda7542c84 100644 (file)
--- a/src/Hud.hh
+++ b/src/Hud.hh
@@ -17,48 +17,48 @@
  * Heads-up Display
  */
 
-#include <Moof/Drawable.hh>
-#include <Moof/Math.hh>
-//#include <Moof/Rectangle.hh>
-#include <Moof/Texture.hh>
-#include <Moof/View.hh>
+#include <moof/drawable.hh>
+#include <moof/math.hh>
+//#include <moof/rectangle.hh>
+#include <moof/texture.hh>
+#include <moof/view.hh>
 
 #include "GameState.hh"
 
 
-class Rectangle;
+class rectangle;
 
 // TODO this stuff is still just hacked up
 
-class ProgressBar : public Mf::Drawable
+class ProgressBar : public moof::drawable
 {
 public:
 
-       ProgressBar(const Mf::Texture& tilemap, Mf::Texture::TileIndex index);
+       ProgressBar(const moof::texture& 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;
 
-       Mf::Texture     mTilemap;
-       Mf::Scalar      mTexCoords[8];
-       Mf::Scalar      mMidCoords[2];
+       moof::texture   mTilemap;
+       moof::scalar    mTexCoords[8];
+       moof::scalar    mMidCoords[2];
 };
 
 
 class Hud;
 typedef boost::shared_ptr<Hud> HudP;
 
-class Hud : public Mf::View
+class Hud : public moof::view
 {
 public:
 
@@ -69,13 +69,13 @@ public:
        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);
@@ -85,21 +85,21 @@ public:
 
        void resize(int width, int height);
 
-       void update(Mf::Scalar t, Mf::Scalar dt);
-       void draw(Mf::Scalar alpha = 0.0) const;
-       bool handleEvent(const 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&      mState;
+       GameState&      state_;
 
        ProgressBar     mBar1;
        ProgressBar     mBar2;
 
        unsigned        mNumber;
-       Mf::Texture     mFont;
+       moof::texture   mFont;
 
-       Mf::Matrix4     mProjection;
+       moof::matrix4   mProjection;
 };