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

Moved more shaders.

Browse Source
This commit is contained in:
hiker 2015-05-19 18:51:26 +10:00
parent 553a0a8b58
commit 0c2e6c1640
3 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/graphics/post_processing.cpp
View File

@ -448,6 +448,57 @@ public:
} // LinearizeDepthShader
}; // LinearizeDepthShader
// ============================================================================
class GlowShader : public TextureShader < GlowShader, 1 >
{
public:
GLuint vao;
GlowShader()
{
loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "glow.frag");
assignUniforms();
assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
vao = createVAO();
} // GlowShader
}; // GlowShader
// ============================================================================
class SSAOShader : public TextureShader<SSAOShader, 1, float, float, float>
{
public:
SSAOShader()
{
loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
GL_FRAGMENT_SHADER, "ssao.frag");
assignUniforms("radius", "k", "sigma");
assignSamplerNames(0, "dtex", ST_SEMI_TRILINEAR);
} // SSAOShader
}; // SSAOShader
// ============================================================================
class MotionBlurShader : public TextureShader<MotionBlurShader, 2,
core::matrix4, core::vector2df,
float, float>
{
public:
MotionBlurShader()
{
loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
GL_FRAGMENT_SHADER, "motion_blur.frag");
assignUniforms("previous_viewproj", "center", "boost_amount",
"mask_radius");
assignSamplerNames(0, "color_buffer", ST_BILINEAR_CLAMPED_FILTERED,
1, "dtex", ST_NEAREST_FILTERED);
} // MotionBlurShader
}; // MotionBlurShader
// ============================================================================
PostProcessing::PostProcessing(IVideoDriver* video_driver)
@ -1003,11 +1054,11 @@ void PostProcessing::renderTextureLayer(unsigned tex, unsigned layer)
// ----------------------------------------------------------------------------
void PostProcessing::renderGlow(unsigned tex)
{
FullScreenShader::GlowShader::getInstance()->use();
glBindVertexArray(FullScreenShader::GlowShader::getInstance()->vao);
GlowShader::getInstance()->use();
glBindVertexArray(GlowShader::getInstance()->vao);
FullScreenShader::GlowShader::getInstance()->setTextureUnits(tex);
FullScreenShader::GlowShader::getInstance()->setUniforms();
GlowShader::getInstance()->setTextureUnits(tex);
GlowShader::getInstance()->setUniforms();
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
} // renderGlow
@ -1027,11 +1078,11 @@ void PostProcessing::renderSSAO()
irr_driver->getSceneManager()->getActiveCamera()->getFarValue() );
irr_driver->getFBO(FBO_SSAO).Bind();
FullScreenShader::SSAOShader::getInstance()
SSAOShader::getInstance()
->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH));
glGenerateMipmap(GL_TEXTURE_2D);
DrawFullScreenEffect<FullScreenShader::SSAOShader>
DrawFullScreenEffect<SSAOShader>
(irr_driver->getSSAORadius(), irr_driver->getSSAOK(),
irr_driver->getSSAOSigma() );
}
@ -1064,10 +1115,10 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
out_fbo.Bind();
glClear(GL_COLOR_BUFFER_BIT);
FullScreenShader::MotionBlurShader::getInstance()
MotionBlurShader::getInstance()
->setTextureUnits(in_fbo.getRTT()[0],
irr_driver->getDepthStencilTexture());
DrawFullScreenEffect<FullScreenShader::MotionBlurShader>
DrawFullScreenEffect<MotionBlurShader>
(// Todo : use a previousPVMatrix per cam, not global
cam->getPreviousPVMatrix(),
core::vector2df(0.5, 0.5),

34
src/graphics/shaders.cpp
View File

@ -457,29 +457,6 @@ namespace FullScreenShader
assignUniforms("direction", "col");
}
GlowShader::GlowShader()
{
loadProgram(OBJECT,
GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "glow.frag");
assignUniforms();
assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
vao = createVAO();
}
SSAOShader::SSAOShader()
{
loadProgram(OBJECT,
GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
GL_FRAGMENT_SHADER, "ssao.frag");
assignUniforms("radius", "k", "sigma");
assignSamplerNames(0, "dtex", ST_SEMI_TRILINEAR);
}
FogShader::FogShader()
{
loadProgram(OBJECT,
@ -491,17 +468,6 @@ namespace FullScreenShader
assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
}
MotionBlurShader::MotionBlurShader()
{
loadProgram(OBJECT,
GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
GL_FRAGMENT_SHADER, "motion_blur.frag");
assignUniforms("previous_viewproj", "center", "boost_amount", "mask_radius");
assignSamplerNames(0, "color_buffer", ST_BILINEAR_CLAMPED_FILTERED,
1, "dtex", ST_NEAREST_FILTERED);
}
GodFadeShader::GodFadeShader()
{
loadProgram(OBJECT,

20
src/graphics/shaders.hpp
View File

@ -88,32 +88,12 @@ public:
SunLightShader();
};
class GlowShader : public TextureShader<GlowShader, 1>
{
public:
GLuint vao;
GlowShader();
};
class SSAOShader : public TextureShader<SSAOShader, 1, float, float, float>
{
public:
SSAOShader();
};
class FogShader : public TextureShader<FogShader, 1, float, core::vector3df>
{
public:
FogShader();
};
class MotionBlurShader : public TextureShader<MotionBlurShader, 2, core::matrix4, core::vector2df, float, float>
{
public:
MotionBlurShader();
};
class GodFadeShader : public TextureShader<GodFadeShader, 1, video::SColorf>
{
public: