Skip to content

Commit

Permalink
Fixed unnecessary warnings from matrix_projection.inl #995
Browse files Browse the repository at this point in the history
  • Loading branch information
Groovounet committed Mar 5, 2020
1 parent 2a65978 commit f4c6667
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions glm/ext/matrix_projection.inl
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@ namespace glm
template<typename T, typename U, qualifier Q>
GLM_FUNC_QUALIFIER vec<3, T, Q> project(vec<3, T, Q> const& obj, mat<4, 4, T, Q> const& model, mat<4, 4, T, Q> const& proj, vec<4, U, Q> const& viewport)
{
if(GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_ZO_BIT)
# if GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_ZO_BIT
return projectZO(obj, model, proj, viewport);
else
# else
return projectNO(obj, model, proj, viewport);
# endif
}

template<typename T, typename U, qualifier Q>
Expand Down Expand Up @@ -77,10 +78,11 @@ namespace glm
template<typename T, typename U, qualifier Q>
GLM_FUNC_QUALIFIER vec<3, T, Q> unProject(vec<3, T, Q> const& win, mat<4, 4, T, Q> const& model, mat<4, 4, T, Q> const& proj, vec<4, U, Q> const& viewport)
{
if(GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_ZO_BIT)
# if GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_ZO_BIT
return unProjectZO(win, model, proj, viewport);
else
# else
return unProjectNO(win, model, proj, viewport);
# endif
}

template<typename T, qualifier Q, typename U>
Expand Down

0 comments on commit f4c6667

Please sign in to comment.