mewin/glm
1
0
Fork 0
Code Releases Activity

Improved see also

Browse Source
This commit is contained in:
Christophe Riccio 2011-05-16 17:14:33 +01:00
parent 921175612b
commit db651b1845
2 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glm/gtc/matrix_transform.hpp
View File

@ -26,7 +26,7 @@
//! \author Christophe Riccio //! \author Christophe Riccio
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
//! Dependency: //! Dependency:
//! - \ref core GLM core //! - \link core GLM core \endlink
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#ifndef glm_gtc_matrix_transform #ifndef glm_gtc_matrix_transform
@ -53,16 +53,20 @@ namespace glm
///@{ ///@{
//! Builds a translation 4 * 4 matrix created from a vector of 3 components. //! Builds a translation 4 * 4 matrix created from a vector of 3 components.
//! - From \link gtc_matrix_transform GLM_GTC_matrix_transform \endlink extension //! \sa
//! - See also: \link glm::gtx::transform::translate GLM_GTX_transform \endlink //! - \link gtx_transform GLM_GTX_transform \endlink extension
//! - glm::gtx::transform::translate(T x, T y, T z)
//! - glm::gtx::transform::translate(detail::tmat4x4<T> const & m, T x, T y, T z)
template <typename T> template <typename T>
detail::tmat4x4<T> translate( detail::tmat4x4<T> translate(
detail::tmat4x4<T> const & m, detail::tmat4x4<T> const & m,
detail::tvec3<T> const & v); detail::tvec3<T> const & v);
//! Builds a rotation 4 * 4 matrix created from an axis vector and an angle expressed in degrees. //! 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 //! \sa
//! - See also: \link glm::gtx::transform::rotate GLM_GTX_transform \endlink //! - \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<T> const & m, T angle, T x, T y, T z)
template <typename T> template <typename T>
detail::tmat4x4<T> rotate( detail::tmat4x4<T> rotate(
detail::tmat4x4<T> const & m, detail::tmat4x4<T> const & m,
@ -166,7 +170,10 @@ namespace glm
detail::tvec4<U> const & viewport); detail::tvec4<U> const & viewport);
//! Build a look at view matrix. //! 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 <typename T> template <typename T>
detail::tmat4x4<T> lookAt( detail::tmat4x4<T> lookAt(
detail::tvec3<T> const & eye, detail::tvec3<T> const & eye,

43
glm/gtx/transform.hpp
View File

@ -1,15 +1,34 @@
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) //! OpenGL Mathematics (glm.g-truc.net)
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Created : 2005-12-21 //! Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
// Updated : 2009-04-29 //! Permission is hereby granted, free of charge, to any person obtaining a copy
// Licence : This source is under MIT License //! of this software and associated documentation files (the "Software"), to deal
// File : glm/gtx/transform.hpp //! in the Software without restriction, including without limitation the rights
/////////////////////////////////////////////////////////////////////////////////////////////////// //! to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// Dependency: //! copies of the Software, and to permit persons to whom the Software is
// - GLM core //! furnished to do so, subject to the following conditions:
// - GLM_GTC_matric_transform //!
/////////////////////////////////////////////////////////////////////////////////////////////////// //! 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 #ifndef glm_gtx_transform
#define glm_gtx_transform #define glm_gtx_transform