Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 12:42:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

texturec: Added .png output.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-01-25 21:45:50 -08:00
parent 0ef400dfcd
commit 7901feb777
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tools/texturec/texturec.cpp
View File

@@ -635,7 +635,7 @@ void help(const char* _error = NULL, bool _showHelp = true)
" *.jpg (input) JPEG Interchange Format.\n"
" *.hdr (input) Radiance RGBE.\n"
" *.ktx (input, output) Khronos Texture.\n"
" *.png (input) Portable Network Graphics.\n"
" *.png (input, output) Portable Network Graphics.\n"
" *.psd (input) Photoshop Document.\n"
" *.pvr (input) PowerVR.\n"
" *.tga (input) Targa.\n"
@@ -717,6 +717,7 @@ int main(int _argc, const char* _argv[])
const char* saveAs = cmdLine.findOption("as");
saveAs = NULL == saveAs ? bx::strFindI(outputFileName, ".ktx") : saveAs;
saveAs = NULL == saveAs ? bx::strFindI(outputFileName, ".dds") : saveAs;
saveAs = NULL == saveAs ? bx::strFindI(outputFileName, ".png") : saveAs;
if (NULL == saveAs)
{
help("Output file format must be specified.");
@@ -771,6 +772,19 @@ int main(int _argc, const char* _argv[])
}
}
if (NULL != bx::strFindI(outputFileName, ".png") )
{
if (options.format == bimg::TextureFormat::Count)
{
options.format = bimg::TextureFormat::RGBA8;
}
else if (options.format != bimg::TextureFormat::RGBA8)
{
help("Ouput PNG format must be RGBA8.");
return bx::kExitFailure;
}
}
const char* quality = cmdLine.findOption('q');
if (NULL != quality)
{
@@ -831,6 +845,19 @@ int main(int _argc, const char* _argv[])
{
bimg::imageWriteDds(&writer, *output, output->m_data, output->m_size, &err);
}
else if (NULL != bx::strFindI(saveAs, "png") )
{
bimg::ImageMip mip;
bimg::imageGetRawData(*output, 0, 0, output->m_data, output->m_size, mip);
bimg::imageWritePng(&writer
, mip.m_width
, mip.m_height
, mip.m_width*4
, mip.m_data
, false
, false
, &err);
}
bx::close(&writer);