]> Dogcows Code - chaz/yoink/blobdiff - src/Hud.cc
minor refactoring and state progress
[chaz/yoink] / src / Hud.cc
index 84b7bc1964dd9e2ab8e1e539ffd90e3407d5f787..a7e141e1ef8a7d57138ffb1fc9a2dff80421e2e7 100644 (file)
 
 
 ProgressBar::ProgressBar(const Tilemap& tilemap, Tilemap::Index index) :
-       progress_(0.0),
-       tilemap_(tilemap)
+       mProgress(0.0),
+       mTilemap(tilemap)
 {
-       tilemap.getTileCoords(index, texCoords_);
+       tilemap.getTileCoords(index, mTexCoords);
 
-       Mf::Scalar half = (texCoords_[2] - texCoords_[0]) / 2.0 + texCoords_[0];
-       midCoords_[0] = half - 0.01;
-       midCoords_[1] = half + 0.01;
+       Mf::Scalar half = (mTexCoords[2] - mTexCoords[0]) / 2.0 + mTexCoords[0];
+       mMidCoords[0] = half - 0.01;
+       mMidCoords[1] = half + 0.01;
 }
 
 void ProgressBar::resize(const Mf::Rectangle& rect)
@@ -49,79 +49,79 @@ void ProgressBar::resize(const Mf::Rectangle& rect)
        Mf::Scalar height = rect.max[1] - rect.min[1];
        Mf::Scalar halfHeight = height / 2.0;
 
-       width_ = rect.max[0] - rect.min[0] - height;
+       mWidth = rect.max[0] - rect.min[0] - height;
        // assert width > 0
 
-       vertices_[0] = rect.min;
-       vertices_[1] = Mf::Vector2(rect.min[0] + halfHeight, rect.min[1]);
-       vertices_[2] = vertices_[1];
-       vertices_[3] = Mf::Vector2(rect.min[0] + height,     rect.min[1]);
-       vertices_[4] = Mf::Vector2(rect.min[0] + height,     rect.max[1]);
-       vertices_[5] = Mf::Vector2(rect.min[0] + halfHeight, rect.max[1]);
-       vertices_[6] = vertices_[5];
-       vertices_[7] = Mf::Vector2(rect.min[0],              rect.max[1]);
+       mVertices[0] = rect.min;
+       mVertices[1] = Mf::Vector2(rect.min[0] + halfHeight, rect.min[1]);
+       mVertices[2] = mVertices[1];
+       mVertices[3] = Mf::Vector2(rect.min[0] + height,     rect.min[1]);
+       mVertices[4] = Mf::Vector2(rect.min[0] + height,     rect.max[1]);
+       mVertices[5] = Mf::Vector2(rect.min[0] + halfHeight, rect.max[1]);
+       mVertices[6] = mVertices[5];
+       mVertices[7] = Mf::Vector2(rect.min[0],              rect.max[1]);
 
-       setProgress(progress_);
+       setProgress(mProgress);
 }
 
 void ProgressBar::setProgress(Mf::Scalar progress)
 {
-       Mf::Scalar halfHeight = (vertices_[7][1] - vertices_[0][1]) / 2.0;
+       Mf::Scalar halfHeight = (mVertices[7][1] - mVertices[0][1]) / 2.0;
 
-       vertices_[2][0] = vertices_[1][0] + progress * width_;
-       vertices_[3][0] = vertices_[1][0] + progress * width_ + halfHeight;
-       vertices_[4][0] = vertices_[1][0] + progress * width_ + halfHeight;
-       vertices_[5][0] = vertices_[1][0] + progress * width_;
+       mVertices[2][0] = mVertices[1][0] + progress * mWidth;
+       mVertices[3][0] = mVertices[1][0] + progress * mWidth + halfHeight;
+       mVertices[4][0] = mVertices[1][0] + progress * mWidth + halfHeight;
+       mVertices[5][0] = mVertices[1][0] + progress * mWidth;
 
-       progress_ = progress;
+       mProgress = progress;
 }
 
 void ProgressBar::draw(Mf::Scalar alpha) const
 {
-       if (Mf::isEqual(progress_, 0.0))
+       if (Mf::isEqual(mProgress, 0.0))
        {
                // don't draw anything if the progress is 0%
                return;
        }
 
        glColor4f(1.0f, 1.0f, 1.0f, 0.85f);
-       tilemap_.bind();
+       mTilemap.bind();
 
        glBegin(GL_QUADS);
-               glTexCoord2(texCoords_[0], texCoords_[1]);
-               glVertex2v(vertices_[0].data());
-               glTexCoord2(midCoords_[0], texCoords_[3]);
-               glVertex2v(vertices_[1].data());
-               glTexCoord2(midCoords_[0], texCoords_[5]);
-               glVertex2v(vertices_[6].data());
-               glTexCoord2(texCoords_[6], texCoords_[7]);
-               glVertex2v(vertices_[7].data());
-
-               glTexCoord2(midCoords_[0], texCoords_[1]);
-               glVertex2v(vertices_[1].data());
-               glTexCoord2(midCoords_[1], texCoords_[3]);
-               glVertex2v(vertices_[2].data());
-               glTexCoord2(midCoords_[1], texCoords_[5]);
-               glVertex2v(vertices_[5].data());
-               glTexCoord2(midCoords_[0], texCoords_[7]);
-               glVertex2v(vertices_[6].data());
-
-               glTexCoord2(midCoords_[1], texCoords_[1]);
-               glVertex2v(vertices_[2].data());
-               glTexCoord2(texCoords_[2], texCoords_[3]);
-               glVertex2v(vertices_[3].data());
-               glTexCoord2(texCoords_[4], texCoords_[5]);
-               glVertex2v(vertices_[4].data());
-               glTexCoord2(midCoords_[1], texCoords_[7]);
-               glVertex2v(vertices_[5].data());
+               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());
        glEnd();
 }
 
 
 Hud::Hud() :
-       bar1_(Tilemap("StatusBars"), 0),
-       bar2_(Tilemap("StatusBars"), 2),
-       font_("Font")
+       mBar1(Tilemap("StatusBars"), 0),
+       mBar2(Tilemap("StatusBars"), 2),
+       mFont("Font")
 {
        resize(800, 600);
 }
@@ -129,15 +129,15 @@ Hud::Hud() :
 
 void Hud::resize(int width, int height)
 {
-       cml::matrix_orthographic_RH(projection_
+       cml::matrix_orthographic_RH(mProjection
                        SCALAR(0.0), 
                        Mf::Scalar(width), SCALAR(0.0), Mf::Scalar(height),
                        SCALAR(1.0), SCALAR(-1.0), cml::z_clip_neg_one);
 
        // position the two progress bars at the top-left of the screen
-       bar1_.resize(Mf::Rectangle(20, height - 51,
+       mBar1.resize(Mf::Rectangle(20, height - 51,
                                0.7 * width, height - 3));
-       bar2_.resize(Mf::Rectangle(20, height - 28,
+       mBar2.resize(Mf::Rectangle(20, height - 28,
                                0.7 * width, height - 70));
 
        setBar1Progress(0.05);
@@ -149,7 +149,7 @@ void Hud::draw(Mf::Scalar alpha) const
 {
        glMatrixMode(GL_PROJECTION);
        glPushMatrix();
-       glLoadMatrix(projection_.data());
+       glLoadMatrix(mProjection.data());
 
        glMatrixMode(GL_MODELVIEW);
        glPushMatrix();
@@ -158,8 +158,8 @@ void Hud::draw(Mf::Scalar alpha) const
        glDisable(GL_DEPTH_TEST);
        glEnable(GL_BLEND);
 
-       bar1_.draw();
-       bar2_.draw();
+       mBar1.draw();
+       mBar2.draw();
 
        glDisable(GL_BLEND);
        glEnable(GL_DEPTH_TEST);
This page took 0.03062 seconds and 4 git commands to generate.