diff --git a/doc/gtxModules.doxy b/doc/gtxModules.doxy index c6db4bc3..8b137891 100644 --- a/doc/gtxModules.doxy +++ b/doc/gtxModules.doxy @@ -1,113 +1 @@ -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - -/*! - -**/ - diff --git a/doc/pages.doxy b/doc/pages.doxy index a1803b78..54d03a04 100644 --- a/doc/pages.doxy +++ b/doc/pages.doxy @@ -311,38 +311,38 @@ void foo()
glRotate[fd]
-
\link glm::gtc::matrix_transform::rotate glm::rotate \endlink
+
\link glm::gtc::rotate glm::rotate \endlink
glScale[fd]
-
\link glm::gtc::matrix_transform::scale glm::scale \endlink
+
\link glm::gtc::scale glm::scale \endlink
glTranslate[fd]
-
\link glm::gtc::matrix_transform::translate glm::translate \endlink
+
\link glm::gtc::translate glm::translate \endlink
glLoadIdentity
The default constructor of all matrix types creates an identity matrix.
glMultMatrix[fd]
Per the GLSL specification, the multiplication operator is overloaded for all matrix types. Multiplying two matrices together will perform matrix multiplication.
glLoadTransposeMatrix[fd]
-
\link glm::core::function::matrix::transpose glm::transpose \endlink
+
\link glm::core::transpose glm::transpose \endlink
glMultTransposeMatrix
Combine the last two.
glFrustum
-
\link glm::gtc::matrix_transform::frustum glm::frustum \endlink
+
\link glm::gtc::frustum glm::frustum \endlink
glOrtho
-
\link glm::gtc::matrix_transform::ortho glm::ortho \endlink
+
\link glm::gtc::ortho glm::ortho \endlink
gluLookAt
-
\link glm::gtc::matrix_transform::lookAt glm::lookAt \endlink
+
\link glm::gtc::lookAt glm::lookAt \endlink
\section deprecated_glu GLU function replacements
gluOrtho2D
-
\link glm::gtc::matrix_transform::ortho glm::ortho \endlink
+
\link glm::gtc::ortho glm::ortho \endlink
gluPerspective
-
\link glm::gtc::matrix_transform::perspective glm::perspective \endlink
+
\link glm::gtc::perspective glm::perspective \endlink
gluProject
-
\link glm::gtc::matrix_transform::project glm::project \endlink
+
\link glm::gtc::project glm::project \endlink
gluUnProject
-
\link glm::gtc::matrix_transform::unProject glm::unProject \endlink
+
\link glm::gtc::unProject glm::unProject \endlink
**/ diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index d94f0be3..8fc03b64 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -62,9 +62,9 @@ namespace gtc /// Builds a translation 4 * 4 matrix created from a vector of 3 components. /// @see - gtc_matrix_transform /// @see - gtx_transform: - /// - @link glm::gtx::transform::translate(T x, T y, T z) translate(T x, T y, T z) @endlink - /// - @link glm::gtx::transform::translate(detail::tmat4x4 const & m, T x, T y, T z) translate(mat4x4 const & m, T x, T y, T z) @endlink - /// - @link glm::gtx::transform::translate(detail::tvec3 const & v) translate(vec3 const & v) @endlink + /// - @link glm::gtx::translate(T x, T y, T z) translate(T x, T y, T z) @endlink + /// - @link glm::gtx::translate(detail::tmat4x4 const & m, T x, T y, T z) translate(mat4x4 const & m, T x, T y, T z) @endlink + /// - @link glm::gtx::translate(detail::tvec3 const & v) translate(vec3 const & v) @endlink template detail::tmat4x4 translate( detail::tmat4x4 const & m, @@ -73,9 +73,9 @@ namespace gtc /// Builds a rotation 4 * 4 matrix created from an axis vector and an angle expressed in degrees. /// @see - gtc_matrix_transform /// @see - gtx_transform: - /// - @link glm::gtx::transform::rotate(T angle, T x, T y, T z) rotate(T const & angle, T const & x, T const & y, T const & z) @endlink - /// - @link glm::gtx::transform::rotate(detail::tmat4x4 const & m, T angle, T x, T y, T z) rotate(mat4x4 const & m, T const & angle, T const & x, T const & y, T const & z) @endlink - /// - @link glm::gtx::transform::rotate(T angle, detail::tvec3 const & v) rotate(T const & angle, vec3 const & v) @endlink + /// - @link glm::gtx::rotate(T angle, T x, T y, T z) rotate(T const & angle, T const & x, T const & y, T const & z) @endlink + /// - @link glm::gtx::rotate(detail::tmat4x4 const & m, T angle, T x, T y, T z) rotate(mat4x4 const & m, T const & angle, T const & x, T const & y, T const & z) @endlink + /// - @link glm::gtx::rotate(T angle, detail::tvec3 const & v) rotate(T const & angle, vec3 const & v) @endlink template detail::tmat4x4 rotate( detail::tmat4x4 const & m, @@ -85,9 +85,9 @@ namespace gtc /// Builds a scale 4 * 4 matrix created from 3 scalars. /// @see - gtc_matrix_transform /// @see - gtx_transform: - /// - @link glm::gtx::transform::scale(T x, T y, T z) scale(T const & x, T const & y, T const & z) @endlink - /// - @link glm::gtx::transform::scale(detail::tmat4x4 const & m, T x, T y, T z) scale(mat4x4 const & m, T const & angle, T const & x, T const & y, T const & z) @endlink - /// - @link glm::gtx::transform::scale(detail::tvec3 const & v) scale(vec3 const & v) @endlink + /// - @link glm::gtx::scale(T x, T y, T z) scale(T const & x, T const & y, T const & z) @endlink + /// - @link glm::gtx::scale(detail::tmat4x4 const & m, T x, T y, T z) scale(mat4x4 const & m, T const & angle, T const & x, T const & y, T const & z) @endlink + /// - @link glm::gtx::scale(detail::tvec3 const & v) scale(vec3 const & v) @endlink template detail::tmat4x4 scale( detail::tmat4x4 const & m,