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

using list of strips for drawing

Browse source
This commit is contained in:
Roman Sorokin 2014-08-04 11:18:37 +03:00 • committed by Alex Zolotarev
parent 9e24a2868e
commit 5024e1d2ca
5 changed files with 30 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drape_frontend/line_shape.cpp
View file

@ -263,7 +263,7 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
}
dp::GLState state(gpu::SOLID_LINE_PROGRAM, dp::GLState::GeometryLayer);
dp::AttributeProvider provider(6, 6*(size-1));
dp::AttributeProvider provider(6, 4 * (size - 1));
{
dp::BindingInfo pos_dir(1);
@ -273,7 +273,7 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
decl.m_componentType = gl_const::GLFloatType;
decl.m_offset = 0;
decl.m_stride = 0;
provider.InitStream(0, pos_dir, dp::MakeStackRefPointer((void*)&vertex2[0]));
provider.InitStream(0, pos_dir, dp::MakeStackRefPointer((void*)&vertex[0]));
}
{
dp::BindingInfo deltas(1);
@ -284,7 +284,7 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
decl.m_offset = 0;
decl.m_stride = 0;
provider.InitStream(1, deltas, dp::MakeStackRefPointer((void*)&dxVals2[0]));
provider.InitStream(1, deltas, dp::MakeStackRefPointer((void*)&dxVals[0]));
}
{
dp::BindingInfo width_type(1);
@ -295,7 +295,7 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
decl.m_offset = 0;
decl.m_stride = 0;
provider.InitStream(2, width_type, dp::MakeStackRefPointer((void*)&widthType2[0]));
provider.InitStream(2, width_type, dp::MakeStackRefPointer((void*)&widthType[0]));
}
{
dp::BindingInfo centres(1);
@ -306,7 +306,7 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
decl.m_offset = 0;
decl.m_stride = 0;
provider.InitStream(3, centres, dp::MakeStackRefPointer((void*)&centers2[0]));
provider.InitStream(3, centres, dp::MakeStackRefPointer((void*)&centers[0]));
}
{
@ -333,7 +333,8 @@ 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->InsertTriangleList(state, dp::MakeStackRefPointer(&provider));
batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), 4);
}
} // namespace df

14
drape_frontend/path_symbol_shape.cpp
View file

@ -55,12 +55,10 @@ public:
PointF const p3 = pos - dir + norm;
PointF const p4 = pos + dir + norm;
*it = p2; it++;
*it = p3; it++;
*it = p1; it++;
*it = p2; it++;
*it = p4; it++;
*it = p1; it++;
*it = p3; it++;
itr.Step(m_params.m_step * m_scaleFactor);
}
@ -99,7 +97,7 @@ void PathSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<d
if (maxCount <= 0)
return;
int const vertCnt = maxCount * 6;
int const vertCnt = maxCount * 4;
vector<vec2> positions(vertCnt, vec2(0.0f, 0.0f));
vector<vec4> uvs(vertCnt);
vec4 * tc = &uvs[0];
@ -113,18 +111,14 @@ void PathSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<d
for(int i = 0; i < maxCount; ++i)
{
*tc = vec4(rect.minX(), rect.minY(), textureNum, m_params.m_depth);
tc++;
*tc = vec4(rect.minX(), rect.maxY(), textureNum, m_params.m_depth);
tc++;
*tc = vec4(rect.maxX(), rect.minY(), textureNum, m_params.m_depth);
*tc = vec4(rect.minX(), rect.minY(), textureNum, m_params.m_depth);
tc++;
*tc = vec4(rect.maxX(), rect.maxY(), textureNum, m_params.m_depth);
tc++;
*tc = vec4(rect.maxX(), rect.minY(), textureNum, m_params.m_depth);
tc++;
*tc = vec4(rect.minX(), rect.maxY(), textureNum, m_params.m_depth);
tc++;
}
dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::DynamicGeometry);
@ -164,7 +158,7 @@ void PathSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<d
}
dp::OverlayHandle * handle = new PathSymbolHandle(m_path, m_params, maxCount, pixelSize.x / 2.0f, pixelSize.y / 2.0f);
batcher->InsertTriangleList(state, dp::MakeStackRefPointer(&provider), dp::MovePointer(handle));
batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), dp::MovePointer(handle), 4);
}
}

41
drape_frontend/path_text_shape.cpp
View file

@ -23,31 +23,19 @@ namespace df
using m2::PointF;
using m2::Spline;
using glsl_types::vec2;
using glsl_types::vec4;
namespace
{
static float const realFontSize = 20.0f;
struct TexCoord
{
TexCoord() {}
TexCoord(m2::PointF const & tex, float index = 0.0f, float depth = 0.0f)
: m_texCoord(tex), m_index(index), m_depth(depth) {}
TexCoord(float texX, float texY, float index = 0.0f, float depth = 0.0f)
: m_texCoord(texX, texY), m_index(index), m_depth(depth) {}
m2::PointF m_texCoord;
float m_index;
float m_depth;
};
struct Buffer
{
vector<Position> m_pos;
vector<TexCoord> m_uvs;
vector<dp::ColorF> m_baseColor;
vector<dp::ColorF> m_outlineColor;
vector<vec2> m_pos;
vector<vec4> m_uvs;
vector<vec4> m_baseColor;
vector<vec4> m_outlineColor;
vector<LetterInfo> m_info;
float m_offset;
float m_maxSize;
@ -64,9 +52,7 @@ namespace
PathTextShape::PathTextShape(vector<PointF> const & path, PathTextViewParams const & params)
: m_spline(path)
, m_params(params)
{
}
, m_params(params) {}
void PathTextShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const
{
@ -275,14 +261,11 @@ void PathTextHandle::Update(ScreenBase const & screen)
PointF const p3 = pivot - dir - norm;
PointF const p4 = pivot + dir - norm;
int index = i * 6;
m_positions[index++] = Position(p2);
m_positions[index++] = Position(p3);
m_positions[index++] = Position(p1);
m_positions[index++] = Position(p4);
m_positions[index++] = Position(p1);
m_positions[index++] = Position(p3);
int index = i * 4;
m_positions[index++] = p3;
m_positions[index++] = p2;
m_positions[index++] = p4;
m_positions[index++] = p1;
}
}

16
drape_frontend/path_text_shape.hpp
View file

@ -2,6 +2,7 @@
#include "map_shape.hpp"
#include "shape_view_params.hpp"
#include "common_structures.hpp"
#include "../drape/overlay_handle.hpp"
@ -30,19 +31,6 @@ struct LetterInfo
float m_halfHeight;
};
namespace
{
struct Position
{
Position() {}
Position(float x, float y) : m_x(x), m_y(y){}
Position(PointF const & p) : m_x(p.x), m_y(p.y){}
float m_x;
float m_y;
};
}
class PathTextShape : public MapShape
{
public:
@ -70,7 +58,7 @@ private:
PathTextViewParams m_params;
vector<LetterInfo> m_infos;
float m_scaleFactor;
mutable vector<Position> m_positions;
mutable vector<glsl_types::vec2> m_positions;
float m_maxSize;
};

9
drape_frontend/text_shape.cpp
View file

@ -214,7 +214,7 @@ void TextShape::DrawUnicalTextLine(TextLine const & textLine, int setNum, int le
state.SetTextureSet(textureSet);
state.SetBlending(dp::Blending(true));
dp::AttributeProvider provider(4, 6 * letterCount);
dp::AttributeProvider provider(4, 4 * letterCount);
{
dp::BindingInfo position(1);
dp::BindingDecl & decl = position.GetBindingDecl(0);
@ -223,7 +223,7 @@ void TextShape::DrawUnicalTextLine(TextLine const & textLine, int setNum, int le
decl.m_componentType = gl_const::GLFloatType;
decl.m_offset = 0;
decl.m_stride = 0;
provider.InitStream(0, position, dp::MakeStackRefPointer((void*)&vertex2[0]));
provider.InitStream(0, position, dp::MakeStackRefPointer((void*)&vertex[0]));
}
{
dp::BindingInfo texcoord(1);
@ -233,7 +233,7 @@ void TextShape::DrawUnicalTextLine(TextLine const & textLine, int setNum, int le
decl.m_componentType = gl_const::GLFloatType;
decl.m_offset = 0;
decl.m_stride = 0;
provider.InitStream(1, texcoord, dp::MakeStackRefPointer((void*)&texture2[0]));
provider.InitStream(1, texcoord, dp::MakeStackRefPointer((void*)&texture[0]));
}
{
dp::BindingInfo base_color(1);
@ -258,7 +258,8 @@ 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->InsertTriangleList(state, MakeStackRefPointer(&provider), MovePointer(handle));
batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), MovePointer(handle), 4);
}
void TextShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const