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

Clean bloom shader provider.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
vincentlj
2014-01-12 23:27:31 +00:00
parent f8e17ecffa
commit 98f58d257c
4 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/callbacks.cpp
View File

@@ -512,13 +512,6 @@ void SunLightProvider::OnSetConstants(IMaterialRendererServices *srv, int)
//-------------------------------------
void BloomProvider::OnSetConstants(IMaterialRendererServices *srv, int)
{
srv->setVertexShaderConstant("low", &m_threshold, 1);
}
//-------------------------------------
void MLAAColor1Provider::OnSetConstants(IMaterialRendererServices *srv, int)
{
core::matrix4 ModelViewProjectionMatrix = srv->getVideoDriver()->getTransform(ETS_PROJECTION);

15
src/graphics/callbacks.hpp
View File

@@ -481,21 +481,6 @@ private:
//
class BloomProvider: public CallBase
{
public:
BloomProvider() { m_threshold = 0.75f; }
virtual void OnSetConstants(video::IMaterialRendererServices *srv, int);
void setThreshold(const float f) { m_threshold = f; }
private:
float m_threshold;
};
//
class MLAAColor1Provider: public CallBase
{
public:

6
src/graphics/shaders.cpp
View File

@@ -50,7 +50,6 @@ Shaders::Shaders()
m_callbacks[ES_LIGHTBLEND] = new LightBlendProvider();
m_callbacks[ES_POINTLIGHT] = new PointLightProvider();
m_callbacks[ES_SUNLIGHT] = new SunLightProvider();
m_callbacks[ES_BLOOM] = new BloomProvider();
m_callbacks[ES_MLAA_COLOR1] = new MLAAColor1Provider();
m_callbacks[ES_MLAA_BLEND2] = new MLAABlend2Provider();
m_callbacks[ES_MLAA_NEIGH3] = new MLAANeigh3Provider();
@@ -143,9 +142,6 @@ void Shaders::loadShaders()
m_shaders[ES_COLOR_LEVELS] = glslmat(std::string(""), dir + "color_levels.frag",
m_callbacks[ES_COLOR_LEVELS], EMT_SOLID);
m_shaders[ES_BLOOM] = glslmat(std::string(""), dir + "bloom.frag",
m_callbacks[ES_BLOOM], EMT_SOLID);
m_shaders[ES_COLORIZE] = glslmat(std::string(""), dir + "colorize.frag",
m_callbacks[ES_COLORIZE], EMT_SOLID);
m_shaders[ES_COLORIZE_REF] = glslmat(std::string(""), dir + "colorize_ref.frag",
@@ -205,8 +201,6 @@ void Shaders::loadShaders()
m_shaders[ES_BLOOM_POWER] = glsl(std::string(""), dir + "bloompower.frag",
m_callbacks[ES_BLOOM_POWER]);
m_shaders[ES_BLOOM_BLEND] = glslmat(std::string(""), dir + "bloomblend.frag",
0, EMT_TRANSPARENT_ADD_COLOR);
m_shaders[ES_MULTIPLY_ADD] = glslmat(std::string(""), dir + "multiply.frag",
m_callbacks[ES_MULTIPLY_ADD], EMT_ONETEXTURE_BLEND);

2
src/graphics/shaders.hpp
View File

@@ -41,7 +41,6 @@ using namespace irr;
ACT(ES_FLIP) \
ACT(ES_FLIP_ADDITIVE) \
ACT(ES_COLOR_LEVELS) \
ACT(ES_BLOOM) \
ACT(ES_GAUSSIAN6H) \
ACT(ES_GAUSSIAN6V) \
ACT(ES_COLORIZE) \
@@ -68,7 +67,6 @@ using namespace irr;
ACT(ES_SHADOW_WARPH) \
ACT(ES_SHADOW_WARPV) \
ACT(ES_BLOOM_POWER) \
ACT(ES_BLOOM_BLEND) \
ACT(ES_MULTIPLY_ADD) \
ACT(ES_PENUMBRAH) \
ACT(ES_PENUMBRAV) \