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

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

Browse Source
This commit is contained in:
Marianne Gagnon 2015-07-25 19:55:55 -04:00
commit a268354ac9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/shaders/lensblend.frag
View File

@ -16,12 +16,11 @@ void main()
col += .25 * texture(tex_256, uv); col += .25 * texture(tex_256, uv);
col += .5 * texture(tex_512, uv); col += .5 * texture(tex_512, uv);
//col *= 0.5; // Blue color for lens flare
/*col *= 0.5;
float final = max(col.r,max(col.g,col.b));
//float final = max(col.r,max(col.g,col.b)); final = final * 2;
//final = final * 2; vec3 blue = vec3(final * 0.1, final * 0.2, final);*/
//vec3 blue = vec3(final * 0.1, final * 0.2, final);
FragColor = vec4(col.rgb, 1.); FragColor = vec4(col.rgb, 1.);
} }

2
data/stk_config.xml
View File

@ -136,7 +136,7 @@
<!-- The field od views for 1-4 player split screen. fov-3 is <!-- The field od views for 1-4 player split screen. fov-3 is
actually not used (since 3 player split screen uses the actually not used (since 3 player split screen uses the
same layout as 4 player split screen) --> same layout as 4 player split screen) -->
<camera fov-1="75" fov-2="65" fov-3="50" fov-4="75" /> <camera fov-1="80" fov-2="65" fov-3="50" fov-4="75" />
<!-- disable-while-unskid: Disable steering when stop skidding during <!-- disable-while-unskid: Disable steering when stop skidding during
the time it takes to adjust the physical body with the graphics. the time it takes to adjust the physical body with the graphics.