diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-04-09 18:11:43 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-13 22:40:52 +0100 |
| commit | 67fc15279173bb357c16ef21b73a2e8dd3561b2e (patch) | |
| tree | ff0a04e3f5cbd96b3f6a0c8678e081e9764b8e3b | |
| parent | 3ec8616aa76390280c7b51696b731a85e070de0f (diff) | |
| download | usdx-67fc15279173bb357c16ef21b73a2e8dd3561b2e.tar.gz usdx-67fc15279173bb357c16ef21b73a2e8dd3561b2e.tar.xz usdx-67fc15279173bb357c16ef21b73a2e8dd3561b2e.zip | |
menu/application: alpha blending should not be enabled by default
| -rw-r--r-- | src/menu/application.cpp | 4 | ||||
| -rw-r--r-- | src/menu/software_mouse_pointer.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/menu/application.cpp b/src/menu/application.cpp index 3505f498..ccc983d3 100644 --- a/src/menu/application.cpp +++ b/src/menu/application.cpp @@ -147,10 +147,6 @@ namespace usdx glClear(GL_COLOR_BUFFER_BIT); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_COLOR_MATERIAL); - glMatrixMode( GL_PROJECTION ); glLoadIdentity(); diff --git a/src/menu/software_mouse_pointer.cpp b/src/menu/software_mouse_pointer.cpp index 461ad4d5..721d46a2 100644 --- a/src/menu/software_mouse_pointer.cpp +++ b/src/menu/software_mouse_pointer.cpp @@ -112,8 +112,13 @@ namespace usdx glColorPointer(4, GL_UNSIGNED_BYTE, 0, color); glTexCoordPointer(2, GL_FLOAT, 0, texture); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glDrawArrays(GL_QUADS, 0, 4); + glDisable(GL_BLEND); + glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY); glDisableClientState(GL_COLOR_ARRAY); |