Browse Source

Clarified signed normalized texture types, formatting fixes.

Signed normalization results in [-1.0, 1.0], NOT [0.0, 1.0].
pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
cbdff68052
  1. 30
      src/AbstractTexture.h

30
src/AbstractTexture.h

@ -147,85 +147,75 @@ class MAGNUM_EXPORT AbstractTexture {
enum class ComponentType { enum class ComponentType {
/** /**
* (Non-normalized) unsigned byte * (Non-normalized) unsigned byte
*
* @requires_gl30 Extension @extension{EXT,texture_integer} * @requires_gl30 Extension @extension{EXT,texture_integer}
*/ */
UnsignedByte, UnsignedByte,
/** /**
* (Non-normalized) byte * (Non-normalized) byte
*
* @requires_gl30 Extension @extension{EXT,texture_integer} * @requires_gl30 Extension @extension{EXT,texture_integer}
*/ */
Byte, Byte,
/** /**
* (Non-normalized) unsigned short * (Non-normalized) unsigned short
*
* @requires_gl30 Extension @extension{EXT,texture_integer} * @requires_gl30 Extension @extension{EXT,texture_integer}
*/ */
UnsignedShort, UnsignedShort,
/** /**
* (Non-normalized) short * (Non-normalized) short
*
* @requires_gl30 Extension @extension{EXT,texture_integer} * @requires_gl30 Extension @extension{EXT,texture_integer}
*/ */
Short, Short,
/** /**
* (Non-normalized) unsigned integer * (Non-normalized) unsigned integer
*
* @requires_gl30 Extension @extension{EXT,texture_integer} * @requires_gl30 Extension @extension{EXT,texture_integer}
*/ */
UnsignedInt, UnsignedInt,
/** /**
* (Non-normalized) integer * (Non-normalized) integer
*
* @requires_gl30 Extension @extension{EXT,texture_integer} * @requires_gl30 Extension @extension{EXT,texture_integer}
*/ */
Int, Int,
/** /**
* Half float (16 bit) * Half float (16 bit)
*
* @requires_gl30 Extension @extension{ARB,texture_float} * @requires_gl30 Extension @extension{ARB,texture_float}
*/ */
Half, Half,
/** /**
* Float (32 bit) * Float (32 bit)
*
* @requires_gl30 Extension @extension{ARB,texture_float} * @requires_gl30 Extension @extension{ARB,texture_float}
*/ */
Float, Float,
/** /**
* Normalized unsigned byte, i.e. values from range * Normalized unsigned byte, i.e. values from range @f$ [0; 255] @f$
* @f$ [0; 255] @f$ are converted to range @f$ [0.0; 1.0] @f$. * are converted to range @f$ [0.0; 1.0] @f$.
*/ */
NormalizedUnsignedByte, NormalizedUnsignedByte,
/** /**
* Normalized byte, i.e. values from range * Normalized signed byte, i.e. values from range @f$ [-128; 127] @f$
* @f$ [-128; 127] @f$ are converted to range @f$ [0.0; 1.0] @f$. * are converted to range @f$ [-1.0; 1.0] @f$.
* * @requires_gl31 Extension @extension{EXT,texture_snorm}
* @requires_gl31 (no extension providing this functionality)
*/ */
NormalizedByte, NormalizedByte,
/** /**
* Normalized unsigned short, i.e. values from range * Normalized unsigned short, i.e. values from range @f$ [0; 65536] @f$
* @f$ [0; 65536] @f$ are converted to range @f$ [0.0; 1.0] @f$. * are converted to range @f$ [0.0; 1.0] @f$.
*/ */
NormalizedUnsignedShort, NormalizedUnsignedShort,
/** /**
* Normalized short, i.e. values from range * Normalized signed short, i.e. values from range @f$ [-32768; 32767] @f$
* @f$ [-32768; 32767] @f$ are converted to range @f$ [0.0; 1.0] @f$. * are converted to range @f$ [-1.0; 1.0] @f$.
* * @requires_gl31 Extension @extension{EXT,texture_snorm}
* @requires_gl31 (no extension providing this functionality)
*/ */
NormalizedShort NormalizedShort
}; };

Loading…
Cancel
Save