From a3770925c652e0d2bab15f5bd46fa740345a28d0 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sun, 15 Apr 2007 01:16:02 +0000 Subject: Rely on default 0 value for z axis. --- ChangeLog | 17 +++++++++++------ src/openglgraphics.cpp | 24 ++++++++++++------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29bf11a8..20cfc79c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2007-04-05 Eugenio Favalli +2007-04-15 Bjørn Lindeijer + + * src/openglgraphics.cpp: Rely on default 0 value for z axis. + +2007-04-05 Eugenio Favalli * src/main.cpp: Unified storage of configuration, updates and screenshots in home directory. @@ -11,16 +15,17 @@ data/graphics/items/generic-easteregg-red.png, data/graphics/items/generic-easteregg-teal.png, data/graphics/items/generic-easteregg-yellow.png, - data/items.xml: Added six different easter egg item graphics for the easter - event. Item IDs are 1208 - 1213. - * data/graphics/sprites/npcs.png: Added bunny girl npc for the easter event. + data/items.xml: Added six different easter egg item graphics for the + easter event. Item IDs are 1208 - 1213. + * data/graphics/sprites/npcs.png: Added bunny girl npc for the easter + event. 2007-04-01 Philipp Sehmisch * src/game.cpp: Screenshots are no longer saved directly in the users home directory on UNIX systems but in the sub folder /.tmw/. A chatlog - message about the success of the screenshot saving does appear now. Based - on a patch by Patrick "the-me" Matthäi. + message about the success of the screenshot saving does appear now. + Based on a patch by Patrick "the-me" Matthäi. 2007-03-27 Bjørn Lindeijer diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index acc0fbb9..f2406e38 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -259,7 +259,7 @@ void OpenGLGraphics::drawPoint(int x, int y) setTexturingAndBlending(false); glBegin(GL_POINTS); - glVertex3i(x, y, 0); + glVertex2i(x, y); glEnd(); } @@ -268,12 +268,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(); } @@ -327,10 +327,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(); } @@ -342,16 +342,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(); } -- cgit v1.2.3-70-g09d2