From 618926293ca497ff8e31d048e34d10954cb0e059 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Mon, 17 Sep 2012 01:35:27 +0200
Subject: menu/background_image: remove the unused texture color
---
src/menu/background_image.cpp | 5 +----
src/menu/background_image.hpp | 2 --
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/menu/background_image.cpp b/src/menu/background_image.cpp
index 15229284..bb398304 100644
--- a/src/menu/background_image.cpp
+++ b/src/menu/background_image.cpp
@@ -30,7 +30,7 @@ namespace usdx
{
BackgroundImage::BackgroundImage(const DrawableControl &control,
boost::filesystem::wpath filename) :
- Background(control), color(255,255,255)
+ Background(control)
{
texture = new Disposer<Texture>(new Texture(filename));
}
@@ -59,16 +59,13 @@ namespace usdx
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glEnableClientState(GL_COLOR_ARRAY);
glVertexPointer(2, GL_INT, 0, vertices);
- glColorPointer(3, GL_UNSIGNED_BYTE, 0, color.get_array(4));
glTexCoordPointer(2, GL_FLOAT, 0, Texture::default_vertices);
glDrawArrays(GL_QUADS, 0, 4);
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- glDisableClientState(GL_COLOR_ARRAY);
}
};
diff --git a/src/menu/background_image.hpp b/src/menu/background_image.hpp
index d7475007..23b1a68e 100644
--- a/src/menu/background_image.hpp
+++ b/src/menu/background_image.hpp
@@ -30,7 +30,6 @@
#include "background.hpp"
#include "texture.hpp"
-#include "utils/rgb_color.hpp"
#include "utils/disposer.hpp"
namespace usdx
@@ -48,7 +47,6 @@ namespace usdx
Disposer<Texture>* texture;
GLint vertices[8];
- RgbColor color;
protected:
void draw(void);
--
cgit v1.2.3