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

texturec: Fixed SDF generation.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-11-01 18:06:19 -07:00
parent f2d5b4651a
commit 084e14e301
3 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/bimg/encode.h
View File

@@ -87,7 +87,6 @@ namespace bimg
, uint32_t _width , uint32_t _width
, uint32_t _height , uint32_t _height
, uint32_t _srcPitch , uint32_t _srcPitch
, float _edge
, const void* _src , const void* _src
); );

7
src/image_encode.cpp
View File

@@ -368,7 +368,7 @@ namespace bimg
BX_FREE(_allocator, gy); BX_FREE(_allocator, gy);
} }
void imageMakeDist(bx::AllocatorI* _allocator, void* _dst, uint32_t _width, uint32_t _height, uint32_t _srcPitch, float _edge, const void* _src) void imageMakeDist(bx::AllocatorI* _allocator, void* _dst, uint32_t _width, uint32_t _height, uint32_t _srcPitch, const void* _src)
{ {
const uint32_t numPixels = _width*_height; const uint32_t numPixels = _width*_height;
@@ -399,12 +399,9 @@ namespace bimg
uint8_t* dst = (uint8_t*)_dst; uint8_t* dst = (uint8_t*)_dst;
double edgeOffset = _edge*0.5;
double invEdge = 1.0/_edge;
for (uint32_t ii = 0; ii < numPixels; ++ii) for (uint32_t ii = 0; ii < numPixels; ++ii)
{ {
double dist = bx::clamp( ( (outside[ii] - inside[ii])+edgeOffset) * invEdge, 0.0, 1.0); double dist = bx::clamp( (outside[ii] - inside[ii]) * 1.0/16.0 + 0.5, 0.0, 1.0);
dst[ii] = 255-uint8_t(dist * 255.0); dst[ii] = 255-uint8_t(dist * 255.0);
} }

29
tools/texturec/texturec.cpp
View File

@@ -256,7 +256,8 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
&& (bimg::LightingModel::Count == _options.radiance) && (bimg::LightingModel::Count == _options.radiance)
; ;
if (needResize) if (!_options.sdf
&& needResize)
{ {
bimg::ImageContainer* src = bimg::imageConvert(_allocator, bimg::TextureFormat::RGBA32F, *input, false); bimg::ImageContainer* src = bimg::imageConvert(_allocator, bimg::TextureFormat::RGBA32F, *input, false);
@@ -630,7 +631,6 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
, mip.m_width , mip.m_width
, mip.m_height , mip.m_height
, mip.m_width , mip.m_width
, _options.edge
, rgba , rgba
); );
} }
@@ -848,7 +848,7 @@ void help(const char* _error = NULL, bool _showHelp = true)
" -n, --normalmap Input texture is normal map.\n" " -n, --normalmap Input texture is normal map.\n"
" --equirect Input texture is equirectangular projection of cubemap.\n" " --equirect Input texture is equirectangular projection of cubemap.\n"
" --strip Input texture is horizontal strip of cubemap.\n" " --strip Input texture is horizontal strip of cubemap.\n"
" --sdf <edge> Compute SDF texture.\n" " --sdf Compute SDF texture.\n"
" --ref <alpha> Alpha reference value.\n" " --ref <alpha> Alpha reference value.\n"
" --iqa Image Quality Assessment\n" " --iqa Image Quality Assessment\n"
" --pma Premultiply alpha into RGB channel.\n" " --pma Premultiply alpha into RGB channel.\n"
@@ -970,28 +970,17 @@ int main(int _argc, const char* _argv[])
Options options; Options options;
const char* edgeOpt = cmdLine.findOption("sdf"); const char* alphaRef = cmdLine.findOption("ref");
if (NULL != edgeOpt) if (NULL != alphaRef)
{ {
options.sdf = true; options.alphaTest = true;
if (!bx::fromString(&options.edge, edgeOpt) ) if (!bx::fromString(&options.edge, alphaRef))
{ {
options.edge = 255.0f; options.edge = 0.5f;
}
}
else
{
const char* alphaRef = cmdLine.findOption("ref");
if (NULL != alphaRef)
{
options.alphaTest = true;
if (!bx::fromString(&options.edge, alphaRef))
{
options.edge = 0.5f;
}
} }
} }
options.sdf = cmdLine.hasArg("sdf");
options.mips = cmdLine.hasArg('m', "mips"); options.mips = cmdLine.hasArg('m', "mips");
options.normalMap = cmdLine.hasArg('n', "normalmap"); options.normalMap = cmdLine.hasArg('n', "normalmap");
options.equirect = cmdLine.hasArg("equirect"); options.equirect = cmdLine.hasArg("equirect");