drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add alpha component to color weights. It may be needed in the future.

Browse Source
This commit is contained in:
castano 2008-01-18 06:11:58 +00:00
parent ac0cb61927
commit d89c26889c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvtt/CompressionOptions.cpp
View File

@ -47,7 +47,7 @@ void CompressionOptions::reset()
{ {
m.format = Format_DXT1; m.format = Format_DXT1;
m.quality = Quality_Normal; m.quality = Quality_Normal;
m.colorWeight.set(1.0f, 1.0f, 1.0f); m.colorWeight.set(1.0f, 1.0f, 1.0f, 1.0f);
m.useCuda = true; m.useCuda = true;
m.bitcount = 32; m.bitcount = 32;
@ -83,13 +83,13 @@ void CompressionOptions::setQuality(Quality quality, float errorThreshold /*= 0.
/// (1.0, 1.0, 1.0) work very well. A popular choice is to use the NTSC luma encoding /// (1.0, 1.0, 1.0) work very well. A popular choice is to use the NTSC luma encoding
/// weights (0.2126, 0.7152, 0.0722), but I think that blue contributes to our /// weights (0.2126, 0.7152, 0.0722), but I think that blue contributes to our
/// perception more than a 7%. A better choice in my opinion is (3, 4, 2). /// perception more than a 7%. A better choice in my opinion is (3, 4, 2).
void CompressionOptions::setColorWeights(float red, float green, float blue) void CompressionOptions::setColorWeights(float red, float green, float blue, float alpha/*=1.0f*/)
{ {
float total = red + green + blue; // float total = red + green + blue;
float x = red / total; // float x = red / total;
float y = green / total; // float y = green / total;
// m.colorWeight.set(x, y, 1.0f - x - y);
m.colorWeight.set(x, y, 1.0f - x - y); m.colorWeight.set(red, green, blue, alpha);
} }

2
src/nvtt/CompressionOptions.h
View File

@ -38,7 +38,7 @@ namespace nvtt
Quality quality; Quality quality;
float errorThreshold; // deprecated. float errorThreshold; // deprecated.
nv::Vector3 colorWeight; nv::Vector4 colorWeight;
// Pixel format description. // Pixel format description.
uint bitcount; uint bitcount;

2
src/nvtt/nvtt.h
View File

@ -97,7 +97,7 @@ namespace nvtt
NVTT_API void setFormat(Format format); NVTT_API void setFormat(Format format);
NVTT_API void setQuality(Quality quality, float errorThreshold = 0.5f); NVTT_API void setQuality(Quality quality, float errorThreshold = 0.5f);
NVTT_API void setColorWeights(float red, float green, float blue); NVTT_API void setColorWeights(float red, float green, float blue, float alpha = 1.0f);
NVTT_DEPRECATED void enableHardwareCompression(bool enable); NVTT_DEPRECATED void enableHardwareCompression(bool enable);
NVTT_API void enableCudaCompression(bool enable); NVTT_API void enableCudaCompression(bool enable);