mewin/glm
1
0
Fork 0
Code Releases Activity

Removed scalar functions

Browse Source
This commit is contained in:
Christophe Riccio
2013-05-10 12:36:10 +02:00
parent ebd38a0a78
commit a319cff426
2 changed files with 0 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
glm/gtx/transform.hpp
View File

@@ -54,21 +54,6 @@ namespace glm
/// @addtogroup gtx_transform /// @addtogroup gtx_transform
/// @{ /// @{
/// Builds a translation 4 * 4 matrix created from 3 scalars.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink
template <typename T>
detail::tmat4x4<T, defaultp> translate(
T x, T y, T z);
/// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink
template <typename T>
detail::tmat4x4<T, defaultp> translate(
detail::tmat4x4<T, defaultp> const & m,
T x, T y, T z);
/// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars. /// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension /// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink /// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink
@@ -76,14 +61,6 @@ namespace glm
detail::tmat4x4<T, P> translate( detail::tmat4x4<T, P> translate(
detail::tvec3<T, P> const & v); detail::tvec3<T, P> const & v);
/// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink
template <typename T>
detail::tmat4x4<T, defaultp> rotate(
T angle,
T x, T y, T z);
/// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees. /// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension /// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink /// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink
@@ -92,30 +69,6 @@ namespace glm
T angle, T angle,
detail::tvec3<T, P> const & v); detail::tvec3<T, P> const & v);
/// Transforms a matrix with a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink
template <typename T, precision P>
detail::tmat4x4<T, P> rotate(
detail::tmat4x4<T, P> const & m,
T angle,
T x, T y, T z);
/// Builds a scale 4 * 4 matrix created from 3 scalars.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink
template <typename T>
detail::tmat4x4<T, defaultp> scale(
T x, T y, T z);
/// Transforms a matrix with a scale 4 * 4 matrix created from 3 scalars.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink
template <typename T, precision P>
detail::tmat4x4<T, P> scale(
detail::tmat4x4<T, P> const & m,
T x, T y, T z);
/// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components. /// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components.
/// - From \link gtx_transform GLM_GTX_transform \endlink extension /// - From \link gtx_transform GLM_GTX_transform \endlink extension
/// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink /// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink

53
glm/gtx/transform.inl
View File

@@ -9,24 +9,6 @@
namespace glm namespace glm
{ {
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, defaultp> translate(
T x, T y, T z)
{
return translate(
detail::tmat4x4<T, defaultp>(1.0f),
detail::tvec3<T, defaultp>(x, y , z));
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> translate(
detail::tmat4x4<T, P> const & m,
T x, T y, T z)
{
return translate(
m, detail::tvec3<T, P>(x, y , z));
}
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> translate( GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> translate(
detail::tvec3<T, P> const & v) detail::tvec3<T, P> const & v)
@@ -35,15 +17,6 @@ namespace glm
detail::tmat4x4<T, P>(1.0f), v); detail::tmat4x4<T, P>(1.0f), v);
} }
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, defaultp> rotate(
T angle,
T x, T y, T z)
{
return rotate(
detail::tmat4x4<T, defaultp>(1), angle, detail::tvec3<T, defaultp>(x, y, z));
}
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> rotate( GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> rotate(
T angle, T angle,
@@ -53,32 +26,6 @@ namespace glm
detail::tmat4x4<T, P>(1), angle, v); detail::tmat4x4<T, P>(1), angle, v);
} }
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> rotate(
detail::tmat4x4<T, P> const & m,
T angle,
T x, T y, T z)
{
return rotate(
m, angle, detail::tvec3<T, P>(x, y, z));
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, defaultp> scale(T x, T y, T z)
{
return scale(
detail::tmat4x4<T, defaultp>(1), detail::tvec3<T, defaultp>(x, y, z));
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> scale(
detail::tmat4x4<T, P> const & m,
T x, T y, T z)
{
return scale(
m, detail::tvec3<T, P>(x, y, z));
}
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> scale( GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> scale(
detail::tvec3<T, P> const & v) detail::tvec3<T, P> const & v)