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

[drape] small pointers improvement

Browse source
This commit is contained in:
ExMix 2015-04-27 11:49:22 +03:00 • committed by r.kuznetsov
parent 199040d0aa
commit 3b030fcf01
4 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape/pointers.hpp
View file

@ -109,6 +109,8 @@ public:
template<typename TResult>
operator ref_ptr<TResult>() const
{
STATIC_ASSERT(is_base_of<TResult, T>::value || is_base_of<T, TResult>::value ||
is_void<T>::value || is_void<TResult>::value);
return ref_ptr<TResult>(static_cast<TResult *>(m_ptr), m_isOwnerUnique);
}

16
drape/texture_manager.cpp
View file

@ -93,41 +93,37 @@ TextureManager::GlyphRegion::GlyphRegion()
float TextureManager::GlyphRegion::GetOffsetX() const
{
ASSERT(m_info->GetType() == Texture::Glyph, ());
ref_ptr<GlyphInfo> info = static_cast<ref_ptr<GlyphInfo>>(m_info);
return info->GetMetrics().m_xOffset;
return ref_ptr<GlyphInfo>(m_info)->GetMetrics().m_xOffset;
}
float TextureManager::GlyphRegion::GetOffsetY() const
{
ASSERT(m_info->GetType() == Texture::Glyph, ());
ref_ptr<GlyphInfo> info = static_cast<ref_ptr<GlyphInfo>>(m_info);
return info->GetMetrics().m_yOffset;
return ref_ptr<GlyphInfo>(m_info)->GetMetrics().m_yOffset;
}
float TextureManager::GlyphRegion::GetAdvanceX() const
{
ASSERT(m_info->GetType() == Texture::Glyph, ());
ref_ptr<GlyphInfo> info = static_cast<ref_ptr<GlyphInfo>>(m_info);
return info->GetMetrics().m_xAdvance;
return ref_ptr<GlyphInfo>(m_info)->GetMetrics().m_xAdvance;
}
float TextureManager::GlyphRegion::GetAdvanceY() const
{
ASSERT(m_info->GetType() == Texture::Glyph, ());
ref_ptr<GlyphInfo> info = static_cast<ref_ptr<GlyphInfo>>(m_info);
return info->GetMetrics().m_yAdvance;
return ref_ptr<GlyphInfo>(m_info)->GetMetrics().m_yAdvance;
}
uint32_t TextureManager::StippleRegion::GetMaskPixelLength() const
{
ASSERT(m_info->GetType() == Texture::StipplePen, ());
return static_cast<ref_ptr<StipplePenResourceInfo>>(m_info)->GetMaskPixelLength();
return ref_ptr<StipplePenResourceInfo>(m_info)->GetMaskPixelLength();
}
uint32_t TextureManager::StippleRegion::GetPatternPixelLength() const
{
ASSERT(m_info->GetType() == Texture::StipplePen, ());
return static_cast<ref_ptr<StipplePenResourceInfo>>(m_info)->GetPatternPixelLength();
return ref_ptr<StipplePenResourceInfo>(m_info)->GetPatternPixelLength();
}
void TextureManager::Release()

16
drape_frontend/frontend_renderer.cpp
View file

@ -108,7 +108,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
{
case Message::FlushTile:
{
ref_ptr<FlushRenderBucketMessage> msg = static_cast<ref_ptr<FlushRenderBucketMessage>>(message);
ref_ptr<FlushRenderBucketMessage> msg = message;
dp::GLState const & state = msg->GetState();
TileKey const & key = msg->GetKey();
drape_ptr<dp::RenderBucket> bucket = msg->AcceptBuffer();
@ -124,14 +124,14 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
case Message::FinishReading:
{
ref_ptr<FinishReadingMessage> msg = static_cast<ref_ptr<FinishReadingMessage>>(message);
ref_ptr<FinishReadingMessage> msg = message;
m_tileTree->FinishTiles(msg->GetTiles(), GetCurrentZoomLevel());
break;
}
case Message::Resize:
{
ref_ptr<ResizeMessage> rszMsg = static_cast<ref_ptr<ResizeMessage>>(message);
ref_ptr<ResizeMessage> rszMsg = message;
m_viewport = rszMsg->GetViewport();
m_view.OnSize(m_viewport.GetX0(), m_viewport.GetY0(),
m_viewport.GetWidth(), m_viewport.GetHeight());
@ -153,14 +153,14 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
}
case Message::MyPositionShape:
m_myPositionMark = static_cast<ref_ptr<MyPositionShapeMessage>>(message)->AcceptShape();
m_myPositionMark = ref_ptr<MyPositionShapeMessage>(message)->AcceptShape();
break;
case Message::InvalidateRect:
{
// TODO(@kuznetsov): implement invalidation
//InvalidateRectMessage * m = static_cast<ref_ptr<InvalidateRectMessage>>(message);
//ref_ptr<InvalidateRectMessage> m = message;
//TTilesCollection keyStorage;
//Message * msgToBackend = new InvalidateReadManagerRectMessage(keyStorage);
//m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
@ -171,7 +171,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
case Message::ClearUserMarkLayer:
{
TileKey const & tileKey = static_cast<ref_ptr<ClearUserMarkLayerMessage>>(message)->GetKey();
TileKey const & tileKey = ref_ptr<ClearUserMarkLayerMessage>(message)->GetKey();
auto const functor = [&tileKey](drape_ptr<UserMarkRenderGroup> const & g)
{
return g->GetTileKey() == tileKey;
@ -186,7 +186,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
}
case Message::ChangeUserMarkLayerVisibility:
{
ref_ptr<ChangeUserMarkLayerVisibilityMessage> m = static_cast<ref_ptr<ChangeUserMarkLayerVisibilityMessage>>(message);
ref_ptr<ChangeUserMarkLayerVisibilityMessage> m = message;
TileKey const & key = m->GetKey();
if (m->IsVisible())
m_userMarkVisibility.insert(key);
@ -196,7 +196,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
}
case Message::GuiLayerRecached:
{
ref_ptr<GuiLayerRecachedMessage> msg = static_cast<ref_ptr<GuiLayerRecachedMessage>>(message);
ref_ptr<GuiLayerRecachedMessage> msg = message;
drape_ptr<gui::LayerRenderer> renderer = move(msg->AcceptRenderer());
renderer->Build(make_ref(m_gpuProgramManager));
if (m_guiRenderer == nullptr)

8
std/type_traits.hpp
View file

@ -10,21 +10,17 @@
using std::conditional;
using std::enable_if;
using std::is_arithmetic;
using std::is_base_of;
using std::is_floating_point;
using std::is_integral;
using std::is_pod;
using std::is_same;
using std::is_signed;
using std::is_unsigned;
using std::make_signed;
using std::make_unsigned;
using std::underlying_type;
using std::is_same;
using std::is_signed;
using std::is_standard_layout;
using std::is_unsigned;
using std::make_signed;
using std::make_unsigned;
using std::underlying_type;
using std::is_void;
/// @todo clang on linux doesn't have is_trivially_copyable.