diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-04-09 20:10:50 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-04-09 20:10:50 +0000 |
| commit | a2c0647e07d178fd69b962205f4b1163682e2d80 (patch) | |
| tree | 055f753f4d4a6c9e55ffa250ae13e9831531c40e /src/client | |
| parent | 62423c6b9fbae0f427eac6d26d39db80541d5ee2 (diff) | |
fix texture binding
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/chat.cc | 4 | ||||
| -rw-r--r-- | src/client/console.cc | 5 | ||||
| -rw-r--r-- | src/client/view.cc | 8 |
3 files changed, 5 insertions, 12 deletions
diff --git a/src/client/chat.cc b/src/client/chat.cc index 8de2665..fc0ce1b 100644 --- a/src/client/chat.cc +++ b/src/client/chat.cc @@ -72,9 +72,8 @@ void draw() if (console::visible() || !visible()) return; - + // draw the console input - gl::enable(GL_TEXTURE_2D); gl::color(1.0f, 1.0f, 1.0f, 1.0f); draw_text(CHARWIDTH , 4 + CHARHEIGHT * (MAXNOTIFYLINES+1), "say"); gl::color(0.0f, 1.0f, .0f, 1.0f); @@ -88,7 +87,6 @@ void draw() std::string cursor("_"); draw_text(CHARWIDTH*(input_pos+6), 4 + CHARHEIGHT * (MAXNOTIFYLINES+1) , cursor); } - gl::disable(GL_TEXTURE_2D); } void toggle() diff --git a/src/client/console.cc b/src/client/console.cc index 04f896f..28d80f0 100644 --- a/src/client/console.cc +++ b/src/client/console.cc @@ -122,10 +122,7 @@ void draw() float con_height = 0.70f; - glBindTexture(GL_TEXTURE_2D, render::textures[1]); // bitmaps/conchars.tga - // draw version below the bottom of the console - gl::enable(GL_TEXTURE_2D); gl::color(0.0f, 1.0f, 0.0f, 0.5f); std::string version(core::name()); version += ' '; @@ -180,7 +177,7 @@ void draw() std::string cursor("_"); draw_text(CHARWIDTH*(input_pos+1), video::height*con_height - CHARHEIGHT - 4 , cursor); } - gl::disable(GL_TEXTURE_2D); + } void flush() diff --git a/src/client/view.cc b/src/client/view.cc index 4180b1e..522526e 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -126,8 +126,6 @@ void draw_status() if (console::visible()) return; - glBindTexture(GL_TEXTURE_2D, render::textures[1]); // bitmaps/conchars.tga - // print the status in the upper left corner gl::color(1.0f, 1.0f, 1.0f, 1.0f); std::stringstream status; @@ -286,11 +284,11 @@ void frame(float seconds) draw_loader(); } - // draw the console + // draw text elements + glBindTexture(GL_TEXTURE_2D, render::textures[1]); // bitmaps/conchars.tga + console::draw(); chat::draw(); - - // draw the status line draw_status(); // draw the mouse cursor |