ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean GaussianBlur6 shaders.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15042 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
vincentlj 2014-01-13 14:31:31 +00:00
parent 62e5fbf6ad
commit 645d4504ab
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/graphics/render.cpp
View File

@ -502,13 +502,13 @@ void IrrDriver::renderShadows(ShadowImportanceProvider * const sicb,
m_rtts->getRTT(RTT_WARPV)->getSize().Height,
m_rtts->getRTT(RTT_WARPV)->getSize().Height);
sq.setMaterialType(m_shaders->getShader(ES_GAUSSIAN6H));
/* sq.setMaterialType(m_shaders->getShader(ES_GAUSSIAN6H));
sq.setTexture(m_rtts->getRTT(RTT_WARPH));
sq.render(m_rtts->getRTT(curh));
sq.setMaterialType(m_shaders->getShader(ES_GAUSSIAN6V));
sq.setTexture(m_rtts->getRTT(RTT_WARPV));
sq.render(m_rtts->getRTT(curv));
sq.render(m_rtts->getRTT(curv));*/
// Convert importance maps to warp maps
//
@ -649,19 +649,7 @@ void IrrDriver::renderGlow(video::SOverrideMaterial &overridemat,
m_post_processing->drawQuad(cam, minimat);
// Blur it
((GaussianBlurProvider *) m_shaders->m_callbacks[ES_GAUSSIAN3H])->setResolution(
UserConfigParams::m_width / 4,
UserConfigParams::m_height / 4);
minimat.MaterialType = m_shaders->getShader(ES_GAUSSIAN6H);
minimat.setTexture(0, m_rtts->getRTT(RTT_QUARTER1));
m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_QUARTER2), false, false);
m_post_processing->drawQuad(cam, minimat);
minimat.MaterialType = m_shaders->getShader(ES_GAUSSIAN6V);
minimat.setTexture(0, m_rtts->getRTT(RTT_QUARTER2));
m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_QUARTER1), false, false);
m_post_processing->drawQuad(cam, minimat);
m_post_processing->renderGaussian6Blur(m_rtts->getRTT(RTT_QUARTER1), m_rtts->getRTT(RTT_QUARTER2), 4.f / UserConfigParams::m_width, 4.f / UserConfigParams::m_height);
// The glows will be rendered in the transparent phase
m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_COLOR), false, false);

5
src/graphics/shaders.cpp
View File

@ -122,11 +122,6 @@ void Shaders::loadShaders()
m_shaders[ES_GAUSSIAN3V] = glslmat(dir + "pass.vert", dir + "gaussian3v.frag",
m_callbacks[ES_GAUSSIAN3V], EMT_SOLID);
m_shaders[ES_GAUSSIAN6H] = glslmat(dir + "pass.vert", dir + "gaussian6h.frag",
m_callbacks[ES_GAUSSIAN3H], EMT_SOLID);
m_shaders[ES_GAUSSIAN6V] = glslmat(dir + "pass.vert", dir + "gaussian6v.frag",
m_callbacks[ES_GAUSSIAN3V], EMT_SOLID);
m_shaders[ES_MIPVIZ] = glslmat(std::string(""), dir + "mipviz.frag",
m_callbacks[ES_MIPVIZ], EMT_SOLID);

2
src/graphics/shaders.hpp
View File

@ -40,8 +40,6 @@ using namespace irr;
ACT(ES_MIPVIZ) \
ACT(ES_FLIP) \
ACT(ES_FLIP_ADDITIVE) \
ACT(ES_GAUSSIAN6H) \
ACT(ES_GAUSSIAN6V) \
ACT(ES_COLORIZE) \
ACT(ES_COLORIZE_REF) \
ACT(ES_PASS) \