Fixed some of the pull request code in order to merge it

Former-commit-id: 76d71f15b335535e7dfcaf986440a00e85e45c1b
This commit is contained in:
Lynix
2014-06-15 01:55:07 +02:00
parent 62daced765
commit eceabcd241
10 changed files with 56 additions and 48 deletions

View File

@@ -573,9 +573,9 @@ NzMatrix4<T>& NzMatrix4<T>::MakePerspective(T angle, T ratio, T zNear, T zFar)
{
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb204945(v=vs.85).aspx
#if NAZARA_MATH_ANGLE_RADIAN
angle *= F(0.5);
angle /= F(2.0);
#else
angle = NzDegreeToRadian(angle * F(0.5));
angle = NzDegreeToRadian(angle/F(2.0));
#endif
T yScale = F(1.0) / std::tan(angle);