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

Use alpha-aware resize when alpha is used for transparency and it's not premultiplied.

Browse Source
This commit is contained in:
castano 2009-01-28 10:58:57 +00:00
parent 4f576d5539
commit 242aa4254e
1 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/nvtt/Compressor.cpp
View File

@ -701,23 +701,47 @@ void Compressor::Private::downsampleMipmap(Mipmap & mipmap, const InputOptions::
mipmap.toFloatImage(inputOptions); mipmap.toFloatImage(inputOptions);
const FloatImage * floatImage = mipmap.asFloatImage(); const FloatImage * floatImage = mipmap.asFloatImage();
FloatImage::WrapMode wrapMode = (FloatImage::WrapMode)inputOptions.wrapMode;
if (inputOptions.mipmapFilter == MipmapFilter_Box) if (inputOptions.alphaMode == AlphaMode_Transparency)
{ {
// Use fast downsample. if (inputOptions.mipmapFilter == MipmapFilter_Box)
mipmap.setImage(floatImage->fastDownSample()); {
BoxFilter filter;
mipmap.setImage(floatImage->downSample(filter, wrapMode, 3));
}
else if (inputOptions.mipmapFilter == MipmapFilter_Triangle)
{
TriangleFilter filter;
mipmap.setImage(floatImage->downSample(filter, wrapMode, 3));
}
else /*if (inputOptions.mipmapFilter == MipmapFilter_Kaiser)*/
{
nvDebugCheck(inputOptions.mipmapFilter == MipmapFilter_Kaiser);
KaiserFilter filter(inputOptions.kaiserWidth);
filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
mipmap.setImage(floatImage->downSample(filter, wrapMode, 3));
}
} }
else if (inputOptions.mipmapFilter == MipmapFilter_Triangle) else
{ {
TriangleFilter filter; if (inputOptions.mipmapFilter == MipmapFilter_Box)
mipmap.setImage(floatImage->downSample(filter, (FloatImage::WrapMode)inputOptions.wrapMode)); {
} // Use fast downsample.
else /*if (inputOptions.mipmapFilter == MipmapFilter_Kaiser)*/ mipmap.setImage(floatImage->fastDownSample());
{ }
nvDebugCheck(inputOptions.mipmapFilter == MipmapFilter_Kaiser); else if (inputOptions.mipmapFilter == MipmapFilter_Triangle)
KaiserFilter filter(inputOptions.kaiserWidth); {
filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch); TriangleFilter filter;
mipmap.setImage(floatImage->downSample(filter, (FloatImage::WrapMode)inputOptions.wrapMode)); mipmap.setImage(floatImage->downSample(filter, wrapMode));
}
else /*if (inputOptions.mipmapFilter == MipmapFilter_Kaiser)*/
{
nvDebugCheck(inputOptions.mipmapFilter == MipmapFilter_Kaiser);
KaiserFilter filter(inputOptions.kaiserWidth);
filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
mipmap.setImage(floatImage->downSample(filter, wrapMode));
}
} }
// Normalize mipmap. // Normalize mipmap.
@ -737,7 +761,15 @@ void Compressor::Private::scaleMipmap(Mipmap & mipmap, const InputOptions::Priva
// Resize image. // Resize image.
BoxFilter boxFilter; BoxFilter boxFilter;
mipmap.setImage(mipmap.asFloatImage()->resize(boxFilter, w, h, (FloatImage::WrapMode)inputOptions.wrapMode));
if (inputOptions.alphaMode == AlphaMode_Transparency)
{
mipmap.setImage(mipmap.asFloatImage()->resize(boxFilter, w, h, (FloatImage::WrapMode)inputOptions.wrapMode, 3));
}
else
{
mipmap.setImage(mipmap.asFloatImage()->resize(boxFilter, w, h, (FloatImage::WrapMode)inputOptions.wrapMode));
}
} }