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

Undo changes.

Browse Source
This commit is contained in:
castano 2010-11-11 19:52:00 +00:00
parent 1484c667a0
commit d6f6c1f1d4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvtt/squish/colourfit.cpp
View File

@ -38,21 +38,21 @@ void ColourFit::SetColourSet( ColourSet const* colours, int flags )
m_flags = flags; m_flags = flags;
} }
void ColourFit::Compress( Vec3 * start, Vec3 * end ) void ColourFit::Compress( void* block )
{ {
bool isDxt1 = ( ( m_flags & kDxt1 ) != 0 ); bool isDxt1 = ( ( m_flags & kDxt1 ) != 0 );
if( isDxt1 ) if( isDxt1 )
{ {
Compress3( start, end ); Compress3( block );
if( !m_colours->IsTransparent() ) if( !m_colours->IsTransparent() )
{ {
Compress4( start, end ); Compress4( block );
} }
} }
else else
{ {
Compress4( start, end ); Compress4( block );
} }
} }

6
src/nvtt/squish/colourfit.h
View File

@ -40,11 +40,11 @@ public:
void SetColourSet( ColourSet const* colours, int flags ); void SetColourSet( ColourSet const* colours, int flags );
void Compress( Vec3 * start, Vec3 * end ); void Compress( void* block );
protected: protected:
virtual bool Compress3( Vec3 * start, Vec3 * end ) = 0; virtual void Compress3( void* block ) = 0;
virtual bool Compress4( Vec3 * start, Vec3 * end ) = 0; virtual void Compress4( void* block ) = 0;
ColourSet const* m_colours; ColourSet const* m_colours;
int m_flags; int m_flags;