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

Fixed compiler warnings.

Browse Source
This commit is contained in:
hiker 2014-11-12 13:27:53 +11:00
parent 8ac0bd6793
commit f78c7e0779
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/post_processing.cpp
View File

@ -477,7 +477,7 @@ void PostProcessing::renderFog()
FullScreenShader::FogShader::getInstance()->SetTextureUnits(irr_driver->getDepthStencilTexture());
DrawFullScreenEffect<FullScreenShader::FogShader>(1. / (40. * start), col);
DrawFullScreenEffect<FullScreenShader::FogShader>(1.f / (40.f * start), col);
glEnable(GL_DEPTH_TEST);
glDisable(GL_BLEND);

11
src/graphics/render.cpp
View File

@ -896,16 +896,17 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
core::matrix4 tmp_matrix;
if (irr_driver->supportsSDSM()){
float left = CBB[currentCBB][i].xmin / 4 - 2;
float right = CBB[currentCBB][i].xmax / 4 + 2;
float up = CBB[currentCBB][i].ymin / 4 - 2;
float down = CBB[currentCBB][i].ymax / 4 + 2;
float left = float(CBB[currentCBB][i].xmin / 4 - 2);
float right = float(CBB[currentCBB][i].xmax / 4 + 2);
float up = float(CBB[currentCBB][i].ymin / 4 - 2);
float down = float(CBB[currentCBB][i].ymax / 4 + 2);
// Prevent Matrix without extend
if (left != right && up != down)
tmp_matrix.buildProjectionMatrixOrthoLH(left, right,
down, up,
CBB[currentCBB][i].zmin / 4 - 100, CBB[currentCBB][i].zmax / 4 + 2);
float(CBB[currentCBB][i].zmin / 4 - 100),
float(CBB[currentCBB][i].zmax / 4 + 2) );
}
else
tmp_matrix = getTighestFitOrthoProj(SunCamViewMatrix, vectors);