diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-21 18:09:18 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-21 18:09:18 +0400 |
| commit | 4551490dd44dbd8eae21826842e7e904bed5c288 (patch) | |
| tree | d6c989bab8568579ffd0814cf92cac192c97b549 /source/gameengine/Ketsji/KX_Camera.cpp | |
| parent | a7456b37f1a38af87615801473fe203d27e92339 (diff) | |
near & far are reserved words on MSVC. Don't use them as variable names.
Diffstat (limited to 'source/gameengine/Ketsji/KX_Camera.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Camera.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp index 2e103e64445..715d7918647 100644 --- a/source/gameengine/Ketsji/KX_Camera.cpp +++ b/source/gameengine/Ketsji/KX_Camera.cpp @@ -252,13 +252,13 @@ void KX_Camera::ExtractFrustumSphere() hfar = clip_camcs_matrix*hfar; // Tranform to 3d camera local space. - MT_Point3 near(hnear[0]/hnear[3], hnear[1]/hnear[3], hnear[2]/hnear[3]); - MT_Point3 far(hfar[0]/hfar[3], hfar[1]/hfar[3], hfar[2]/hfar[3]); + MT_Point3 nearpoint(hnear[0]/hnear[3], hnear[1]/hnear[3], hnear[2]/hnear[3]); + MT_Point3 farpoint(hfar[0]/hfar[3], hfar[1]/hfar[3], hfar[2]/hfar[3]); // Compute centre m_frustum_centre = MT_Point3(0., 0., - (near.dot(near) - far.dot(far))/(2.0*(m_camdata.m_clipend - m_camdata.m_clipstart))); - m_frustum_radius = m_frustum_centre.distance(far); + (nearpoint.dot(nearpoint) - farpoint.dot(farpoint))/(2.0*(m_camdata.m_clipend - m_camdata.m_clipstart))); + m_frustum_radius = m_frustum_centre.distance(farpoint); // Transform to world space. m_frustum_centre = GetCameraToWorld()(m_frustum_centre); |