From 5a5819333437aa2592158f61a9ee414e2b84340b Mon Sep 17 00:00:00 2001 From: Roman Sorokin Date: Mon, 15 Sep 2014 14:26:30 +0300 Subject: [PATCH] Loading of new texture in textureSet --- drape/texture_manager.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp index f8715c4ccb..7f4b1a08c8 100644 --- a/drape/texture_manager.cpp +++ b/drape/texture_manager.cpp @@ -3,6 +3,7 @@ #include "font_texture.hpp" #include "dynamic_texture.hpp" #include "stipple_pen_resource.hpp" +#include "texture_of_colors.hpp" #include "glfunctions.hpp" @@ -131,7 +132,9 @@ void TextureManager::Init(string const & resourcePrefix) } typedef DynamicTexture TStippleTexture; + typedef DynamicTexture TColorTexture; textureSet->AddTexture(MovePointer(new TStippleTexture(m2::PointU(1024, 1024), dp::ALPHA))); + textureSet->AddTexture(MovePointer(new TColorTexture(m2::PointU(1024, 1024), dp::RGBA8))); } void TextureManager::Release() @@ -180,6 +183,12 @@ void TextureManager::GetStippleRegion(StipplePenKey const & pen, TextureSetHolde VERIFY(FindResource(pen, region), ()); } +void TextureManager::GetColorRegion(ColorKey const & pen, TextureSetHolder::ColorRegion & region) const +{ + VERIFY(FindResource(pen, region), ()); +} + + void TextureManager::BindTextureSet(uint32_t textureSet) const { ASSERT_LESS(textureSet, m_textures.size(), ());