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

Clean up

Browse Source
This commit is contained in:
Christophe Riccio 2014-11-15 18:54:29 +01:00
parent 9914308726
commit 0b39c3b911
2 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
glm/gtc/matrix_transform.hpp
View File

@ -100,7 +100,7 @@ namespace glm
template <typename T, precision P>
GLM_FUNC_DECL tmat4x4<T, P> rotate(
tmat4x4<T, P> const & m,
T const & angle,
T angle,
tvec3<T, P> const & axis);
/// Builds a scale 4 * 4 matrix created from 3 scalars.
@ -131,12 +131,12 @@ namespace glm
/// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top)
template <typename T>
GLM_FUNC_DECL tmat4x4<T, defaultp> ortho(
T const & left,
T const & right,
T const & bottom,
T const & top,
T const & zNear,
T const & zFar);
T left,
T right,
T bottom,
T top,
T zNear,
T zFar);
/// Creates a matrix for projecting two-dimensional coordinates onto the screen.
///
@ -149,10 +149,10 @@ namespace glm
/// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top, T const & zNear, T const & zFar)
template <typename T>
GLM_FUNC_DECL tmat4x4<T, defaultp> ortho(
T const & left,
T const & right,
T const & bottom,
T const & top);
T left,
T right,
T bottom,
T top);
/// Creates a frustum matrix.
///
@ -166,12 +166,12 @@ namespace glm
/// @see gtc_matrix_transform
template <typename T>
GLM_FUNC_DECL tmat4x4<T, defaultp> frustum(
T const & left,
T const & right,
T const & bottom,
T const & top,
T const & near,
T const & far);
T left,
T right,
T bottom,
T top,
T near,
T far);
/// Creates a matrix for a symetric perspective-view frustum.
///
@ -183,10 +183,10 @@ namespace glm
/// @see gtc_matrix_transform
template <typename T>
GLM_FUNC_DECL tmat4x4<T, defaultp> perspective(
T const & fovy,
T const & aspect,
T const & near,
T const & far);
T fovy,
T aspect,
T near,
T far);
/// Builds a perspective projection matrix based on a field of view.
///
@ -199,11 +199,11 @@ namespace glm
/// @see gtc_matrix_transform
template <typename T>
GLM_FUNC_DECL tmat4x4<T, defaultp> perspectiveFov(
T const & fov,
T const & width,
T const & height,
T const & near,
T const & far);
T fov,
T width,
T height,
T near,
T far);
/// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite.
///

54
glm/gtc/matrix_transform.inl
View File

@ -48,7 +48,7 @@ namespace glm
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate
(
tmat4x4<T, P> const & m,
T const & angle,
T angle,
tvec3<T, P> const & v
)
{
@ -84,7 +84,7 @@ namespace glm
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate_slow
(
tmat4x4<T, P> const & m,
T const & angle,
T angle,
tvec3<T, P> const & v
)
{
@ -146,12 +146,12 @@ namespace glm
template <typename T>
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> ortho
(
T const & left,
T const & right,
T const & bottom,
T const & top,
T const & zNear,
T const & zFar
T left,
T right,
T bottom,
T top,
T zNear,
T zFar
)
{
tmat4x4<T, defaultp> Result(1);
@ -167,10 +167,10 @@ namespace glm
template <typename T>
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> ortho
(
T const & left,
T const & right,
T const & bottom,
T const & top
T left,
T right,
T bottom,
T top
)
{
tmat4x4<T, defaultp> Result(1);
@ -185,12 +185,12 @@ namespace glm
template <typename T>
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> frustum
(
T const & left,
T const & right,
T const & bottom,
T const & top,
T const & nearVal,
T const & farVal
T left,
T right,
T bottom,
T top,
T nearVal,
T farVal
)
{
tmat4x4<T, defaultp> Result(0);
@ -207,10 +207,10 @@ namespace glm
template <typename T>
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspective
(
T const & fovy,
T const & aspect,
T const & zNear,
T const & zFar
T fovy,
T aspect,
T zNear,
T zFar
)
{
assert(aspect != static_cast<T>(0));
@ -230,11 +230,11 @@ namespace glm
template <typename T>
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFov
(
T const & fov,
T const & width,
T const & height,
T const & zNear,
T const & zFar
T fov,
T width,
T height,
T zNear,
T zFar
)
{
assert(width > static_cast<T>(0));