From 10c75a337be97c93b6de839402461fd400baf128 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sun, 22 Jul 2012 21:17:15 +0200
Subject: Some cleanups in OpenGL code

* Removed empty and unused function `setTargetPlane`
* Removed duplicated enabling of `GL_VERTEX_ARRAY`
* Removed strange smoothing code from `drawRescaledImage`

Reviewed-by: Erik Schilling
---
 src/openglgraphics.cpp | 37 -------------------------------------
 src/openglgraphics.h   | 13 +------------
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 6148b367..66d0d0fc 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -289,19 +289,6 @@ bool OpenGLGraphics::drawRescaledImage(Image *image, int srcX, int srcY,
                                        int width, int height,
                                        int desiredWidth, int desiredHeight,
                                        bool useColor)
-{
-    return drawRescaledImage(image, srcX, srcY,
-                             dstX, dstY,
-                             width, height,
-                             desiredWidth, desiredHeight,
-                             useColor, true);
-}
-
-bool OpenGLGraphics::drawRescaledImage(Image *image, int srcX, int srcY,
-                                       int dstX, int dstY,
-                                       int width, int height,
-                                       int desiredWidth, int desiredHeight,
-                                       bool useColor, bool smooth)
 {
     if (!image)
         return false;
@@ -313,11 +300,6 @@ bool OpenGLGraphics::drawRescaledImage(Image *image, int srcX, int srcY,
                          width, height, useColor);
     }
 
-    // When the desired image is smaller than the current one,
-    // disable smooth effect.
-    if (width > desiredWidth && height > desiredHeight)
-        smooth = false;
-
     srcX += image->mBounds.x;
     srcY += image->mBounds.y;
 
@@ -332,20 +314,6 @@ bool OpenGLGraphics::drawRescaledImage(Image *image, int srcX, int srcY,
     drawRescaledQuad(image, srcX, srcY, dstX, dstY, width, height,
                      desiredWidth, desiredHeight);
 
-    if (smooth) // A basic smooth effect...
-    {
-        glColor4f(1.0f, 1.0f, 1.0f, 0.2f);
-        drawRescaledQuad(image, srcX, srcY, dstX - 1, dstY - 1, width, height,
-                         desiredWidth + 1, desiredHeight + 1);
-        drawRescaledQuad(image, srcX, srcY, dstX + 1, dstY + 1, width, height,
-                         desiredWidth - 1, desiredHeight - 1);
-
-        drawRescaledQuad(image, srcX, srcY, dstX + 1, dstY, width, height,
-                         desiredWidth - 1, desiredHeight);
-        drawRescaledQuad(image, srcX, srcY, dstX, dstY + 1, width, height,
-                         desiredWidth, desiredHeight - 1);
-    }
-
     if (!useColor)
     {
         glColor4ub(static_cast<GLubyte>(mColor.r),
@@ -652,7 +620,6 @@ void OpenGLGraphics::_beginDraw()
     glLoadIdentity();
 
     glEnable(GL_SCISSOR_TEST);
-    glEnableClientState(GL_VERTEX_ARRAY);
 
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -791,10 +758,6 @@ void OpenGLGraphics::fillRectangle(const gcn::Rectangle& rect)
     drawRectangle(rect, true);
 }
 
-void OpenGLGraphics::setTargetPlane(int width, int height)
-{
-}
-
 void OpenGLGraphics::setTexturingAndBlending(bool enable)
 {
     if (enable)
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index d61bf3db..a1d78e46 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -52,7 +52,7 @@ class OpenGLGraphics : public Graphics
                        bool useColor);
 
         /**
-         * Draws a resclaled version of the image
+         * Draws a rescaled version of the image
          */
         bool drawRescaledImage(Image *image, int srcX, int srcY,
                                int dstX, int dstY,
@@ -60,15 +60,6 @@ class OpenGLGraphics : public Graphics
                                int desiredWidth, int desiredHeight,
                                bool useColor);
 
-        /**
-         * Used to get the smooth rescale option over the standard function.
-         */
-        bool drawRescaledImage(Image *image, int srcX, int srcY,
-                               int dstX, int dstY,
-                               int width, int height,
-                               int desiredWidth, int desiredHeight,
-                               bool useColor, bool smooth);
-
         void drawImagePattern(Image *image,
                               int x, int y,
                               int w, int h);
@@ -100,8 +91,6 @@ class OpenGLGraphics : public Graphics
 
         void fillRectangle(const gcn::Rectangle &rect);
 
-        void setTargetPlane(int width, int height);
-
         /**
          * Takes a screenshot and returns it as SDL surface.
          */
-- 
cgit v1.2.3-60-g2f50