mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-29 11:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio 2016-12-30 10:26:12 +01:00
parent f00d666e22
commit 1477d323d9
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glm/gtx/string_cast.hpp
View File

@ -21,6 +21,7 @@
#include "../gtc/quaternion.hpp" #include "../gtc/quaternion.hpp"
#include "../gtx/dual_quaternion.hpp" #include "../gtx/dual_quaternion.hpp"
#include <string> #include <string>
#include <cmath>
#ifndef GLM_ENABLE_EXPERIMENTAL #ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." # error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
@ -41,8 +42,8 @@ namespace glm
/// Create a string from a GLM vector or matrix typed variable. /// Create a string from a GLM vector or matrix typed variable.
/// @see gtx_string_cast extension. /// @see gtx_string_cast extension.
template <typename matType> template <typename genType>
GLM_FUNC_DECL std::string to_string(matType const & x); GLM_FUNC_DECL std::string to_string(genType const& x);
/// @} /// @}
}//namespace glm }//namespace glm

40
glm/gtx/string_cast.inl
View File

@ -130,7 +130,7 @@ namespace detail
{}; {};
template <precision P> template <precision P>
struct compute_to_string<vec<1, bool, P>> struct compute_to_string<vec<1, bool, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(vec<1, bool, P> const & x) GLM_FUNC_QUALIFIER static std::string call(vec<1, bool, P> const & x)
{ {
@ -140,7 +140,7 @@ namespace detail
}; };
template <precision P> template <precision P>
struct compute_to_string<vec<2, bool, P>> struct compute_to_string<vec<2, bool, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(vec<2, bool, P> const & x) GLM_FUNC_QUALIFIER static std::string call(vec<2, bool, P> const & x)
{ {
@ -151,7 +151,7 @@ namespace detail
}; };
template <precision P> template <precision P>
struct compute_to_string<vec<3, bool, P>> struct compute_to_string<vec<3, bool, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(vec<3, bool, P> const & x) GLM_FUNC_QUALIFIER static std::string call(vec<3, bool, P> const & x)
{ {
@ -163,7 +163,7 @@ namespace detail
}; };
template <precision P> template <precision P>
struct compute_to_string<vec<4, bool, P>> struct compute_to_string<vec<4, bool, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(vec<4, bool, P> const & x) GLM_FUNC_QUALIFIER static std::string call(vec<4, bool, P> const & x)
{ {
@ -176,7 +176,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<vec<1, T, P>> struct compute_to_string<vec<1, T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(vec<1, T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(vec<1, T, P> const & x)
{ {
@ -191,7 +191,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<vec<2, T, P>> struct compute_to_string<vec<2, T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(vec<2, T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(vec<2, T, P> const & x)
{ {
@ -206,7 +206,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<vec<3, T, P>> struct compute_to_string<vec<3, T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(vec<3, T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(vec<3, T, P> const & x)
{ {
@ -221,7 +221,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<vec<4, T, P>> struct compute_to_string<vec<4, T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(vec<4, T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(vec<4, T, P> const & x)
{ {
@ -237,7 +237,7 @@ namespace detail
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat2x2<T, P>> struct compute_to_string<tmat2x2<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat2x2<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat2x2<T, P> const & x)
{ {
@ -255,7 +255,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat2x3<T, P>> struct compute_to_string<tmat2x3<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat2x3<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat2x3<T, P> const & x)
{ {
@ -273,7 +273,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat2x4<T, P>> struct compute_to_string<tmat2x4<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat2x4<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat2x4<T, P> const & x)
{ {
@ -291,7 +291,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat3x2<T, P>> struct compute_to_string<tmat3x2<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat3x2<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat3x2<T, P> const & x)
{ {
@ -311,7 +311,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat3x3<T, P>> struct compute_to_string<tmat3x3<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat3x3<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat3x3<T, P> const & x)
{ {
@ -331,7 +331,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat3x4<T, P>> struct compute_to_string<tmat3x4<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat3x4<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat3x4<T, P> const & x)
{ {
@ -351,7 +351,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat4x2<T, P>> struct compute_to_string<tmat4x2<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat4x2<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat4x2<T, P> const & x)
{ {
@ -373,7 +373,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat4x3<T, P>> struct compute_to_string<tmat4x3<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat4x3<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat4x3<T, P> const & x)
{ {
@ -395,7 +395,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tmat4x4<T, P>> struct compute_to_string<tmat4x4<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tmat4x4<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tmat4x4<T, P> const & x)
{ {
@ -418,7 +418,7 @@ namespace detail
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tquat<T, P>> struct compute_to_string<tquat<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tquat<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tquat<T, P> const & x)
{ {
@ -433,7 +433,7 @@ namespace detail
}; };
template <typename T, precision P> template <typename T, precision P>
struct compute_to_string<tdualquat<T, P>> struct compute_to_string<tdualquat<T, P> >
{ {
GLM_FUNC_QUALIFIER static std::string call(tdualquat<T, P> const & x) GLM_FUNC_QUALIFIER static std::string call(tdualquat<T, P> const & x)
{ {
@ -450,7 +450,7 @@ namespace detail
}//namespace detail }//namespace detail
template <class matType> template <class matType>
GLM_FUNC_QUALIFIER std::string to_string(matType const & x) GLM_FUNC_QUALIFIER std::string to_string(matType const& x)
{ {
return detail::compute_to_string<matType>::call(x); return detail::compute_to_string<matType>::call(x);
} }

22
test/external/gli/type.hpp vendored
View File

@ -34,31 +34,31 @@ namespace gli
using std::size_t; using std::size_t;
typedef tvec1<int> extent1d; typedef vec<1, int> extent1d;
typedef tvec2<int> extent2d; typedef vec<2, int> extent2d;
typedef tvec3<int> extent3d; typedef vec<3, int> extent3d;
typedef tvec4<int> extent4d; typedef vec<4, int> extent4d;
template <typename T, precision P> template <typename T, precision P>
inline tvec4<T, P> make_vec4(tvec1<T, P> const & v) inline vec<4, T, P> make_vec4(vec<1, T, P> const& v)
{ {
return tvec4<T, P>(v.x, static_cast<T>(0), static_cast<T>(0), static_cast<T>(1)); return vec<4, T, P>(v.x, static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
} }
template <typename T, precision P> template <typename T, precision P>
inline tvec4<T, P> make_vec4(tvec2<T, P> const & v) inline vec<4, T, P> make_vec4(vec<2, T, P> const& v)
{ {
return tvec4<T, P>(v.x, v.y, static_cast<T>(0), static_cast<T>(1)); return vec<4, T, P>(v.x, v.y, static_cast<T>(0), static_cast<T>(1));
} }
template <typename T, precision P> template <typename T, precision P>
inline tvec4<T, P> make_vec4(tvec3<T, P> const & v) inline vec<4, T, P> make_vec4(vec<3, T, P> const& v)
{ {
return tvec4<T, P>(v.x, v.y, v.z, static_cast<T>(1)); return vec<4, T, P>(v.x, v.y, v.z, static_cast<T>(1));
} }
template <typename T, precision P> template <typename T, precision P>
inline tvec4<T, P> make_vec4(tvec4<T, P> const & v) inline vec<4, T, P> make_vec4(vec<4, T, P> const& v)
{ {
return v; return v;
} }