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:
authorr.kuznetsov <r.kuznetsov@corp.mail.ru>2019-09-10 14:00:33 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2019-09-24 19:19:32 +0300
commita196629d78d732af7b14648c2682e64de2d3b7bc (patch)
treedb3ec5d8e52ae200bd8828685c78caaddb16f922 /drape/render_state.cpp
parent07864dff07ad01acad745d22606d1370d72ce233 (diff)
[drape][bookmarks] Added support of custom images
Diffstat (limited to 'drape/render_state.cpp')
-rw-r--r--drape/render_state.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/drape/render_state.cpp b/drape/render_state.cpp
index b4c0081627..d618e17459 100644
--- a/drape/render_state.cpp
+++ b/drape/render_state.cpp
@@ -156,6 +156,16 @@ void RenderState::SetLineWidth(int width)
m_lineWidth = width;
}
+uint32_t RenderState::GetTextureIndex() const
+{
+ return m_textureIndex;
+}
+
+void RenderState::SetTextureIndex(uint32_t index)
+{
+ m_textureIndex = index;
+}
+
bool RenderState::operator<(RenderState const & other) const
{
if (!m_renderStateExtension->Equal(other.m_renderStateExtension))
@@ -174,8 +184,10 @@ bool RenderState::operator<(RenderState const & other) const
return m_textureFilter < other.m_textureFilter;
if (m_drawAsLine != other.m_drawAsLine)
return m_drawAsLine < other.m_drawAsLine;
+ if (m_lineWidth != other.m_lineWidth)
+ return m_lineWidth < other.m_lineWidth;
- return m_lineWidth < other.m_lineWidth;
+ return m_textureIndex < other.m_textureIndex;
}
bool RenderState::operator==(RenderState const & other) const
@@ -188,7 +200,8 @@ bool RenderState::operator==(RenderState const & other) const
m_textureFilter == other.m_textureFilter &&
m_depthFunction == other.m_depthFunction &&
m_drawAsLine == other.m_drawAsLine &&
- m_lineWidth == other.m_lineWidth;
+ m_lineWidth == other.m_lineWidth &&
+ m_textureIndex == other.m_textureIndex;
}
bool RenderState::operator!=(RenderState const & other) const