livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACME-1236 : WIP : Introduced screenFilter, simple creative screening filter

master
Merov Linden 2014-01-07 22:10:23 -08:00
parent 57d9fa36bd
commit c2a974f155
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/integration_tests/llimage_libtest/llimage_libtest.cpp
View File

@ -119,8 +119,7 @@ static bool sAllDone = false;
// Load filter from file
LLSD load_filter_from_file(const std::string& file_path)
{
std::cout << "Loading filter settings from : " << file_path << std::endl;
//std::cout << "Loading filter settings from : " << file_path << std::endl;
llifstream filter_xml(file_path);
if (filter_xml.is_open())
{
@ -213,6 +212,10 @@ void execute_filter(const LLSD& filter_data, LLPointer<LLImageRaw> raw_image)
LLColor3 color((float)(filter_data[i][2].asReal()),(float)(filter_data[i][3].asReal()),(float)(filter_data[i][4].asReal()));
raw_image->filterEqualize((S32)(filter_data[i][1].asReal()),color);
}
else if (filter_name == "screen")
{
raw_image->screenFilter((S32)(filter_data[i][1].asReal()));
}
}
}
@ -818,6 +821,10 @@ int main(int argc, char** argv)
{
raw_image->filterEqualize((S32)(filter_param),LLColor3::white);
}
else if (filter_name == "screen")
{
raw_image->screenFilter((S32)(filter_param));
}
else if (filter_name != "")
{
// We're interpreting the filter as a filter file name

46
indra/llimage/llimage.cpp
View File

@ -1312,6 +1312,52 @@ void LLImageRaw::colorCorrect(const U8* lut_red, const U8* lut_green, const U8*
}
}
void LLImageRaw::screenFilter(const S32 wave_length)
{
const S32 components = getComponents();
llassert( components >= 1 && components <= 4 );
S32 width = getWidth();
S32 height = getHeight();
U8* dst_data = getData();
for (S32 j = 0; j < height; j++)
{
for (S32 i = 0; i < width; i++)
{
F32 value = (sinf(2*F_PI*i/wave_length)*sinf(2*F_PI*j/wave_length)+1.0)*255.0/2.0;
//F32 value = (sinf(2*F_PI*i/wave_length)+1.0)*255.0/2.0; // will do line
U8 dst_value = (dst_data[VRED] >= (U8)(value) ? 255 : 0);
if (mVignetteMode == VIGNETTE_MODE_NONE)
{
dst_data[VRED] = dst_value;
dst_data[VGREEN] = dst_value;
dst_data[VBLUE] = dst_value;
}
else
{
F32 alpha = getVignetteAlpha(i,j);
if (mVignetteMode == VIGNETTE_MODE_BLEND)
{
// Blends with the source image on the edges
F32 inv_alpha = 1.0 - alpha;
dst_data[VRED] = inv_alpha * dst_data[VRED] + alpha * dst_value;
dst_data[VGREEN] = inv_alpha * dst_data[VGREEN] + alpha * dst_value;
dst_data[VBLUE] = inv_alpha * dst_data[VBLUE] + alpha * dst_value;
}
else // VIGNETTE_MODE_FADE
{
// Fade to black on the edges
dst_data[VRED] = alpha * dst_value;
dst_data[VGREEN] = alpha * dst_value;
dst_data[VBLUE] = alpha * dst_value;
}
}
dst_data += components;
}
}
}
void LLImageRaw::setVignette(EVignetteMode mode, F32 gamma, F32 min)
{
mVignetteMode = mode;

1
indra/llimage/llimage.h
View File

@ -299,6 +299,7 @@ public:
// Filter Primitives
void colorTransform(const LLMatrix3 &transform);
void colorCorrect(const U8* lut_red, const U8* lut_green, const U8* lut_blue);
void screenFilter(const S32 wave_length);
void setVignette(EVignetteMode mode, F32 gamma, F32 min);
U32* getBrightnessHistogram();