mewin/glm
1
0
Fork 0
Code Releases Activity

Removed GTC extensions namespace

Browse Source
This commit is contained in:
Christophe Riccio
2011-06-07 01:13:51 +01:00
parent 5acf2d84a0
commit 493c5a5614
21 changed files with 199 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
glm/gtx/transform.inl
View File

@@ -15,7 +15,7 @@ namespace transform
GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate(
T x, T y, T z)
{
return gtc::matrix_transform::translate(
return gtc::translate(
detail::tmat4x4<T>(1.0f),
detail::tvec3<T>(x, y , z));
}
@@ -25,7 +25,7 @@ namespace transform
detail::tmat4x4<T> const & m,
T x, T y, T z)
{
return gtc::matrix_transform::translate(
return gtc::translate(
m, detail::tvec3<T>(x, y , z));
}
@@ -33,7 +33,7 @@ namespace transform
GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate(
detail::tvec3<T> const & v)
{
return gtc::matrix_transform::translate(
return gtc::translate(
detail::tmat4x4<T>(1.0f), v);
}
@@ -42,7 +42,7 @@ namespace transform
T angle,
T x, T y, T z)
{
return gtc::matrix_transform::rotate(
return gtc::rotate(
detail::tmat4x4<T>(1), angle, detail::tvec3<T>(x, y, z));
}
@@ -51,7 +51,7 @@ namespace transform
T angle,
detail::tvec3<T> const & v)
{
return gtc::matrix_transform::rotate(
return gtc::rotate(
detail::tmat4x4<T>(1), angle, v);
}
@@ -61,14 +61,14 @@ namespace transform
T angle,
T x, T y, T z)
{
return gtc::matrix_transform::rotate(
return gtc::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)
{
return gtc::matrix_transform::scale(
return gtc::scale(
detail::tmat4x4<T>(1), detail::tvec3<T>(x, y, z));
}
@@ -77,7 +77,7 @@ namespace transform
detail::tmat4x4<T> const & m,
T x, T y, T z)
{
return gtc::matrix_transform::scale(
return gtc::scale(
m, detail::tvec3<T>(x, y, z));
}
@@ -85,7 +85,7 @@ namespace transform
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale(
detail::tvec3<T> const & v)
{
return gtc::matrix_transform::scale(
return gtc::scale(
detail::tmat4x4<T>(1.0f), v);
}