anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Fixed unnecessary warnings from matrix_projection.inl #995

Browse Source
master
Christophe Riccio ago%!(EXTRA string=6 years)
parent 2a65978348
commit f4c6667347
1 changed files with 6 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      glm/ext/matrix_projection.inl

10
glm/ext/matrix_projection.inl
Unescape View File

@ -35,10 +35,11 @@ namespace glm
template<typename T, typename U, qualifier Q> 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) 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); return projectZO(obj, model, proj, viewport);
else # else
return projectNO(obj, model, proj, viewport); return projectNO(obj, model, proj, viewport);
# endif
} }
template<typename T, typename U, qualifier Q> template<typename T, typename U, qualifier Q>
@ -77,10 +78,11 @@ namespace glm
template<typename T, typename U, qualifier Q> 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) 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); return unProjectZO(win, model, proj, viewport);
else # else
return unProjectNO(win, model, proj, viewport); return unProjectNO(win, model, proj, viewport);
# endif
} }
template<typename T, qualifier Q, typename U> template<typename T, qualifier Q, typename U>

Write Preview
Loading…
Cancel
Save