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

Merge pull request #264 from justinmeiners/master

Browse Source 
added noalpha option to assemble and fixed RGB write
This commit is contained in:
Ignacio 2017-06-28 15:06:12 -07:00 committed by GitHub
commit 8d333f2a4f
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/nvtt/tools/assemble.cpp
View File

@ -46,6 +46,7 @@ int main(int argc, char *argv[])
bool assembleVolume = false; bool assembleVolume = false;
bool assembleTextureArray = false; bool assembleTextureArray = false;
bool bgra = false; bool bgra = false;
bool forceNoAlpha = false;
nv::Array<nv::Path> files; nv::Array<nv::Path> files;
nv::Path output = "output.dds"; nv::Path output = "output.dds";
@ -84,6 +85,10 @@ int main(int argc, char *argv[])
{ {
bgra = true; bgra = true;
} }
else if (strcmp("-noalpha", argv[i]) == 0)
{
forceNoAlpha = true;
}
else if (argv[i][0] != '-') else if (argv[i][0] != '-')
{ {
files.append(argv[i]); files.append(argv[i]);
@ -97,7 +102,7 @@ int main(int argc, char *argv[])
if (files.count() == 0) if (files.count() == 0)
{ {
printf("NVIDIA Texture Tools - Copyright NVIDIA Corporation 2007\n\n"); printf("NVIDIA Texture Tools - Copyright NVIDIA Corporation 2007\n\n");
printf("usage: nvassemble [-cube|-volume|-array] 'file0' 'file1' ...\n\n"); printf("usage: nvassemble [-cube|-volume|-array] [-bgra] [-noalpha] 'file0' 'file1' ...\n\n");
return 1; return 1;
} }
@ -112,6 +117,12 @@ int main(int argc, char *argv[])
printf("*** error, 6 files expected, but got %d\n", files.count()); printf("*** error, 6 files expected, but got %d\n", files.count());
return 1; return 1;
} }
if (forceNoAlpha && assembleTextureArray)
{
printf("*** error, -noalpha is incompatible with texture arrays\n");
return 1;
}
// Load all files. // Load all files.
nv::Array<nv::Image> images; nv::Array<nv::Image> images;
@ -172,14 +183,22 @@ int main(int argc, char *argv[])
header.setTextureArray(imageCount); header.setTextureArray(imageCount);
} }
// @@ It always outputs 32 bpp.
if (!assembleTextureArray) { if (!assembleTextureArray) {
header.setPitch(4 * w); uint bpp = forceNoAlpha ? 24 : 32;
uint pitch = w * bpp / 8;
if (pitch % 4 != 0) {
printf("Warning: bytes per scanline is not divisable by 4\n");
}
header.setPitch(pitch);
uint alphaMask = (!hasAlpha || forceNoAlpha) ? 0 : 0xFF000000;
if (bgra) { if (bgra) {
header.setPixelFormat(32, 0xFF0000, 0xFF00, 0xFF, hasAlpha ? 0xFF000000 : 0); header.setPixelFormat(bpp, 0xFF0000, 0xFF00, 0xFF, alphaMask);
} }
else { else {
header.setPixelFormat(32, 0xFF, 0xFF00, 0xFF0000, hasAlpha ? 0xFF000000 : 0); header.setPixelFormat(bpp, 0xFF, 0xFF00, 0xFF0000, alphaMask);
} }
} else { } else {
if (bgra) { if (bgra) {
@ -203,7 +222,15 @@ int main(int argc, char *argv[])
uint8 g = c.g; uint8 g = c.g;
uint8 b = c.b; uint8 b = c.b;
uint8 a = c.a; uint8 a = c.a;
stream << b << g << r << a; if (bgra) {
stream << b << g << r;
}
else {
stream << r << g << b;
}
if (!forceNoAlpha) {
stream << a;
}
} }
} }