Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/drape
diff options
context:
space:
mode:
authorExMix <rahuba.youri@mapswithme.com>2015-01-06 12:01:28 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:35:52 +0300
commita264df045eea60edcbdda64093f643b895ca0965 (patch)
treea1326e4d679efc250cfc07dad81e4cf37344334a /drape
parent181017b90d8153724b7ed75f76509f979d51fe7e (diff)
[drape] minor changes
Diffstat (limited to 'drape')
-rw-r--r--drape/font_texture.cpp3
-rw-r--r--drape/render_bucket.cpp2
-rw-r--r--drape/render_bucket.hpp7
3 files changed, 9 insertions, 3 deletions
diff --git a/drape/font_texture.cpp b/drape/font_texture.cpp
index d643a3172b..82832ffea1 100644
--- a/drape/font_texture.cpp
+++ b/drape/font_texture.cpp
@@ -40,7 +40,6 @@ GlyphPacker::GlyphPacker(const m2::PointU & size)
bool GlyphPacker::PackGlyph(uint32_t width, uint32_t height, m2::RectU & rect)
{
- ASSERT(!IsFull(), ());
ASSERT_LESS(width, m_size.x, ());
ASSERT_LESS(height, m_size.y, ());
@@ -123,7 +122,7 @@ void GlyphIndex::UploadResources(RefPointer<Texture> texture)
{
ranges.push_back(i);
maxHeights.push_back(maxHeight);
- maxHeight = 0;
+ maxHeight = currentNode.first.SizeY();
}
}
maxHeights.push_back(maxHeight);
diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index e420143f9a..79d55c9ab4 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -57,7 +57,7 @@ void RenderBucket::Render(ScreenBase const & screen)
for_each(m_overlay.begin(), m_overlay.end(), [&] (MasterPointer<OverlayHandle> handle)
{
- if (handle->IsVisible())
+ if (handle->IsValid() && handle->IsVisible())
{
handle->GetElementIndexes(rfpIndex);
if (handle->HasDynamicAttributes())
diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp
index c3044d0234..347cf3853e 100644
--- a/drape/render_bucket.hpp
+++ b/drape/render_bucket.hpp
@@ -25,6 +25,13 @@ public:
void CollectOverlayHandles(RefPointer<OverlayTree> tree);
void Render(ScreenBase const & screen);
+ template <typename ToDo>
+ void ForEachOverlay(ToDo const & todo)
+ {
+ for (MasterPointer<OverlayHandle> & h : m_overlay)
+ todo(h.GetRaw());
+ }
+
private:
vector<MasterPointer<OverlayHandle> > m_overlay;
MasterPointer<VertexArrayBuffer> m_buffer;