From db651b18451a6327bc4f4e4f2dc6307f313aa90c Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 16 May 2011 17:14:33 +0100 Subject: [PATCH] Improved see also --- glm/gtc/matrix_transform.hpp | 19 +++++++++++----- glm/gtx/transform.hpp | 43 ++++++++++++++++++++++++++---------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index a1ed2c58..89a806b4 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -26,7 +26,7 @@ //! \author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// //! Dependency: -//! - \ref core GLM core +//! - \link core GLM core \endlink /////////////////////////////////////////////////////////////////////////////////// #ifndef glm_gtc_matrix_transform @@ -53,16 +53,20 @@ namespace glm ///@{ //! Builds a translation 4 * 4 matrix created from a vector of 3 components. - //! - From \link gtc_matrix_transform GLM_GTC_matrix_transform \endlink extension - //! - See also: \link glm::gtx::transform::translate GLM_GTX_transform \endlink + //! \sa + //! - \link gtx_transform GLM_GTX_transform \endlink extension + //! - glm::gtx::transform::translate(T x, T y, T z) + //! - glm::gtx::transform::translate(detail::tmat4x4 const & m, T x, T y, T z) template detail::tmat4x4 translate( detail::tmat4x4 const & m, detail::tvec3 const & v); //! Builds a rotation 4 * 4 matrix created from an axis vector and an angle expressed in degrees. - //! - From \link gtc_matrix_transform GLM_GTC_matrix_transform \endlink extension - //! - See also: \link glm::gtx::transform::rotate GLM_GTX_transform \endlink + //! \sa + //! - \link gtx_transform GLM_GTX_transform \endlink extension + //! - glm::gtx::transform::rotate(T angle, T x, T y, T z) + //! - glm::gtx::transform::rotate(detail::tmat4x4 const & m, T angle, T x, T y, T z) template detail::tmat4x4 rotate( detail::tmat4x4 const & m, @@ -166,7 +170,10 @@ namespace glm detail::tvec4 const & viewport); //! Build a look at view matrix. - //! - From \link gtc_matrix_transform GLM_GTC_matrix_transform \endlink extension + //! \sa frustum() + //! \param eye Position of the camera + //! \param center Position where the camera is looking at + //! \param up Normalized up vector, how the camera is oriented. Typically (0, 0, 1) template detail::tmat4x4 lookAt( detail::tvec3 const & eye, diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index 73b188f0..a1808955 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -1,15 +1,34 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Created : 2005-12-21 -// Updated : 2009-04-29 -// Licence : This source is under MIT License -// File : glm/gtx/transform.hpp -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Dependency: -// - GLM core -// - GLM_GTC_matric_transform -/////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////////// +//! OpenGL Mathematics (glm.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////// +//! Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +//! Permission is hereby granted, free of charge, to any person obtaining a copy +//! of this software and associated documentation files (the "Software"), to deal +//! in the Software without restriction, including without limitation the rights +//! to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +//! copies of the Software, and to permit persons to whom the Software is +//! furnished to do so, subject to the following conditions: +//! +//! The above copyright notice and this permission notice shall be included in +//! all copies or substantial portions of the Software. +//! +//! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +//! IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +//! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +//! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +//! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +//! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +//! THE SOFTWARE. +/////////////////////////////////////////////////////////////////////////////////// +//! \ref gtc_matrix_transform GLM_GTC_matrix_transform +//! \date 2005-12-21 / 2011-05-16 +//! \file glm/gtx/transform.hpp +//! \author Christophe Riccio +/////////////////////////////////////////////////////////////////////////////////// +//! Dependency: +//! - \link core GLM core \endlink +//! - \link gtc_matrix_transform GLM_GTC_matric_transform \endlink +/////////////////////////////////////////////////////////////////////////////////// #ifndef glm_gtx_transform #define glm_gtx_transform