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

[android] adapting tileSize to screen size.

Browse source
This commit is contained in:
rachytski 2012-01-12 21:09:23 +04:00 • committed by Alex Zolotarev
parent e51c501019
commit 17a67319e5
5 changed files with 117 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
android/jni/com/mapswithme/maps/MWMActivity.cpp
View file

@ -36,13 +36,29 @@ extern "C"
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MWMActivity_nativeInit(JNIEnv * env, jobject thiz, int densityDpi,
jstring apkPath, jstring storagePath, jstring tmpPath, jstring extTmpPath, jstring settingsPath)
Java_com_mapswithme_maps_MWMActivity_nativeInit(JNIEnv * env,
jobject thiz,
jint densityDpi,
jint screenWidth,
jint screenHeight,
jstring apkPath,
jstring storagePath,
jstring tmpPath,
jstring extTmpPath,
jstring settingsPath)
{
if (!g_framework)
{
android::Platform::Instance().Initialize(env, densityDpi, apkPath, storagePath,
tmpPath, extTmpPath, settingsPath);
android::Platform::Instance().Initialize(env,
densityDpi,
screenWidth,
screenHeight,
apkPath,
storagePath,
tmpPath,
extTmpPath,
settingsPath);
g_framework = new android::Framework(g_jvm);
}
}

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

@ -1,24 +1,68 @@
#include "Platform.hpp"
#include "../core/jni_string.hpp"
#include <math.h>
#include "../../../../../base/logging.hpp"
class Platform::PlatformImpl
{
public:
PlatformImpl(int densityDpi)
PlatformImpl(int densityDpi, int screenWidth, int screenHeight)
{ // Constants are taken from android.util.DisplayMetrics
/// ceiling screen sizes to the nearest power of two, and taking half of it as a tile size
double const log2 = log(2.0);
screenWidth = static_cast<int>(pow(2.0, ceil(log(double(screenWidth)) / log2)));
screenHeight = static_cast<int>(pow(2.0, ceil(log(double(screenHeight)) / log2)));
m_tileSize = min(max(max(screenWidth, screenHeight) / 2, 128), 512);
int k = static_cast<int>((256.0 / m_tileSize) * (256.0 / m_tileSize));
/// calculating how much tiles we need for the screen of such size
/// pure magic ;)
double rotatedScreenCircleDiameter = sqrt(screenWidth * screenWidth + screenHeight * screenHeight);
int tilesOnOneSide = ceil(rotatedScreenCircleDiameter / m_tileSize);
int singleScreenTilesCount = tilesOnOneSide * tilesOnOneSide;
m_maxTilesCount = singleScreenTilesCount * 2;
LOG(LINFO, ("minimum amount of tiles needed is", m_maxTilesCount));
m_maxTilesCount = max(120 * k, m_maxTilesCount);
switch (densityDpi)
{
case 120: m_visualScale = 0.75; m_skinName = "basic_ldpi.skn"; break;
case 160: m_visualScale = 1.0; m_skinName = "basic_mdpi.skn"; break;
case 240: m_visualScale = 1.5; m_skinName = "basic_hdpi.skn"; break;
default: m_visualScale = 2.0; m_skinName = "basic_xhdpi.skn"; break;
case 120:
m_visualScale = 0.75;
m_skinName = "basic_ldpi.skn";
LOG(LINFO, ("using LDPI resources"));
break;
case 160:
m_visualScale = 1.0;
m_skinName = "basic_mdpi.skn";
LOG(LINFO, ("using MDPI resources"));
break;
case 240:
m_visualScale = 1.5;
m_skinName = "basic_hdpi.skn";
LOG(LINFO, ("using HDPI resources"));
break;
default:
m_visualScale = 2.0;
m_skinName = "basic_xhdpi.skn";
LOG(LINFO, ("using XHDPI resources"));
break;
}
}
double m_visualScale;
string m_skinName;
int m_maxTilesCount;
size_t m_tileSize;
};
double Platform::VisualScale() const
@ -31,6 +75,16 @@ 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;
}
namespace android
{
Platform::~Platform()
@ -38,10 +92,17 @@ namespace android
delete m_impl;
}
void Platform::Initialize(JNIEnv * env, jint densityDpi, jstring apkPath, jstring storagePath,
jstring tmpPath, jstring extTmpPath, jstring settingsPath)
void Platform::Initialize(JNIEnv * env,
jint densityDpi,
jint screenWidth,
jint screenHeight,
jstring apkPath,
jstring storagePath,
jstring tmpPath,
jstring extTmpPath,
jstring settingsPath)
{
m_impl = new PlatformImpl(densityDpi);
m_impl = new PlatformImpl(densityDpi, screenWidth, screenHeight);
m_resourcesDir = jni::ToString(env, apkPath);
m_writableDir = jni::ToString(env, storagePath);

11
android/jni/com/mapswithme/platform/Platform.hpp
View file

@ -15,8 +15,15 @@ namespace android
public:
~Platform();
void Initialize(JNIEnv * env, jint densityDpi, jstring apkPath, jstring storagePath,
jstring tmpPath, jstring extTmpPath, jstring settingsPath);
void Initialize(JNIEnv * env,
jint densityDpi,
jint screenWidth,
jint screenHeight,
jstring apkPath,
jstring storagePath,
jstring tmpPath,
jstring extTmpPath,
jstring settingsPath);
void OnExternalStorageStatusChanged(bool isAvailable);

20
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -163,7 +163,14 @@ public class MWMActivity extends NvEventQueueActivity implements
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
nativeInit(metrics.densityDpi, getAppBundlePath(), extStoragePath, getTmpPath(), extTmpPath, getSettingsPath());
nativeInit(metrics.densityDpi,
metrics.widthPixels,
metrics.heightPixels,
getAppBundlePath(),
extStoragePath,
getTmpPath(),
extTmpPath,
getSettingsPath());
checkMeasurementSystem();
@ -356,8 +363,15 @@ public class MWMActivity extends NvEventQueueActivity implements
private native void nativeStorageConnected();
private native void nativeStorageDisconnected();
private native void nativeInit(int densityDpi, String apkPath, String storagePath,
String tmpPath, String extTmpPath, String settingsPath);
private native void nativeInit(int densityDpi,
int width,
int height,
String apkPath,
String storagePath,
String tmpPath,
String extTmpPath,
String settingsPath);
private native void nativeLocationStatusChanged(int newStatus);
private native void nativeLocationUpdated(long time, double lat, double lon, float accuracy);
private native void nativeCompassUpdated(long time, double magneticNorth, double trueNorth, float accuracy);

4
platform/platform_android.cpp
View file

@ -108,7 +108,7 @@ int Platform::ScaleEtalonSize() const
return 512 + 256;
}
int Platform::TileSize() const
/*int Platform::TileSize() const
{
return 256;
}
@ -116,7 +116,7 @@ int Platform::TileSize() const
int Platform::MaxTilesCount() const
{
return 120;
}
}*/
int Platform::VideoMemoryLimit() const
{