brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid near/far identifier names.

Browse Source 
Leads to conflict with system headers on Windows, where macros named
"near" and "far" are defined.
This commit is contained in:
Ole André Vadla Ravnås 2009-07-07 20:02:25 +02:00 committed by Neil Roberts
parent 237553984e
commit 05dabd1aa5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/cogl-matrix.c
View File

@ -220,8 +220,8 @@ cogl_matrix_ortho (CoglMatrix *matrix,
float right, float right,
float bottom, float bottom,
float top, float top,
float near, float near_val,
float far) float far_val)
{ {
CoglMatrix ortho; CoglMatrix ortho;
@ -240,13 +240,13 @@ cogl_matrix_ortho (CoglMatrix *matrix,
/* column 2 */ /* column 2 */
ortho.xz = 0.0; ortho.xz = 0.0;
ortho.yz = 0.0; ortho.yz = 0.0;
ortho.zz = -2.0 / (far - near); ortho.zz = -2.0 / (far_val - near_val);
ortho.wz = 0.0; ortho.wz = 0.0;
/* column 3 */ /* column 3 */
ortho.xw = -(right + left) / (right - left); ortho.xw = -(right + left) / (right - left);
ortho.yw = -(top + bottom) / (top - bottom); ortho.yw = -(top + bottom) / (top - bottom);
ortho.zw = -(far + near) / (far - near); ortho.zw = -(far_val + near_val) / (far_val - near_val);
ortho.ww = 1.0; ortho.ww = 1.0;
cogl_matrix_multiply (matrix, matrix, &ortho); cogl_matrix_multiply (matrix, matrix, &ortho);