lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename parameters near/far to avoid conflicts with macros from windows.h

Browse Source
This commit is contained in:
baldurk
2017-04-28 10:38:31 +01:00
parent 199d5266ad
commit 95f366344a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/maths/matrix.cpp
+4 -4
View File
@@ -288,7 +288,7 @@ Matrix4f Matrix4f::RotationXYZ(const Vec3f &rot)
return R.GetMatrix();
}
Matrix4f Matrix4f::Orthographic(const float near, const float far)
Matrix4f Matrix4f::Orthographic(const float Near, const float Far)
{
float L = -10.0f;
float R = 10.0f;
@@ -296,10 +296,10 @@ Matrix4f Matrix4f::Orthographic(const float near, const float far)
float T = 10.0f;
float B = -10.0f;
float N = -fabsf(far - near) * 0.5f;
float F = fabsf(far - near) * 0.5f;
float N = -fabsf(Far - Near) * 0.5f;
float F = fabsf(Far - Near) * 0.5f;
if(far < near)
if(Far < Near)
{
float tmp = F;
F = N;