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

[codereview]

Browse source
This commit is contained in:
Dmitry Kunin 2014-02-05 10:58:19 +03:00 • committed by Alex Zolotarev
parent e0338663ba
commit 591f82b0af
4 changed files with 72 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drape/shaders/line_fragment_shader.fsh
View file

@ -1,9 +1,9 @@
uniform lowp vec4 color;
uniform lowp vec4 u_color;
varying highp vec4 v_vertType;
varying highp vec4 v_distanceInfo;
highp float cap(highp float type, highp float dx, highp float dy, highp float width)
highp float cap(lowp float type, highp float dx, highp float dy, highp float width)
{
highp float hw = width/2.0;
@ -13,53 +13,46 @@ highp float cap(highp float type, highp float dx, highp float dy, highp float wi
return 1.0;
}
highp float join(int type, highp float dx, highp float dy, highp float width)
highp float join(lowp float type, highp float dx, highp float dy, highp float width)
{
return 1.0;
}
void main(void)
{
highp float vertType = v_vertType.x;
lowp float vertType = v_vertType.x;
if (vertType == 0.0)
{
gl_FragColor = color;
gl_FragColor = u_color;
return;
}
else if (vertType > 0.0)
{
highp float joinType = v_vertType.z;
highp float dx = v_distanceInfo.z - v_distanceInfo.x;
highp float dy = v_distanceInfo.w - v_distanceInfo.y;
highp float width = v_vertType.w;
if (join(int(joinType), dx, dy, width) > 0.0)
highp vec2 d = v_distanceInfo.zw - v_distanceInfo.xy;
highp float width = v_vertType.w;
if (vertType > 0.0)
{
lowp float joinType = v_vertType.z;
if ( join(joinType, d.x, d.y, width) > 0.0 )
{
gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);
return;
}
else
{
discard;
}
discard;
}
else if (vertType < 0.0)
{
highp float capType = v_vertType.y;
highp float dx = v_distanceInfo.z - v_distanceInfo.x;
highp float dy = v_distanceInfo.w - v_distanceInfo.y;
highp float width = v_vertType.w;
lowp float capType = v_vertType.y;
if ( cap(capType, dx, dy, width) > 0.0 )
if ( cap(capType, d.x, d.y, width) > 0.0 )
{
gl_FragColor = color;
gl_FragColor = u_color;
return;
}
else
{
discard;
}
discard;
}
gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);

22
drape/shaders/line_vertex_shader.vsh
View file

@ -1,6 +1,5 @@
attribute highp vec4 position;
attribute highp vec4 direction;
attribute highp vec4 a_position;
attribute highp vec4 a_direction;
attribute highp vec4 a_vertType;
varying highp vec4 v_vertType;
@ -11,33 +10,28 @@ uniform highp mat4 projection;
void main(void)
{
highp float half_w = direction.z;
highp float half_w = a_direction.z;
highp float vertexType = a_vertType.x;
highp vec4 pos;
highp vec4 pivot = position * modelView;
highp vec4 pivot = a_position * modelView;
highp vec4 n = vec4(-a_direction.y, a_direction.x, 0, 0);
highp vec4 pn = normalize(n * modelView) * half_w;
if (vertexType < 0.0)
{
highp vec4 n = vec4(-direction.y, direction.x, 0, 0);
highp vec4 d = vec4( direction.x, direction.y, 0, 0);
highp vec4 pn = normalize(n * modelView) * half_w;
highp vec4 d = vec4(a_direction.x, a_direction.y, 0, 0);
highp float quadWidth = a_vertType.y <= 0.0 ? 2.0 * abs(half_w) : abs(half_w);
highp vec4 pd = normalize(d * modelView) * quadWidth;
pos = (pn - pd + pivot);
}
else
{
highp vec4 n = vec4(-direction.y, direction.x, 0, 0);
highp vec4 pn = normalize(n * modelView) * half_w;
pos = (pn + pivot);
}
v_distanceInfo = vec4(pivot.x, pivot.y, pos.x, pos.y);
v_vertType = a_vertType;
v_vertType.w = 2.0 * abs(half_w);

91
drape_frontend/line_shape.cpp
View file

@ -13,39 +13,14 @@
namespace df
{
namespace
{
struct MatchesPrevious
{
MatchesPrevious(m2::PointF const & first)
: m_prev(first)
{}
bool operator ()(m2::PointF const & current)
{
if (m2::AlmostEqual(m_prev, current))
return true;
else
{
m_prev = current;
return false;
}
}
private:
m2::PointF m_prev;
};
}
LineShape::LineShape(const vector<m2::PointF> & points,
float depth,
const LineViewParams & params)
: m_depth(depth)
: m_points(points)
, m_depth(depth)
, m_params(params)
{
ASSERT(points.size() > 1, ());
m_points = points;
ASSERT_GREATER(m_points.size(), 1, ());
}
void LineShape::Draw(RefPointer<Batcher> batcher) const
@ -60,34 +35,41 @@ namespace df
const float T_SEGMENT = 0.f;
const float T_JOIN = +1.f;
vector<Point3D> renderPoints;
vector<Point3D> renderDirections;
vector<Point3D> renderVertexTypes;
const float hw = GetWidth() / 2.0f;
typedef m2::PointF vec2;
// Add start cap quad
vec2 firstSegment = m_points[1] - m_points[0];
vec2 direction = firstSegment;
const size_t count = m_points.size();
// prepare data
vector<Point3D> renderPoints;
renderPoints.reserve(count);
vector<Point3D> renderDirections;
renderDirections.reserve(count);
vector<vec2> renderVertexTypes;
renderVertexTypes.reserve(count);
//
const float hw = GetWidth() / 2.0f;
// Add start cap quad
vec2 direction = m_points[1] - m_points[0];
m2::PointF firstPoint = m_points[0];
// Cap quad points
renderPoints.push_back(Point3D::From2D(firstPoint, m_depth)); // A
renderDirections.push_back(Point3D::From2D(direction, hw));
renderVertexTypes.push_back(Point3D(T_CAP, m_params.m_cap, 0));
renderVertexTypes.push_back(vec2(T_CAP, m_params.m_cap));
renderPoints.push_back(Point3D::From2D(firstPoint, m_depth)); // B
renderDirections.push_back(Point3D::From2D(direction, -hw));
renderVertexTypes.push_back(Point3D(T_CAP, m_params.m_cap, 0));
renderVertexTypes.push_back(vec2(T_CAP, m_params.m_cap));
//
vec2 start = m_points[0];
for (size_t i = 1; i < m_points.size(); ++i)
m2::PointF start = m_points[0];
for (size_t i = 1; i < count; ++i)
{
vec2 end = m_points[i];
vec2 segment = end - start;
m2::PointF end = m_points[i];
vec2 segment = end - start;
if (i < m_points.size() - 1)
if (i < count - 1)
{
vec2 longer = m_points[i+1] - start;
const float dp = m2::DotProduct(segment, longer);
@ -113,49 +95,48 @@ namespace df
renderPoints.push_back(start3d);
renderDirections.push_back(directionPos);
renderVertexTypes.push_back(Point3D(T_SEGMENT, 0, 0));
renderVertexTypes.push_back(vec2(T_SEGMENT, 0));
renderPoints.push_back(start3d);
renderDirections.push_back(directionNeg);
renderVertexTypes.push_back(Point3D(T_SEGMENT, 0, 0));
renderVertexTypes.push_back(vec2(T_SEGMENT, 0));
renderPoints.push_back(end3d);
renderDirections.push_back(directionPos);
renderVertexTypes.push_back(Point3D(T_SEGMENT, 0, 0));
renderVertexTypes.push_back(vec2(T_SEGMENT, 0));
renderPoints.push_back(end3d);
renderDirections.push_back(directionNeg);
renderVertexTypes.push_back(Point3D(T_SEGMENT, 0, 0));
renderVertexTypes.push_back(vec2(T_SEGMENT, 0));
start = end;
}
//Add final cap
const size_t count = m_points.size();
vec2 lastSegment = m_points[count-1] - m_points[count-2];
m2::PointF lastPoint = m_points[count-1];
direction = -lastSegment;
renderPoints.push_back(Point3D::From2D(lastPoint, m_depth)); // A
renderDirections.push_back(Point3D::From2D(direction, -hw));
renderVertexTypes.push_back(Point3D(T_CAP, m_params.m_cap, 0));
renderVertexTypes.push_back(vec2(T_CAP, m_params.m_cap));
renderPoints.push_back(Point3D::From2D(lastPoint, m_depth)); // B
renderDirections.push_back(Point3D::From2D(direction, hw));
renderVertexTypes.push_back(Point3D(T_CAP, m_params.m_cap, 0));
renderVertexTypes.push_back(vec2(T_CAP, m_params.m_cap));
//
GLState state(gpu::SOLID_LINE_PROGRAM, 0, TextureBinding("", false, 0, MakeStackRefPointer<Texture>(NULL)));
float r, g, b, a;
::Convert(GetColor(), r, g, b, a);
state.GetUniformValues().SetFloatValue("color", r, g, b, a);
state.GetUniformValues().SetFloatValue("u_color", r, g, b, a);
AttributeProvider provider(3, renderPoints.size());
{
BindingInfo positionInfo(1);
BindingDecl & decl = positionInfo.GetBindingDecl(0);
decl.m_attributeName = "position";
decl.m_attributeName = "a_position";
decl.m_componentCount = 3;
decl.m_componentType = GLConst::GLFloatType;
decl.m_offset = 0;
@ -167,7 +148,7 @@ namespace df
{
BindingInfo directionInfo(1);
BindingDecl & decl = directionInfo.GetBindingDecl(0);
decl.m_attributeName = "direction";
decl.m_attributeName = "a_direction";
decl.m_componentCount = 3;
decl.m_componentType = GLConst::GLFloatType;
decl.m_offset = 0;
@ -180,7 +161,7 @@ namespace df
BindingInfo vertexTypeInfo(1);
BindingDecl & decl = vertexTypeInfo.GetBindingDecl(0);
decl.m_attributeName = "a_vertType";
decl.m_componentCount = 3;
decl.m_componentCount = 2;
decl.m_componentType = GLConst::GLFloatType;
decl.m_offset = 0;
decl.m_stride = 0;

11
drape_head/testing_engine.cpp
View file

@ -85,11 +85,18 @@ namespace df
float bottom = m_viewport.GetY0();
float top = bottom + m_viewport.GetHeight();
float resolution = 32;
const float resolution = 32;
const float stepX = right/resolution;
const float stepY = top/resolution;
m2::PointF grid[32][32]; // to simpify testing
for (size_t i = 1; i <= resolution; ++i)
for (size_t j = 1; j <= resolution; ++j)
grid[i-1][j-1] = m2::PointF((right/resolution)*i, (top/resolution)*j);
grid[i-1][j-1] = m2::PointF(stepX*i, stepY*j);
// grid:
// [31,31] ... [31,31]
// ... ...
// [0,0] ... [0,31]
vector<m2::PointF> linePoints1;