mewin/glm
1
0
Fork 0
Code Releases Activity

Resolved issue #4, added GLM_GTX_rotate_normalized_axis

Browse Source
This commit is contained in:
Christophe Riccio
2012-12-14 00:14:02 +01:00
parent 8a291a9dc2
commit 739ab3529c
9 changed files with 292 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
glm/gtx/transform.inl
View File

@@ -9,82 +9,82 @@
namespace glm
{
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate(
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate(
T x, T y, T z)
{
{
return translate(
detail::tmat4x4<T>(1.0f),
detail::tvec3<T>(x, y , z));
}
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate(
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate(
detail::tmat4x4<T> const & m,
T x, T y, T z)
{
return translate(
{
return translate(
m, detail::tvec3<T>(x, y , z));
}
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate(
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate(
detail::tvec3<T> const & v)
{
{
return translate(
detail::tmat4x4<T>(1.0f), v);
}
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate(
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate(
T angle,
T x, T y, T z)
{
{
return rotate(
detail::tmat4x4<T>(1), angle, detail::tvec3<T>(x, y, z));
}
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate(
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate(
T angle,
detail::tvec3<T> const & v)
{
{
return rotate(
detail::tmat4x4<T>(1), angle, v);
}
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate(
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate(
detail::tmat4x4<T> const & m,
T angle,
T x, T y, T z)
{
{
return rotate(
m, angle, detail::tvec3<T>(x, y, z));
}
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale(T x, T y, T z)
{
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale(T x, T y, T z)
{
return scale(
detail::tmat4x4<T>(1), detail::tvec3<T>(x, y, z));
}
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale(
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale(
detail::tmat4x4<T> const & m,
T x, T y, T z)
{
return scale(
{
return scale(
m, detail::tvec3<T>(x, y, z));
}
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale(
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale(
detail::tvec3<T> const & v)
{
return scale(
{
return scale(
detail::tmat4x4<T>(1.0f), v);
}
}
}//namespace glm