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

Add todo item to perform color transforms before compression.

Browse Source
This commit is contained in:
castano 2009-10-21 19:19:09 +00:00
parent 9a9366cf4c
commit 34cd266d8c
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvtt/Context.cpp
View File

@ -917,6 +917,8 @@ bool Compressor::Private::compressMipmaps(uint f, const InputOptions::Private &
premultiplyAlphaMipmap(mipmap, inputOptions); premultiplyAlphaMipmap(mipmap, inputOptions);
} }
#pragma message(NV_FILE_LINE "TODO: All color transforms should be done here!")
// Apply gamma space color transforms: // Apply gamma space color transforms:
if (inputOptions.colorTransform == ColorTransform_YCoCg) if (inputOptions.colorTransform == ColorTransform_YCoCg)
{ {
@ -928,6 +930,28 @@ bool Compressor::Private::compressMipmaps(uint f, const InputOptions::Private &
//ColorSpace::RGBtoYCoCg_R(mipmap.asMutableFixedImage()); //ColorSpace::RGBtoYCoCg_R(mipmap.asMutableFixedImage());
} }
/*// Apply linear transforms in linear space.
if (inputOptions.colorTransform == ColorTransform_Linear)
{
FloatImage * image = mipmap.asMutableFloatImage();
nvDebugCheck(image != NULL);
Vector4 offset(
inputOptions.colorOffsets[0],
inputOptions.colorOffsets[1],
inputOptions.colorOffsets[2],
inputOptions.colorOffsets[3]);
image->transform(0, inputOptions.linearTransform, offset);
}
else if (inputOptions.colorTransform == ColorTransform_Swizzle)
{
FloatImage * image = mipmap.asMutableFloatImage();
nvDebugCheck(image != NULL);
image->swizzle(0, inputOptions.swizzleTransform[0], inputOptions.swizzleTransform[1], inputOptions.swizzleTransform[2], inputOptions.swizzleTransform[3]);
}*/
quantizeMipmap(mipmap, compressionOptions); quantizeMipmap(mipmap, compressionOptions);
} }
@ -1173,7 +1197,9 @@ void Compressor::Private::processInputImage(Mipmap & mipmap, const InputOptions:
mipmap.toFloatImage(inputOptions); mipmap.toFloatImage(inputOptions);
} }
// Apply linear transforms in linear space. #pragma message(NV_FILE_LINE "FIXME: Do not perform color transforms here!")
/*// Apply linear transforms in linear space.
if (inputOptions.colorTransform == ColorTransform_Linear) if (inputOptions.colorTransform == ColorTransform_Linear)
{ {
FloatImage * image = mipmap.asMutableFloatImage(); FloatImage * image = mipmap.asMutableFloatImage();
@ -1193,7 +1219,7 @@ void Compressor::Private::processInputImage(Mipmap & mipmap, const InputOptions:
nvDebugCheck(image != NULL); nvDebugCheck(image != NULL);
image->swizzle(0, inputOptions.swizzleTransform[0], inputOptions.swizzleTransform[1], inputOptions.swizzleTransform[2], inputOptions.swizzleTransform[3]); image->swizzle(0, inputOptions.swizzleTransform[0], inputOptions.swizzleTransform[1], inputOptions.swizzleTransform[2], inputOptions.swizzleTransform[3]);
} }*/
} }
} }