Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-21 06:13:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

texturev: Added support for linear input images.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-12-12 17:31:22 -08:00
parent 9d2578e2cb
commit d32ca7682c
11 changed files with 2700 additions and 2146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/texturev/texturev.cpp
View File

@@ -76,6 +76,7 @@ static const char* s_supportedExt[] =
"dds",
"exr",
"gif",
"gnf",
"jpg",
"jpeg",
"hdr",
@@ -232,6 +233,7 @@ struct View
, m_info(false)
, m_files(false)
, m_sdf(false)
, m_inLinear(false)
{
load();
}
@@ -736,6 +738,7 @@ struct View
bool m_info;
bool m_files;
bool m_sdf;
bool m_inLinear;
};
int cmdView(CmdContext* /*_context*/, void* _userData, int _argc, char const* const* _argv)
@@ -1459,11 +1462,11 @@ int _main_(int _argc, char** _argv)
if (view.m_info)
{
ImGui::SetNextWindowSize(
ImVec2(300.0f, 200.0f)
ImVec2(300.0f, 240.0f)
, ImGuiCond_FirstUseEver
);
if (ImGui::Begin("Info", NULL) )
if (ImGui::Begin("Info", NULL, ImGuiWindowFlags_AlwaysAutoResize) )
{
if (ImGui::BeginChild("##info", ImVec2(0.0f, 0.0f) ) )
{
@@ -1486,6 +1489,7 @@ int _main_(int _argc, char** _argv)
, view.m_textureInfo.numMips - 1
);
ImGui::Checkbox("Input linear", &view.m_inLinear);
ImGui::RangeSliderFloat("EV range", &view.m_evMin, &view.m_evMax, kEvMin, kEvMax);
ImGui::SliderFloat("EV", &view.m_ev, view.m_evMin, view.m_evMax);
@@ -1654,6 +1658,8 @@ int _main_(int _argc, char** _argv)
, &orientation
);
view.m_inLinear = bimg::isFloat(bimg::TextureFormat::Enum(view.m_textureInfo.format) );
switch (orientation)
{
default:
@@ -1819,7 +1825,7 @@ int _main_(int _argc, char** _argv)
layer.set(float(view.m_layer), 0.25f*view.m_transitionTime);
ev.set(view.m_ev, 0.5f*view.m_transitionTime);
float params[4] = { mip.getValue(), layer.getValue(), 0.0f, ev.getValue() };
float params[4] = { mip.getValue(), layer.getValue(), view.m_inLinear ? 1.0f : 0.0f, ev.getValue() };
if (1 < view.m_textureInfo.depth)
{
params[1] = layer.getValue()/view.m_textureInfo.depth;