experimental shapes hierarchy and raycasting

[chaz/yoink] / src / Hud.cc

diff --git a/src/Hud.cc b/src/Hud.cc
index 90f5dd9418dd90f85bb25bc72ef631d0af5ebf90..3a178f627491699ec3b5d921035e8a817b964a69 100644 (file)
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -88,32 +88,32 @@ 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();
 }