summaryrefslogtreecommitdiff
path: root/src/openglgraphics.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-06-04 21:48:47 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-06-04 21:48:47 +0000
commita353543dd4da3c489a84f6f17125fdd0e1be2349 (patch)
tree5e447a0f9a3fd50f58a48f39bbb77d392d78af36 /src/openglgraphics.cpp
parentab072dddb231895ba7b6762eda9fa70af961b0fb (diff)
downloadMana-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.gz
Mana-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.bz2
Mana-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.xz
Mana-a353543dd4da3c489a84f6f17125fdd0e1be2349.zip
Merged 0.0 changes from revision 3234 to 3317 to trunk.
Diffstat (limited to 'src/openglgraphics.cpp')
-rw-r--r--src/openglgraphics.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index ec6c1ee3..f4cda0b9 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -261,7 +261,7 @@ void OpenGLGraphics::drawPoint(int x, int y)
setTexturingAndBlending(false);
glBegin(GL_POINTS);
- glVertex3i(x, y, 0);
+ glVertex2i(x, y);
glEnd();
}
@@ -270,12 +270,12 @@ void OpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
setTexturingAndBlending(false);
glBegin(GL_LINES);
- glVertex3f(x1 + 0.5f, y1 + 0.5f, 0);
- glVertex3f(x2 + 0.5f, y2 + 0.5f, 0);
+ glVertex2f(x1 + 0.5f, y1 + 0.5f);
+ glVertex2f(x2 + 0.5f, y2 + 0.5f);
glEnd();
glBegin(GL_POINTS);
- glVertex3f(x2 + 0.5f, y2 + 0.5f, 0);
+ glVertex2f(x2 + 0.5f, y2 + 0.5f);
glEnd();
}
@@ -329,10 +329,10 @@ void OpenGLGraphics::drawRectangle(const gcn::Rectangle& rect, bool filled)
setTexturingAndBlending(false);
glBegin(filled ? GL_QUADS : GL_LINE_LOOP);
- glVertex3f(rect.x + offset, rect.y + offset, 0);
- glVertex3f(rect.x + rect.width - offset, rect.y + offset, 0);
- glVertex3f(rect.x + rect.width - offset, rect.y + rect.height - offset, 0);
- glVertex3f(rect.x + offset, rect.y + rect.height - offset, 0);
+ glVertex2f(rect.x + offset, rect.y + offset);
+ glVertex2f(rect.x + rect.width - offset, rect.y + offset);
+ glVertex2f(rect.x + rect.width - offset, rect.y + rect.height - offset);
+ glVertex2f(rect.x + offset, rect.y + rect.height - offset);
glEnd();
}
@@ -344,16 +344,16 @@ void OpenGLGraphics::drawTexedQuad(int x, int y, int w, int h,
// Draw a textured quad
glBegin(GL_QUADS);
glTexCoord2f(texX1, texY1);
- glVertex3i(x, y, 0);
+ glVertex2i(x, y);
glTexCoord2f(texX2, texY1);
- glVertex3i(x + w, y, 0);
+ glVertex2i(x + w, y);
glTexCoord2f(texX2, texY2);
- glVertex3i(x + w, y + h, 0);
+ glVertex2i(x + w, y + h);
glTexCoord2f(texX1, texY2);
- glVertex3i(x, y + h, 0);
+ glVertex2i(x, y + h);
glEnd();
}