diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2019-09-10 14:00:33 +0300 |
|---|---|---|
| committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2019-09-24 19:19:32 +0300 |
| commit | a196629d78d732af7b14648c2682e64de2d3b7bc (patch) | |
| tree | db3ec5d8e52ae200bd8828685c78caaddb16f922 /drape_frontend/user_mark_shapes.cpp | |
| parent | 07864dff07ad01acad745d22606d1370d72ce233 (diff) | |
[drape][bookmarks] Added support of custom images
Diffstat (limited to 'drape_frontend/user_mark_shapes.cpp')
| -rw-r--r-- | drape_frontend/user_mark_shapes.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index 188e99ba00..fe604c1646 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -401,7 +401,10 @@ void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe textures->GetSymbolRegion(symbolName, region); auto const backgroundSymbol = GetBackgroundForSymbol(symbolName, textures); if (!backgroundSymbol.empty()) + { textures->GetSymbolRegion(backgroundSymbol, backgroundRegion); + CHECK_EQUAL(region.GetTextureIndex(), backgroundRegion.GetTextureIndex(), ()); + } m2::RectF const & texRect = region.GetTexRect(); m2::RectF const & bgTexRect = backgroundRegion.GetTexRect(); @@ -461,6 +464,7 @@ void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe state.SetColorTexture(region.GetTexture()); state.SetTextureFilter(dp::TextureFilter::Nearest); state.SetDepthTestEnabled(renderInfo.m_depthTestEnabled); + state.SetTextureIndex(region.GetTextureIndex()); dp::AttributeProvider attribProvider(1, static_cast<uint32_t>(buffer.size())); attribProvider.InitStream(0, UPV::GetBinding(), make_ref(buffer.data())); |