diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-05-24 10:13:42 +0200 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-05-24 10:13:42 +0200 |
| commit | a6d312ccb942b50287777fc22dc69de926ea3412 (patch) | |
| tree | 0acabef2e78a97e7cd1742b9d98acb2a1b496e72 /tests/sdl_ogl.c | |
| parent | c3570e254952ba0593038993674473e900ada9e0 (diff) | |
| parent | b7ce870dd4b1352e308e212e77cd6161c1ec904e (diff) | |
Merge branch 'master' into llvmsvn
Diffstat (limited to 'tests/sdl_ogl.c')
| -rw-r--r-- | tests/sdl_ogl.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/tests/sdl_ogl.c b/tests/sdl_ogl.c index 9aaae280..6b6a5b4a 100644 --- a/tests/sdl_ogl.c +++ b/tests/sdl_ogl.c @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) glViewport( 0, 0, 640, 480 ); glMatrixMode( GL_PROJECTION ); + glPushMatrix(); // just for testing glLoadIdentity(); glOrtho( 0, 640, 480, 0, -1, 1 ); @@ -138,7 +139,26 @@ int main(int argc, char *argv[]) glTexCoord2i( 1, 1 ); glVertex3f( 300, 400, 0 ); glTexCoord2i( 0, 1 ); glVertex3f( 500, 410, 0 ); glEnd(); - + +#if !EMSCRIPTEN + glDisable(GL_TEXTURE_2D); +#endif + + glColor3ub(90, 255, 255); + glBegin( GL_QUADS ); + glVertex3f( 10, 410, 0 ); + glVertex3f( 300, 410, 0 ); + glVertex3f( 300, 480, 0 ); + glVertex3f( 10, 470, 0 ); + glEnd(); + + glBegin( GL_QUADS ); + glColor3f(1.0, 0, 1.0); glVertex3f( 410, 410, 0 ); + glColor3f(0, 1.0, 0); glVertex3f( 600, 410, 0 ); + glColor3f(0, 0, 1.0); glVertex3f( 600, 480, 0 ); + glColor3f(1.0, 1.0, 1.0); glVertex3f( 410, 470, 0 ); + glEnd(); + SDL_GL_SwapBuffers(); #if !EMSCRIPTEN |