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

[Android]

Browse source 
- Add rendering routine;
- Add more framework routine;
- Add logging;
This commit is contained in:
vng 2011-07-02 01:12:33 +03:00 • committed by Alex Zolotarev
parent a8c6c07af5
commit 397876c838
12 changed files with 200 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/Android.mk
View file

@ -13,6 +13,7 @@ LOCAL_HEADER_FILES := \
logging.h \
platform.h \
framework.h \
rendering.h \
LOCAL_SRC_FILES := \
main_native.cpp \
@ -22,6 +23,7 @@ LOCAL_SRC_FILES := \
framework.cpp \
logging.cpp \
temp_stubs.cpp \
rendering.cpp \
LOCAL_LDLIBS := -llog -lGLESv1_CM \
-lwords -lmap -lstorage -lversion -lsearch -lindexer -lyg -lplatform \

49
android/jni/framework.cpp
View file

@ -1,7 +1,8 @@
#include "framework.h"
#include "jni_helper.h"
#include "rendering.h"
#include "../../map/drawer_yg.hpp"
#include "../../base/logging.hpp"
void AndroidFramework::ViewHandle::invalidateImpl()
@ -27,9 +28,47 @@ void AndroidFramework::SetParentView(JNIEnv * env, jobject view)
m_parentView = view;
}
void AndroidFramework::Init()
void AndroidFramework::InitRenderer()
{
//initializeGL();
//m_view->setDrawer(new DrawerYG());
//m_view->setRenderContext();
LOG(LDEBUG, ("AF::InitRenderer 1"));
shared_ptr<yg::gl::RenderContext> pRC = CreateRenderContext();
LOG(LDEBUG, ("AF::InitRenderer 2"));
shared_ptr<yg::ResourceManager> pRM = CreateResourceManager();
LOG(LDEBUG, ("AF::InitRenderer 3"));
m_view->setRenderContext(pRC);
m_view->setDrawer(CreateDrawer(pRM));
LOG(LDEBUG, ("AF::InitRenderer 4"));
m_work.initializeGL(pRC, pRM);
LOG(LDEBUG, ("AF::InitRenderer 5"));
}
void AndroidFramework::Resize(int w, int h)
{
LOG(LDEBUG, ("AF::Resize 1"));
m_view->drawer()->onSize(w, h);
LOG(LDEBUG, ("AF::Resize 2"));
}
void AndroidFramework::DrawFrame()
{
LOG(LDEBUG, ("AF::DrawFrame 1"));
shared_ptr<DrawerYG> p = m_view->drawer();
LOG(LDEBUG, ("AF::DrawFrame 2"));
p->beginFrame();
LOG(LDEBUG, ("AF::DrawFrame 3"));
p->clear();
LOG(LDEBUG, ("AF::DrawFrame 4"));
p->screen()->drawRectangle(m2::RectD(100, 100, 200, 200), yg::Color(255, 0, 0, 255), yg::maxDepth);
LOG(LDEBUG, ("AF::DrawFrame 5"));
p->endFrame();
LOG(LDEBUG, ("AF::DrawFrame 6"));
}

6
android/jni/framework.h
View file

@ -35,5 +35,9 @@ public:
void SetParentView(JNIEnv * env, jobject view);
void Init();
void InitRenderer();
void Resize(int w, int h);
void DrawFrame();
};

5
android/jni/jni_helper.cpp
View file

@ -1,6 +1,6 @@
#include "jni_helper.h"
#include <assert.h>
#include "../../base/assert.hpp"
namespace jni {
@ -11,9 +11,10 @@ namespace jni {
jmethodID GetJavaMethodID(JNIEnv * env, jobject obj,
char const * fn, char const * sig)
{
ASSERT ( env != 0 && obj != 0, () );
jclass cls = env->GetObjectClass(obj);
jmethodID mid = env->GetMethodID(cls, fn, sig);
assert(mid != 0);
ASSERT ( mid != 0, () );
return mid;
}

13
android/jni/jni_string.cpp
View file

@ -1,7 +1,10 @@
#include "jni_string.h"
namespace jni {
#include "../../base/string_utils.hpp"
namespace jni
{
String::String(JNIEnv * env, jstring s)
: m_env(env), m_s(s)
{
@ -15,8 +18,12 @@ namespace jni {
string String::ToString() const
{
/// @todo
return std::string();
size_t const sz = m_env->GetStringLength(m_s);
string res;
utf8::unchecked::utf16to8(m_ret, m_ret + sz, back_inserter(res));
return res;
}
string ToString(JNIEnv * env, jstring s)

13
android/jni/logging.cpp
View file

@ -19,7 +19,13 @@ void AndroidLogMessage(LogLevel l, SrcPoint const & src, string const & s)
case LCRITICAL: pr = ANDROID_LOG_FATAL; break;
}
__android_log_print(pr, "mapswithme", s.c_str());
string const out = debug_print(src) + " " + s;
__android_log_print(pr, "MapsWithMe_JNI", out.c_str());
}
void AndroidAssertMessage(SrcPoint const & src, string const & s)
{
AndroidLogMessage(LERROR, src, s);
}
void InitSystemLog()
@ -27,4 +33,9 @@ void InitSystemLog()
SetLogMessageFn(&AndroidLogMessage);
}
void InitAssertLog()
{
OnAssertFailed = &AndroidAssertMessage;
}
}

2
android/jni/logging.h
View file

@ -1,8 +1,10 @@
#pragma once
#include "../../base/logging.hpp"
#include "../../base/assert.hpp"
namespace jni
{
void InitSystemLog();
void InitAssertLog();
}

14
android/jni/main_native.cpp
View file

@ -6,7 +6,7 @@
#include <jni.h>
AndroidFramework * g_work;
AndroidFramework * g_work = 0;
extern "C"
{
@ -18,10 +18,15 @@ extern "C"
Java_com_mapswithme_maps_MWMActivity_nativeInit(JNIEnv * env, jobject thiz, jstring path)
{
jni::InitSystemLog();
jni::InitAssertLog();
LOG(LDEBUG, ("MWMActivity::Init 1"));
GetAndroidPlatform().Initialize(env, thiz, path);
LOG(LDEBUG, ("MWMActivity::Init 2"));
//g_work = new AndroidFramework();
LOG(LDEBUG, ("MWMActivity::Init 3"));
}
///////////////////////////////////////////////////////////////////////////////////
@ -31,6 +36,7 @@ extern "C"
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MainGLView_nativeInit(JNIEnv * env, jobject thiz)
{
//ASSERT ( g_work, () );
//g_work->SetParentView(env, thiz);
}
@ -53,15 +59,21 @@ extern "C"
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MainRenderer_nativeInit(JNIEnv * env, jobject thiz)
{
//ASSERT ( g_work, () );
//g_work->InitRenderer();
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MainRenderer_nativeResize(JNIEnv * env, jobject thiz, jint w, jint h)
{
//ASSERT ( g_work, () );
//g_work->Resize(w, h);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MainRenderer_nativeDraw(JNIEnv * env, jobject thiz)
{
//ASSERT ( g_work, () );
//g_work->DrawFrame();
}
}

5
android/jni/platform.cpp
View file

@ -1,10 +1,15 @@
#include "platform.h"
#include "jni_string.h"
#include "../../base/logging.hpp"
void AndroidPlatform::Initialize(JNIEnv * env, jobject activity, jstring path)
{
m_writableDir = m_resourcesDir = jni::ToString(env, path);
LOG(LDEBUG, ("Resource path = ", m_resourcesDir));
LOG(LDEBUG, ("Writable path = ", m_writableDir));
}
int AndroidPlatform::CpuCores() const

85
android/jni/rendering.cpp Normal file
View file

@ -0,0 +1,85 @@
#include "rendering.h"
#include "../../yg/framebuffer.hpp"
#include "../../yg/internal/opengl.hpp"
#include "../../platform/platform.hpp"
#include "../../base/math.hpp"
shared_ptr<yg::ResourceManager> CreateResourceManager()
{
int bigVBSize = pow(2, ceil(log(15000 * sizeof(yg::gl::Vertex))));
int bigIBSize = pow(2, ceil(log(30000 * sizeof(unsigned short))));
int smallVBSize = pow(2, ceil(log(1500 * sizeof(yg::gl::Vertex))));
int smallIBSize = pow(2, ceil(log(3000 * sizeof(unsigned short))));
int blitVBSize = pow(2, ceil(log(10 * sizeof(yg::gl::AuxVertex))));
int blitIBSize = pow(2, ceil(log(10 * sizeof(unsigned short))));
Platform & pl = GetPlatform();
yg::ResourceManager * pRM = new yg::ResourceManager(
bigVBSize, bigIBSize, 4,
smallVBSize, smallIBSize, 10,
blitVBSize, blitIBSize, 10,
512, 256, 6,
512, 256, 4,
pl.ReadPathForFile("unicode_blocks.txt").c_str(),
pl.ReadPathForFile("fonts_whitelist.txt").c_str(),
pl.ReadPathForFile("fonts_blacklist.txt").c_str(),
1 * 1024 * 1024,
500 * 1024,
yg::Rt8Bpp,
!yg::gl::g_isBufferObjectsSupported,
!pl.IsMultiSampled());
Platform::FilesList fonts;
pl.GetFontNames(fonts);
pRM->addFonts(fonts);
return make_shared_ptr(pRM);
}
shared_ptr<DrawerYG> CreateDrawer(shared_ptr<yg::ResourceManager> pRM)
{
Platform & pl = GetPlatform();
DrawerYG::params_t p;
p.m_resourceManager = pRM;
p.m_isMultiSampled = pl.IsMultiSampled();
p.m_frameBuffer.reset(new yg::gl::FrameBuffer());
p.m_glyphCacheID = 1;
return make_shared_ptr(new DrawerYG(pl.SkinName(), p));
}
namespace
{
class AndroidRenderContext : public yg::gl::RenderContext
{
public:
AndroidRenderContext()
{
}
virtual void makeCurrent()
{
}
virtual shared_ptr<yg::gl::RenderContext> createShared()
{
return make_shared_ptr(new AndroidRenderContext());
}
virtual void endThreadDrawing()
{
}
};
}
shared_ptr<yg::gl::RenderContext> CreateRenderContext()
{
return make_shared_ptr(new AndroidRenderContext());
}

13
android/jni/rendering.h Normal file
View file

@ -0,0 +1,13 @@
#pragma once
#include "../../map/drawer_yg.hpp"
#include "../../yg/rendercontext.hpp"
#include "../../yg/resource_manager.hpp"
shared_ptr<yg::ResourceManager> CreateResourceManager();
shared_ptr<yg::gl::RenderContext> CreateRenderContext();
shared_ptr<DrawerYG> CreateDrawer(shared_ptr<yg::ResourceManager> pRM);

7
android/src/com/mapswithme/maps/MainGLView.java
View file

@ -7,7 +7,7 @@ import javax.microedition.khronos.opengles.GL10;
import android.content.Context;
import android.opengl.GLSurfaceView;
//import android.util.Log;
import android.util.Log;
import android.view.MotionEvent;
public class MainGLView extends GLSurfaceView
@ -49,21 +49,26 @@ public class MainGLView extends GLSurfaceView
class MainRenderer implements GLSurfaceView.Renderer
{
private static String TAG = "MainGLView.MainRenderer";
@Override
public void onDrawFrame(GL10 gl)
{
Log.i(TAG, "onDrawFrame");
nativeDraw();
}
@Override
public void onSurfaceChanged(GL10 gl, int w, int h)
{
Log.i(TAG, "onSurfaceChanged");
nativeResize(w, h);
}
@Override
public void onSurfaceCreated(GL10 gl, EGLConfig config)
{
Log.i(TAG, "onSurfaceCreated");
nativeInit();
}