diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index bd0ed9e4..68dadccc 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -41,7 +41,6 @@ // Dependency: #include "../glm.hpp" -#include "../gtc/half_float.hpp" #include "../gtc/quaternion.hpp" #if(defined(GLM_MESSAGES) && !defined(glm_ext)) @@ -119,22 +118,6 @@ namespace glm typedef detail::tmat4x3 int4x3; //!< \brief integer matrix with 4 x 3 components. (From GLM_GTX_compatibility extension) typedef detail::tmat4x4 int4x4; //!< \brief integer matrix with 4 x 4 components. (From GLM_GTX_compatibility extension) - typedef detail::half half1; //!< \brief half-precision floating-point vector with 1 component. (From GLM_GTX_compatibility extension) - typedef detail::tvec2 half2; //!< \brief half-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension) - typedef detail::tvec3 half3; //!< \brief half-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension) - typedef detail::tvec4 half4; //!< \brief half-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension) - - typedef detail::half half1x1; //!< \brief half-precision floating-point matrix with 1 component. (From GLM_GTX_compatibility extension) - typedef detail::tmat2x2 half2x2; //!< \brief half-precision floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension) - typedef detail::tmat2x3 half2x3; //!< \brief half-precision floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension) - typedef detail::tmat2x4 half2x4; //!< \brief half-precision floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension) - typedef detail::tmat3x2 half3x2; //!< \brief half-precision floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension) - typedef detail::tmat3x3 half3x3; //!< \brief half-precision floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension) - typedef detail::tmat3x4 half3x4; //!< \brief half-precision floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension) - typedef detail::tmat4x2 half4x2; //!< \brief half-precision floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension) - typedef detail::tmat4x3 half4x3; //!< \brief half-precision floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension) - typedef detail::tmat4x4 half4x4; //!< \brief half-precision floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension) - typedef float float1; //!< \brief single-precision floating-point vector with 1 component. (From GLM_GTX_compatibility extension) typedef detail::tvec2 float2; //!< \brief single-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension) typedef detail::tvec3 float3; //!< \brief single-precision floating-point vector with 3 components. (From GLM_GTX_compatibility extension) diff --git a/glm/gtx/int_10_10_10_2.hpp b/glm/gtx/int_10_10_10_2.hpp index 12704816..f67a665a 100644 --- a/glm/gtx/int_10_10_10_2.hpp +++ b/glm/gtx/int_10_10_10_2.hpp @@ -19,21 +19,6 @@ /// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN /// THE SOFTWARE. -/// -/// @ref gtx_int_10_10_10_2 -/// @file glm/gtx/int_10_10_10_2.hpp -/// @date 2010-07-07 / 2011-06-07 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtx_raw_data (dependence) -/// -/// @defgroup gtx_int_10_10_10_2 GLM_GTX_int_10_10_10_2 -/// @ingroup gtx -/// -/// @brief Pack vector to 1010102 integers. Storage only. -/// -/// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_int_10_10_10_2 @@ -43,20 +28,15 @@ #include "../glm.hpp" #include "../gtx/raw_data.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) -# pragma message("GLM: GLM_GTX_int_10_10_10_2 extension included") +#if(defined(GLM_MESSAGES)) +# pragma message("GLM: GLM_GTX_int_10_10_10_2 extension is deprecated, include GLM_GTC_packing (glm/gtc/packing.hpp) instead") #endif namespace glm { - /// @addtogroup gtx_int_10_10_10_2 - /// @{ + //! Deprecated, use packUnorm3x10_1x2 instead. + GLM_DEPRECATED dword uint10_10_10_2_cast(glm::vec4 const & v); - //! From GLM_GTX_int_10_10_10_2 extension. - //! Cast a vec4 to an u_10_10_10_2. - dword uint10_10_10_2_cast(glm::vec4 const & v); - - /// @} }//namespace glm #include "int_10_10_10_2.inl" diff --git a/glm/gtx/int_10_10_10_2.inl b/glm/gtx/int_10_10_10_2.inl index c1ec201f..669b7503 100644 --- a/glm/gtx/int_10_10_10_2.inl +++ b/glm/gtx/int_10_10_10_2.inl @@ -1,11 +1,25 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Created : 2010-07-07 -// Updated : 2010-07-07 -// Licence : This source is under MIT License -// File : glm/gtx/int_10_10_10_2.inl -/////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////////// +/// OpenGL Mathematics (glm.g-truc.net) +/// +/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) +/// Permission is hereby granted, free of charge, to any person obtaining a copy +/// of this software and associated documentation files (the "Software"), to deal +/// in the Software without restriction, including without limitation the rights +/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +/// copies of the Software, and to permit persons to whom the Software is +/// furnished to do so, subject to the following conditions: +/// +/// The above copyright notice and this permission notice shall be included in +/// all copies or substantial portions of the Software. +/// +/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +/// THE SOFTWARE. +/////////////////////////////////////////////////////////////////////////////////// namespace glm { diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index 0e4744db..f2c5e040 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -54,32 +54,32 @@ namespace glm //! Return a point from a catmull rom curve. /// @see gtx_spline extension. template - genType catmullRom( + GLM_FUNC_DECL genType catmullRom( genType const & v1, genType const & v2, genType const & v3, genType const & v4, - typename genType::T const & s); + typename genType::value_type const & s); //! Return a point from a hermite curve. /// @see gtx_spline extension. template - genType hermite( + GLM_FUNC_DECL genType hermite( genType const & v1, genType const & t1, genType const & v2, genType const & t2, - typename genType::T const & s); + typename genType::value_type const & s); //! Return a point from a cubic curve. /// @see gtx_spline extension. template - genType cubic( + GLM_FUNC_DECL genType cubic( genType const & v1, genType const & v2, genType const & v3, genType const & v4, - typename genType::T const & s); + typename genType::value_type const & s); /// @} }//namespace glm diff --git a/glm/gtx/spline.inl b/glm/gtx/spline.inl index c56688fa..6a6509ed 100644 --- a/glm/gtx/spline.inl +++ b/glm/gtx/spline.inl @@ -16,7 +16,7 @@ GLM_FUNC_QUALIFIER genType catmullRom genType const & v2, genType const & v3, genType const & v4, - typename genType::T const & s + typename genType::value_type const & s ) { typename genType::value_type s1 = s; @@ -39,7 +39,7 @@ GLM_FUNC_QUALIFIER genType hermite genType const & t1, genType const & v2, genType const & t2, - typename genType::T const & s + typename genType::value_type const & s ) { typename genType::value_type s1 = s; @@ -61,7 +61,7 @@ GLM_FUNC_QUALIFIER genType cubic genType const & v2, genType const & v3, genType const & v4, - typename genType::T const & s + typename genType::value_type const & s ) { return ((v1 * s + v2) * s + v3) * s + v4; diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index c5c04dc6..b2756de8 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -53,27 +53,27 @@ namespace glm /// Vector type based of two std::size_t components. /// @see GLM_GTX_std_based_type - typedef detail::tvec2 size2; + typedef detail::tvec2 size2; /// Vector type based of three std::size_t components. /// @see GLM_GTX_std_based_type - typedef detail::tvec3 size3; + typedef detail::tvec3 size3; /// Vector type based of four std::size_t components. /// @see GLM_GTX_std_based_type - typedef detail::tvec4 size4; + typedef detail::tvec4 size4; /// Vector type based of two std::size_t components. /// @see GLM_GTX_std_based_type - typedef detail::tvec2 size2_t; + typedef detail::tvec2 size2_t; /// Vector type based of three std::size_t components. /// @see GLM_GTX_std_based_type - typedef detail::tvec3 size3_t; + typedef detail::tvec3 size3_t; /// Vector type based of four std::size_t components. /// @see GLM_GTX_std_based_type - typedef detail::tvec4 size4_t; + typedef detail::tvec4 size4_t; /// @} }//namespace glm diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index 5b29008b..cf4e991f 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -53,17 +53,17 @@ namespace glm /// Simulate GL_CLAMP OpenGL wrap mode /// @see gtx_wrap extension. template - genType clamp(genType const & Texcoord); + GLM_FUNC_DECL genType clamp(genType const & Texcoord); /// Simulate GL_REPEAT OpenGL wrap mode /// @see gtx_wrap extension. template - genType repeat(genType const & Texcoord); + GLM_FUNC_DECL genType repeat(genType const & Texcoord); /// Simulate GL_MIRROR_REPEAT OpenGL wrap mode /// @see gtx_wrap extension. template - genType mirrorRepeat(genType const & Texcoord); + GLM_FUNC_DECL genType mirrorRepeat(genType const & Texcoord); /// @} }// namespace glm