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

Fix DXT1a support.

Browse Source
This commit is contained in:
castano
2008-01-07 07:45:27 +00:00
parent c02a5bb51f
commit 33c09ae591
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvtt/CompressDXT.cpp
View File

@ -241,7 +241,7 @@ void nv::compressDXT1a(const Image * image, const OutputOptions::Private & outpu
rgba.init(image, x, y); rgba.init(image, x, y);
// Compress color. // Compress color.
squish::ColourSet colours((uint8 *)rgba.colors(), 0); squish::ColourSet colours((uint8 *)rgba.colors(), squish::kDxt1|squish::kWeightColourByAlpha);
squish::WeightedClusterFit fit(&colours, squish::kDxt1); squish::WeightedClusterFit fit(&colours, squish::kDxt1);
fit.setMetric(compressionOptions.colorWeight.x(), compressionOptions.colorWeight.y(), compressionOptions.colorWeight.z()); fit.setMetric(compressionOptions.colorWeight.x(), compressionOptions.colorWeight.y(), compressionOptions.colorWeight.z());
fit.Compress(&block); fit.Compress(&block);

6
src/nvtt/squish/colourset.cpp
View File

@ -27,6 +27,12 @@
namespace squish { namespace squish {
// @@ Add flags:
// - FindColorMatch
// - DXT1a
// - WeightColorByAlpha
ColourSet::ColourSet( u8 const* rgba, int flags ) ColourSet::ColourSet( u8 const* rgba, int flags )
: m_count( 0 ), : m_count( 0 ),
m_transparent( false ) m_transparent( false )