diff --git a/glm/ext.hpp b/glm/ext.hpp index 2f054c4e..f3d29a2e 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -41,6 +41,7 @@ #include "./gtx/gradient_paint.hpp" #include "./gtx/handed_coordinate_space.hpp" #include "./gtx/inertia.hpp" +#include "./gtx/int_10_10_10_2.hpp" #include "./gtx/integer.hpp" #include "./gtx/intersect.hpp" #include "./gtx/inverse.hpp" diff --git a/glm/gtx/int_10_10_10_2.hpp b/glm/gtx/int_10_10_10_2.hpp index 0b48f6b7..966d7462 100644 --- a/glm/gtx/int_10_10_10_2.hpp +++ b/glm/gtx/int_10_10_10_2.hpp @@ -23,10 +23,8 @@ namespace glm namespace int_10_10_10_2 { //! From GLM_GTX_int_10_10_10_2 extension. - int int10_10_10_2_cast(glm::vec4 const & v); - - //! From GLM_GTX_int_10_10_10_2 extension. - uint uint10_10_10_2_cast(glm::vec4 const & v); + //! Cast a vec4 to an u_10_10_10_2. + dword uint10_10_10_2_cast(glm::vec4 const & v); }//namespace integer }//namespace gtx diff --git a/glm/gtx/int_10_10_10_2.inl b/glm/gtx/int_10_10_10_2.inl index 28a87894..8ab6a1d2 100644 --- a/glm/gtx/int_10_10_10_2.inl +++ b/glm/gtx/int_10_10_10_2.inl @@ -11,16 +11,9 @@ namespace glm{ namespace gtx{ namespace int_10_10_10_2 { - //! From GLM_GTX_int_10_10_10_2 extension. - int int10_10_10_2_cast(glm::vec4 const & v) + dword uint10_10_10_2_cast(glm::vec4 const & v) { - return int(v.x * 2047.f) << 0 | int(v.y * 2047.f) << 10 | int(v.z * 2047.f) << 20 | int(v.w * 3.f) << 30; - } - - //! From GLM_GTX_int_10_10_10_2 extension. - uint uint10_10_10_2_cast(glm::vec4 const & v) - { - return uint(v.x * 2047.f) << 0 | uint(v.y * 2047.f) << 10 | uint(v.z * 2047.f) << 20 | uint(v.w * 3.f) << 30; + return dword(uint(v.x * 2047.f) << 0 | uint(v.y * 2047.f) << 10 | uint(v.z * 2047.f) << 20 | uint(v.w * 3.f) << 30); } }//namespace int_10_10_10_2