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

Minor changes (replace pow(2, X) with 1 << X).

Browse source
This commit is contained in:
vng 2012-07-24 12:55:39 -07:00 • committed by Alex Zolotarev
parent bf5fcdfa60
commit 9c47eb0403
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
map/basic_tiling_render_policy.cpp
View file

@ -11,31 +11,27 @@
size_t BasicTilingRenderPolicy::CalculateTileSize(size_t screenWidth, size_t screenHeight)
{
/// getting maximum screenSize
size_t maxScreenSize = max(screenWidth, screenHeight);
int const maxSz = max(screenWidth, screenHeight);
/// we're calculating the tileSize based on
/// (maxScreenSize > 1024 ? rounded : ceiled) to the nearest power of two value
/// of the maxScreenSize
// we're calculating the tileSize based on (maxSz > 1024 ? rounded : ceiled)
// to the nearest power of two value of the maxSz
double const log2 = log(2.0);
int const ceiledSz = 1 << static_cast<int>(ceil(log(double(maxSz + 1)) / log(2.0)));
int res = 0;
size_t ceiledScreenSize = static_cast<int>(pow(2.0, ceil(log(double(maxScreenSize + 1)) / log2)));
size_t flooredScreenSize = ceiledScreenSize / 2;
size_t resScreenSize = 0;
if (maxScreenSize < 1024)
resScreenSize = ceiledScreenSize;
if (maxSz < 1024)
res = ceiledSz;
else
{
/// rounding to the nearest power of two.
if (ceiledScreenSize - maxScreenSize < maxScreenSize - flooredScreenSize)
resScreenSize = ceiledScreenSize;
int const flooredSz = ceiledSz / 2;
// rounding to the nearest power of two.
if (ceiledSz - maxSz < maxSz - flooredSz)
res = ceiledSz;
else
resScreenSize = flooredScreenSize;
res = flooredSz;
}
return min(max(resScreenSize / 2, (size_t)128), (size_t)1024);
return min(max(res / 2, 128), 1024);
}
BasicTilingRenderPolicy::BasicTilingRenderPolicy(Params const & p,

4
yg/render_state.cpp
View file

@ -51,6 +51,7 @@ namespace yg
m_surfaceWidth = w;
m_surfaceHeight = h;
/*
double const log2 = log(2.0);
m_textureWidth = static_cast<uint32_t>(pow(2, ceil(log(double(w)) / log2)));
@ -58,6 +59,9 @@ namespace yg
m_textureWidth = max(m_textureWidth, m_textureHeight);
m_textureHeight = max(m_textureWidth, m_textureHeight);
*/
m_textureWidth = m_textureHeight =
1 << static_cast<int>(ceil(log(double(max(w, h))) / log(2.0)));
}
}