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

review fixes

Browse source
This commit is contained in:
ExMix 2015-03-05 17:34:34 +03:00 • committed by r.kuznetsov
parent 2ab06f38c7
commit 7c7176b8f6
5 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape/drape.pro
View file

@ -20,4 +20,4 @@ OTHER_FILES += \
shaders/text_fragment_shader.fsh \
shaders/text_vertex_shader.vsh \
shaders/compass_vertex_shader.vsh \
shaders/ruler_vertex_shader.vsh
shaders/ruler_vertex_shader.vsh \

2
drape/fribidi.cpp
View file

@ -5,7 +5,7 @@
namespace fribidi
{
strings::UniString log2vis(const strings::UniString & str)
strings::UniString log2vis(strings::UniString const & str)
{
size_t const count = str.size();
if (count == 0)

4
drape_gui/drape_gui.pro
View file

@ -17,7 +17,7 @@ HEADERS += \
ruler_helper.hpp \
drape_gui.hpp \
gui_text.hpp \
ruler_text.hpp
ruler_text.hpp \
SOURCES += \
skin.cpp \
@ -28,5 +28,5 @@ SOURCES += \
ruler_helper.cpp \
drape_gui.cpp \
gui_text.cpp \
ruler_text.cpp
ruler_text.cpp \

15
drape_gui/gui_text.cpp
View file

@ -121,14 +121,17 @@ dp::RefPointer<dp::Texture> GuiText::Precache(buffer_vector<StaticVertex, 32> &
glsl::vec2 colorTex = glsl::ToVec2(color.GetTexRect().Center());
glsl::vec2 outlineTex = glsl::ToVec2(outlineColor.GetTexRect().Center());
float depth = 0.0f;
for (size_t i = 0; i < m_maxLength; ++i)
size_t vertexCount = 4 * m_maxLength;
buffer.resize(vertexCount, StaticVertex(glsl::vec3(0.0, 0.0, 0.0), colorTex, outlineTex));
float depth = 0.0f;
for (size_t i = 0; i < vertexCount; i += 4)
{
buffer.push_back(StaticVertex(glsl::vec3(0.0, 0.0, depth), colorTex, outlineTex));
buffer.push_back(StaticVertex(glsl::vec3(0.0, 0.0, depth), colorTex, outlineTex));
buffer.push_back(StaticVertex(glsl::vec3(0.0, 0.0, depth), colorTex, outlineTex));
buffer.push_back(StaticVertex(glsl::vec3(0.0, 0.0, depth), colorTex, outlineTex));
buffer[i + 0].m_position.z = depth;
buffer[i + 1].m_position.z = depth;
buffer[i + 2].m_position.z = depth;
buffer[i + 3].m_position.z = depth;
depth += 10.0f;
}

32
drape_gui/ruler.cpp
View file

@ -95,28 +95,22 @@ void Ruler::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Texture
glsl::vec2 texCoord = glsl::ToVec2(reg.GetTexRect().Center());
float h = RulerHelper::Instance().GetRulerHalfHeight();
glsl::vec2 normals[] =
{
glsl::vec2(-1.0, 0.0),
glsl::vec2(1.0, 0.0),
};
dp::Anchor anchor = m_position.m_anchor;
if (anchor & dp::Left)
{
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, h), glsl::vec2(0.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, -h), glsl::vec2(0.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, h), glsl::vec2(1.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, -h), glsl::vec2(1.0, 0.0), texCoord));
}
normals[0] = glsl::vec2(0.0, 0.0);
else if (anchor & dp::Right)
{
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, h), glsl::vec2(-1.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, -h), glsl::vec2(-1.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, h), glsl::vec2(0.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, -h), glsl::vec2(0.0, 0.0), texCoord));
}
else
{
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, h), glsl::vec2(-1.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, -h), glsl::vec2(-1.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, h), glsl::vec2(1.0, 0.0), texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, -h), glsl::vec2(1.0, 0.0), texCoord));
}
normals[1] = glsl::vec2(0.0, 0.0);
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, h), normals[0], texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, -h), normals[0], texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, h), normals[1], texCoord));
data.push_back(RulerVertex(pivot + glsl::vec2(0.0, -h), normals[1], texCoord));
dp::GLState state(gpu::RULER_PROGRAM, dp::GLState::UserMarkLayer);
state.SetColorTexture(reg.GetTexture());