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

Removed kakashcky.

Browse source
This commit is contained in:
Dmitry Kunin 2013-09-13 21:18:34 +03:00 • committed by Alex Zolotarev
parent 2fbb6683d5
commit a5d170737b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/YoPme/jni/Framework.cpp
View file

@ -35,7 +35,8 @@ namespace yopme
m_framework.PrepareToShutdown();
}
bool Framework::ShowRect(double lat, double lon, double zoom, bool needApiMark, bool needMyLoc, double myLat, double myLon)
bool Framework::ShowRect(double lat, double lon, double zoom,
bool needApiMark, bool needMyLoc, double myLat, double myLon)
{
m2::PointD point(MercatorBounds::LonToX(lon), MercatorBounds::LatToY(lat));
m2::PointD altPoint(MercatorBounds::LonToX(myLon), MercatorBounds::LatToY(myLat));
@ -49,7 +50,8 @@ namespace yopme
return true;
}
void Framework::InitRenderPolicy(bool needApiPin, m2::PointD apiPinPoint, bool needMyLoc, m2::PointD myLocPoint)
void Framework::InitRenderPolicy(bool needApiPin, m2::PointD const & apiPinPoint,
bool needMyLoc, m2::PointD const & myLocPoint)
{
shared_ptr<RenderContext> primaryRC(new RenderContext());
graphics::ResourceManager::Params rmParams;

7
android/YoPme/jni/Framework.hpp
View file

@ -11,10 +11,13 @@ namespace yopme
Framework(int width, int height);
~Framework();
bool ShowRect(double lat, double lon, double zoom, bool needApiMark, bool needMyLoc, double myLat, double myLoc);
bool ShowRect(double lat, double lon, double zoom,
bool needApiMark, bool needMyLoc, double myLat, double myLoc);
private:
void InitRenderPolicy(bool needApiPin, m2::PointD apiPinPoint, bool needMyLoc, m2::PointD myLocPoint);
void InitRenderPolicy(bool needApiPin, m2::PointD const & apiPinPoint,
bool needMyLoc, m2::PointD const & myLocPoint);
void TeardownRenderPolicy();
void RenderMap();

5
map/yopme_render_policy.cpp
View file

@ -20,7 +20,6 @@ YopmeRP::YopmeRP(RenderPolicy::Params const & p)
, m_drawApiPin(false)
, m_drawMyPosition(false)
{
LOG(LDEBUG, ("Yopme render policy created"));
ResourceManager::Params rmp = p.m_rmParams;
rmp.checkDeviceCaps();
@ -130,16 +129,12 @@ void YopmeRP::DrawFrame(shared_ptr<PaintEvent> const & e, ScreenBase const & s)
if (m_drawMyPosition)
{
LOG(LINFO, ("UVRLOG : MyPosition is drawing ", m_myPositionPoint));
graphics::Circle::Info info(8, graphics::Color(0, 0, 0, 255), true, 3, graphics::Color(255, 255, 255, 255));
pScreen->drawCircle(m_myPositionPoint, info, graphics::EPosCenter, graphics::maxDepth);
}
if (m_drawApiPin)
{
LOG(LINFO, ("UVRLOG : Apipin is drawing ", m_apiPinPoint));
pScreen->drawSymbol(m_apiPinPoint, "api_pin", graphics::EPosCenter, graphics::maxDepth);
}
pScreen->endFrame();
}