diff --git a/glm/detail/func_exponential.inl b/glm/detail/func_exponential.inl index 854862b2..a1d656f9 100644 --- a/glm/detail/func_exponential.inl +++ b/glm/detail/func_exponential.inl @@ -84,61 +84,14 @@ namespace detail // pow using std::pow; - -/* - template - GLM_FUNC_QUALIFIER genType pow - ( - genType const & x, - genType const & y - ) - { - GLM_STATIC_ASSERT( - std::numeric_limits::is_iec559, - "'pow' only accept floating-point inputs"); - - return std::pow(x, y); - } -*/ - VECTORIZE_VEC_VEC(pow) // exp using std::exp; - -/* - template - GLM_FUNC_QUALIFIER genType exp - ( - genType const & x - ) - { - GLM_STATIC_ASSERT( - std::numeric_limits::is_iec559, - "'exp' only accept floating-point inputs"); - - return std::exp(x); - } -*/ - VECTORIZE_VEC(exp) // log using std::log; -/* - template - GLM_FUNC_QUALIFIER genType log - ( - genType const & x - ) - { - GLM_STATIC_ASSERT( - std::numeric_limits::is_iec559, - "'log' only accept floating-point inputs"); - - return std::log(x); - } -*/ VECTORIZE_VEC(log) //exp2, ln2 = 0.69314718055994530941723212145818f @@ -211,27 +164,6 @@ namespace detail // sqrt using std::sqrt; -/* - GLM_FUNC_QUALIFIER float sqrt(float x) - { -# ifdef __CUDACC__ // Wordaround for a CUDA compiler bug up to CUDA6 - tvec1 tmp(detail::compute_sqrt::call(x)); - return tmp.x; -# else - return detail::compute_sqrt::call(x).x; -# endif - } - - GLM_FUNC_QUALIFIER double sqrt(double x) - { -# ifdef __CUDACC__ // Wordaround for a CUDA compiler bug up to CUDA6 - tvec1 tmp(detail::compute_sqrt::call(x)); - return tmp.x; -# else - return detail::compute_sqrt::call(x).x; -# endif - } -*/ template class vecType> GLM_FUNC_QUALIFIER vecType sqrt(vecType const & x) { diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 42dc5f2f..6f8b94ef 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -144,7 +144,7 @@ namespace glm // Implicit basic constructors GLM_FUNC_DECL tvec4(); - GLM_FUNC_DECL tvec4(type const & v); + GLM_FUNC_DECL tvec4(tvec4 const & v); template GLM_FUNC_DECL tvec4(tvec4 const & v); diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index 8b488c99..d7960d69 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -49,11 +49,15 @@ namespace glm { /// @addtogroup gtx_std_based_type /// @{ - + + /// Vector type based of one std::size_t component. + /// @see GLM_GTX_std_based_type + typedef tvec1 size1; + /// Vector type based of two std::size_t components. /// @see GLM_GTX_std_based_type typedef tvec2 size2; - + /// Vector type based of three std::size_t components. /// @see GLM_GTX_std_based_type typedef tvec3 size3; @@ -62,14 +66,18 @@ namespace glm /// @see GLM_GTX_std_based_type typedef tvec4 size4; + /// Vector type based of one std::size_t component. + /// @see GLM_GTX_std_based_type + typedef tvec1 size1_t; + /// Vector type based of two std::size_t components. /// @see GLM_GTX_std_based_type typedef tvec2 size2_t; - + /// Vector type based of three std::size_t components. /// @see GLM_GTX_std_based_type typedef tvec3 size3_t; - + /// Vector type based of four std::size_t components. /// @see GLM_GTX_std_based_type typedef tvec4 size4_t;