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

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker
2014-02-26 08:40:51 +11:00
parent b17d2ca0e2 65c0750525
commit c6288af326
5 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/callbacks.cpp
View File

@@ -422,13 +422,6 @@ void MLAANeigh3Provider::OnSetConstants(IMaterialRendererServices *srv, int)
//-------------------------------------
void GodRayProvider::OnSetConstants(IMaterialRendererServices *srv, int)
{
srv->setPixelShaderConstant("sunpos", m_sunpos, 2);
}
//-------------------------------------
void ShadowPassProvider::OnSetConstants(IMaterialRendererServices *srv, int)
{
const int hastex = mat.TextureLayer[0].Texture != NULL;

14
src/graphics/callbacks.hpp
View File

@@ -450,20 +450,6 @@ public:
//
class GodRayProvider: public CallBase
{
public:
virtual void OnSetConstants(video::IMaterialRendererServices *srv, int);
// In texcoords
void setSunPosition(float x, float y) { m_sunpos[0] = x; m_sunpos[1] = y; }
private:
float m_sunpos[2];
};
//
class ShadowPassProvider: public CallBase
{
public:

2
src/graphics/post_processing.cpp
View File

@@ -895,7 +895,7 @@ void PostProcessing::render()
if (irr_driver->getNormals())
renderPassThrough(irr_driver->getRTT(RTT_NORMAL_AND_DEPTH));
else if (irr_driver->getSSAOViz())
renderPassThrough(irr_driver->getRTT(RTT_TMP3));
renderPassThrough(irr_driver->getRTT(RTT_SSAO));
else
renderColorLevel(in);
}

4
src/graphics/shaders.cpp
View File

@@ -44,7 +44,6 @@ Shaders::Shaders()
m_callbacks[ES_MLAA_COLOR1] = new MLAAColor1Provider();
m_callbacks[ES_MLAA_BLEND2] = new MLAABlend2Provider();
m_callbacks[ES_MLAA_NEIGH3] = new MLAANeigh3Provider();
m_callbacks[ES_GODRAY] = new GodRayProvider();
m_callbacks[ES_SHADOWPASS] = new ShadowPassProvider();
m_callbacks[ES_SHADOW_IMPORTANCE] = new ShadowImportanceProvider();
m_callbacks[ES_COLLAPSE] = new CollapseProvider();
@@ -160,9 +159,6 @@ void Shaders::loadShaders()
m_shaders[ES_MLAA_NEIGH3] = glsl(dir + "mlaa_offset.vert", dir + "mlaa_neigh3.frag",
m_callbacks[ES_MLAA_NEIGH3]);
m_shaders[ES_GODFADE] = glsl(std::string(""), dir + "godfade.frag", m_callbacks[ES_COLORIZE]);
m_shaders[ES_GODRAY] = glsl(std::string(""), dir + "godray.frag", m_callbacks[ES_GODRAY]);
m_shaders[ES_SHADOWPASS] = glsl(dir + "shadowpass.vert", dir + "shadowpass.frag",
m_callbacks[ES_SHADOWPASS]);

2
src/graphics/shaders.hpp
View File

@@ -623,8 +623,6 @@ public:
ACT(ES_MLAA_COLOR1) \
ACT(ES_MLAA_BLEND2) \
ACT(ES_MLAA_NEIGH3) \
ACT(ES_GODFADE) \
ACT(ES_GODRAY) \
ACT(ES_SHADOWPASS) \
ACT(ES_SHADOW_IMPORTANCE) \
ACT(ES_COLLAPSE) \