diff --git a/glm/core/precision.hpp b/glm/core/precision.hpp index 9880370d..8d503352 100644 --- a/glm/core/precision.hpp +++ b/glm/core/precision.hpp @@ -33,9 +33,9 @@ namespace glm { enum precision { - lowp, + highp, mediump, - highp + lowp }; }//namespace glm diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 91188b0d..4767fa1b 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -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 +# include #endif //#if(GLM_ARCH != GLM_ARCH_PURE) diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index f144378f..73b42d04 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -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 + template detail::tvec3 rgbColor( detail::tvec3 const & hsvValue); /// Converts a color from RGB color space to its color in HSV color space. /// @see gtx_color_space - template + template detail::tvec3 hsvColor( detail::tvec3 const & rgbValue); /// Build a saturation matrix. /// @see gtx_color_space - template + template detail::tmat4x4 saturation( valType const s); - /// Modify the saturation of a color. + /// Modify the saturation of a color. /// @see gtx_color_space template detail::tvec3 saturation( @@ -77,7 +77,7 @@ namespace glm /// Modify the saturation of a color. /// @see gtx_color_space - template + template detail::tvec4 saturation( valType const s, detail::tvec4 const & color); diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index 8ca4b102..a4fecb91 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -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 detail::tvec3 rgb2YCoCg( detail::tvec3 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 + template detail::tvec3 YCoCg2rgb( detail::tvec3 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 detail::tvec3 rgb2YCoCgR( detail::tvec3 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 + template detail::tvec3 YCoCgR2rgb( detail::tvec3 const & YCoCgColor);