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

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

Browse Source
This commit is contained in:
hiker 2014-12-14 11:41:47 +11:00
commit 6cf4d381ee
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/shaders/bilateralH.comp
View File

@ -3,7 +3,7 @@
uniform sampler2D source;
uniform sampler2D depth;
uniform vec2 pixel;
uniform layout(size1x16) volatile restrict writeonly image2D dest;
uniform layout(r16f) volatile restrict writeonly image2D dest;
uniform float sigma = 5.;
layout (local_size_x = 8, local_size_y = 8) in;

2
data/shaders/bilateralV.comp
View File

@ -3,7 +3,7 @@
uniform sampler2D source;
uniform sampler2D depth;
uniform vec2 pixel;
uniform layout(size1x16) volatile restrict writeonly image2D dest;
uniform layout(r16f) volatile restrict writeonly image2D dest;
uniform float sigma = 5.;
layout (local_size_x = 8, local_size_y = 8) in;

2
data/shaders/importance_sampling_specular.frag
View File

@ -29,5 +29,5 @@ void main(void)
weight += NdotL;
}
FragColor = FinalColor / weight;
FragColor = FinalColor / max(weight, 1.);
}

2
data/shaders/utils/SpecularIBL.frag
View File

@ -7,5 +7,5 @@ vec3 SpecularIBL(vec3 normal, vec3 V, float roughness)
// Assume 8 level of lod (ie 256x256 texture)
float lodval = 8. * (1. - roughness);
return clamp( textureLod(probe, sampleDirection, lodval).rgb, 0., 1.);
return textureLod(probe, sampleDirection, lodval).rgb;
}

4
src/addons/news_manager.cpp
View File

@ -49,7 +49,7 @@ NewsManager::~NewsManager()
// ---------------------------------------------------------------------------
/** This function initialises the data for the news manager. It starts a
* separate thread to execute downloadNews() - which (if necessary) downaloads
* separate thread to execute downloadNews() - which (if necessary) downloads
* the news.xml file and updates the list of news messages. It also
* initialises the addons manager (which can trigger another download of
* news.xml).
@ -458,7 +458,7 @@ bool NewsManager::conditionFulfilled(const std::string &cond)
// ==============================
else if(cond[1]=="not" && cond[2]=="installed")
{
// The addons_manager can not be access, since it's
// The addons_manager cannot be accessed, since it's
// being initialised after the news manager. So a simple
// test is made to see if the directory exists. It is
// necessary to check for karts and tracks separately,

8
src/config/player_manager.cpp
View File

@ -326,7 +326,7 @@ void PlayerManager::enforceCurrentPlayer()
{
if (!player->isGuestAccount())
{
Log::info("PlayerManager", "Enfocring current player '%ls'.",
Log::info("PlayerManager", "Enforcing current player '%ls'.",
player->getName().c_str() );
m_current_player = player;
return;
@ -340,7 +340,7 @@ void PlayerManager::enforceCurrentPlayer()
{
if (!player->isGuestAccount())
{
Log::info("PlayerManager", "Enfocring current player '%s'.",
Log::info("PlayerManager", "Enforcing current player '%s'.",
player->getName().c_str());
m_current_player = player;
return;
@ -353,8 +353,8 @@ void PlayerManager::enforceCurrentPlayer()
// ----------------------------------------------------------------------------
/** Called when no player profiles exists. It creates two players: one
* guest player, and one non-guest player for whic hit tries to guess a
* mame based on environment variables.
* guest player, and one non-guest player for which it tries to guess a
* name based on environment variables.
*/
void PlayerManager::addDefaultPlayer()
{