diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-09-17 01:35:27 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-13 22:41:06 +0100 |
commit | 618926293ca497ff8e31d048e34d10954cb0e059 (patch) | |
tree | fe126c2a751138e54cbc7d637272eb50d0a644e0 /src/menu/background_image.cpp | |
parent | 11e4937c9f9af5e064ad7434b2e4bf47b5fe31f6 (diff) | |
download | usdx-618926293ca497ff8e31d048e34d10954cb0e059.tar.gz usdx-618926293ca497ff8e31d048e34d10954cb0e059.tar.xz usdx-618926293ca497ff8e31d048e34d10954cb0e059.zip |
menu/background_image: remove the unused texture color
Diffstat (limited to '')
-rw-r--r-- | src/menu/background_image.cpp | 5 |
1 files changed, 1 insertions, 4 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); } }; |