From cbdff680529bb32d796b1ebef3491a1b81f5f83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 13 Aug 2012 14:45:33 +0200 Subject: [PATCH] Clarified signed normalized texture types, formatting fixes. Signed normalization results in [-1.0, 1.0], NOT [0.0, 1.0]. --- src/AbstractTexture.h | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index 680fc144c..2e1856e6f 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -147,85 +147,75 @@ class MAGNUM_EXPORT AbstractTexture { enum class ComponentType { /** * (Non-normalized) unsigned byte - * * @requires_gl30 Extension @extension{EXT,texture_integer} */ UnsignedByte, /** * (Non-normalized) byte - * * @requires_gl30 Extension @extension{EXT,texture_integer} */ Byte, /** * (Non-normalized) unsigned short - * * @requires_gl30 Extension @extension{EXT,texture_integer} */ UnsignedShort, /** * (Non-normalized) short - * * @requires_gl30 Extension @extension{EXT,texture_integer} */ Short, /** * (Non-normalized) unsigned integer - * * @requires_gl30 Extension @extension{EXT,texture_integer} */ UnsignedInt, /** * (Non-normalized) integer - * * @requires_gl30 Extension @extension{EXT,texture_integer} */ Int, /** * Half float (16 bit) - * * @requires_gl30 Extension @extension{ARB,texture_float} */ Half, /** * Float (32 bit) - * * @requires_gl30 Extension @extension{ARB,texture_float} */ Float, /** - * Normalized unsigned byte, i.e. values from range - * @f$ [0; 255] @f$ are converted to range @f$ [0.0; 1.0] @f$. + * Normalized unsigned byte, i.e. values from range @f$ [0; 255] @f$ + * are converted to range @f$ [0.0; 1.0] @f$. */ NormalizedUnsignedByte, /** - * Normalized byte, i.e. values from range - * @f$ [-128; 127] @f$ are converted to range @f$ [0.0; 1.0] @f$. - * - * @requires_gl31 (no extension providing this functionality) + * Normalized signed byte, i.e. values from range @f$ [-128; 127] @f$ + * are converted to range @f$ [-1.0; 1.0] @f$. + * @requires_gl31 Extension @extension{EXT,texture_snorm} */ NormalizedByte, /** - * Normalized unsigned short, i.e. values from range - * @f$ [0; 65536] @f$ are converted to range @f$ [0.0; 1.0] @f$. + * Normalized unsigned short, i.e. values from range @f$ [0; 65536] @f$ + * are converted to range @f$ [0.0; 1.0] @f$. */ NormalizedUnsignedShort, /** - * Normalized short, i.e. values from range - * @f$ [-32768; 32767] @f$ are converted to range @f$ [0.0; 1.0] @f$. - * - * @requires_gl31 (no extension providing this functionality) + * Normalized signed short, i.e. values from range @f$ [-32768; 32767] @f$ + * are converted to range @f$ [-1.0; 1.0] @f$. + * @requires_gl31 Extension @extension{EXT,texture_snorm} */ NormalizedShort };