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

Work in progress. Experiment with lightmap compression.

Browse Source
This commit is contained in:
castano
2010-11-12 03:32:46 +00:00
parent 4cbf43165c
commit 23b140416a
23 changed files with 1057 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/nvtt/CompressorDX9.cpp
View File

@ -27,6 +27,7 @@
#include "OptimalCompressDXT.h"
#include "CompressionOptions.h"
#include "OutputOptions.h"
#include "ClusterFit.h"
// squish
#include "squish/colourset.h"
@ -109,30 +110,36 @@ void FastCompressorDXT5n::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alpha
}
inline static Vector3 vec(nvsquish::Vec3 v) { return Vector3(v.X(), v.Y(), v.Z()); }
void NormalCompressorDXT1::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
void NormalCompressorDXT1::compressBlock(ColorSet & set, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
{
nvsquish::WeightedClusterFit fit;
fit.SetMetric(compressionOptions.colorWeight.x, compressionOptions.colorWeight.y, compressionOptions.colorWeight.z);
set.setUniformWeights();
set.createMinimalSet(false);
ClusterFit fit;
fit.setMetric(compressionOptions.colorWeight);
BlockDXT1 * block = new(output) BlockDXT1;
if (rgba.isSingleColor())
if (set.isSingleColor(true))
{
OptimalCompress::compressDXT1(rgba.color(0), block);
Color32 c;
c.r = uint8(clamp(set.colors[0].x, 0.0f, 1.0f) * 255);
c.g = uint8(clamp(set.colors[0].y, 0.0f, 1.0f) * 255);
c.b = uint8(clamp(set.colors[0].z, 0.0f, 1.0f) * 255);
c.a = 255;
OptimalCompress::compressDXT1(c, block);
}
else
{
nvsquish::ColourSet colours((uint8 *)rgba.colors(), 0);
fit.SetColourSet(&colours, nvsquish::kDxt1);
fit.setColourSet(&set);
nvsquish::Vec3 start, end;
Vector3 start, end;
fit.Compress4(&start, &end);
QuickCompress::outputBlock4(rgba, vec(start), vec(end), block);
fit.compress4(&start, &end);
QuickCompress::outputBlock4(set, start, end, block);
if (fit.Compress3(&start, &end)) {
QuickCompress::outputBlock3(rgba, vec(start), vec(end), block);
if (fit.compress3(&start, &end)) {
QuickCompress::outputBlock3(set, start, end, block);
}
}
}
@ -140,8 +147,6 @@ void NormalCompressorDXT1::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alph
void NormalCompressorDXT1a::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
{
#pragma NV_MESSAGE("NormalCompressorDXT1a - Not implemented!")
/*
uint alphaMask = 0;
for (uint i = 0; i < 16; i++)
{
@ -168,14 +173,11 @@ void NormalCompressorDXT1a::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alp
fit.Compress(output);
}
*/
}
void NormalCompressorDXT3::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
{
#pragma NV_MESSAGE("NormalCompressorDXT1a - Not implemented!")
/*
BlockDXT3 * block = new(output) BlockDXT3;
// Compress explicit alpha.
@ -198,14 +200,11 @@ void NormalCompressorDXT3::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alph
fit.SetColourSet(&colours, 0);
fit.Compress(&block->color);
}
*/
}
void NormalCompressorDXT5::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
{
#pragma NV_MESSAGE("NormalCompressorDXT1a - Not implemented!")
/*
BlockDXT5 * block = new(output) BlockDXT5;
// Compress alpha.
@ -235,14 +234,11 @@ void NormalCompressorDXT5::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alph
fit.SetColourSet(&colours, 0);
fit.Compress(&block->color);
}
*/
}
void NormalCompressorDXT5n::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
{
#pragma NV_MESSAGE("NormalCompressorDXT1a - Not implemented!")
/*
BlockDXT5 * block = new(output) BlockDXT5;
// Compress Y.
@ -284,7 +280,6 @@ void NormalCompressorDXT5n::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alp
{
QuickCompress::compressDXT5A(rgba, &block->alpha);
}
*/
}