diff options
Diffstat (limited to 'progs/demos')
| -rw-r--r-- | progs/demos/isosurf.c | 11 | ||||
| -rw-r--r-- | progs/demos/tessdemo.c | 17 |
2 files changed, 15 insertions, 13 deletions
diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c index 160886f9ce..12125aac96 100644 --- a/progs/demos/isosurf.c +++ b/progs/demos/isosurf.c @@ -1,4 +1,4 @@ -/* $Id: isosurf.c,v 1.14 2002/01/04 09:47:17 gareth Exp $ */ +/* $Id: isosurf.c,v 1.15 2002/10/18 17:47:35 kschultz Exp $ */ /* * Display an isosurface of 3-D wind speed volume. @@ -32,6 +32,7 @@ #include <math.h> #ifdef _WIN32 #include <windows.h> +#undef CLIP_MASK #endif #define GL_GLEXT_LEGACY #include "GL/glut.h" @@ -84,7 +85,7 @@ #define POLYGON_MASK (POLYGON_FILL|POLYGON_LINE) #define MAXVERTS 10000 -static GLuint maxverts = MAXVERTS; +static GLint maxverts = MAXVERTS; static float data[MAXVERTS][6]; static float compressed_data[MAXVERTS][6]; static float expanded_data[MAXVERTS*3][6]; @@ -337,7 +338,7 @@ static void make_tri_indices( void ) { unsigned int *v = tri_indices; unsigned int parity = 0; - unsigned int i, j; + int i, j; for (j=2;j<numverts;j++,parity^=1) { if (parity) { @@ -367,9 +368,9 @@ static void make_tri_indices( void ) #define MIN(x,y) (x < y) ? x : y -static void draw_surface( int with_state ) +static void draw_surface( unsigned int with_state ) { - GLuint i, j; + GLint i, j; if (with_state & DISPLAYLIST) { if ((with_state & (RENDER_STYLE_MASK|PRIMITIVE_MASK|MATERIAL_MASK)) != diff --git a/progs/demos/tessdemo.c b/progs/demos/tessdemo.c index abde73054c..581dec90d5 100644 --- a/progs/demos/tessdemo.c +++ b/progs/demos/tessdemo.c @@ -1,4 +1,4 @@ -/* $Id: tessdemo.c,v 1.12 2002/07/12 15:54:02 brianp Exp $ */ +/* $Id: tessdemo.c,v 1.13 2002/10/18 17:47:36 kschultz Exp $ */ /* * A demo of the GLU polygon tesselation functions written by Bogdan Sikorski. @@ -90,7 +90,7 @@ static void GLCALLBACK edge_callback( GLenum flag ) static void GLCALLBACK end_callback() { - GLint i; + GLuint i; glBegin( GL_LINES ); @@ -310,6 +310,7 @@ static void mouse_clicked( int button, int state, int x, int y ) static void display( void ) { GLuint i,j; + GLsizei ii, jj; GLuint point_cnt; glClear( GL_COLOR_BUFFER_BIT ); @@ -321,12 +322,12 @@ static void display( void ) glBegin( GL_LINES ); - for ( i = 0 ; i < width ; i += 10 ) { - for ( j = 0 ; j < height ; j += 10 ) { - glVertex2i( 0, j ); - glVertex2i( width, j ); - glVertex2i( i, height ); - glVertex2i( i, 0 ); + for ( ii = 0 ; ii < width ; ii += 10 ) { + for ( jj = 0 ; jj < height ; jj += 10 ) { + glVertex2i( 0, jj ); + glVertex2i( width, jj ); + glVertex2i( ii, height ); + glVertex2i( ii, 0 ); } } |