# HG changeset patch # User John Tsiombikas # Date 1360255948 -7200 # Node ID 5fb21401b7c8d76412fd6b7d92ff61dec683d515 # Parent 403ec1be3a1a32af5a4a79dee0df019eda9d8d5d lala diff -r 403ec1be3a1a -r 5fb21401b7c8 src/scroller.cc --- a/src/scroller.cc Fri Jan 11 22:52:56 2013 +0200 +++ b/src/scroller.cc Thu Feb 07 18:52:28 2013 +0200 @@ -25,6 +25,7 @@ void draw_scroller(float sec) { + return; glPushAttrib(GL_ENABLE_BIT); glDisable(GL_DEPTH_TEST); diff -r 403ec1be3a1a -r 5fb21401b7c8 src/udg.cc --- a/src/udg.cc Fri Jan 11 22:52:56 2013 +0200 +++ b/src/udg.cc Thu Feb 07 18:52:28 2013 +0200 @@ -106,7 +106,6 @@ void draw_backdrop() { - /* glPushAttrib(GL_ENABLE_BIT); glDisable(GL_DEPTH_TEST); glDisable(GL_LIGHTING); @@ -132,23 +131,27 @@ glPopMatrix(); glPopAttrib(); - */ - draw_scroller(glutGet(GLUT_ELAPSED_TIME) / 1000.0); + /*draw_scroller(glutGet(GLUT_ELAPSED_TIME) / 1000.0); */ } void disp() { float ldir[] = {-1, 1, 2, 0}; + int xres = xsz / DITHER_SZ; + int yres = ysz / DITHER_SZ; + /*int xres = xsz; + int yres = ysz;*/ + if(!rtarg) { - printf("(re)creating render target (%dx%d)\n", xsz / DITHER_SZ, ysz / DITHER_SZ); - if(!(rtarg = create_rtarg(xsz / DITHER_SZ, ysz / DITHER_SZ))) { + printf("(re)creating render target (%dx%d)\n", xres, yres); + if(!(rtarg = create_rtarg(xres, yres))) { exit(0); } } glBindFramebufferEXT(GL_FRAMEBUFFER, rtarg->fbo); - glViewport(0, 0, xsz / DITHER_SZ, ysz / DITHER_SZ); + glViewport(0, 0, xres, yres); glClearColor(1, 1, 1, 1); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -255,6 +258,22 @@ switch(key) { case 27: exit(0); + + case 'f': + { + static bool fullscreen; + static int orig_x, orig_y; + + fullscreen = !fullscreen; + if(fullscreen) { + orig_x = xsz; + orig_y = ysz; + glutFullScreen(); + } else { + glutReshapeWindow(orig_x, orig_y); + } + } + break; } }