Merge branch 'master' into GTC_integer

This commit is contained in:
Christophe Riccio
2014-11-20 23:39:07 +01:00
3 changed files with 6 additions and 12 deletions

View File

@@ -213,8 +213,8 @@ namespace glm
T zFar
)
{
assert(aspect != static_cast<T>(0));
assert(zFar != zNear);
assert(abs(aspect - std::numeric_limits<T>::epsilon()) > static_cast<T>(0));
assert(zFar > zNear);
T const tanHalfFovy = tan(fovy / static_cast<T>(2));