Update of /cvsroot/plib/plib/examples/src/ssg/water
In directory usw-pr-cvs1:/tmp/cvs-serv1528/plib/examples/src/ssg/water
Modified Files:
water.cxx
Log Message:
Fixed texture enable/disable when multitexture is not available.
Index: water.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/water/water.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- water.cxx 30 Aug 2002 13:11:11 -0000 1.21
+++ water.cxx 31 Aug 2002 16:44:12 -0000 1.22
@@ -89,8 +89,8 @@
glTexGeni ( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ) ;
glEnable ( GL_TEXTURE_GEN_S ) ;
glEnable ( GL_TEXTURE_GEN_T ) ;
- glEnable ( GL_TEXTURE_2D ) ;
#ifdef GL_ARB_multitexture
+ glEnable ( GL_TEXTURE_2D ) ; /* Enables the second texture map. */
glBindTexture ( GL_TEXTURE_2D, tx ) ;
glActiveTextureARB ( GL_TEXTURE0_ARB ) ;
#endif
@@ -104,8 +104,8 @@
#endif
glDisable ( GL_TEXTURE_GEN_S ) ;
glDisable ( GL_TEXTURE_GEN_T ) ;
- glDisable ( GL_TEXTURE_2D ) ;
#ifdef GL_ARB_multitexture
+ glDisable ( GL_TEXTURE_2D ) ; /* Disables the second texture map */
glActiveTextureARB ( GL_TEXTURE0_ARB ) ;
#endif
return TRUE ;
|
