From 3bf3664bb0cc082549b26c8bc670a8d239f2c783 Mon Sep 17 00:00:00 2001 From: ExMix Date: Sun, 24 Mar 2013 17:49:24 +0300 Subject: [PATCH] orthographic fixes --- map/basic_tiling_render_policy.cpp | 2 +- map/benchmark_engine.cpp | 2 +- map/coverage_generator.cpp | 10 +++++----- map/coverage_generator.hpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/map/basic_tiling_render_policy.cpp b/map/basic_tiling_render_policy.cpp index 75953b8fe0..04132aeca3 100644 --- a/map/basic_tiling_render_policy.cpp +++ b/map/basic_tiling_render_policy.cpp @@ -131,7 +131,7 @@ void BasicTilingRenderPolicy::DrawFrame(shared_ptr const & e, Screen } pDrawer->endFrame(); - m_CoverageGenerator->AddFinishSequenceTaskIfNeed(); + m_CoverageGenerator->AddFinishSequenceTaskIfNeeded(); } void BasicTilingRenderPolicy::EndFrame(shared_ptr const & e, ScreenBase const & s) diff --git a/map/benchmark_engine.cpp b/map/benchmark_engine.cpp index 754ee5c0a9..df46e101e4 100644 --- a/map/benchmark_engine.cpp +++ b/map/benchmark_engine.cpp @@ -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) { diff --git a/map/coverage_generator.cpp b/map/coverage_generator.cpp index 41bd3cdb2a..49eb964ee7 100644 --- a/map/coverage_generator.cpp +++ b/map/coverage_generator.cpp @@ -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 const & CoverageGenerator::resourceManager() const diff --git a/map/coverage_generator.hpp b/map/coverage_generator.hpp index d479af6d5d..3af5e6781a 100644 --- a/map/coverage_generator.hpp +++ b/map/coverage_generator.hpp @@ -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);