immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove default lambda parameters 

They cause compilation error on MSVC and should give errors, as it's explicitly stated in the C++11 standard: http://stackoverflow.com/questions/6281472/why-does-a-default-argument-for-a-lambda-argument-trigger-a-pedantic-gcc-warni
dev-new-models
MrSimbax 2016-08-18 10:02:54 +02:00
parent 584d782a9f
commit 92b1e544ec
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/graphics/engine/engine.cpp
View File

@ -5057,7 +5057,7 @@ void CEngine::DrawStats()
SetState(ENG_RSTATE_TEXT); SetState(ENG_RSTATE_TEXT);
auto drawStatsLine = [&](const std::string& name = "", const std::string& value = "", const std::string& value2 = "") auto drawStatsLine = [&](const std::string& name, const std::string& value, const std::string& value2)
{ {
if (!name.empty()) if (!name.empty())
m_text->DrawText(name+":", FONT_COLOBOT, 12.0f, pos, 1.0f, TEXT_ALIGN_LEFT, 0, Color(1.0f, 1.0f, 1.0f, 1.0f)); m_text->DrawText(name+":", FONT_COLOBOT, 12.0f, pos, 1.0f, TEXT_ALIGN_LEFT, 0, Color(1.0f, 1.0f, 1.0f, 1.0f));
@ -5103,14 +5103,14 @@ void CEngine::DrawStats()
CProfiler::GetPerformanceCounterTime(PCNT_RENDER_SHADOW_MAP); CProfiler::GetPerformanceCounterTime(PCNT_RENDER_SHADOW_MAP);
drawStatsCounter("Event processing", PCNT_EVENT_PROCESSING); drawStatsCounter("Event processing", PCNT_EVENT_PROCESSING);
drawStatsLine( ""); drawStatsLine( "", "", "");
drawStatsCounter("Frame update", PCNT_UPDATE_ALL); drawStatsCounter("Frame update", PCNT_UPDATE_ALL);
drawStatsValue (" Engine update", engineUpdate); drawStatsValue (" Engine update", engineUpdate);
drawStatsCounter(" Particle update", PCNT_UPDATE_PARTICLE); drawStatsCounter(" Particle update", PCNT_UPDATE_PARTICLE);
drawStatsValue (" Game update", gameUpdate); drawStatsValue (" Game update", gameUpdate);
drawStatsCounter(" CBot programs", PCNT_UPDATE_CBOT); drawStatsCounter(" CBot programs", PCNT_UPDATE_CBOT);
drawStatsValue( " Other update", otherUpdate); drawStatsValue( " Other update", otherUpdate);
drawStatsLine( ""); drawStatsLine( "", "", "");
drawStatsCounter("Frame render", PCNT_RENDER_ALL); drawStatsCounter("Frame render", PCNT_RENDER_ALL);
drawStatsCounter(" Particle render", PCNT_RENDER_PARTICLE_WORLD); drawStatsCounter(" Particle render", PCNT_RENDER_PARTICLE_WORLD);
drawStatsCounter(" Water render", PCNT_RENDER_WATER); drawStatsCounter(" Water render", PCNT_RENDER_WATER);
@ -5121,13 +5121,13 @@ void CEngine::DrawStats()
drawStatsCounter(" Shadow map render", PCNT_RENDER_SHADOW_MAP); drawStatsCounter(" Shadow map render", PCNT_RENDER_SHADOW_MAP);
drawStatsValue( " Other render", otherRender); drawStatsValue( " Other render", otherRender);
drawStatsCounter("Swap buffers & VSync", PCNT_SWAP_BUFFERS); drawStatsCounter("Swap buffers & VSync", PCNT_SWAP_BUFFERS);
drawStatsLine( ""); drawStatsLine( "", "", "");
drawStatsLine( "Triangles", StrUtils::ToString<int>(m_statisticTriangle)); drawStatsLine( "Triangles", StrUtils::ToString<int>(m_statisticTriangle), "");
drawStatsLine( "FPS", StrUtils::Format("%.3f", m_fps)); drawStatsLine( "FPS", StrUtils::Format("%.3f", m_fps), "");
drawStatsLine( ""); drawStatsLine( "", "", "");
std::stringstream str; std::stringstream str;
str << std::fixed << std::setprecision(2) << m_statisticPos.x << "; " << m_statisticPos.z; str << std::fixed << std::setprecision(2) << m_statisticPos.x << "; " << m_statisticPos.z;
drawStatsLine( "Position", str.str()); drawStatsLine( "Position", str.str(), "");
} }
void CEngine::DrawTimer() void CEngine::DrawTimer()