diff --git a/graphics/path_renderer.cpp b/graphics/path_renderer.cpp index 55300b66b6..20f3e1090e 100644 --- a/graphics/path_renderer.cpp +++ b/graphics/path_renderer.cpp @@ -67,7 +67,7 @@ namespace graphics float rawTileLen = (float)pen->rawTileLen(); - if ((offset < 0) && (!pen->m_isWrapped)) + if (offset < 0) offset = offset - rawTileLen * ceil(offset / rawTileLen); bool skipToOffset = true; @@ -127,12 +127,9 @@ namespace graphics while (segLenRemain > 0) { - rawTileLen = pen->m_isWrapped - ? segLen - : std::min(((float)pen->rawTileLen() - rawTileStartLen), segLenRemain); + rawTileLen = std::min(((float)pen->rawTileLen() - rawTileStartLen), segLenRemain); - - float texMinX = pen->m_isWrapped ? 0 : pen->m_texRect.minX() + 2 + rawTileStartLen; + float texMinX = pen->m_texRect.minX() + 2 + rawTileStartLen; float texMaxX = texMinX + rawTileLen; rawTileStartLen += rawTileLen; diff --git a/graphics/pen.cpp b/graphics/pen.cpp index c004ace62a..ecbc3140fe 100644 --- a/graphics/pen.cpp +++ b/graphics/pen.cpp @@ -156,8 +156,7 @@ namespace graphics Resource * Pen::Info::createResource(m2::RectU const & texRect, uint8_t pipelineID) const { - return new Pen(false, - texRect, + return new Pen(texRect, pipelineID, *this); } @@ -194,13 +193,11 @@ namespace graphics return false; } - Pen::Pen(bool isWrapped, - m2::RectU const & texRect, + Pen::Pen(m2::RectU const & texRect, int pipelineID, Info const & info) : Resource(EPen, texRect, pipelineID), m_info(info), - m_isWrapped(isWrapped), m_isSolid(info.m_isSolid) { if (m_isSolid) diff --git a/graphics/pen.hpp b/graphics/pen.hpp index 2c46ee3b5e..93a813bc3b 100644 --- a/graphics/pen.hpp +++ b/graphics/pen.hpp @@ -65,14 +65,12 @@ namespace graphics Info m_info; - bool m_isWrapped; bool m_isSolid; m2::PointU m_centerColorPixel; m2::PointU m_borderColorPixel; - Pen(bool isWrapped, - m2::RectU const & texRect, + Pen(m2::RectU const & texRect, int pipelineID, Info const & info);