gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

orthographic fixes

Browse source
This commit is contained in:
ExMix 2013-03-24 17:49:24 +03:00 • committed by Alex Zolotarev
parent 2eac6a6985
commit 3bf3664bb0
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
map/basic_tiling_render_policy.cpp
View file

@ -131,7 +131,7 @@ void BasicTilingRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e, Screen
}
pDrawer->endFrame();
m_CoverageGenerator->AddFinishSequenceTaskIfNeed();
m_CoverageGenerator->AddFinishSequenceTaskIfNeeded();
}
void BasicTilingRenderPolicy::EndFrame(shared_ptr<PaintEvent> const & e, ScreenBase const & s)

2
map/benchmark_engine.cpp
View file

@ -254,7 +254,7 @@ void BenchmarkEngine::Do()
PrepareMaps();
int benchMarkCount = 1;
Settings::Get("BenchmarkCyrcleCount", benchMarkCount);
Settings::Get("BenchmarkCyclesCount", benchMarkCount);
for (int i = 0; i < benchMarkCount; ++i)
{

10
map/coverage_generator.cpp
View file

@ -286,12 +286,12 @@ void CoverageGenerator::CheckEmptyModel(int sequenceID)
m_windowHandle->invalidate();
}
void CoverageGenerator::AddFinishSequenceTaskIfNeed()
void CoverageGenerator::AddFinishSequenceTaskIfNeeded()
{
if (g_coverageGeneratorDestroyed)
return;
if (m_benchmarkBarier.m_tilesCount == 0)
if (m_benchmarkBarrier.m_tilesCount == 0)
m_queue.AddCommand(bind(&CoverageGenerator::FinishSequence, this));
}
@ -305,7 +305,7 @@ void CoverageGenerator::AddDecrementTileCountTask(int sequenceID)
if (g_coverageGeneratorDestroyed)
return;
m_queue.AddCommand(bind(&BenchmarkRenderingBarier::DecrementTileCounter, &m_benchmarkBarier, sequenceID));
m_queue.AddCommand(bind(&BenchmarkRenderingBarier::DecrementTileCounter, &m_benchmarkBarrier, sequenceID));
}
void CoverageGenerator::WaitForEmptyAndFinished()
@ -330,8 +330,8 @@ void CoverageGenerator::SetSequenceID(int sequenceID)
void CoverageGenerator::StartTileDrawingSession(int sequenceID, unsigned tileCount)
{
m_benchmarkBarier.m_sequenceID = sequenceID;
m_benchmarkBarier.m_tilesCount = tileCount;
m_benchmarkBarrier.m_sequenceID = sequenceID;
m_benchmarkBarrier.m_tilesCount = tileCount;
}
shared_ptr<graphics::ResourceManager> const & CoverageGenerator::resourceManager() const

4
map/coverage_generator.hpp
View file

@ -52,7 +52,7 @@ private:
}
};
BenchmarkRenderingBarier m_benchmarkBarier;
BenchmarkRenderingBarier m_benchmarkBarrier;
core::CommandsQueue m_queue;
@ -109,7 +109,7 @@ public:
int sequenceID);
void AddCheckEmptyModelTask(int sequenceID);
void AddFinishSequenceTaskIfNeed();
void AddFinishSequenceTaskIfNeeded();
void AddDecrementTileCountTask(int sequenceID);