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

removed emptyModelFn, using only countryNameFn

Browse source
This commit is contained in:
rachytski 2012-06-05 00:28:09 +04:00 • committed by Alex Zolotarev
parent 6b472399e2
commit 95c4ede478
10 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
map/basic_render_policy.cpp
View file

@ -25,12 +25,6 @@ void BasicRenderPolicy::SetRenderFn(TRenderFn renderFn)
m_RenderQueue->initializeGL(m_primaryRC, m_resourceManager);
}
void BasicRenderPolicy::SetEmptyModelFn(TEmptyModelFn checkFn)
{
RenderPolicy::SetEmptyModelFn(checkFn);
m_RenderQueue->SetEmptyModelFn(checkFn);
}
void BasicRenderPolicy::SetCountryNameFn(TCountryNameFn countryNameFn)
{
RenderPolicy::SetCountryNameFn(countryNameFn);

1
map/basic_render_policy.hpp
View file

@ -46,7 +46,6 @@ public:
RenderQueue & GetRenderQueue();
void SetRenderFn(TRenderFn renderFn);
void SetEmptyModelFn(TEmptyModelFn checkFn);
void SetCountryNameFn(TCountryNameFn countryNameFn);
bool NeedRedraw() const;

1
map/framework.cpp
View file

@ -903,7 +903,6 @@ void Framework::SetRenderPolicy(RenderPolicy * renderPolicy)
m_guiController->SetRenderParams(rp);
m_renderPolicy->SetEmptyModelFn(bind(&Framework::IsEmptyModel, this, _1));
m_renderPolicy->SetCountryNameFn(bind(&Framework::GetCountryName, this, _1));
m_renderPolicy->SetRenderFn(DrawModelFn());

5
map/render_policy.cpp
View file

@ -139,11 +139,6 @@ void RenderPolicy::SetRenderFn(TRenderFn renderFn)
m_renderFn = renderFn;
}
void RenderPolicy::SetEmptyModelFn(TEmptyModelFn emptyModelFn)
{
m_emptyModelFn = emptyModelFn;
}
void RenderPolicy::SetCountryNameFn(TCountryNameFn countryNameFn)
{
m_countryNameFn = countryNameFn;

1
map/render_policy.hpp
View file

@ -101,7 +101,6 @@ public:
/// the start point of rendering in renderpolicy.
virtual void SetRenderFn(TRenderFn renderFn);
virtual void SetEmptyModelFn(TEmptyModelFn emptyModelFn);
virtual void SetCountryNameFn(TCountryNameFn countryNameFn);
bool DoSupportRotation() const;

5
map/render_queue.cpp
View file

@ -70,11 +70,6 @@ void RenderQueue::SetRedrawAll()
m_renderState->m_doRepaintAll = true;
}
void RenderQueue::SetEmptyModelFn(RenderQueueRoutine::TEmptyModelFn fn)
{
m_routine->SetEmptyModelFn(fn);
}
void RenderQueue::SetCountryNameFn(RenderQueueRoutine::TCountryNameFn fn)
{
m_routine->SetCountryNameFn(fn);

2
map/render_queue.hpp
View file

@ -54,8 +54,6 @@ public:
void SetRedrawAll();
void SetEmptyModelFn(RenderQueueRoutine::TEmptyModelFn fn);
void SetCountryNameFn(RenderQueueRoutine::TCountryNameFn fn);
void SetVisualScale(double visualScale);

10
map/render_queue_routine.cpp
View file

@ -81,11 +81,6 @@ void RenderQueueRoutine::onSize(int w, int h)
m_newBackBuffer = m_resourceManager->createRenderTarget(texW, texH);
}
void RenderQueueRoutine::SetEmptyModelFn(TEmptyModelFn emptyModelFn)
{
m_emptyModelFn = emptyModelFn;
}
void RenderQueueRoutine::SetCountryNameFn(TCountryNameFn countryNameFn)
{
m_countryNameFn = countryNameFn;
@ -477,8 +472,9 @@ void RenderQueueRoutine::Do()
if (!cumulativeEmptyModelCurrent || fullRectRepaint)
{
m2::PointD centerPt = m_currentRenderCommand->m_frameScreen.GlobalRect().GetGlobalRect().Center();
m_renderState->m_isEmptyModelActual = cumulativeEmptyModelCurrent && m_emptyModelFn(centerPt);
m_renderState->m_countryNameActual = m_countryNameFn(centerPt);
string countryName = m_countryNameFn(centerPt);
m_renderState->m_countryNameActual = countryName;
m_renderState->m_isEmptyModelActual = cumulativeEmptyModelCurrent && !countryName.empty();
}
/// setting the "whole texture" clip rect to render texts opened by panning.

3
map/render_queue_routine.hpp
View file

@ -40,7 +40,6 @@ class RenderQueueRoutine : public threads::IRoutine
public:
typedef function<void(shared_ptr<PaintEvent>, ScreenBase const &, m2::RectD const &, m2::RectD const &, int, bool)> render_fn_t;
typedef function<bool (m2::PointD const &)> TEmptyModelFn;
typedef function<string (m2::PointD const &)> TCountryNameFn;
private:
@ -95,7 +94,6 @@ private:
yg::Color m_bgColor;
yg::gl::PacketsQueue * m_glQueue;
TEmptyModelFn m_emptyModelFn;
TCountryNameFn m_countryNameFn;
void waitForRenderCommand(list<shared_ptr<RenderModelCommand> > & cmdList,
@ -120,7 +118,6 @@ public:
void onSize(int w, int h);
void SetEmptyModelFn(TEmptyModelFn emptyModelFn);
void SetCountryNameFn(TCountryNameFn countryNameFn);
/// Check, whether the resize command is queued, and resize accordingly.

5
map/screen_coverage.cpp
View file

@ -395,9 +395,8 @@ void ScreenCoverage::CheckEmptyModelAtCoverageCenter()
if (!IsPartialCoverage() && IsEmptyDrawingCoverage())
{
m2::PointD centerPt = m_screen.GlobalRect().GetGlobalRect().Center();
m_isEmptyModelAtCoverageCenter = m_coverageGenerator->IsEmptyModelAtPoint(centerPt);
if (m_isEmptyModelAtCoverageCenter)
m_countryNameAtCoverageCenter = m_coverageGenerator->GetCountryName(centerPt);
m_countryNameAtCoverageCenter = m_coverageGenerator->GetCountryName(centerPt);
m_isEmptyModelAtCoverageCenter = !m_countryNameAtCoverageCenter.empty();
}
}