mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch 'jtg/type-traits-size' of https://github.com/JesseTG/glm into type_trait

Browse Source
This commit is contained in:
Christophe Riccio 2016-04-29 23:26:13 +02:00
commit 6558df25e8
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
glm/gtx/type_trait.hpp
View File

@ -24,19 +24,19 @@
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
/// THE SOFTWARE. /// THE SOFTWARE.
/// ///
/// @ref gtx_type_info /// @ref gtx_type_trait
/// @file glm/gtx/type_info.hpp /// @file glm/gtx/type_trait.hpp
/// @date 2016-03-12 / 2016-03-12 /// @date 2016-03-12 / 2016-03-12
/// @author Christophe Riccio /// @author Christophe Riccio
/// ///
/// @see core (dependence) /// @see core (dependence)
/// ///
/// @defgroup gtx_type_info GLM_GTX_type_info /// @defgroup gtx_type_trait GLM_GTX_type_trait
/// @ingroup gtx /// @ingroup gtx
/// ///
/// @brief Defines aligned types. /// @brief Defines traits for each type.
/// ///
/// <glm/gtx/type_aligned.hpp> need to be included to use these functionalities. /// <glm/gtx/type_trait.hpp> need to be included to use these functionalities.
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
@ -46,12 +46,12 @@
#include "../detail/setup.hpp" #include "../detail/setup.hpp"
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) #if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
# pragma message("GLM: GLM_GTX_type_info extension included") # pragma message("GLM: GLM_GTX_type_trait extension included")
#endif #endif
namespace glm namespace glm
{ {
/// @addtogroup gtx_type_info /// @addtogroup gtx_type_trait
/// @{ /// @{
template <typename T, precision P> struct tvec1; template <typename T, precision P> struct tvec1;
@ -79,6 +79,8 @@ namespace glm
static bool const is_mat = false; static bool const is_mat = false;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 0; static GLM_RELAXED_CONSTEXPR length_t components = 0;
static GLM_RELAXED_CONSTEXPR length_t cols = 0;
static GLM_RELAXED_CONSTEXPR length_t rows = 0;
}; };
template <> template <>
@ -88,6 +90,8 @@ namespace glm
static bool const is_mat = false; static bool const is_mat = false;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 1; static GLM_RELAXED_CONSTEXPR length_t components = 1;
static GLM_RELAXED_CONSTEXPR length_t cols = 1;
static GLM_RELAXED_CONSTEXPR length_t rows = 1;
}; };
template <> template <>
@ -124,6 +128,8 @@ namespace glm
static bool const is_mat = true; static bool const is_mat = true;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 2; static GLM_RELAXED_CONSTEXPR length_t components = 2;
static GLM_RELAXED_CONSTEXPR length_t cols = 2;
static GLM_RELAXED_CONSTEXPR length_t rows = 2;
}; };
template <> template <>
@ -133,6 +139,8 @@ namespace glm
static bool const is_mat = true; static bool const is_mat = true;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 2; static GLM_RELAXED_CONSTEXPR length_t components = 2;
static GLM_RELAXED_CONSTEXPR length_t cols = 2;
static GLM_RELAXED_CONSTEXPR length_t rows = 3;
}; };
template <> template <>
@ -142,6 +150,8 @@ namespace glm
static bool const is_mat = true; static bool const is_mat = true;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 2; static GLM_RELAXED_CONSTEXPR length_t components = 2;
static GLM_RELAXED_CONSTEXPR length_t cols = 2;
static GLM_RELAXED_CONSTEXPR length_t rows = 4;
}; };
template <> template <>
@ -162,6 +172,8 @@ namespace glm
static bool const is_mat = true; static bool const is_mat = true;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 3; static GLM_RELAXED_CONSTEXPR length_t components = 3;
static GLM_RELAXED_CONSTEXPR length_t cols = 3;
static GLM_RELAXED_CONSTEXPR length_t rows = 3;
}; };
template <> template <>
@ -171,6 +183,8 @@ namespace glm
static bool const is_mat = true; static bool const is_mat = true;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 3; static GLM_RELAXED_CONSTEXPR length_t components = 3;
static GLM_RELAXED_CONSTEXPR length_t cols = 3;
static GLM_RELAXED_CONSTEXPR length_t rows = 4;
}; };
template <> template <>
@ -180,6 +194,8 @@ namespace glm
static bool const is_mat = true; static bool const is_mat = true;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 4; static GLM_RELAXED_CONSTEXPR length_t components = 4;
static GLM_RELAXED_CONSTEXPR length_t cols = 4;
static GLM_RELAXED_CONSTEXPR length_t rows = 2;
}; };
template <> template <>
@ -189,6 +205,8 @@ namespace glm
static bool const is_mat = true; static bool const is_mat = true;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 4; static GLM_RELAXED_CONSTEXPR length_t components = 4;
static GLM_RELAXED_CONSTEXPR length_t cols = 4;
static GLM_RELAXED_CONSTEXPR length_t rows = 3;
}; };
template <> template <>
@ -198,6 +216,8 @@ namespace glm
static bool const is_mat = true; static bool const is_mat = true;
static bool const is_quat = false; static bool const is_quat = false;
static GLM_RELAXED_CONSTEXPR length_t components = 4; static GLM_RELAXED_CONSTEXPR length_t components = 4;
static GLM_RELAXED_CONSTEXPR length_t cols = 4;
static GLM_RELAXED_CONSTEXPR length_t rows = 4;
}; };
template <> template <>