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

[drape] review fixes

Browse source
This commit is contained in:
ExMix 2015-03-11 18:43:00 +03:00 • committed by r.kuznetsov
parent 79c730e51d
commit a5a4725085
4 changed files with 31 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape/texture_manager.cpp
View file

@ -20,7 +20,7 @@ namespace dp
uint32_t const STIPPLE_TEXTURE_SIZE = 1024;
uint32_t const COLOR_TEXTURE_SIZE = 1024;
size_t const INVALID_GLYPH_GROUP = static_cast<size_t>(-1);
size_t const INVALID_GLYPH_GROUP = numeric_limits<size_t>::max();
bool TextureManager::BaseRegion::IsValid() const
{

4
drape/texture_manager.hpp
View file

@ -76,9 +76,9 @@ public:
void GetStippleRegion(TStipplePattern const & pen, StippleRegion & region);
void GetColorRegion(Color const & color, ColorRegion & region);
typedef buffer_vector<strings::UniString, 3> TMultilineText;
typedef buffer_vector<strings::UniString, 4> TMultilineText;
typedef buffer_vector<GlyphRegion, 128> TGlyphsBuffer;
typedef buffer_vector<TGlyphsBuffer, 3> TMultilineGlyphsBuffer;
typedef buffer_vector<TGlyphsBuffer, 4> TMultilineGlyphsBuffer;
void GetGlyphRegions(TMultilineText const & text, TMultilineGlyphsBuffer & buffers);
void GetGlyphRegions(strings::UniString const & text, TGlyphsBuffer & regions);

54
drape_gui/gui_text.cpp
View file

@ -41,49 +41,38 @@ namespace
return glsl::vec2(xOffset, yOffset);
}
void FillPositionDecl(dp::BindingDecl & decl, uint8_t stride, uint8_t offset)
void FillCommonDecl(dp::BindingDecl & decl, string const & name, uint8_t compCount, uint8_t stride, uint8_t offset)
{
decl.m_attributeName = "a_position";
decl.m_componentCount = 3;
decl.m_attributeName = name;
decl.m_componentCount = compCount;
decl.m_componentType = gl_const::GLFloatType;
decl.m_stride = stride;
decl.m_offset = offset;
}
void FillPositionDecl(dp::BindingDecl & decl, uint8_t stride, uint8_t offset)
{
FillCommonDecl(decl, "a_position", 3, stride, offset);
}
void FillNormalDecl(dp::BindingDecl & decl, uint8_t stride, uint8_t offset)
{
decl.m_attributeName = "a_normal";
decl.m_componentCount = 2;
decl.m_componentType = gl_const::GLFloatType;
decl.m_stride = stride;
decl.m_offset = offset;
FillCommonDecl(decl, "a_normal", 2, stride, offset);
}
void FillColorDecl(dp::BindingDecl & decl, uint8_t stride, uint8_t offset)
{
decl.m_attributeName = "a_colorTexCoord";
decl.m_componentCount = 2;
decl.m_componentType = gl_const::GLFloatType;
decl.m_stride = stride;
decl.m_offset = offset;
FillCommonDecl(decl, "a_colorTexCoord", 2, stride, offset);
}
void FillOutlineDecl(dp::BindingDecl & decl, uint8_t stride, uint8_t offset)
{
decl.m_attributeName = "a_outlineColorTexCoord";
decl.m_componentCount = 2;
decl.m_componentType = gl_const::GLFloatType;
decl.m_stride = stride;
decl.m_offset = offset;
FillCommonDecl(decl, "a_outlineColorTexCoord", 2, stride, offset);
}
void FillMaskDecl(dp::BindingDecl & decl, uint8_t stride, uint8_t offset)
{
decl.m_attributeName = "a_maskTexCoord";
decl.m_componentCount = 2;
decl.m_componentType = gl_const::GLFloatType;
decl.m_stride = stride;
decl.m_offset = offset;
FillCommonDecl(decl, "a_maskTexCoord", 2, stride, offset);
}
}
@ -113,8 +102,8 @@ dp::BindingInfo const & StaticLabel::Vertex::GetBindingInfo()
}
void StaticLabel::CacheStaticText(string const & text, const char * delim,
dp::Anchor anchor, const dp::FontDecl & font,
void StaticLabel::CacheStaticText(string const & text, char const * delim,
dp::Anchor anchor, dp::FontDecl const & font,
dp::RefPointer<dp::TextureManager> mng, LabelResult & result)
{
ASSERT(!text.empty(), ());
@ -152,15 +141,15 @@ void StaticLabel::CacheStaticText(string const & text, const char * delim,
mng->GetColorRegion(font.m_outlineColor, outline);
ASSERT(color.GetTexture().GetRaw() == outline.GetTexture().GetRaw(), ());
glsl::vec2 cTex = glsl::ToVec2(color.GetTexRect().Center());
glsl::vec2 oTex = glsl::ToVec2(outline.GetTexRect().Center());
glsl::vec2 colorTex = glsl::ToVec2(color.GetTexRect().Center());
glsl::vec2 outlineTex = glsl::ToVec2(outline.GetTexRect().Center());
float textRatio = font.m_size * DrapeGui::Instance().GetScaleFactor() / BASE_GLYPH_HEIGHT;
buffer_vector<float, 3> lineLengths;
buffer_vector<float, 4> lineLengths;
lineLengths.resize(buffers.size());
buffer_vector<size_t, 3> ranges;
buffer_vector<size_t, 4> ranges;
float fullHeight = 0.0;
float prevLineHeight = 0.0;
@ -186,7 +175,7 @@ void StaticLabel::CacheStaticText(string const & text, const char * delim,
glsl::vec3 position = glsl::vec3(0.0, 0.0, depth);
for (size_t v = 0; v < normals.size(); ++v)
rb.push_back(Vertex(position, pen + normals[v], cTex, oTex, maskTex[v]));
rb.push_back(Vertex(position, pen + normals[v], colorTex, outlineTex, maskTex[v]));
float const advance = glyph.GetAdvanceX() * textRatio;
currentLineLength += advance;
@ -223,10 +212,7 @@ void StaticLabel::CacheStaticText(string const & text, const char * delim,
size_t endIndex = ranges[i];
for (size_t i = startIndex; i < endIndex; ++i)
{
Vertex & v = rb[i];
v.m_normal = v.m_normal + glsl::vec2(xOffset, yOffset);
}
rb[i].m_normal = rb[i].m_normal + glsl::vec2(xOffset, yOffset);
startIndex = endIndex;
}

13
drape_head/testing_engine.cpp
View file

@ -55,14 +55,15 @@ public:
for (gui::StaticLabel::Vertex & v : result.m_buffer)
v.m_position = glsl::vec3(glsl::ToVec2(m_base), v.m_position.z);
dp::AttributeProvider provider(1, result.m_buffer.size());
provider.InitStream(0, gui::StaticLabel::Vertex::GetBindingInfo(), dp::MakeStackRefPointer<void>(result.m_buffer.data()));
dp::AttributeProvider provider(1 /* streamCount */, result.m_buffer.size());
provider.InitStream(0 /* streamIndex */, gui::StaticLabel::Vertex::GetBindingInfo(),
dp::MakeStackRefPointer<void>(result.m_buffer.data()));
dp::GLState state(gpu::TEXT_PROGRAM, dp::GLState::OverlayLayer);
state.SetColorTexture(result.m_colorTexture);
state.SetMaskTexture(result.m_maskTexture);
batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), 4);
batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), 4 /* vertexStride */);
}
private:
@ -100,8 +101,10 @@ public:
ASSERT_EQUAL(statData.size(), dynData.size(), ());
dp::AttributeProvider provider(2, dynData.size());
provider.InitStream(0, gui::MutableLabel::StaticVertex::GetBindingInfo(), dp::MakeStackRefPointer<void>(statData.data()));
provider.InitStream(1, gui::MutableLabel::DynamicVertex::GetBindingInfo(), dp::MakeStackRefPointer<void>(dynData.data()));
provider.InitStream(0 /* streamIndex */, gui::MutableLabel::StaticVertex::GetBindingInfo(),
dp::MakeStackRefPointer<void>(statData.data()));
provider.InitStream(1 /* streamIndex */, gui::MutableLabel::DynamicVertex::GetBindingInfo(),
dp::MakeStackRefPointer<void>(dynData.data()));
dp::GLState state(gpu::TEXT_PROGRAM, dp::GLState::OverlayLayer);
state.SetColorTexture(colorTexure);