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

Merge branch 'master' of github.com:bkaradzic/bimg

Browse Source
This commit is contained in:
Branimir Karadžić
2018-07-11 17:18:31 -07:00
parent 1725c45193 73e4e1deaa
commit 4c809cb2b2
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/nvtt/nvtt.cpp vendored
View File

@@ -50,9 +50,9 @@ namespace nvtt
for (uint32_t blockX = 0; blockX < ZOH::Tile::TILE_W; ++blockX)
{
nv::Vector4 color = srcRgba[blockY*srcRgbaStride + blockX];
zohTile.data[blockY][blockX].x = float(int16_t(bx::halfFromFloat(color.x) ) );
zohTile.data[blockY][blockX].y = float(int16_t(bx::halfFromFloat(color.y) ) );
zohTile.data[blockY][blockX].z = float(int16_t(bx::halfFromFloat(color.z) ) );
zohTile.data[blockY][blockX].x = float(int16_t(bx::halfFromFloat(bx::max(color.x, 0.0f) ) ) );
zohTile.data[blockY][blockX].y = float(int16_t(bx::halfFromFloat(bx::max(color.y, 0.0f) ) ) );
zohTile.data[blockY][blockX].z = float(int16_t(bx::halfFromFloat(bx::max(color.z, 0.0f) ) ) );
}
}

35
tools/texturec/texturec.cpp
View File

@@ -44,6 +44,8 @@ struct Options
"\t pma: %s\n"
"\t sdf: %s\n"
"\t radiance: %s\n"
"\t equirect: %s\n"
"\t strip: %s\n"
, maxSize
, edge
, bimg::getName(format)
@@ -53,6 +55,8 @@ struct Options
, pma ? "true" : "false"
, sdf ? "true" : "false"
, radiance ? "true" : "false"
, equirect ? "true" : "false"
, strip ? "true" : "false"
);
}
@@ -64,6 +68,7 @@ struct Options
bool mips = false;
bool normalMap = false;
bool equirect = false;
bool strip = false;
bool iqa = false;
bool pma = false;
bool sdf = false;
@@ -169,7 +174,17 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
outputHeight = _options.maxSize*2;
}
}
else if (outputDepth == 1
else
{
bimg::imageFree(input);
BX_ERROR_SET(_err, TEXTRUREC_ERROR, "Input image format is not equirectangular projection.");
return NULL;
}
}
else if (_options.strip)
{
if (outputDepth == 1
&& outputWidth/6 == outputHeight)
{
if (outputWidth/6 > _options.maxSize)
@@ -182,7 +197,7 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
{
bimg::imageFree(input);
BX_ERROR_SET(_err, TEXTRUREC_ERROR, "Input image format is not equirectangular projection.");
BX_ERROR_SET(_err, TEXTRUREC_ERROR, "Input image format is not horizontal strip.");
return NULL;
}
}
@@ -222,7 +237,7 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
&& !_options.sdf
&& !_options.alphaTest
&& !_options.normalMap
&& !_options.equirect
&& !(_options.equirect || _options.strip)
&& !_options.iqa
&& !_options.pma
&& (bimg::LightingModel::Count == _options.radiance)
@@ -280,7 +295,8 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
return output;
}
if (_options.equirect)
if (_options.equirect
|| _options.strip)
{
bimg::ImageContainer* src = bimg::imageConvert(_allocator, bimg::TextureFormat::RGBA32F, *input);
bimg::imageFree(input);
@@ -816,7 +832,8 @@ void help(const char* _error = NULL, bool _showHelp = true)
" -q <quality> Encoding quality (default, fastest, highest).\n"
" -m, --mips Generate mip-maps.\n"
" -n, --normalmap Input texture is normal map.\n"
" --equirect Input texture equirectangular projection of cubemap.\n"
" --equirect Input texture is equirectangular projection of cubemap.\n"
" --strip Input texture is horizontal strip of cubemap.\n"
" --sdf <edge> Compute SDF texture.\n"
" --ref <alpha> Alpha reference value.\n"
" --iqa Image Quality Assessment\n"
@@ -945,9 +962,17 @@ int main(int _argc, const char* _argv[])
options.mips = cmdLine.hasArg('m', "mips");
options.normalMap = cmdLine.hasArg('n', "normalmap");
options.equirect = cmdLine.hasArg("equirect");
options.strip = cmdLine.hasArg("strip");
options.iqa = cmdLine.hasArg("iqa");
options.pma = cmdLine.hasArg("pma");
if (options.equirect
&& options.strip)
{
help("Image can't be equirect and strip at the same time.");
return bx::kExitFailure;
}
const char* maxSize = cmdLine.findOption("max");
if (NULL != maxSize)
{