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 into ScriptEngine

Browse Source
This commit is contained in:
Sachith Hasaranga Seneviratne 2014-06-05 12:39:07 +05:30
commit 85f6a7b576
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/glwrap.cpp
View File

@ -273,7 +273,10 @@ GLuint LoadShader(const char * file, unsigned type)
{
Log::error("GLWrap", "Error in shader %s", file);
glGetShaderiv(Id, GL_INFO_LOG_LENGTH, &InfoLogLength);
if(InfoLogLength<0)
InfoLogLength = 1024;
char *ErrorMessage = new char[InfoLogLength];
ErrorMessage[0]=0;
glGetShaderInfoLog(Id, InfoLogLength, NULL, ErrorMessage);
Log::error("GLWrap", ErrorMessage);
delete[] ErrorMessage;

2
src/graphics/render.cpp
View File

@ -570,7 +570,7 @@ void IrrDriver::renderSolidFirstPass()
void IrrDriver::renderSolidSecondPass()
{
SColor clearColor(0., 150, 150, 150);
SColor clearColor(0, 150, 150, 150);
if (World::getWorld() != NULL)
clearColor = World::getWorld()->getClearColor();

2
src/graphics/rtts.cpp
View File

@ -90,7 +90,7 @@ RTT::RTT(size_t width, size_t height)
const dimension2du warpvsize(1, 512);
const dimension2du warphsize(512, 1);
unsigned linear_depth_mip_levels = ceil(log2(max_(res.Width, res.Height)));
unsigned linear_depth_mip_levels = int(ceilf(log2f( float(max_(res.Width, res.Height)) )));
DepthStencilTexture = generateRTT(res, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);

2
src/states_screens/feature_unlocked.hpp
View File

@ -94,7 +94,7 @@ class FeatureUnlockedCutScene : public GUIEngine::CutsceneScreen, public GUIEngi
PtrVector<KartModel> m_all_kart_models;
/** Global evolution of time */
double m_global_time;
float m_global_time;
/** Key position from origin (where the chest is) */
float m_key_pos;