[Csp-commits] svn:csp r1299 - trunk/CSP/Demeter

[<sv...@ww...>]

Author: delta
Date: 2004-10-30 14:57:17 -0700 (Sat, 30 Oct 2004)
New Revision: 1299

Modified:
   trunk/CSP/Demeter/CHANGES.current
   trunk/CSP/Demeter/Terrain.cpp
Log:
* Changed GL_CLAMP mode to GL_CLAMP_TO_EDGE_EXT in CreateTexture to avoid edge clamping problem on windows. Need to be tested on GNU/Linux.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1299

Modified: trunk/CSP/Demeter/CHANGES.current
===================================================================
--- trunk/CSP/Demeter/CHANGES.current	2004-10-25 20:44:43 UTC (rev 1298)
+++ trunk/CSP/Demeter/CHANGES.current	2004-10-30 21:57:17 UTC (rev 1299)
@@ -1,5 +1,11 @@
 Version 0.3.2 (in progress)
 ===========================
+
+2004-10-18: delta
+		Changed GL_CLAMP mode to GL_CLAMP_TO_EDGE_EXT in CreateTexture
+		to avoid edge clamping problem on windows. Need to be tested on
+		GNU/Linux.
+		
 2004-09-29: delta
 		Added #NOMINMAX before including windows.h to avoid
 		conflict with std::max/min.
@@ -9,8 +15,7 @@
         
 2003-12-06: delta
         Minor changes to shut up .net 7.1 warnings.
-            Demeter debug version links onto release 
-            SDL_image.lib 
+        Demeter debug version links onto release SDL_image.lib.
 
 2003-07-15: onsight
             Disabled GDAL support by default.

Modified: trunk/CSP/Demeter/Terrain.cpp
===================================================================
--- trunk/CSP/Demeter/Terrain.cpp	2004-10-25 20:44:43 UTC (rev 1298)
+++ trunk/CSP/Demeter/Terrain.cpp	2004-10-30 21:57:17 UTC (rev 1299)
@@ -2660,8 +2660,8 @@
     glBindTexture(GL_TEXTURE_2D,texId);
     if (bClamp)
     {
-        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_CLAMP);
-        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP);
+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_CLAMP_TO_EDGE_EXT);
+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE_EXT);
     }
     else
     {