mirror of
https://github.com/g-truc/glm.git
synced 2024-11-29 19:34:36 +00:00
Merge branch '0.9.4' of https://github.com/g-truc/glm into 0.9.5
This commit is contained in:
commit
5de63682f2
@ -103,7 +103,7 @@ namespace glm
|
||||
if(x > y)
|
||||
return genUType(detail::highp_int_t(x) - detail::highp_int_t(y));
|
||||
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>
|
||||
|
@ -242,7 +242,7 @@ namespace glm
|
||||
valType const rad = glm::radians(fovy);
|
||||
#endif
|
||||
|
||||
valType range = tan(radians(rad / valType(2))) * zNear;
|
||||
valType range = tan(rad / valType(2)) * zNear;
|
||||
valType left = -range * aspect;
|
||||
valType right = range * aspect;
|
||||
valType bottom = -range;
|
||||
|
Loading…
Reference in New Issue
Block a user