[Scummvm-cvs-logs] SF.net SVN: scummvm: [20620] residual/trunk/tinygl

[aquadran at users.sourceforge.net]

Revision: 20620
Author:   aquadran
Date:     2006-02-12 07:25:17 -0800 (Sun, 12 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20620&view=rev

Log Message:
-----------
don't use near, far variable names, that is in conflict with msvc7 obsoleted keywords

Modified Paths:
--------------
    residual/trunk/tinygl/api.cpp
    residual/trunk/tinygl/gl.h
    residual/trunk/tinygl/matrix.cpp
Modified: residual/trunk/tinygl/api.cpp
===================================================================
--- residual/trunk/tinygl/api.cpp	2006-02-12 15:01:32 UTC (rev 20619)
+++ residual/trunk/tinygl/api.cpp	2006-02-12 15:25:17 UTC (rev 20620)
@@ -352,7 +352,7 @@
 }
 
 void tglFrustum(double left,double right,double bottom,double top,
-               double near,double farv)
+               double nearv,double farv)
 {
   TGLParam p[7];
 
@@ -361,7 +361,7 @@
   p[2].f=(float)right;
   p[3].f=(float)bottom;
   p[4].f=(float)top;
-  p[5].f=(float)near;
+  p[5].f=(float)nearv;
   p[6].f=(float)farv;
 
   gl_add_op(p);

Modified: residual/trunk/tinygl/gl.h
===================================================================
--- residual/trunk/tinygl/gl.h	2006-02-12 15:01:32 UTC (rev 20619)
+++ residual/trunk/tinygl/gl.h	2006-02-12 15:25:17 UTC (rev 20620)
@@ -733,7 +733,7 @@
 
 void tglViewport(int x,int y,int width,int height);
 void tglFrustum(double left,double right,double bottom,double top,
-               double near,double far);
+               double nearv,double farv);
 
 /* lists */
 unsigned int tglGenLists(int range);

Modified: residual/trunk/tinygl/matrix.cpp
===================================================================
--- residual/trunk/tinygl/matrix.cpp	2006-02-12 15:01:32 UTC (rev 20619)
+++ residual/trunk/tinygl/matrix.cpp	2006-02-12 15:25:17 UTC (rev 20620)
@@ -217,16 +217,16 @@
   float right=p[2].f;
   float bottom=p[3].f;
   float top=p[4].f;
-  float near=p[5].f;
+  float nearp=p[5].f;
   float farp=p[6].f;
   float x,y,A,B,C,D;
 
-  x = (float)((2.0*near) / (right-left));
-  y = (float)((2.0*near) / (top-bottom));
+  x = (float)((2.0*nearp) / (right-left));
+  y = (float)((2.0*nearp) / (top-bottom));
   A = (right+left) / (right-left);
   B = (top+bottom) / (top-bottom);
-  C = -(farp+near) / ( farp-near);
-  D = (float)(-(2.0*farp*near) / (farp-near));
+  C = -(farp+nearp) / ( farp-nearp);
+  D = (float)(-(2.0*farp*nearp) / (farp-nearp));
 
   r=&m.m[0][0];
   r[0]= x; r[1]=0; r[2]=A; r[3]=0;