kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Revert "[android] Enabled continuous rendering mode @TODO implement stop rendering"

Browse source 
This reverts commit 4a5d9f1beb3c14067b9423ab57d430ff76de0755.
This commit is contained in:
rachytski 2012-01-30 19:04:48 +04:00 • committed by Alex Zolotarev
parent 8d60be2b23
commit d51b987c31
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/jni/com/mapswithme/maps/VideoTimer.cpp
View file

@ -46,12 +46,12 @@ namespace android
void VideoTimer::start()
{
// if (g_smartGLSurfaceView)
// {
// JNIEnv * env = jni::GetEnv();
// ASSERT(env, ("JNIEnv is null"));
// env->CallVoidMethod(g_smartGLSurfaceView, g_requestRenderMethodID);
// }
if (g_smartGLSurfaceView)
{
JNIEnv * env = jni::GetEnv();
ASSERT(env, ("JNIEnv is null"));
env->CallVoidMethod(g_smartGLSurfaceView, g_requestRenderMethodID);
}
}
void VideoTimer::resume()

16
android/src/com/mapswithme/maps/SmartGLSurfaceView.java
View file

@ -34,9 +34,9 @@ public class SmartGLSurfaceView extends GLSurfaceView
private void init()
{
setEGLConfigChooser(true);
m_renderer = new SmartRenderer();
m_renderer = new SmartRenderer(this);
setRenderer(m_renderer);
//setRenderMode(RENDERMODE_CONTINUOUSLY); enabled by default
setRenderMode(RENDERMODE_WHEN_DIRTY);
m_tryToLoadResourcesIfReady = new Runnable()
{
@ -85,6 +85,7 @@ public class SmartGLSurfaceView extends GLSurfaceView
m_renderer.m_isActive = true;
super.onResume();
queueEvent(m_tryToLoadResourcesIfReady);
requestRender();
}
@Override
@ -107,7 +108,10 @@ public class SmartGLSurfaceView extends GLSurfaceView
{
m_renderer.m_isFocused = hasFocus;
if (hasFocus)
{
queueEvent(m_tryToLoadResourcesIfReady);
requestRender();
}
}
private final static int START_CMD = 0;
@ -201,6 +205,7 @@ public class SmartGLSurfaceView extends GLSurfaceView
break;
}
requestRender();
return true;
}
@ -223,8 +228,11 @@ class SmartRenderer implements GLSurfaceView.Renderer
private boolean m_areResourcesLoaded = false;
public SmartRenderer()
private SmartGLSurfaceView m_view;
public SmartRenderer(SmartGLSurfaceView view)
{
m_view = view;
}
public void loadResources()
@ -256,7 +264,7 @@ class SmartRenderer implements GLSurfaceView.Renderer
{
if (!m_areResourcesLoaded)
loadResources();
else if (m_isFocused)
if (m_isFocused)
{
Log.d(TAG, "***Draw***");
nativeDrawFrame();