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

VideoTimer should use RenderPolicy::NeedRedraw to check the "dirtyRect" status.

Browse source
This commit is contained in:
rachytski 2012-01-02 18:59:04 +04:00 • committed by Alex Zolotarev
parent 431a4f85c5
commit 9768db8af6
8 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,6 @@
#include "../../../../../indexer/drawing_rules.hpp"
#include "../../../../../map/partial_render_policy.hpp"
#include "../../../../../map/framework.hpp"
#include "../../../../../std/shared_ptr.hpp"

1
map/basic_render_policy.cpp
View file

@ -104,6 +104,7 @@ BasicRenderPolicy::BasicRenderPolicy(VideoTimer * videoTimer,
m_windowHandle.reset(new WindowHandle());
m_windowHandle->setUpdatesEnabled(false);
m_windowHandle->setRenderPolicy(this);
m_windowHandle->setVideoTimer(videoTimer);
m_windowHandle->setRenderContext(primaryRC);
}

1
map/render_policy_mt.cpp
View file

@ -127,6 +127,7 @@ RenderPolicyMT::RenderPolicyMT(VideoTimer * videoTimer,
m_windowHandle.reset(new WindowHandle());
m_windowHandle->setUpdatesEnabled(false);
m_windowHandle->setRenderPolicy(this);
m_windowHandle->setVideoTimer(videoTimer);
m_windowHandle->setRenderContext(primaryRC);

1
map/render_policy_st.cpp
View file

@ -128,6 +128,7 @@ RenderPolicyST::RenderPolicyST(VideoTimer * videoTimer,
m_windowHandle.reset(new WindowHandle());
m_windowHandle->setUpdatesEnabled(false);
m_windowHandle->setRenderPolicy(this);
m_windowHandle->setVideoTimer(videoTimer);
m_windowHandle->setRenderContext(primaryRC);

1
map/tiling_render_policy_mt.cpp
View file

@ -155,6 +155,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(VideoTimer * videoTimer,
m_windowHandle.reset(new WindowHandle());
m_windowHandle->setUpdatesEnabled(false);
m_windowHandle->setRenderPolicy(this);
m_windowHandle->setVideoTimer(videoTimer);
m_windowHandle->setRenderContext(primaryRC);
}

1
map/tiling_render_policy_st.cpp
View file

@ -175,6 +175,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(VideoTimer * videoTimer,
m_windowHandle.reset(new WindowHandle());
m_windowHandle->setUpdatesEnabled(false);
m_windowHandle->setRenderPolicy(this);
m_windowHandle->setVideoTimer(videoTimer);
m_windowHandle->setRenderContext(primaryRC);
}

8
map/window_handle.cpp
View file

@ -1,4 +1,5 @@
#include "window_handle.hpp"
#include "render_policy.hpp"
WindowHandle::WindowHandle() :
m_hasPendingUpdates(false),
@ -8,6 +9,11 @@ WindowHandle::WindowHandle() :
{
}
void WindowHandle::setRenderPolicy(RenderPolicy * renderPolicy)
{
m_renderPolicy = renderPolicy;
}
void WindowHandle::setVideoTimer(VideoTimer * videoTimer)
{
m_videoTimer = videoTimer;
@ -18,7 +24,7 @@ void WindowHandle::setVideoTimer(VideoTimer * videoTimer)
void WindowHandle::checkedFrameFn()
{
if (needRedraw())
if (m_renderPolicy->NeedRedraw())
m_stallsCount = 0;
else
++m_stallsCount;

4
map/window_handle.hpp
View file

@ -16,9 +16,12 @@ namespace yg
}
}
class RenderPolicy;
class WindowHandle
{
shared_ptr<yg::gl::RenderContext> m_renderContext;
RenderPolicy * m_renderPolicy;
bool m_hasPendingUpdates;
bool m_isUpdatesEnabled;
@ -33,6 +36,7 @@ public:
WindowHandle();
virtual ~WindowHandle();
void setRenderPolicy(RenderPolicy * renderPolicy);
void setVideoTimer(VideoTimer * videoTimer);
void checkedFrameFn();