Skip to content
Snippets Groups Projects
Commit ff3edd06 authored by Merov Linden's avatar Merov Linden
Browse files

ACME-1275 : WIP : Clean up unwanted code and comments in image filter

parent 88b65f32
No related branches found
No related tags found
No related merge requests found
...@@ -77,7 +77,6 @@ LLImageFilter::~LLImageFilter() ...@@ -77,7 +77,6 @@ LLImageFilter::~LLImageFilter()
*TODO *TODO
* Rename stencil to mask * Rename stencil to mask
* Test blend modes and name them correctly * Test blend modes and name them correctly
* Suppress old "blend", "fade" and "lines" stencil definition. Change all xml accordingly.
* Improve perf: use LUT for alpha blending in uniform case * Improve perf: use LUT for alpha blending in uniform case
* Improve perf: make sure filter is not called more than necessary in viewer (seems to be called 3 times per change) * Improve perf: make sure filter is not called more than necessary in viewer (seems to be called 3 times per change)
* Add gradient coloring as a filter * Add gradient coloring as a filter
...@@ -154,18 +153,6 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image) ...@@ -154,18 +153,6 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image)
// Set the stencil // Set the stencil
setStencil(shape,mode,min,max,params); setStencil(shape,mode,min,max,params);
} }
else if (filter_name == "blend")
{
setStencil(STENCIL_BLEND_MODE_BLEND,STENCIL_SHAPE_VIGNETTE,(float)(mFilterData[i][1].asReal()),(float)(mFilterData[i][2].asReal()),1.0);
}
else if (filter_name == "fade")
{
setStencil(STENCIL_BLEND_MODE_FADE,STENCIL_SHAPE_VIGNETTE,(float)(mFilterData[i][1].asReal()),(float)(mFilterData[i][2].asReal()),1.0);
}
else if (filter_name == "lines")
{
setStencil(STENCIL_BLEND_MODE_BLEND,STENCIL_SHAPE_SCAN_LINES,(float)(mFilterData[i][1].asReal()),(float)(mFilterData[i][2].asReal()),1.0);
}
else if (filter_name == "sepia") else if (filter_name == "sepia")
{ {
filterSepia(); filterSepia();
...@@ -258,6 +245,10 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image) ...@@ -258,6 +245,10 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image)
kernel.mMatrix[1][1] = 8.0; kernel.mMatrix[1][1] = 8.0;
convolve(kernel,false,true); convolve(kernel,false,true);
} }
else
{
llwarns << "Filter unknown, cannot execute filter command : " << filter_name << llendl;
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment