Cleanup public header.

This commit is contained in:
castano 2008-02-03 08:24:58 +00:00
parent 79d305008a
commit 039035ae25
2 changed files with 8 additions and 7 deletions

View File

@ -47,8 +47,6 @@
# define NVTT_API # define NVTT_API
#endif #endif
#define NVTT_DEPRECATED NVTT_API
// Public interface. // Public interface.
namespace nvtt namespace nvtt
@ -111,7 +109,7 @@ namespace nvtt
}; };
/// Wrap modes. // This matches FloatImage::WrapMode. /// Wrap modes.
enum WrapMode enum WrapMode
{ {
WrapMode_Clamp, WrapMode_Clamp,
@ -155,7 +153,7 @@ namespace nvtt
{ {
RoundMode_None, RoundMode_None,
RoundMode_ToNextPowerOfTwo, RoundMode_ToNextPowerOfTwo,
RoundMode_ToNearestPowerOfTwo, RoundMode_ToNearestPowerOfTwo,
RoundMode_ToPreviousPowerOfTwo, RoundMode_ToPreviousPowerOfTwo,
}; };
@ -186,7 +184,7 @@ namespace nvtt
// Describe the format of the input. // Describe the format of the input.
NVTT_API void setFormat(InputFormat format); NVTT_API void setFormat(InputFormat format);
// Set the way the input alpha channel is interpreted. // Set the way the input alpha channel is interpreted. @@ Not implemented!
NVTT_API void setAlphaMode(AlphaMode alphaMode); NVTT_API void setAlphaMode(AlphaMode alphaMode);
// Set gamma settings. // Set gamma settings.
@ -210,7 +208,7 @@ namespace nvtt
NVTT_API void setColorTransform(ColorTransform t); NVTT_API void setColorTransform(ColorTransform t);
NVTT_API void setLinearTransform(int channel, float w0, float w1, float w2, float w3); NVTT_API void setLinearTransform(int channel, float w0, float w1, float w2, float w3);
// Set resizing options. @@ Not fully tested! // Set resizing options.
NVTT_API void setMaxExtents(int d); NVTT_API void setMaxExtents(int d);
NVTT_API void setRoundMode(RoundMode mode); NVTT_API void setRoundMode(RoundMode mode);

View File

@ -370,7 +370,10 @@ int main(int argc, char *argv[])
{ {
inputOptions.setMipmapping(false); inputOptions.setMipmapping(false);
} }
//inputOptions.setGamma(2.2, 1);
//inputOptions.setRoundMode(nvtt::RoundMode_ToPreviousPowerOfTwo);
nvtt::CompressionOptions compressionOptions; nvtt::CompressionOptions compressionOptions;
compressionOptions.setFormat(format); compressionOptions.setFormat(format);