diff options
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/demos/copypix.c | 22 | ||||
| -rw-r--r-- | progs/samples/select.c | 6 | ||||
| -rw-r--r-- | progs/tests/fbotest1.c | 2 | ||||
| -rw-r--r-- | progs/tests/texcmp.c | 2 | ||||
| -rw-r--r-- | progs/tests/zreaddraw.c | 18 |
5 files changed, 47 insertions, 3 deletions
diff --git a/progs/demos/copypix.c b/progs/demos/copypix.c index 51435acfa0..a13339ea62 100644 --- a/progs/demos/copypix.c +++ b/progs/demos/copypix.c @@ -26,6 +26,7 @@ static int Scissor = 0; static float Xzoom, Yzoom; static GLboolean DrawFront = GL_FALSE; static GLboolean Dither = GL_TRUE; +static GLboolean Invert = GL_FALSE; static void Reset( void ) @@ -59,6 +60,15 @@ static void Display( void ) if (Scissor) glEnable(GL_SCISSOR_TEST); + if (Invert) { + glPixelTransferf(GL_RED_SCALE, -1.0); + glPixelTransferf(GL_GREEN_SCALE, -1.0); + glPixelTransferf(GL_BLUE_SCALE, -1.0); + glPixelTransferf(GL_RED_BIAS, 1.0); + glPixelTransferf(GL_GREEN_BIAS, 1.0); + glPixelTransferf(GL_BLUE_BIAS, 1.0); + } + /* draw copy */ glPixelZoom(Xzoom, Yzoom); glWindowPos2iARB(Xpos, Ypos); @@ -67,6 +77,15 @@ static void Display( void ) glDisable(GL_SCISSOR_TEST); + if (Invert) { + glPixelTransferf(GL_RED_SCALE, 1.0); + glPixelTransferf(GL_GREEN_SCALE, 1.0); + glPixelTransferf(GL_BLUE_SCALE, 1.0); + glPixelTransferf(GL_RED_BIAS, 0.0); + glPixelTransferf(GL_GREEN_BIAS, 0.0); + glPixelTransferf(GL_BLUE_BIAS, 0.0); + } + if (DrawFront) glFinish(); else @@ -105,6 +124,9 @@ static void Key( unsigned char key, int x, int y ) else glDisable(GL_DITHER); break; + case 'i': + Invert = !Invert; + break; case 's': Scissor = !Scissor; break; diff --git a/progs/samples/select.c b/progs/samples/select.c index 2c8f333bfa..31ed93b9e0 100644 --- a/progs/samples/select.c +++ b/progs/samples/select.c @@ -92,6 +92,12 @@ static void Init(void) numObjects = 10; InitObjects(numObjects); glGetIntegerv(GL_VIEWPORT, vp); + +#if 0 /* debug - test culling */ + glCullFace(GL_BACK); + glFrontFace(GL_CW); + glEnable(GL_CULL_FACE); +#endif } static void Reshape(int width, int height) diff --git a/progs/tests/fbotest1.c b/progs/tests/fbotest1.c index 8dac21494e..0cd7f95c35 100644 --- a/progs/tests/fbotest1.c +++ b/progs/tests/fbotest1.c @@ -127,7 +127,7 @@ Init( void ) if (!glutExtensionSupported("GL_EXT_framebuffer_object")) { printf("GL_EXT_framebuffer_object not found!\n"); - /*exit(0);*/ + exit(0); } printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER)); diff --git a/progs/tests/texcmp.c b/progs/tests/texcmp.c index 52c504a318..d1e829d1b7 100644 --- a/progs/tests/texcmp.c +++ b/progs/tests/texcmp.c @@ -371,11 +371,11 @@ int main( int argc, char *argv[] ) glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE ); if (glutCreateWindow(argv[0]) <= 0) { - glewInit(); printf("Couldn't create window\n"); exit(0); } + glewInit(); gl_version = atof( (const char *) glGetString( GL_VERSION ) ); if ( (gl_version < 1.3) && !glutExtensionSupported("GL_ARB_texture_compression") ) { diff --git a/progs/tests/zreaddraw.c b/progs/tests/zreaddraw.c index 2cbfeb6ff1..0821d5fb35 100644 --- a/progs/tests/zreaddraw.c +++ b/progs/tests/zreaddraw.c @@ -12,6 +12,7 @@ #include <GL/glut.h> static GLint WinWidth = 500, WinHeight = 500; +static GLboolean Invert = GL_FALSE; static void Display(void) @@ -24,6 +25,8 @@ static void Display(void) glClearColor(0.5, 0.5, 0.5, 1.0); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glEnable(GL_DEPTH_TEST); + /* draw a sphere */ glViewport(0, 0, 100, 100); glMatrixMode(GL_PROJECTION); @@ -46,8 +49,19 @@ static void Display(void) /* draw depth image with scaling (into z buffer) */ glPixelZoom(4.0, 4.0); + glColor4f(1, 0, 0, 0); glWindowPos2i(100, 0); + if (Invert) { + glPixelTransferf(GL_DEPTH_SCALE, -1.0); + glPixelTransferf(GL_DEPTH_BIAS, 1.0); + } glDrawPixels(100, 100, GL_DEPTH_COMPONENT, GL_FLOAT, depth); + if (Invert) { + glPixelTransferf(GL_DEPTH_SCALE, 1.0); + glPixelTransferf(GL_DEPTH_BIAS, 0.0); + } + + glDisable(GL_DEPTH_TEST); /* read back scaled depth image */ glReadPixels(100, 0, 400, 400, GL_DEPTH_COMPONENT, GL_FLOAT, depth2); @@ -72,6 +86,9 @@ static void Key(unsigned char key, int x, int y) (void) x; (void) y; switch (key) { + case 'i': + Invert = !Invert; + break; case 27: exit(0); break; @@ -96,7 +113,6 @@ static void Init(void) glLightfv(GL_LIGHT0, GL_POSITION, pos); glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); - glEnable(GL_DEPTH_TEST); } |