mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 12:41:54 +00:00
Clean up
This commit is contained in:
parent
9914308726
commit
0b39c3b911
@ -100,7 +100,7 @@ namespace glm
|
|||||||
template <typename T, precision P>
|
template <typename T, precision P>
|
||||||
GLM_FUNC_DECL tmat4x4<T, P> rotate(
|
GLM_FUNC_DECL tmat4x4<T, P> rotate(
|
||||||
tmat4x4<T, P> const & m,
|
tmat4x4<T, P> const & m,
|
||||||
T const & angle,
|
T angle,
|
||||||
tvec3<T, P> const & axis);
|
tvec3<T, P> const & axis);
|
||||||
|
|
||||||
/// Builds a scale 4 * 4 matrix created from 3 scalars.
|
/// 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)
|
/// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top)
|
||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_DECL tmat4x4<T, defaultp> ortho(
|
GLM_FUNC_DECL tmat4x4<T, defaultp> ortho(
|
||||||
T const & left,
|
T left,
|
||||||
T const & right,
|
T right,
|
||||||
T const & bottom,
|
T bottom,
|
||||||
T const & top,
|
T top,
|
||||||
T const & zNear,
|
T zNear,
|
||||||
T const & zFar);
|
T zFar);
|
||||||
|
|
||||||
/// Creates a matrix for projecting two-dimensional coordinates onto the screen.
|
/// 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)
|
/// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top, T const & zNear, T const & zFar)
|
||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_DECL tmat4x4<T, defaultp> ortho(
|
GLM_FUNC_DECL tmat4x4<T, defaultp> ortho(
|
||||||
T const & left,
|
T left,
|
||||||
T const & right,
|
T right,
|
||||||
T const & bottom,
|
T bottom,
|
||||||
T const & top);
|
T top);
|
||||||
|
|
||||||
/// Creates a frustum matrix.
|
/// Creates a frustum matrix.
|
||||||
///
|
///
|
||||||
@ -166,12 +166,12 @@ namespace glm
|
|||||||
/// @see gtc_matrix_transform
|
/// @see gtc_matrix_transform
|
||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_DECL tmat4x4<T, defaultp> frustum(
|
GLM_FUNC_DECL tmat4x4<T, defaultp> frustum(
|
||||||
T const & left,
|
T left,
|
||||||
T const & right,
|
T right,
|
||||||
T const & bottom,
|
T bottom,
|
||||||
T const & top,
|
T top,
|
||||||
T const & near,
|
T near,
|
||||||
T const & far);
|
T far);
|
||||||
|
|
||||||
/// Creates a matrix for a symetric perspective-view frustum.
|
/// Creates a matrix for a symetric perspective-view frustum.
|
||||||
///
|
///
|
||||||
@ -183,10 +183,10 @@ namespace glm
|
|||||||
/// @see gtc_matrix_transform
|
/// @see gtc_matrix_transform
|
||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_DECL tmat4x4<T, defaultp> perspective(
|
GLM_FUNC_DECL tmat4x4<T, defaultp> perspective(
|
||||||
T const & fovy,
|
T fovy,
|
||||||
T const & aspect,
|
T aspect,
|
||||||
T const & near,
|
T near,
|
||||||
T const & far);
|
T far);
|
||||||
|
|
||||||
/// Builds a perspective projection matrix based on a field of view.
|
/// Builds a perspective projection matrix based on a field of view.
|
||||||
///
|
///
|
||||||
@ -199,11 +199,11 @@ namespace glm
|
|||||||
/// @see gtc_matrix_transform
|
/// @see gtc_matrix_transform
|
||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_DECL tmat4x4<T, defaultp> perspectiveFov(
|
GLM_FUNC_DECL tmat4x4<T, defaultp> perspectiveFov(
|
||||||
T const & fov,
|
T fov,
|
||||||
T const & width,
|
T width,
|
||||||
T const & height,
|
T height,
|
||||||
T const & near,
|
T near,
|
||||||
T const & far);
|
T far);
|
||||||
|
|
||||||
/// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite.
|
/// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite.
|
||||||
///
|
///
|
||||||
|
@ -48,7 +48,7 @@ namespace glm
|
|||||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate
|
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate
|
||||||
(
|
(
|
||||||
tmat4x4<T, P> const & m,
|
tmat4x4<T, P> const & m,
|
||||||
T const & angle,
|
T angle,
|
||||||
tvec3<T, P> const & v
|
tvec3<T, P> const & v
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
@ -84,7 +84,7 @@ namespace glm
|
|||||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate_slow
|
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate_slow
|
||||||
(
|
(
|
||||||
tmat4x4<T, P> const & m,
|
tmat4x4<T, P> const & m,
|
||||||
T const & angle,
|
T angle,
|
||||||
tvec3<T, P> const & v
|
tvec3<T, P> const & v
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
@ -146,12 +146,12 @@ namespace glm
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> ortho
|
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> ortho
|
||||||
(
|
(
|
||||||
T const & left,
|
T left,
|
||||||
T const & right,
|
T right,
|
||||||
T const & bottom,
|
T bottom,
|
||||||
T const & top,
|
T top,
|
||||||
T const & zNear,
|
T zNear,
|
||||||
T const & zFar
|
T zFar
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
tmat4x4<T, defaultp> Result(1);
|
tmat4x4<T, defaultp> Result(1);
|
||||||
@ -167,10 +167,10 @@ namespace glm
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> ortho
|
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> ortho
|
||||||
(
|
(
|
||||||
T const & left,
|
T left,
|
||||||
T const & right,
|
T right,
|
||||||
T const & bottom,
|
T bottom,
|
||||||
T const & top
|
T top
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
tmat4x4<T, defaultp> Result(1);
|
tmat4x4<T, defaultp> Result(1);
|
||||||
@ -185,12 +185,12 @@ namespace glm
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> frustum
|
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> frustum
|
||||||
(
|
(
|
||||||
T const & left,
|
T left,
|
||||||
T const & right,
|
T right,
|
||||||
T const & bottom,
|
T bottom,
|
||||||
T const & top,
|
T top,
|
||||||
T const & nearVal,
|
T nearVal,
|
||||||
T const & farVal
|
T farVal
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
tmat4x4<T, defaultp> Result(0);
|
tmat4x4<T, defaultp> Result(0);
|
||||||
@ -207,10 +207,10 @@ namespace glm
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspective
|
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspective
|
||||||
(
|
(
|
||||||
T const & fovy,
|
T fovy,
|
||||||
T const & aspect,
|
T aspect,
|
||||||
T const & zNear,
|
T zNear,
|
||||||
T const & zFar
|
T zFar
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
assert(aspect != static_cast<T>(0));
|
assert(aspect != static_cast<T>(0));
|
||||||
@ -230,11 +230,11 @@ namespace glm
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFov
|
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFov
|
||||||
(
|
(
|
||||||
T const & fov,
|
T fov,
|
||||||
T const & width,
|
T width,
|
||||||
T const & height,
|
T height,
|
||||||
T const & zNear,
|
T zNear,
|
||||||
T const & zFar
|
T zFar
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
assert(width > static_cast<T>(0));
|
assert(width > static_cast<T>(0));
|
||||||
|
Loading…
Reference in New Issue
Block a user