mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-03-09 07:20:40 +00:00
Update squish library to 1.11
This commit is contained in:
parent
31036c4031
commit
8de0b7cbb1
14 changed files with 99 additions and 247 deletions
|
|
@ -24,7 +24,7 @@
|
|||
-------------------------------------------------------------------------- */
|
||||
|
||||
#include "alpha.h"
|
||||
#include "squishMath.h"
|
||||
#include <algorithm>
|
||||
|
||||
namespace squish {
|
||||
|
||||
|
|
@ -92,9 +92,9 @@ void DecompressAlphaDxt3( u8* rgba, void const* block )
|
|||
static void FixRange( int& min, int& max, int steps )
|
||||
{
|
||||
if( max - min < steps )
|
||||
max = SquishMath::min( min + steps, 255 );
|
||||
max = std::min( min + steps, 255 );
|
||||
if( max - min < steps )
|
||||
min = SquishMath::max( 0, max - steps );
|
||||
min = std::max( 0, max - steps );
|
||||
}
|
||||
|
||||
static int FitCodes( u8 const* rgba, int mask, u8 const* codes, u8* indices )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue