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

Merge pull request #555 from bykoianko/get-dpi2

Browse source 
Calculation visualScale based on more exact dpi.
This commit is contained in:
therearesomewhocallmetim 2015-11-18 13:21:30 +03:00
commit 9d50426be8
18 changed files with 88 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -150,6 +150,7 @@ namespace android
}
params.m_density = dens[bestRangeIndex].second;
params.m_exactDensityDPI = densityDpi;
}
bool Framework::InitRenderPolicyImpl(int densityDpi, int screenWidth, int screenHeight)
@ -158,6 +159,7 @@ namespace android
rmParams.m_videoMemoryLimit = 30 * 1024 * 1024;
rmParams.m_texFormat = graphics::Data4Bpp;
rmParams.m_exactDensityDPI = densityDpi;
RenderPolicy::Params rpParams;

9
android/src/com/nvidia/devtech/NvEventQueueFragment.java
View file

@ -76,10 +76,11 @@ public abstract class NvEventQueueFragment extends BaseMwmFragment implements Vi
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
final DisplayMetrics metrics = new DisplayMetrics();
getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
mDisplayDensity = metrics.densityDpi;
final DisplayMetrics dm = getActivity().getResources().getDisplayMetrics();
final float exactDensityDpi = (dm.xdpi + dm.ydpi) / 2;
mDisplayDensity = (int)exactDensityDpi;
mIsNativeLaunched = true;
onCreateNative();
if (getActivity().isChangingConfigurations())

10
graphics/defines.cpp
View file

@ -77,10 +77,14 @@ namespace graphics
density = static_cast<EDensity>(FindFirstBySecond(s_density, name, EqualStrings()));
}
double visualScale(EDensity density)
double visualScaleExact(int exactDensityDPI)
{
static double const vs [6] = { 0.75, 1, 1.5, 2, 3, 2.4 };
return vs[density];
double const mdpiDensityDPI = 160.;
// For some old devices (for example iPad 2) the density could be less than 160 DPI.
// Returns one in that case to keep readable text on the map.
if (exactDensityDPI <= mdpiDensityDPI)
return 1.;
return exactDensityDPI / mdpiDensityDPI;
}
DataIS s_semantics[] = {

4
graphics/defines.hpp
View file

@ -27,8 +27,8 @@ namespace graphics
/// get density from name
void convert(char const * name, EDensity & density);
/// get scaling koefficient for specified density
double visualScale(EDensity density);
/// Gets visual scale by exact density in dpi.
double visualScaleExact(int exactDensityDPI);
/// When adding values here,
/// please check constructor of ResourceManager,

2
graphics/glyph_cache.cpp
View file

@ -47,12 +47,14 @@ namespace graphics
string const & blackListFile,
size_t maxSize,
EDensity density,
int exactDensityDPI,
bool isDebugging)
: m_blocksFile(blocksFile),
m_whiteListFile(whiteListFile),
m_blackListFile(blackListFile),
m_maxSize(maxSize),
m_density(density),
m_exactDensityDPI(exactDensityDPI),
m_isDebugging(isDebugging)
{}

3
graphics/glyph_cache.hpp
View file

@ -72,12 +72,15 @@ namespace graphics
string m_blackListFile;
size_t m_maxSize;
EDensity m_density;
int m_exactDensityDPI;
bool m_isDebugging;
Params(string const & blocksFile,
string const & whiteListFile,
string const & blackListFile,
size_t maxSize,
EDensity density,
int exactDensityDPI,
bool isDebugging);
};

2
graphics/glyph_cache_impl.cpp
View file

@ -379,7 +379,7 @@ namespace graphics
/// Initializing stroker
FREETYPE_CHECK(FT_Stroker_New(m_lib, &m_stroker));
FT_Stroker_Set(m_stroker, FT_Fixed(graphics::visualScale(params.m_density) * 2 * 64), FT_STROKER_LINECAP_ROUND, FT_STROKER_LINEJOIN_ROUND, 0);
FT_Stroker_Set(m_stroker, FT_Fixed(visualScaleExact(params.m_exactDensityDPI) * 2 * 64), FT_STROKER_LINECAP_ROUND, FT_STROKER_LINEJOIN_ROUND, 0);
FREETYPE_CHECK(FTC_CMapCache_New(m_manager, &m_charMapCache));
}

1
graphics/resource_manager.cpp
View file

@ -330,6 +330,7 @@ namespace
gccp.m_blackListFile,
gccp.m_glyphCacheMemoryLimit / p.m_threadSlotsCount,
gccp.m_density,
p.m_exactDensityDPI,
false);
m_threadSlots[i].m_glyphCache.reset(new GlyphCache(gcp));

1
graphics/resource_manager.hpp
View file

@ -215,6 +215,7 @@ namespace graphics
unsigned m_threadSlotsCount;
bool m_rgba4RenderBuffer;
int m_exactDensityDPI;
Params();

6
gui/controller.cpp
View file

@ -9,7 +9,7 @@
namespace gui
{
Controller::RenderParams::RenderParams()
: m_Density(graphics::EDensityMDPI), m_GlyphCache(0)
: m_Density(graphics::EDensityMDPI), m_exactDensityDPI(0), m_GlyphCache(0)
{}
Controller::Controller()
@ -17,10 +17,12 @@ namespace gui
{}
Controller::RenderParams::RenderParams(graphics::EDensity density,
int exactDensityDPI,
TInvalidateFn invalidateFn,
graphics::GlyphCache * glyphCache,
graphics::Screen * cacheScreen)
: m_Density(density),
m_exactDensityDPI(exactDensityDPI),
m_InvalidateFn(invalidateFn),
m_GlyphCache(glyphCache),
m_CacheScreen(cacheScreen)
@ -162,7 +164,7 @@ namespace gui
m_GlyphCache = p.m_GlyphCache;
m_InvalidateFn = p.m_InvalidateFn;
m_Density = p.m_Density;
m_VisualScale = graphics::visualScale(p.m_Density);
m_VisualScale = graphics::visualScaleExact(p.m_exactDensityDPI);
m_CacheScreen = p.m_CacheScreen;
m_DisplayListCache.reset(new DisplayListCache(m_CacheScreen, m_GlyphCache));

2
gui/controller.hpp
View file

@ -36,11 +36,13 @@ namespace gui
struct RenderParams
{
graphics::EDensity m_Density;
int m_exactDensityDPI;
TInvalidateFn m_InvalidateFn;
graphics::GlyphCache * m_GlyphCache;
graphics::Screen * m_CacheScreen;
RenderParams();
RenderParams(graphics::EDensity density,
int exactDensityDPI,
TInvalidateFn invalidateFn,
graphics::GlyphCache * glyphCache,
graphics::Screen * cacheScreen);

27
iphone/Maps/Classes/EAGLView.mm
View file

@ -26,6 +26,29 @@
@implementation EAGLView
namespace
{
// Returns DPI as exact as possible. It works for iPhone, iPad and iWatch.
double getExactDPI()
{
float const iPadDPI = 132.f;
float const iPhoneDPI = 163.f;
float const mDPI = 160.f;
UIScreen * screen = [UIScreen mainScreen];
float const scale = [screen respondsToSelector:@selector(scale)] ? [screen scale] : 1.f;
switch (UI_USER_INTERFACE_IDIOM())
{
case UIUserInterfaceIdiomPhone:
return iPhoneDPI * scale;
case UIUserInterfaceIdiomPad:
return iPadDPI * scale;
default:
return mDPI * scale;
}
}
} // namespace
// You must implement this method
+ (Class)layerClass
@ -82,9 +105,12 @@
NSLog(@"EAGLView initRenderPolicy Started");
#ifndef USE_DRAPE
int const dpi = static_cast<int>(getExactDPI());
graphics::ResourceManager::Params rmParams;
rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit();
rmParams.m_texFormat = graphics::Data4Bpp;
rmParams.m_exactDensityDPI = dpi;
RenderPolicy::Params rpParams;
@ -104,6 +130,7 @@
rpParams.m_density = graphics::EDensityIPhone6Plus;
else
rpParams.m_density = graphics::EDensityXHDPI;
rpParams.m_exactDensityDPI = dpi;
rpParams.m_videoTimer = videoTimer;
rpParams.m_useDefaultFB = false;

4
iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm
View file

@ -56,9 +56,11 @@ extern NSString * const kSearchResultPointKey;
+ (void)initSoftwareRenderer
{
// @TODO. It's a hard code of apple watch dpi. It should be gotten dynamicly.
int const iWatchDPI = 384;
Framework & f = GetFramework();
if (!f.IsSingleFrameRendererInited())
f.InitSingleFrameRenderer(graphics::EDensityXHDPI);
f.InitSingleFrameRenderer(graphics::EDensityXHDPI, iWatchDPI);
}
+ (void)releaseSoftwareRenderer

7
map/framework.cpp
View file

@ -358,13 +358,13 @@ void Framework::DrawSingleFrame(m2::PointD const & center, int zoomModifier,
m_cpuDrawer->EndFrame(image);
}
void Framework::InitSingleFrameRenderer(graphics::EDensity density)
void Framework::InitSingleFrameRenderer(graphics::EDensity density, int exactDensityDPI)
{
ASSERT(!IsSingleFrameRendererInited(), ());
if (m_cpuDrawer == nullptr)
{
CPUDrawer::Params params(GetGlyphCacheParams(density));
params.m_visualScale = graphics::visualScale(density);
CPUDrawer::Params params(GetGlyphCacheParams(density, exactDensityDPI));
params.m_visualScale = graphics::visualScaleExact(exactDensityDPI);
params.m_density = density;
m_cpuDrawer.reset(new CPUDrawer(params));
@ -1582,6 +1582,7 @@ void Framework::InitGuiSubsystem()
if (m_renderPolicy)
{
gui::Controller::RenderParams rp(m_renderPolicy->Density(),
m_renderPolicy->DensityExactDPI(),
bind(&WindowHandle::invalidate,
m_renderPolicy->GetWindowHandle().get()),
m_renderPolicy->GetGlyphCache(),

2
map/framework.hpp
View file

@ -189,7 +189,7 @@ public:
};
/// @param density - for Retina Display you must use EDensityXHDPI
void InitSingleFrameRenderer(graphics::EDensity density);
void InitSingleFrameRenderer(graphics::EDensity density, int exactDensityDPI);
/// @param center - map center in ercator
/// @param zoomModifier - result zoom calculate like "base zoom" + zoomModifier
/// if we are have search result "base zoom" calculate that my position and search result

7
qt/draw_widget.cpp
View file

@ -274,9 +274,16 @@ namespace qt
rpParams.m_screenHeight = L2D(geometry.height());
if (m_ratio >= 1.5 || QApplication::desktop()->physicalDpiX() >= 180)
{
rpParams.m_density = graphics::EDensityXHDPI;
rpParams.m_exactDensityDPI = 320.;
}
else
{
rpParams.m_density = graphics::EDensityMDPI;
rpParams.m_exactDensityDPI = 160.;
}
rmParams.m_exactDensityDPI = rpParams.m_exactDensityDPI;
rpParams.m_videoTimer = m_videoTimer.get();
rpParams.m_useDefaultFB = true;

13
render/render_policy.cpp
View file

@ -39,7 +39,8 @@ RenderPolicy::RenderPolicy(Params const & p,
: m_primaryRC(p.m_primaryRC),
m_doForceUpdate(false),
m_density(p.m_density),
m_visualScale(graphics::visualScale(p.m_density)),
m_exactDensityDPI(p.m_exactDensityDPI),
m_visualScale(graphics::visualScaleExact(p.m_exactDensityDPI)),
m_skinName(p.m_skinName)
{
m_bgColors.resize(scales::UPPER_STYLE_SCALE+1);
@ -208,6 +209,11 @@ graphics::EDensity RenderPolicy::Density() const
return m_density;
}
int RenderPolicy::DensityExactDPI() const
{
return m_exactDensityDPI;
}
string const & RenderPolicy::SkinName() const
{
return m_skinName;
@ -335,13 +341,16 @@ RenderPolicy * CreateRenderPolicy(RenderPolicy::Params const & params)
}
graphics::GlyphCache::Params GetGlyphCacheParams(graphics::EDensity density, size_t cacheMaxSize)
graphics::GlyphCache::Params GetGlyphCacheParams(graphics::EDensity density,
int exactDensityDPI,
size_t cacheMaxSize)
{
return graphics::GlyphCache::Params(UNICODE_BLOCK_FILE,
WHITE_LIST_FILE,
BLACK_LIST_FILE,
cacheMaxSize,
density,
exactDensityDPI,
false);
}

6
render/render_policy.hpp
View file

@ -73,6 +73,7 @@ protected:
bool m_doForceUpdate;
m2::AnyRectD m_invalidRect;
graphics::EDensity m_density;
int m_exactDensityDPI;
double m_visualScale;
string m_skinName;
anim::Controller * m_controller;
@ -91,6 +92,7 @@ public:
string m_skinName;
size_t m_screenWidth;
size_t m_screenHeight;
int m_exactDensityDPI;
};
/// constructor
@ -148,6 +150,7 @@ public:
double VisualScale() const;
virtual size_t TileSize() const { return 256; }
graphics::EDensity Density() const;
int DensityExactDPI() const;
string const & SkinName() const;
/// This function is used when we need to prevent race
@ -198,5 +201,6 @@ protected:
RenderPolicy * CreateRenderPolicy(RenderPolicy::Params const & params);
graphics::GlyphCache::Params GetGlyphCacheParams(graphics::EDensity density, size_t cacheMaxSize = 2 * 1024 * 1024);
graphics::GlyphCache::Params GetGlyphCacheParams(graphics::EDensity density,
int exactDensityDPI, size_t cacheMaxSize = 2 * 1024 * 1024);
graphics::ResourceManager::GlyphCacheParams GetResourceGlyphCacheParams(graphics::EDensity density, size_t cacheMaxSize = 2 * 1024 * 1024);