[Plib-cvs] plib/examples/src/ssg/water water.cxx,1.24,1.25

[M?rten Str?m. <str...@us...>]

Update of /cvsroot/plib/plib/examples/src/ssg/water
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30869

Modified Files:
	water.cxx 
Log Message:
Fix to compile with OpenGL 1.4.

Index: water.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/water/water.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- water.cxx	1 Sep 2002 12:04:52 -0000	1.24
+++ water.cxx	2 Mar 2004 16:25:49 -0000	1.25
@@ -46,6 +46,13 @@
 #  endif
 #endif
 
+#ifndef GL_VERSION_1_3
+// ARB_multitexture
+#define GL_TEXTURE0      GL_TEXTURE0_ARB
+#define GL_TEXTURE1      GL_TEXTURE1_ARB
+#define glActiveTexture  glActiveTextureARB
+#endif
+
 #define GUI_BASE      80
 #define VIEW_GUI_BASE 20
 #define FONT_COLOUR   1,1,1,1
@@ -116,7 +123,7 @@
 #ifdef GL_ARB_multitexture
   int tx ;
   glGetIntegerv ( GL_TEXTURE_BINDING_2D, &tx ) ;
-  glActiveTextureARB ( GL_TEXTURE1_ARB ) ;
+  glActiveTexture ( GL_TEXTURE1 ) ;
 #endif
   glTexGeni ( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ) ;
   glTexGeni ( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ) ;
@@ -125,7 +132,7 @@
 #ifdef GL_ARB_multitexture
   glEnable ( GL_TEXTURE_2D ) ;  /* Enables the second texture map. */
   glBindTexture ( GL_TEXTURE_2D, tx ) ;
-  glActiveTextureARB ( GL_TEXTURE0_ARB ) ;
+  glActiveTexture ( GL_TEXTURE0 ) ;
 #endif    
   return TRUE ;
 } 
@@ -133,13 +140,13 @@
 static int disableTexGen ( ssgEntity * )
 {
 #ifdef GL_ARB_multitexture
-  glActiveTextureARB ( GL_TEXTURE1_ARB ) ;
+  glActiveTexture ( GL_TEXTURE1 ) ;
 #endif
   glDisable ( GL_TEXTURE_GEN_S ) ;
   glDisable ( GL_TEXTURE_GEN_T ) ;
 #ifdef GL_ARB_multitexture
   glDisable ( GL_TEXTURE_2D ) ; /* Disables the second texture map */
-  glActiveTextureARB ( GL_TEXTURE0_ARB ) ;
+  glActiveTexture ( GL_TEXTURE0 ) ;
 #endif
   return TRUE ;
 }