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

Merge pull request #1994 from Flakebi/credits

Browse Source 
Fix transparency of fallback characters
This commit is contained in:
auriamg 2015-02-28 19:00:45 -05:00
commit cb5670c843
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/shaders/colortexturedquad.frag
View File

@ -7,5 +7,5 @@ out vec4 FragColor;
void main()
{
vec4 res = texture(tex, uv);
FragColor = vec4(res.xyz * col.xyz, res.a);
FragColor = res * col;
}

6
src/guiengine/scalable_font.cpp
View File

@ -668,9 +668,9 @@ void ScalableFont::doDraw(const core::stringw& text,
if (fallback[n])
{
// TODO: don't hardcode colors?
static video::SColor orange(color.getAlpha(), 255, 100, 0);
static video::SColor yellow(color.getAlpha(), 255, 220, 15);
video::SColor title_colors[] = {yellow, orange, orange, yellow};
video::SColor orange(color.getAlpha(), 255, 100, 0);
video::SColor yellow(color.getAlpha(), 255, 220, 15);
video::SColor title_colors[] = {orange, yellow, orange, yellow};
if (charCollector != NULL)
{