From cb0d99729f73be3273115ca058f2d6effa3c94c1 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 13 May 2014 15:35:19 +0100 Subject: [PATCH] Revert some rectangle changes that don't work on windows --- dgl/src/Geometry.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dgl/src/Geometry.cpp b/dgl/src/Geometry.cpp index 29a66118..2c2e8947 100644 --- a/dgl/src/Geometry.cpp +++ b/dgl/src/Geometry.cpp @@ -614,6 +614,7 @@ bool Rectangle::containsY(const T& y) const noexcept template void Rectangle::draw() { +#if 0 typedef void (*glVextex2Func)(T x, T y); static bool needsSetup = true; @@ -634,21 +635,22 @@ void Rectangle::draw() needsSetup = false; } +#endif glBegin(GL_QUADS); { glTexCoord2f(0.0f, 0.0f); - glVextex2fn(fPos.fX, fPos.fY); + glVertex2i(fPos.fX, fPos.fY); glTexCoord2f(1.0f, 0.0f); - glVextex2fn(fPos.fX+fSize.fWidth, fPos.fY); + glVertex2i(fPos.fX+fSize.fWidth, fPos.fY); glTexCoord2f(1.0f, 1.0f); - glVextex2fn(fPos.fX+fSize.fWidth, fPos.fY+fSize.fHeight); + glVertex2i(fPos.fX+fSize.fWidth, fPos.fY+fSize.fHeight); glTexCoord2f(0.0f, 1.0f); - glVextex2fn(fPos.fX, fPos.fY+fSize.fHeight); + glVertex2i(fPos.fX, fPos.fY+fSize.fHeight); } glEnd();