Browse Source

Adds protection of the texture matrix stack which allows the user to use sf::Sprites with this code unmodified otherwise

Michael Bosse 8 years ago
parent
commit
0fca7e2045
1 changed files with 5 additions and 0 deletions
  1. 5 0
      demo/sfml_opengl2/nuklear_sfml_gl2.h

+ 5 - 0
demo/sfml_opengl2/nuklear_sfml_gl2.h

@@ -81,6 +81,9 @@ nk_sfml_render(enum nk_anti_aliasing AA)
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 
     glViewport(0, 0, (GLsizei)window_width, (GLsizei)window_height);
     glViewport(0, 0, (GLsizei)window_width, (GLsizei)window_height);
+    glMatrixMode(GL_TEXTURE);
+    glPushMatrix();
+    glLoadIdentity();
     glMatrixMode(GL_PROJECTION);
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
     glPushMatrix();
     glLoadIdentity();
     glLoadIdentity();
@@ -165,6 +168,8 @@ nk_sfml_render(enum nk_anti_aliasing AA)
     glDisable(GL_TEXTURE_2D);
     glDisable(GL_TEXTURE_2D);
 
 
     glBindTexture(GL_TEXTURE_2D, 0);
     glBindTexture(GL_TEXTURE_2D, 0);
+    glMatrixMode(GL_TEXTURE);
+    glPopMatrix();
     glMatrixMode(GL_MODELVIEW);
     glMatrixMode(GL_MODELVIEW);
     glPopMatrix();
     glPopMatrix();
     glMatrixMode(GL_PROJECTION);
     glMatrixMode(GL_PROJECTION);