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

removed Platform::MaxTilesCount

Browse source
This commit is contained in:
rachytski 2012-03-23 17:17:20 +04:00 • committed by Alex Zolotarev
parent 8891c7fe9a
commit ce659dc61b
5 changed files with 1 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -34,35 +34,8 @@ public:
/// calculating how much tiles we need for the screen of such size
m_maxTilesCount = 0;
m_preCachingDepth = 3;
/// calculating for non-rotated screen
for (unsigned i = 0; i < m_preCachingDepth; ++i)
{
// LOG(LINFO, ("calculating", i, "level"));
/// minimum size of tile on the screen
float minTileSize = floor((m_tileSize << i) / 1.05 / 2.0) - 1;
// LOG(LINFO, ("minTileSize:", minTileSize));
int tilesOnXSide = ceil(screenWidth / minTileSize) + 1;
// LOG(LINFO, ("tilesOnXSide:", tilesOnXSide));
int tilesOnYSide = ceil(screenHeight / minTileSize) + 1;
// LOG(LINFO, ("tilesOnYSide:", tilesOnYSide));
/// tiles in the single screen
int singleScreenTilesCount = tilesOnXSide * tilesOnYSide;
// LOG(LINFO, ("singleScreenTilesCount:", singleScreenTilesCount));
int curLevelTilesCount = singleScreenTilesCount * 2;
// LOG(LINFO, ("curLevelTilesCount:", curLevelTilesCount));
m_maxTilesCount += curLevelTilesCount;
// LOG(LINFO, ("on", i, "depth we need", curLevelTilesCount, "tiles"));
}
LOG(LINFO, ("minimum amount of tiles needed is", m_maxTilesCount));
m_maxTilesCount = max(static_cast<int>(120 * k), m_maxTilesCount);
switch (densityDpi)
{
case 120:
@ -104,11 +77,6 @@ string Platform::SkinName() const
return m_impl->m_skinName;
}
int Platform::MaxTilesCount() const
{
return m_impl->m_maxTilesCount;
}
int Platform::TileSize() const
{
return m_impl->m_tileSize;

2
platform/platform.hpp
View file

@ -117,8 +117,6 @@ public:
int TileSize() const;
int MaxTilesCount() const;
int VideoMemoryLimit() const;
int PreCachingDepth() const;

5
platform/platform_android.cpp
View file

@ -122,10 +122,7 @@ int Platform::ScaleEtalonSize() const
return 256;
}
int Platform::MaxTilesCount() const
{
return 120;
}*/
*/
int Platform::VideoMemoryLimit() const
{

5
platform/platform_ios.mm
View file

@ -191,11 +191,6 @@ int Platform::VideoMemoryLimit() const
return m_impl->m_videoMemoryLimit;
}
int Platform::MaxTilesCount() const
{
return 60;
}
int Platform::PreCachingDepth() const
{
return 2;

5
platform/platform_qt.cpp
View file

@ -69,11 +69,6 @@ void Platform::GetFontNames(FilesList & res) const
CHECK(!res.empty(), ("Can't find any valid font in", ResourcesDir(), WritableDir()));
}
int Platform::MaxTilesCount() const
{
return 200;
}
int Platform::PreCachingDepth() const
{
return 5;