diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-09-07 04:04:24 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-13 22:41:05 +0100 |
| commit | 82306827bd8c8b7b0a667df48bd95f5c2948c690 (patch) | |
| tree | e7149f6a921c49acfb0af80c14e80000e010c9d4 /src/menu/background_image.cpp | |
| parent | 06983baa19f0fbf48dd3e89e2d3810a4d8cf340a (diff) | |
| download | usdx-82306827bd8c8b7b0a667df48bd95f5c2948c690.tar.gz usdx-82306827bd8c8b7b0a667df48bd95f5c2948c690.tar.xz usdx-82306827bd8c8b7b0a667df48bd95f5c2948c690.zip | |
menu: use RgbColor.get_array(?) magic everywhere
Diffstat (limited to 'src/menu/background_image.cpp')
| -rw-r--r-- | src/menu/background_image.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/menu/background_image.cpp b/src/menu/background_image.cpp index 56cdb1e0..4db81967 100644 --- a/src/menu/background_image.cpp +++ b/src/menu/background_image.cpp @@ -29,23 +29,10 @@ namespace usdx { BackgroundImage::BackgroundImage(const DrawableControl &control, boost::filesystem::wpath filename) : - Background(control) + Background(control), color(255,255,255) { texture = new Texture(filename); - this->color[0] = 255; - this->color[1] = 255; - this->color[2] = 255; - this->color[3] = 255; - this->color[4] = 255; - this->color[5] = 255; - this->color[6] = 255; - this->color[7] = 255; - this->color[8] = 255; - this->color[9] = 255; - this->color[10] = 255; - this->color[11] = 255; - this->tex[0] = 0.0f; this->tex[1] = 1.0f; this->tex[2] = 1.0f; @@ -80,7 +67,7 @@ namespace usdx glEnableClientState(GL_COLOR_ARRAY); glVertexPointer(2, GL_INT, 0, vertices); - glColorPointer(3, GL_UNSIGNED_BYTE, 0, color); + glColorPointer(3, GL_UNSIGNED_BYTE, 0, color.get_array(4)); glTexCoordPointer(2, GL_FLOAT, 0, tex); glDrawArrays(GL_QUADS, 0, 4); |