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

Fix weighted cluster fit.

Browse Source 
Set metric before color sets.
This commit is contained in:
castano
2008-02-01 19:48:12 +00:00
parent 77168bb40b
commit b7f3ce664f
8 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvtt/squish/fastclusterfit.cpp
View File

@ -31,9 +31,14 @@
namespace squish {
FastClusterFit::FastClusterFit( ColourSet const* colours, int flags ) :
ColourFit( colours, flags )
FastClusterFit::FastClusterFit()
{
}
void FastClusterFit::SetColourSet( ColourSet const* colours, int flags )
{
ColourFit::SetColourSet( colours, flags );
// initialise the best error
#if SQUISH_USE_SIMD
m_besterror = VEC4_CONST( FLT_MAX );
@ -102,7 +107,7 @@ struct Precomp {
static Precomp s_threeElement[153];
static Precomp s_fourElement[969];
void FastClusterFit::doPrecomputation()
void FastClusterFit::DoPrecomputation()
{
int i = 0;
@ -177,7 +182,7 @@ void FastClusterFit::doPrecomputation()
//printf("%d four cluster elements\n", i);
}
void FastClusterFit::setMetric(float r, float g, float b)
void FastClusterFit::SetMetric(float r, float g, float b)
{
#if SQUISH_USE_SIMD
m_metric = Vec4(r, g, b, 0);
@ -187,7 +192,7 @@ void FastClusterFit::setMetric(float r, float g, float b)
m_metricSqr = m_metric * m_metric;
}
float FastClusterFit::bestError() const
float FastClusterFit::GetBestError() const
{
#if SQUISH_USE_SIMD
Vec4 x = m_xxsum * m_metricSqr;