Browse Source

Fixed API doc links

Christophe Riccio 14 years ago
parent
commit
09fb542525
3 changed files with 20 additions and 132 deletions
  1. 0 112
      doc/gtxModules.doxy
  2. 11 11
      doc/pages.doxy
  3. 9 9
      glm/gtc/matrix_transform.hpp

+ 0 - 112
doc/gtxModules.doxy

@@ -1,113 +1 @@
 
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-
-/*!
-
-**/
-

+ 11 - 11
doc/pages.doxy

@@ -311,38 +311,38 @@ void foo()
 	
 	<dl>
 		<dt>glRotate[fd]</dt>
-		<dd>\link glm::gtc::matrix_transform::rotate glm::rotate \endlink</dd>
+		<dd>\link glm::gtc::rotate glm::rotate \endlink</dd>
 		<dt>glScale[fd]</dt>
-		<dd>\link glm::gtc::matrix_transform::scale glm::scale \endlink</dd>
+		<dd>\link glm::gtc::scale glm::scale \endlink</dd>
 		<dt>glTranslate[fd]</dt>
-		<dd>\link glm::gtc::matrix_transform::translate glm::translate \endlink</dd>
+		<dd>\link glm::gtc::translate glm::translate \endlink</dd>
 		<dt>glLoadIdentity</dt>
 		<dd>The default constructor of all matrix types creates an identity matrix.</dd>
 		<dt>glMultMatrix[fd]</dt>
 		<dd>Per the GLSL specification, the multiplication operator is overloaded for all matrix types. Multiplying two matrices together will perform matrix multiplication.</dd>
 		<dt>glLoadTransposeMatrix[fd]</dt>
-		<dd>\link glm::core::function::matrix::transpose glm::transpose \endlink</dd>
+		<dd>\link glm::core::transpose glm::transpose \endlink</dd>
 		<dt>glMultTransposeMatrix</dt>
 		<dd>Combine the last two.</dd>
 		<dt>glFrustum</dt>
-		<dd>\link glm::gtc::matrix_transform::frustum glm::frustum \endlink</dd>
+		<dd>\link glm::gtc::frustum glm::frustum \endlink</dd>
 		<dt>glOrtho</dt>
-		<dd>\link glm::gtc::matrix_transform::ortho glm::ortho \endlink</dd>
+		<dd>\link glm::gtc::ortho glm::ortho \endlink</dd>
 		<dt>gluLookAt</dt>
-		<dd>\link glm::gtc::matrix_transform::lookAt glm::lookAt \endlink</dd>
+		<dd>\link glm::gtc::lookAt glm::lookAt \endlink</dd>
 	</dl>
 	
 	\section deprecated_glu GLU function replacements
 	
 	<dl>
 		<dt>gluOrtho2D</dt>
-		<dd>\link glm::gtc::matrix_transform::ortho glm::ortho \endlink</dd>
+		<dd>\link glm::gtc::ortho glm::ortho \endlink</dd>
 		<dt>gluPerspective</dt>
-		<dd>\link glm::gtc::matrix_transform::perspective glm::perspective \endlink</dd>
+		<dd>\link glm::gtc::perspective glm::perspective \endlink</dd>
 		<dt>gluProject</dt>
-		<dd>\link glm::gtc::matrix_transform::project glm::project \endlink</dd>
+		<dd>\link glm::gtc::project glm::project \endlink</dd>
 		<dt>gluUnProject</dt>
-		<dd>\link glm::gtc::matrix_transform::unProject glm::unProject \endlink</dd>
+		<dd>\link glm::gtc::unProject glm::unProject \endlink</dd>
 	</dl>
 **/
 

+ 9 - 9
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<T> const & m, T x, T y, T z) translate(mat4x4<T> const & m, T x, T y, T z) @endlink
-	/// - @link glm::gtx::transform::translate(detail::tvec3<T> const & v) translate(vec3<T> 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<T> const & m, T x, T y, T z) translate(mat4x4<T> const & m, T x, T y, T z) @endlink
+	/// - @link glm::gtx::translate(detail::tvec3<T> const & v) translate(vec3<T> const & v) @endlink
 	template <typename T> 
 	detail::tmat4x4<T> translate(
 		detail::tmat4x4<T> 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<T> const & m, T angle, T x, T y, T z) rotate(mat4x4<T> const & m, T const & angle, T const & x, T const & y, T const & z) @endlink
-	/// - @link glm::gtx::transform::rotate(T angle, detail::tvec3<T> const & v) rotate(T const & angle, vec3<T> 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<T> const & m, T angle, T x, T y, T z) rotate(mat4x4<T> const & m, T const & angle, T const & x, T const & y, T const & z) @endlink
+	/// - @link glm::gtx::rotate(T angle, detail::tvec3<T> const & v) rotate(T const & angle, vec3<T> const & v) @endlink
 	template <typename T> 
 	detail::tmat4x4<T> rotate(
 		detail::tmat4x4<T> 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<T> const & m, T x, T y, T z) scale(mat4x4<T> const & m, T const & angle, T const & x, T const & y, T const & z) @endlink
-	/// - @link glm::gtx::transform::scale(detail::tvec3<T> const & v) scale(vec3<T> 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<T> const & m, T x, T y, T z) scale(mat4x4<T> const & m, T const & angle, T const & x, T const & y, T const & z) @endlink
+	/// - @link glm::gtx::scale(detail::tvec3<T> const & v) scale(vec3<T> const & v) @endlink
 	template <typename T> 
 	detail::tmat4x4<T> scale(
 		detail::tmat4x4<T> const & m,