mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-12-01 20:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.9.4' of https://github.com/g-truc/glm into 0.9.5

Browse Source
This commit is contained in:
Christophe Riccio 2013-02-10 19:25:38 +01:00
commit 5de63682f2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/func_integer.inl
View File

@ -103,7 +103,7 @@ namespace glm
if(x > y) if(x > y)
return genUType(detail::highp_int_t(x) - detail::highp_int_t(y)); return genUType(detail::highp_int_t(x) - detail::highp_int_t(y));
else else
return genUType(detail::highp_int_t(1) << detail::highp_int_t(32) + detail::highp_int_t(x) - detail::highp_int_t(y)); return genUType((detail::highp_int_t(1) << detail::highp_int_t(32)) + detail::highp_int_t(x) - detail::highp_int_t(y));
} }
template <typename T> template <typename T>

2
glm/gtc/matrix_transform.inl
View File

@ -242,7 +242,7 @@ namespace glm
valType const rad = glm::radians(fovy); valType const rad = glm::radians(fovy);
#endif #endif
valType range = tan(radians(rad / valType(2))) * zNear; valType range = tan(rad / valType(2)) * zNear;
valType left = -range * aspect; valType left = -range * aspect;
valType right = range * aspect; valType right = range * aspect;
valType bottom = -range; valType bottom = -range;