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

Fixed space characters

Browse Source
This commit is contained in:
Christophe Riccio 2013-05-10 21:37:20 +02:00
parent a2583caa0f
commit 1b3d5cd378
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/core/precision.hpp
View File

@ -33,9 +33,9 @@ namespace glm
{
enum precision
{
lowp,
highp,
mediump,
highp
lowp
};
}//namespace glm

2
glm/core/setup.hpp
View File

@ -576,7 +576,7 @@
// that windows.h (and maybe other headers) will silently include intrin.h, which of course causes problems.
// To fix, we just explicitly include intrin.h here.
#if defined(__MINGW32__) && (GLM_ARCH != GLM_ARCH_PURE)
# include <intrin.h>
# include <intrin.h>
#endif
//#if(GLM_ARCH != GLM_ARCH_PURE)

10
glm/gtx/color_space.hpp
View File

@ -52,23 +52,23 @@ namespace glm
/// Converts a color from HSV color space to its color in RGB color space.
/// @see gtx_color_space
template <typename valType>
template <typename valType>
detail::tvec3<valType> rgbColor(
detail::tvec3<valType> const & hsvValue);
/// Converts a color from RGB color space to its color in HSV color space.
/// @see gtx_color_space
template <typename valType>
template <typename valType>
detail::tvec3<valType> hsvColor(
detail::tvec3<valType> const & rgbValue);
/// Build a saturation matrix.
/// @see gtx_color_space
template <typename valType>
template <typename valType>
detail::tmat4x4<valType> saturation(
valType const s);
/// Modify the saturation of a color.
/// Modify the saturation of a color.
/// @see gtx_color_space
template <typename valType>
detail::tvec3<valType> saturation(
@ -77,7 +77,7 @@ namespace glm
/// Modify the saturation of a color.
/// @see gtx_color_space
template <typename valType>
template <typename valType>
detail::tvec4<valType> saturation(
valType const s,
detail::tvec4<valType> const & color);

12
glm/gtx/color_space_YCoCg.hpp
View File

@ -50,29 +50,29 @@ namespace glm
/// @addtogroup gtx_color_space_YCoCg
/// @{
/// Convert a color from RGB color space to YCoCg color space.
/// Convert a color from RGB color space to YCoCg color space.
/// @see gtx_color_space_YCoCg
template <typename valType>
detail::tvec3<valType> rgb2YCoCg(
detail::tvec3<valType> const & rgbColor);
/// Convert a color from YCoCg color space to RGB color space.
/// Convert a color from YCoCg color space to RGB color space.
/// @see gtx_color_space_YCoCg
template <typename valType>
template <typename valType>
detail::tvec3<valType> YCoCg2rgb(
detail::tvec3<valType> const & YCoCgColor);
/// Convert a color from RGB color space to YCoCgR color space.
/// Convert a color from RGB color space to YCoCgR color space.
/// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range"
/// @see gtx_color_space_YCoCg
template <typename valType>
detail::tvec3<valType> rgb2YCoCgR(
detail::tvec3<valType> const & rgbColor);
/// Convert a color from YCoCgR color space to RGB color space.
/// Convert a color from YCoCgR color space to RGB color space.
/// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range"
/// @see gtx_color_space_YCoCg
template <typename valType>
template <typename valType>
detail::tvec3<valType> YCoCgR2rgb(
detail::tvec3<valType> const & YCoCgColor);