mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/g-truc/glm

Browse Source
This commit is contained in:
Christophe Riccio 2017-02-16 00:56:04 +01:00
commit 4a71e6a02f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/gtx/rotate_vector.hpp
View File

@ -87,21 +87,21 @@ namespace glm
vec<3, T, P> const & v, vec<3, T, P> const & v,
T const & angle); T const & angle);
//! Rotate a four dimentionnals vector around the X axis. //! Rotate a four dimensional vector around the X axis.
//! From GLM_GTX_rotate_vector extension. //! From GLM_GTX_rotate_vector extension.
template<typename T, precision P> template<typename T, precision P>
GLM_FUNC_DECL vec<4, T, P> rotateX( GLM_FUNC_DECL vec<4, T, P> rotateX(
vec<4, T, P> const & v, vec<4, T, P> const & v,
T const & angle); T const & angle);
//! Rotate a four dimensional vector around the X axis. //! Rotate a four dimensional vector around the Y axis.
//! From GLM_GTX_rotate_vector extension. //! From GLM_GTX_rotate_vector extension.
template<typename T, precision P> template<typename T, precision P>
GLM_FUNC_DECL vec<4, T, P> rotateY( GLM_FUNC_DECL vec<4, T, P> rotateY(
vec<4, T, P> const & v, vec<4, T, P> const & v,
T const & angle); T const & angle);
//! Rotate a four dimensional vector around the X axis. //! Rotate a four dimensional vector around the Z axis.
//! From GLM_GTX_rotate_vector extension. //! From GLM_GTX_rotate_vector extension.
template<typename T, precision P> template<typename T, precision P>
GLM_FUNC_DECL vec<4, T, P> rotateZ( GLM_FUNC_DECL vec<4, T, P> rotateZ(

8
manual.md
View File

@ -1366,10 +1366,10 @@ LibreOffice includes several applications that make it the most powerful Free an
* [*OpenGL Tutorial*](http://www.opengl-tutorial.org), tutorials for OpenGL 3.1 and later * [*OpenGL Tutorial*](http://www.opengl-tutorial.org), tutorials for OpenGL 3.1 and later
* [*OpenGL Programming on Wikibooks*](http://en.wikibooks.org/wiki/OpenGL_Programming): For beginners who are discovering OpenGL. * [*OpenGL Programming on Wikibooks*](http://en.wikibooks.org/wiki/OpenGL_Programming): For beginners who are discovering OpenGL.
* [*3D Game Engine Programming*](http://3dgep.com/): Learning the latest 3D Game Engine Programming techniques. * [*3D Game Engine Programming*](http://3dgep.com/): Learning the latest 3D Game Engine Programming techniques.
* [Game Tutorials](mailto:http://www.gametutorials.com/opengl-4-matrices-and-glm/), graphics and game programming. * [Game Tutorials](http://www.gametutorials.com/opengl-4-matrices-and-glm/), graphics and game programming.
* [open.gl](mailto:https://open.gl/), OpenGL tutorial * [open.gl](https://open.gl/), OpenGL tutorial
* [c-jump](mailto:http://www.c-jump.com/bcc/common/Talk3/Math/GLM/GLM.html), GLM tutorial * [c-jump](http://www.c-jump.com/bcc/common/Talk3/Math/GLM/GLM.html), GLM tutorial
* [Learn OpenGL](mailto:http://learnopengl.com/), OpenGL tutorial * [Learn OpenGL](http://learnopengl.com/), OpenGL tutorial
** [Are you using GLM in a tutorial?](mailto:glm@g-truc.net)* ** [Are you using GLM in a tutorial?](mailto:glm@g-truc.net)*
### <a name="section9_5"></a> 9.5. Equivalent for other languages ### <a name="section9_5"></a> 9.5. Equivalent for other languages