kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

using ListOfTriangles instead TriangleList

Browse source
This commit is contained in:
Roman Sorokin 2014-08-05 14:55:28 +03:00 • committed by Alex Zolotarev
parent 9ace1f16b3
commit 8bd75a088d
2 changed files with 8 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drape_frontend/line_shape.cpp
View file

@ -17,11 +17,6 @@ using m2::PointF;
namespace df
{
namespace
{
static uint32_t const ListStride = 24;
}
/// Split angle v1-v2-v3 by bisector.
void Bisector(float R, PointF const & v1, PointF const & v2, PointF const & v3,
PointF & leftBisector, PointF & rightBisector, PointF & dx)
@ -58,27 +53,12 @@ void Bisector(float R, PointF const & v1, PointF const & v2, PointF const & v3,
rightBisector += v2;
}
template <typename T>
void QuadStripToList(vector<T> & dst, vector<T> & src, int32_t index)
{
static const int32_t dstStride = 6;
static const int32_t srcStride = 4;
const int32_t baseDstIndex = index * dstStride;
const int32_t baseSrcIndex = index * srcStride;
dst[baseDstIndex] = src[baseSrcIndex];
dst[baseDstIndex + 1] = src[baseSrcIndex + 1];
dst[baseDstIndex + 2] = src[baseSrcIndex + 2];
dst[baseDstIndex + 3] = src[baseSrcIndex + 1];
dst[baseDstIndex + 4] = src[baseSrcIndex + 3];
dst[baseDstIndex + 5] = src[baseSrcIndex + 2];
}
void SetColor(vector<float> &dst, float const * ar, int index)
{
uint32_t const colorArraySize = 4;
uint32_t const ListStride = 16;
uint32_t const baseListIndex = ListStride * index;
for (uint32_t i = 0; i < 6; ++i)
for (uint32_t i = 0; i < 4; ++i)
memcpy(&dst[baseListIndex + colorArraySize * i], ar, colorArraySize * sizeof(float));
}
@ -244,20 +224,10 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
/// TODO this color now not using. We need merge line styles to draw line outline and line by ont pass
float const clr2[4] = {0.5f, 0.5f, 0.5f, 1.0f};
/// TODO add additional functionality in batcher for better perfomance
int32_t const listVertexCount = (numVert >> 1) * 3;
vector<Vertex> vertex2(listVertexCount);
vector<Offset> dxVals2(listVertexCount);
vector<SphereCenters> centers2(listVertexCount);
vector<WidthType> widthType2(listVertexCount);
vector<float> baseColor(numVert * 6);
vector<float> outlineColor(numVert * 6);
vector<float> baseColor(numVert * 4);
vector<float> outlineColor(numVert * 4);
for(int i = 0; i < size-1 ; i++)
{
QuadStripToList(vertex2, vertex, i);
QuadStripToList(dxVals2, dxVals, i);
QuadStripToList(centers2, centers, i);
QuadStripToList(widthType2, widthType, i);
SetColor(baseColor, clr1, i);
SetColor(outlineColor, clr2, i);
}
@ -333,7 +303,6 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
provider.InitStream(5, clr2, dp::MakeStackRefPointer((void*)&outlineColor[0]));
}
//batcher->InsertTriangleList(state, dp::MakeStackRefPointer(&provider));
batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), 4);
}

29
drape_frontend/text_shape.cpp
View file

@ -29,34 +29,18 @@ using glsl_types::vec4;
namespace
{
static uint32_t const ListStride = 24;
static float const realFontSize = 20.0f;
static float const fontOffset = 1.3f;
void SetColor(vector<float> &dst, float const * ar, int index)
{
uint32_t const colorArraySize = 4;
uint32_t const ListStride = 16;
uint32_t const baseListIndex = ListStride * index;
for (uint32_t i = 0; i < 6; ++i)
for (uint32_t i = 0; i < 4; ++i)
memcpy(&dst[baseListIndex + colorArraySize * i], ar, colorArraySize * sizeof(float));
}
template <typename T>
void QuadStripToList(vector<T> & dst, vector<T> & src, int32_t index)
{
static const int32_t dstStride = 6;
static const int32_t srcStride = 4;
const int32_t baseDstIndex = index * dstStride;
const int32_t baseSrcIndex = index * srcStride;
dst[baseDstIndex] = src[baseSrcIndex];
dst[baseDstIndex + 1] = src[baseSrcIndex + 1];
dst[baseDstIndex + 2] = src[baseSrcIndex + 2];
dst[baseDstIndex + 3] = src[baseSrcIndex + 1];
dst[baseDstIndex + 4] = src[baseSrcIndex + 3];
dst[baseDstIndex + 5] = src[baseSrcIndex + 2];
}
PointF GetShift(dp::Anchor anchor, float width, float height)
{
switch(anchor)
@ -193,10 +177,8 @@ void TextShape::DrawUnicalTextLine(TextLine const & textLine, int setNum, int le
stride += advance;
}
vector<vec4> vertex2(numVert * 3 / 2);
vector<vec4> texture2(numVert * 3 / 2);
vector<float> color(numVert * 6);
vector<float> color2(numVert * 6);
vector<float> color(numVert * 4);
vector<float> color2(numVert * 4);
float clr1[4], clr2[4];
dp::Convert(base, clr1[0], clr1[1], clr1[2], clr1[3]);
@ -204,8 +186,6 @@ void TextShape::DrawUnicalTextLine(TextLine const & textLine, int setNum, int le
for(int i = 0; i < letterCount ; i++)
{
QuadStripToList(vertex2, vertex, i);
QuadStripToList(texture2, texture, i);
SetColor(color, clr1, i);
SetColor(color2, clr2, i);
}
@ -258,7 +238,6 @@ void TextShape::DrawUnicalTextLine(TextLine const & textLine, int setNum, int le
PointF const dim = PointF(textLine.m_length, fontOffset * textLine.m_font.m_size);
dp::OverlayHandle * handle = new TextHandle(m_params.m_featureID, m_basePoint, dim, anchorDelta, m_params.m_depth);
//batcher->InsertTriangleList(state, MakeStackRefPointer(&provider), MovePointer(handle));
batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), MovePointer(handle), 4);
}