[Tuxracer-checkins] CVS: tuxracer/src gl_util.c,1.6,1.7 part_sys.c,1.5,1.6 tux.c,1.7,1.8

[Jasmin P. <jf...@us...>]

Update of /cvsroot/tuxracer/tuxracer/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2513

Modified Files:
	gl_util.c part_sys.c tux.c 
Log Message:
Centralized setting of glShadeModel in gl_util.c


Index: gl_util.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/gl_util.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** gl_util.c	2000/08/31 15:32:05	1.6
--- gl_util.c	2000/08/31 15:43:40	1.7
***************
*** 39,42 ****
--- 39,43 ----
  	 Other Functions:
  	   glDepthMask
+ 	   glShadeModel
      */
  
***************
*** 60,63 ****
--- 61,65 ----
  	glDisable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_FLAT );
          break;
  
***************
*** 74,77 ****
--- 76,80 ----
  	glEnable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_SMOOTH );
  
  	glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR );
***************
*** 91,94 ****
--- 94,98 ----
  	glDisable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_SMOOTH );
  
          glAlphaFunc( GL_GEQUAL, 0.9 );
***************
*** 107,110 ****
--- 111,115 ----
  	glEnable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_SMOOTH );
  
  	glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR );
***************
*** 125,128 ****
--- 130,134 ----
  	glDisable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_SMOOTH );
  
          break;
***************
*** 140,143 ****
--- 146,150 ----
  	glDisable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_SMOOTH );
          break;
  
***************
*** 154,157 ****
--- 161,165 ----
  	glDisable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_FALSE );
+ 	glShadeModel( GL_SMOOTH );
  	break;
   	
***************
*** 168,171 ****
--- 176,180 ----
  	glDisable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_SMOOTH );
  	break;
  
***************
*** 182,185 ****
--- 191,195 ----
  	glDisable( GL_TEXTURE_GEN_T );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_SMOOTH );
  
          break;
***************
*** 196,199 ****
--- 206,210 ----
  	glEnable( GL_STENCIL_TEST );
  	glDepthMask( GL_FALSE );
+ 	glShadeModel( GL_SMOOTH );
  
  	glStencilFunc( GL_EQUAL, 0, ~0 );
***************
*** 209,212 ****
--- 220,224 ----
  	glDisable( GL_STENCIL_TEST );
  	glDepthMask( GL_TRUE );
+ 	glShadeModel( GL_SMOOTH );
  #endif
  	break;

Index: part_sys.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/part_sys.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** part_sys.c	2000/08/15 03:08:12	1.5
--- part_sys.c	2000/08/31 15:43:40	1.6
***************
*** 200,207 ****
  
  	setup_course_lighting();
- 	glShadeModel( GL_SMOOTH );
      } else {
          glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL );
- 	glShadeModel( GL_FLAT );
      }
  
--- 200,205 ----

Index: tux.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/tux.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** tux.c	2000/08/28 00:53:07	1.7
--- tux.c	2000/08/31 15:43:40	1.8
***************
*** 158,166 ****
      setup_course_lighting();
  
-     glShadeModel( GL_SMOOTH );
- 
      draw_scene_graph( tuxRootNode );
- 
-     glShadeModel( GL_FLAT );
  } 
  
--- 158,162 ----