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:55:32 +10:00
parent 0c2e6c1640
commit ab4f77e80e
3 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/graphics/post_processing.cpp
View File

@@ -499,6 +499,33 @@ public:
} // MotionBlurShader
}; // MotionBlurShader
// ============================================================================
class GodFadeShader : public TextureShader<GodFadeShader, 1, video::SColorf>
{
public:
GodFadeShader()
{
loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "godfade.frag");
assignUniforms("col");
assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
} // GodFadeShader
};
// ============================================================================
class GodRayShader : public TextureShader<GodRayShader, 1, core::vector2df>
{
public:
GodRayShader()
{
loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "godray.frag");
assignUniforms("sunpos");
assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
} // GodRayShader
}; // GodRayShader
// ============================================================================
PostProcessing::PostProcessing(IVideoDriver* video_driver)
@@ -1129,15 +1156,15 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
// ----------------------------------------------------------------------------
static void renderGodFade(GLuint tex, const SColor &col)
{
FullScreenShader::GodFadeShader::getInstance()->setTextureUnits(tex);
DrawFullScreenEffect<FullScreenShader::GodFadeShader>(col);
GodFadeShader::getInstance()->setTextureUnits(tex);
DrawFullScreenEffect<GodFadeShader>(col);
} // renderGodFade
// ----------------------------------------------------------------------------
static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
{
FullScreenShader::GodRayShader::getInstance()->setTextureUnits(tex);
DrawFullScreenEffect<FullScreenShader::GodRayShader>(sunpos);
GodRayShader::getInstance()->setTextureUnits(tex);
DrawFullScreenEffect<GodRayShader>(sunpos);
} // renderGodRay
// ----------------------------------------------------------------------------

20
src/graphics/shaders.cpp
View File

@@ -468,26 +468,6 @@ namespace FullScreenShader
assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
}
GodFadeShader::GodFadeShader()
{
loadProgram(OBJECT,
GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "godfade.frag");
assignUniforms("col");
assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
}
GodRayShader::GodRayShader()
{
loadProgram(OBJECT,
GL_VERTEX_SHADER, "screenquad.vert",
GL_FRAGMENT_SHADER, "godray.frag");
assignUniforms("sunpos");
assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
}
MLAAColorEdgeDetectionSHader::MLAAColorEdgeDetectionSHader()
{
loadProgram(OBJECT,

12
src/graphics/shaders.hpp
View File

@@ -94,18 +94,6 @@ public:
FogShader();
};
class GodFadeShader : public TextureShader<GodFadeShader, 1, video::SColorf>
{
public:
GodFadeShader();
};
class GodRayShader : public TextureShader<GodRayShader, 1, core::vector2df>
{
public:
GodRayShader();
};
class MLAAColorEdgeDetectionSHader : public TextureShader<MLAAColorEdgeDetectionSHader, 1, core::vector2df>
{
public: