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

Bug fix. Only use tonormal conversion for top of the mipmap chain.

Browse Source
This commit is contained in:
castano
2008-02-11 08:35:32 +00:00
parent ccd9e86d54
commit c3749f48cd
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvtt/Compressor.cpp
View File

@ -418,9 +418,9 @@ bool Compressor::Private::initMipmap(Mipmap & mipmap, const InputOptions::Privat
// Find image from input. // Find image from input.
int inputIdx = findExactMipmap(inputOptions, w, h, d, f); int inputIdx = findExactMipmap(inputOptions, w, h, d, f);
if (inputIdx == -1 && m != 0) if ((inputIdx == -1 || inputOptions.convertToNormalMap) && m != 0)
{ {
// If input mipmap not found, and not top of the chain, then generate from last. // Generate from last, when mipmap not found, or normal map conversion enabled.
downsampleMipmap(mipmap, inputOptions); downsampleMipmap(mipmap, inputOptions);
} }
else else
@ -562,10 +562,7 @@ void Compressor::Private::processInputImage(Mipmap & mipmap, const InputOptions:
{ {
mipmap.toFixedImage(inputOptions); mipmap.toFixedImage(inputOptions);
// @@ Compute heighmap scale factor correctly. Vector4 heightScale = inputOptions.heightFactors;
// m = original_width / this_width
// Scale height factor by 1 / 2 ^ m
Vector4 heightScale = inputOptions.heightFactors; // / float(1 << m);
mipmap.setImage(createNormalMap(mipmap.asFixedImage(), (FloatImage::WrapMode)inputOptions.wrapMode, heightScale, inputOptions.bumpFrequencyScale)); mipmap.setImage(createNormalMap(mipmap.asFixedImage(), (FloatImage::WrapMode)inputOptions.wrapMode, heightScale, inputOptions.bumpFrequencyScale));
} }
else if (inputOptions.isNormalMap) else if (inputOptions.isNormalMap)