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

[codereview] removed u_width uniform.

Browse source
This commit is contained in:
Dmitry Kunin 2014-02-06 12:33:46 +03:00 • committed by Alex Zolotarev
parent 2694651c86
commit f5085e2a71
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drape/shaders/line_fragment_shader.fsh
View file

@ -1,5 +1,4 @@
uniform lowp vec4 u_color;
uniform highp float u_width;
varying highp vec4 v_vertType;
varying highp vec4 v_distanceInfo;
@ -8,7 +7,7 @@ highp float cap(lowp float type, highp float dx, highp float dy)
{
if (type == 0.0)
{
highp float hw = u_width/2.0;
highp float hw = v_vertType.z/2.0;
return -(dx*dx + dy*dy) + hw*hw;
}
else
@ -19,7 +18,7 @@ highp float join(lowp float type, highp float dx, highp float dy)
{
if (type > 0.0)
{
highp float hw = u_width/2.0;
highp float hw = v_vertType.z/2.0;
return -(dx*dx + dy*dy) + hw*hw;
}
else
@ -28,9 +27,9 @@ highp float join(lowp float type, highp float dx, highp float dy)
void main(void)
{
lowp float vertType = v_vertType.x;
lowp float vertType = v_vertType.x;
highp vec2 d = v_distanceInfo.zw - v_distanceInfo.xy;
if (vertType > 0.0)
{
lowp float joinType = v_vertType.y;

32
drape_frontend/line_shape.cpp
View file

@ -45,11 +45,12 @@ namespace df
renderPoints.reserve(count);
vector<Point3D> renderDirections;
renderDirections.reserve(count);
vector<vec2> renderVertexTypes;
vector<Point3D> renderVertexTypes;
renderVertexTypes.reserve(count);
//
const float hw = GetWidth() / 2.0f;
const float realWidth = GetWidth();
// Add start cap quad
vec2 direction = m_points[1] - m_points[0];
@ -57,11 +58,11 @@ namespace df
renderPoints.push_back(Point3D::From2D(firstPoint, m_depth)); // A
renderDirections.push_back(Point3D::From2D(direction, hw));
renderVertexTypes.push_back(vec2(T_CAP, m_params.m_cap));
renderVertexTypes.push_back(Point3D(T_CAP, m_params.m_cap, realWidth));
renderPoints.push_back(Point3D::From2D(firstPoint, m_depth)); // B
renderDirections.push_back(Point3D::From2D(direction, -hw));
renderVertexTypes.push_back(vec2(T_CAP, m_params.m_cap));
renderVertexTypes.push_back(Point3D(T_CAP, m_params.m_cap, realWidth));
//
m2::PointF start = m_points[0];
@ -96,19 +97,19 @@ namespace df
renderPoints.push_back(start3d);
renderDirections.push_back(directionPos);
renderVertexTypes.push_back(vec2(T_SEGMENT, 0));
renderVertexTypes.push_back(Point3D(T_SEGMENT, 0, realWidth));
renderPoints.push_back(start3d);
renderDirections.push_back(directionNeg);
renderVertexTypes.push_back(vec2(T_SEGMENT, 0));
renderVertexTypes.push_back(Point3D(T_SEGMENT, 0, realWidth));
renderPoints.push_back(end3d);
renderDirections.push_back(directionPos);
renderVertexTypes.push_back(vec2(T_SEGMENT, 0));
renderVertexTypes.push_back(Point3D(T_SEGMENT, 0, realWidth));
renderPoints.push_back(end3d);
renderDirections.push_back(directionNeg);
renderVertexTypes.push_back(vec2(T_SEGMENT, 0));
renderVertexTypes.push_back(Point3D(T_SEGMENT, 0, realWidth));
// This is a join!
const bool needJoinSegments = (end != m_points[count - 1]);
@ -137,11 +138,11 @@ namespace df
renderPoints.push_back(pivot);//1
renderDirections.push_back(Point3D::From2D(nInFixed, hw));
renderVertexTypes.push_back(vec2(T_JOIN, m_params.m_join));
renderVertexTypes.push_back(Point3D(T_JOIN, m_params.m_join, realWidth));
renderPoints.push_back(pivot);//2
renderDirections.push_back(Point3D(0,0,0)); // zero-shift point
renderVertexTypes.push_back(vec2(T_JOIN, m_params.m_join));
renderVertexTypes.push_back(Point3D(T_JOIN, m_params.m_join, realWidth));
// T234
vec2 nOut(-vOut.y, vOut.x);
@ -151,11 +152,11 @@ namespace df
renderPoints.push_back(pivot); //3
renderDirections.push_back(Point3D::From2D(joinBackBisec, joinHeight));
renderVertexTypes.push_back(vec2(T_JOIN, m_params.m_join));
renderVertexTypes.push_back(Point3D(T_JOIN, m_params.m_join, realWidth));
renderPoints.push_back(pivot); //4
renderDirections.push_back(Point3D::From2D(nOutFixed, hw));
renderVertexTypes.push_back(vec2(T_JOIN, m_params.m_join));
renderVertexTypes.push_back(Point3D(T_JOIN, m_params.m_join, realWidth));
if (!clockWise)
{
@ -163,7 +164,7 @@ namespace df
// for correct rasterization.
renderPoints.push_back(pivot); //4 second time
renderDirections.push_back(Point3D::From2D(nOutFixed, hw));
renderVertexTypes.push_back(vec2(T_JOIN, m_params.m_join));
renderVertexTypes.push_back(Point3D(T_JOIN, m_params.m_join, realWidth));
}
}
}
@ -179,18 +180,17 @@ namespace df
renderPoints.push_back(Point3D::From2D(lastPoint, m_depth)); // A
renderDirections.push_back(Point3D::From2D(direction, -hw));
renderVertexTypes.push_back(vec2(T_CAP, m_params.m_cap));
renderVertexTypes.push_back(Point3D(T_CAP, m_params.m_cap, realWidth));
renderPoints.push_back(Point3D::From2D(lastPoint, m_depth)); // B
renderDirections.push_back(Point3D::From2D(direction, hw));
renderVertexTypes.push_back(vec2(T_CAP, m_params.m_cap));
renderVertexTypes.push_back(Point3D(T_CAP, m_params.m_cap, realWidth));
//
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("u_color", r, g, b, a);
state.GetUniformValues().SetFloatValue("u_width", GetWidth());
AttributeProvider provider(3, renderPoints.size());
@ -222,7 +222,7 @@ namespace df
BindingInfo vertexTypeInfo(1);
BindingDecl & decl = vertexTypeInfo.GetBindingDecl(0);
decl.m_attributeName = "a_vertType";
decl.m_componentCount = 2;
decl.m_componentCount = 3;
decl.m_componentType = GLConst::GLFloatType;
decl.m_offset = 0;
decl.m_stride = 0;