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
diff options
context:
space:
mode:
authorrachytski <siarhei.rachytski@gmail.com>2012-12-18 14:40:30 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:48:04 +0300
commitc44578fca5db273e8b01e6bbc43dde188220337a (patch)
tree6e16bef373f5e5ee99fdca31af1bc8259175c249 /graphics/text_element.cpp
parent3e98f346b4515a41089ecfc216f839e837de3868 (diff)
refactored GeometryBatcher to derive it from PipelinesManager.
Diffstat (limited to 'graphics/text_element.cpp')
-rw-r--r--graphics/text_element.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/graphics/text_element.cpp b/graphics/text_element.cpp
index a68e5222ec..924b7516a1 100644
--- a/graphics/text_element.cpp
+++ b/graphics/text_element.cpp
@@ -1,6 +1,5 @@
#include "text_element.hpp"
#include "screen.hpp"
-#include "skin.hpp"
#include "resource_cache.hpp"
#include "resource_manager.hpp"
#include "overlay_renderer.hpp"
@@ -120,17 +119,15 @@ namespace graphics
resInfos[i] = &glyphInfos[i];
}
- Skin * skin = screen->skin().get();
-
if (firstVis != lastVis)
- skin->map(&resInfos[firstVis],
- &glyphIDs[firstVis],
- lastVis - firstVis);
+ screen->mapInfo(&resInfos[firstVis],
+ &glyphIDs[firstVis],
+ lastVis - firstVis);
for (unsigned i = firstVis; i < lastVis; ++i)
{
GlyphLayoutElem const & elem = layout.entries()[i];
- Glyph const * glyph = static_cast<Glyph const *>(skin->fromID(glyphIDs[i]));
+ Glyph const * glyph = static_cast<Glyph const *>(screen->fromID(glyphIDs[i]));
m2::PointD glyphPt;
ang::AngleD glyphAngle;