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-25 13:58:28 +11:00
parent 346bae4d03
commit af186b6926
5 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/graphics/lod_node.cpp
View File

@ -75,7 +75,6 @@ int LODNode::getLevel()
if(m_forced_lod>-1)
return m_forced_lod;
scene::ICameraSceneNode* curr_cam = irr_driver->getSceneManager()->getActiveCamera();
Camera* camera = Camera::getActiveCamera();
if (camera == NULL)
return (int)m_detail.size() - 1;

4
src/graphics/post_processing.cpp
View File

@ -519,11 +519,7 @@ void PostProcessing::renderFog()
const Track * const track = World::getWorld()->getTrack();
// This function is only called once per frame - thus no need for setters.
const float fogmax = track->getFogMax();
const float startH = track->getFogStartHeight();
const float endH = track->getFogEndHeight();
const float start = track->getFogStart();
const float end = track->getFogEnd();
const SColor tmpcol = track->getFogColor();
core::vector3df col( tmpcol.getRed() / 255.0f,

1
src/graphics/render_geometry.cpp
View File

@ -692,7 +692,6 @@ static void renderInstancedMeshNormals()
glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
for (unsigned i = 0; i < meshes.size(); i++)
{
GLMesh *mesh = meshes[i];
MeshShader::NormalVisualizer::getInstance()->setUniforms(video::SColor(255, 0, 255, 0));
glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((SolidPassCmd::getInstance()->Offset[T::MaterialType] + i) * sizeof(DrawElementsIndirectCommand)));
}

3
src/graphics/render_lighting.cpp
View File

@ -201,7 +201,6 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
const Track * const track = World::getWorld()->getTrack();
const float start = track->getFogStart();
const video::SColor tmpcol = track->getFogColor();
core::vector3df col(1., 1., 1.);
glUseProgram(LightShader::PointLightScatterShader::getInstance()->Program);
@ -223,4 +222,4 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
getFBO(FBO_COLORS).Bind();
m_post_processing->renderPassThrough(getRenderTargetTexture(RTT_HALF1));
}
}

3
src/graphics/stkanimatedmesh.cpp
View File

@ -208,9 +208,6 @@ void STKAnimatedMesh::updateGL()
void STKAnimatedMesh::render()
{
bool isTransparentPass =
SceneManager->getSceneNodeRenderPass() == scene::ESNRP_TRANSPARENT;
++PassCount;
updateNoGL();