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

Moved more shaders into 2dutils.

Browse Source
This commit is contained in:
hiker
2015-05-12 16:48:12 +10:00
parent 320dd6d1df
commit 827b9adce2
3 changed files with 35 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/graphics/2dutils.cpp
View File

@@ -57,6 +57,36 @@ public:
} // UniformColoredTextureRectShader
}; // UniformColoredTextureRectShader
// ============================================================================
class TextureRectShader : public Shader<TextureRectShader, core::vector2df,
core::vector2df, core::vector2df,
core::vector2df>,
public TextureReadNew<ST_BILINEAR_FILTERED>
{
public:
TextureRectShader()
{
loadProgram(OBJECT, GL_VERTEX_SHADER, "texturedquad.vert",
GL_FRAGMENT_SHADER, "texturedquad.frag");
assignUniforms("center", "size", "texcenter", "texsize");
assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
} // TextureRectShader
}; // TextureRectShader
// ============================================================================
class ColoredRectShader : public Shader<ColoredRectShader, core::vector2df,
core::vector2df, video::SColor>
{
public:
ColoredRectShader()
{
loadProgram(OBJECT, GL_VERTEX_SHADER, "coloredquad.vert",
GL_FRAGMENT_SHADER, "coloredquad.frag");
assignUniforms("center", "size", "color");
} // ColoredRectShader
}; // ColoredRectShader
// ============================================================================
class ColoredTextureRectShader : public Shader<ColoredTextureRectShader,
core::vector2df, core::vector2df,
@@ -162,11 +192,11 @@ static void drawTexQuad(GLuint texture, float width, float height,
float tex_center_pos_x, float tex_center_pos_y,
float tex_width, float tex_height)
{
UIShader::TextureRectShader::getInstance()->use();
TextureRectShader::getInstance()->use();
glBindVertexArray(SharedObject::UIVAO);
UIShader::TextureRectShader::getInstance()->setTextureUnits(texture);
UIShader::TextureRectShader::getInstance()->setUniforms(
TextureRectShader::getInstance()->setTextureUnits(texture);
TextureRectShader::getInstance()->setUniforms(
core::vector2df(center_pos_x, center_pos_y),
core::vector2df(width, height),
core::vector2df(tex_center_pos_x, tex_center_pos_y),
@@ -489,9 +519,9 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
clip->getWidth(), clip->getHeight());
}
UIShader::ColoredRectShader::getInstance()->use();
ColoredRectShader::getInstance()->use();
glBindVertexArray(SharedObject::UIVAO);
UIShader::ColoredRectShader::getInstance()
ColoredRectShader::getInstance()
->setUniforms(core::vector2df(center_pos_x, center_pos_y),
core::vector2df(width, height), color );

25
src/graphics/shaders.cpp
View File

@@ -1298,28 +1298,3 @@ namespace FullScreenShader
1, "colorMap", ST_NEAREST_FILTERED);
}
}
namespace UIShader
{
TextureRectShader::TextureRectShader()
{
loadProgram(OBJECT,
GL_VERTEX_SHADER, "texturedquad.vert",
GL_FRAGMENT_SHADER, "texturedquad.frag");
assignUniforms("center", "size", "texcenter", "texsize");
assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
}
ColoredRectShader::ColoredRectShader()
{
loadProgram(OBJECT,
GL_VERTEX_SHADER, "coloredquad.vert",
GL_FRAGMENT_SHADER, "coloredquad.frag");
assignUniforms("center", "size", "color");
}
}

22
src/graphics/shaders.hpp
View File

@@ -521,28 +521,6 @@ public:
}
namespace UIShader
{
class TextureRectShader : public Shader<TextureRectShader, core::vector2df,
core::vector2df, core::vector2df,
core::vector2df>,
public TextureReadNew<ST_BILINEAR_FILTERED>
{
public:
TextureRectShader();
};
class ColoredRectShader : public Shader<ColoredRectShader, core::vector2df,
core::vector2df, video::SColor>
{
public:
ColoredRectShader();
};
}
#define FOREACH_SHADER(ACT) \
ACT(ES_NORMAL_MAP) \
ACT(ES_NORMAL_MAP_LIGHTMAP) \