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

Render circles as transit line joins.

Browse source
This commit is contained in:
Daria Volvenkova 2018-07-02 14:11:06 +03:00 • committed by Roman Kuznetsov
parent 71db6f02e5
commit dd4c8e4445
11 changed files with 111 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/render_group.cpp
View file

@ -237,13 +237,13 @@ UserMarkRenderGroup::UserMarkRenderGroup(dp::GLState const & state, TileKey cons
void UserMarkRenderGroup::UpdateAnimation()
{
BaseRenderGroup::UpdateAnimation();
float interplationT = 1.0f;
float interpolation = 1.0f;
if (m_animation)
{
auto const t = static_cast<float>(m_animation->GetOpacity());
interplationT = m_mapping.GetValue(t);
interpolation = m_mapping.GetValue(t);
}
m_uniforms.SetFloatValue("u_interpolation", interplationT);
m_uniforms.SetFloatValue("u_interpolation", interpolation);
}
bool UserMarkRenderGroup::IsUserPoint() const

90
drape_frontend/transit_scheme_builder.cpp
View file

@ -52,14 +52,14 @@ std::string const kTransitStopInnerColor = "TransitStopInnerMarker";
float const kTransitMarkTextSize = 12.0f;
struct TransitLineStaticVertex
struct TransitStaticVertex
{
using TPosition = glsl::vec3;
using TNormal = glsl::vec4;
using TColor = glsl::vec4;
TransitLineStaticVertex() = default;
TransitLineStaticVertex(TPosition const & position, TNormal const & normal,
TransitStaticVertex() = default;
TransitStaticVertex(TPosition const & position, TNormal const & normal,
TColor const & color)
: m_position(position), m_normal(normal), m_color(color) {}
@ -76,41 +76,50 @@ struct SchemeSegment
glsl::vec2 m_leftNormal;
glsl::vec2 m_rightNormal;
};
using TGeometryBuffer = std::vector<TransitLineStaticVertex>;
using TGeometryBuffer = std::vector<TransitStaticVertex>;
dp::BindingInfo const & GetTransitStaticBindingInfo()
{
static unique_ptr<dp::BindingInfo> s_info;
if (s_info == nullptr)
{
dp::BindingFiller<TransitLineStaticVertex> filler(3);
filler.FillDecl<TransitLineStaticVertex::TPosition>("a_position");
filler.FillDecl<TransitLineStaticVertex::TNormal>("a_normal");
filler.FillDecl<TransitLineStaticVertex::TColor>("a_color");
dp::BindingFiller<TransitStaticVertex> filler(3);
filler.FillDecl<TransitStaticVertex::TPosition>("a_position");
filler.FillDecl<TransitStaticVertex::TNormal>("a_normal");
filler.FillDecl<TransitStaticVertex::TColor>("a_color");
s_info.reset(new dp::BindingInfo(filler.m_info));
}
return *s_info;
}
void SubmitStaticVertex(glsl::vec3 const & pivot, glsl::vec2 const & normal, float side,
glsl::vec4 const & color, TGeometryBuffer & geometry)
void GenerateLineCaps(std::vector<SchemeSegment> const & segments, glsl::vec4 const & color,
float lineOffset, float halfWidth, float depth, dp::Batcher & batcher)
{
geometry.emplace_back(pivot, TransitLineStaticVertex::TNormal(normal, side, 0.0), color);
}
using TV = TransitStaticVertex;
void GenerateJoinsTriangles(glsl::vec3 const & pivot,
std::vector<glsl::vec2> const & normals,
glsl::vec2 const & offset,
glsl::vec4 const & color,
TGeometryBuffer & joinsGeometry)
{
size_t const trianglesCount = normals.size() / 3;
for (size_t j = 0; j < trianglesCount; j++)
TGeometryBuffer geometry;
geometry.reserve(segments.size() * 3);
for (auto const & segment : segments)
{
SubmitStaticVertex(pivot, normals[3 * j] + offset, 1.0f, color, joinsGeometry);
SubmitStaticVertex(pivot, normals[3 * j + 1] + offset, 1.0f, color, joinsGeometry);
SubmitStaticVertex(pivot, normals[3 * j + 2] + offset, 1.0f, color, joinsGeometry);
// Here we use an equilateral triangle to render a circle (incircle of a triangle).
static float const kSqrt3 = sqrt(3.0f);
auto const offset = lineOffset * segment.m_rightNormal;
auto const pivot = glsl::vec3(segment.m_p2, depth);
auto const n1 = glsl::vec2(-2.0 * halfWidth, -halfWidth);
auto const n2 = glsl::vec2(2.0 * halfWidth, -halfWidth);
auto const n3 = glsl::vec2(0.0f, (2.0f * kSqrt3 - 1.0f) * halfWidth);
geometry.emplace_back(pivot, TV::TNormal(-offset, n1), color);
geometry.emplace_back(pivot, TV::TNormal(-offset, n2), color);
geometry.emplace_back(pivot, TV::TNormal(-offset, n3), color);
}
dp::AttributeProvider provider(1 /* stream count */, static_cast<uint32_t>(geometry.size()));
provider.InitStream(0 /* stream index */, GetTransitStaticBindingInfo(), make_ref(geometry.data()));
auto state = CreateGLState(gpu::Program::TransitCircle, RenderState::TransitSchemeLayer);
batcher.InsertTriangleList(state, make_ref(&provider));
}
struct TitleInfo
@ -537,7 +546,6 @@ void TransitSchemeBuilder::GenerateShapes(MwmSet::MwmId const & mwmId)
auto const linesCount = shape.second.m_forwardLines.size() + shape.second.m_backwardLines.size();
auto shapeOffset = -static_cast<float>(linesCount / 2) * 2.0f - 1.0f * static_cast<float>(linesCount % 2) + 1.0f;
auto const shapeOffsetIncrement = 2.0f;
auto const lineHalfWidth = 0.8f;
std::vector<std::pair<dp::Color, routing::transit::LineId>> coloredLines;
for (auto lineId : shape.second.m_forwardLines)
@ -559,7 +567,8 @@ void TransitSchemeBuilder::GenerateShapes(MwmSet::MwmId const & mwmId)
auto const & lineId = coloredLine.second;
auto const depth = scheme.m_lines.at(lineId).m_depth;
GenerateLine(shape.second.m_polyline, scheme.m_pivot, colorConst, shapeOffset, lineHalfWidth, depth, batcher);
GenerateLine(shape.second.m_polyline, scheme.m_pivot, colorConst, shapeOffset,
kTransitLineHalfWidth, depth, batcher);
shapeOffset += shapeOffsetIncrement;
}
}
@ -728,7 +737,7 @@ void TransitSchemeBuilder::GenerateMarker(m2::PointD const & pt, m2::PointD widt
float scaleWidth, float scaleHeight,
float depth, dp::Color const & color, dp::Batcher & batcher)
{
using TV = TransitLineStaticVertex;
using TV = TransitStaticVertex;
scaleWidth = (scaleWidth - 1.0f) / linesCountWidth + 1.0f;
scaleHeight = (scaleHeight - 1.0f) / linesCountHeight + 1.0f;
@ -760,9 +769,11 @@ void TransitSchemeBuilder::GenerateMarker(m2::PointD const & pt, m2::PointD widt
}
void TransitSchemeBuilder::GenerateLine(std::vector<m2::PointD> const & path, m2::PointD const & pivot,
dp::Color const & colorConst, float lineOffset, float lineHalfWidth,
dp::Color const & colorConst, float lineOffset, float halfWidth,
float depth, dp::Batcher & batcher)
{
using TV = TransitStaticVertex;
TGeometryBuffer geometry;
auto const color = glsl::vec4(colorConst.GetRedF(), colorConst.GetGreenF(), colorConst.GetBlueF(), 1.0f /* alpha */);
size_t const kAverageSize = path.size() * 6;
@ -787,30 +798,21 @@ void TransitSchemeBuilder::GenerateLine(std::vector<m2::PointD> const & path, m2
auto const endPivot = glsl::vec3(segment.m_p2, depth);
auto const offset = lineOffset * segment.m_rightNormal;
SubmitStaticVertex(startPivot, segment.m_rightNormal * lineHalfWidth - offset, -lineHalfWidth, color, geometry);
SubmitStaticVertex(startPivot, segment.m_leftNormal * lineHalfWidth - offset, lineHalfWidth, color, geometry);
SubmitStaticVertex(endPivot, segment.m_rightNormal * lineHalfWidth - offset, -lineHalfWidth, color, geometry);
SubmitStaticVertex(endPivot, segment.m_rightNormal * lineHalfWidth - offset, -lineHalfWidth, color, geometry);
SubmitStaticVertex(startPivot, segment.m_leftNormal * lineHalfWidth - offset, lineHalfWidth, color, geometry);
SubmitStaticVertex(endPivot, segment.m_leftNormal * lineHalfWidth - offset, lineHalfWidth, color, geometry);
geometry.emplace_back(startPivot, TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0), color);
geometry.emplace_back(startPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
geometry.emplace_back(endPivot, TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0), color);
geometry.emplace_back(endPivot, TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0), color);
geometry.emplace_back(startPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
geometry.emplace_back(endPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
segments.emplace_back(std::move(segment));
}
for (size_t i = 0; i < segments.size(); ++i)
{
int const kSegmentsCount = 4;
vector<glsl::vec2> normals;
normals.reserve(kAverageCapSize);
GenerateCapNormals(dp::RoundCap, segments[i].m_leftNormal, segments[i].m_rightNormal, segments[i].m_tangent,
lineHalfWidth, false /* isStart */, normals, kSegmentsCount);
GenerateJoinsTriangles(glsl::vec3(segments[i].m_p2, depth), normals, -lineOffset * segments[i].m_rightNormal,
color, geometry);
}
dp::AttributeProvider provider(1 /* stream count */, static_cast<uint32_t>(geometry.size()));
provider.InitStream(0 /* stream index */, GetTransitStaticBindingInfo(), make_ref(geometry.data()));
auto state = CreateGLState(gpu::Program::Transit, RenderState::TransitSchemeLayer);
batcher.InsertTriangleList(state, make_ref(&provider));
GenerateLineCaps(segments, color, lineOffset, halfWidth, depth, batcher);
}
} // namespace df

3
drape_frontend/transit_scheme_builder.hpp
View file

@ -15,6 +15,7 @@
namespace df
{
int constexpr kTransitSchemeMinZoomLevel = 10;
float constexpr kTransitLineHalfWidth = 0.8f;
extern std::vector<float> const kTransitLinesWidthInPixel;
@ -154,7 +155,7 @@ private:
ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher);
void GenerateLine(std::vector<m2::PointD> const & path, m2::PointD const & pivot, dp::Color const & colorConst,
float lineOffset, float lineHalfWidth, float depth, dp::Batcher & batcher);
float lineOffset, float halfWidth, float depth, dp::Batcher & batcher);
using TransitSchemes = std::map<MwmSet::MwmId, MwmSchemeData>;
TransitSchemes m_schemes;

1
drape_frontend/transit_scheme_renderer.cpp
View file

@ -180,6 +180,7 @@ void TransitSchemeRenderer::RenderLines(ScreenBase const & screen, ref_ptr<gpu::
uniforms.SetMatrix4x4Value("u_modelView", mv.m_data);
uniforms.SetFloatValue("u_lineHalfWidth", pixelHalfWidth);
uniforms.SetFloatValue("u_maxRadius", kTransitLineHalfWidth);
dp::ApplyUniforms(uniforms, program);
renderData.m_bucket->Render(false /* draw as line */);

6
shaders/CMakeLists.txt
View file

@ -98,10 +98,12 @@ set(
GL/traffic.vsh.glsl
GL/traffic_line.fsh.glsl
GL/traffic_line.vsh.glsl
GL/transit_marker.fsh.glsl
GL/transit_marker.vsh.glsl
GL/transit.fsh.glsl
GL/transit.vsh.glsl
GL/transit_circle.fsh.glsl
GL/transit_circle.vsh.glsl
GL/transit_marker.fsh.glsl
GL/transit_marker.vsh.glsl
GL/user_mark.fsh.glsl
GL/user_mark.vsh.glsl
GL/user_mark_billboard.vsh.glsl

1
shaders/GL/shader_index.txt
View file

@ -13,6 +13,7 @@ Area3d area3d.vsh.glsl texturing3d.fsh.glsl
Area3dOutline area3d_outline.vsh.glsl solid_color.fsh.glsl
Line line.vsh.glsl line.fsh.glsl
CapJoin circle.vsh.glsl circle.fsh.glsl
TransitCircle transit_circle.vsh.glsl transit_circle.fsh.glsl
DashedLine dashed_line.vsh.glsl dashed_line.fsh.glsl
PathSymbol path_symbol.vsh.glsl texturing.fsh.glsl
HatchingArea hatching_area.vsh.glsl hatching_area.fsh.glsl

19
shaders/GL/transit_circle.fsh.glsl Normal file
View file

@ -0,0 +1,19 @@
varying vec3 v_radius;
varying vec4 v_color;
#ifdef SAMSUNG_GOOGLE_NEXUS
uniform sampler2D u_colorTex;
#endif
const float aaPixelsCount = 2.5;
void main()
{
vec4 finalColor = v_color;
float smallRadius = v_radius.z - aaPixelsCount;
float stepValue = smoothstep(smallRadius * smallRadius, v_radius.z * v_radius.z,
dot(v_radius.xy, v_radius.xy));
finalColor.a = finalColor.a * (1.0 - stepValue);
gl_FragColor = samsungGoogleNexusWorkaround(finalColor);
}

30
shaders/GL/transit_circle.vsh.glsl Normal file
View file

@ -0,0 +1,30 @@
attribute vec3 a_position;
attribute vec4 a_normal;
attribute vec4 a_color;
uniform mat4 u_modelView;
uniform mat4 u_projection;
uniform mat4 u_pivotTransform;
uniform float u_lineHalfWidth;
uniform float u_maxRadius;
varying vec3 v_radius;
varying vec4 v_color;
void main()
{
vec2 normal = a_normal.xy;
vec2 transformedAxisPos = (vec4(a_position.xy, 0.0, 1.0) * u_modelView).xy;
if (dot(normal, normal) != 0.0)
{
vec2 norm = normal * u_lineHalfWidth;
transformedAxisPos = calcLineTransformedAxisPos(transformedAxisPos, a_position.xy + norm,
u_modelView, length(norm));
}
transformedAxisPos += a_normal.zw * u_lineHalfWidth;
vec4 pos = vec4(transformedAxisPos, a_position.z, 1.0) * u_projection;
gl_Position = applyPivotTransform(pos, u_pivotTransform, 0.0);
v_color = a_color;
v_radius = vec3(a_normal.zw, u_maxRadius) * u_lineHalfWidth;
}

1
shaders/gl_program_params.cpp
View file

@ -129,6 +129,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GpuProgram> program, TransitProgra
Parameter::CheckApply(guard, "u_pivotTransform", params.m_pivotTransform);
Parameter::CheckApply(guard, "u_params", params.m_params);
Parameter::CheckApply(guard, "u_lineHalfWidth", params.m_lineHalfWidth);
Parameter::CheckApply(guard, "u_maxRadius", params.m_maxRadius);
}
void GLProgramParamsSetter::Apply(ref_ptr<dp::GpuProgram> program, GuiProgramParams const & params)

2
shaders/program_params.hpp
View file

@ -128,9 +128,11 @@ struct TransitProgramParams
glsl::mat4 m_pivotTransform;
glsl::vec3 m_params;
float m_lineHalfWidth = 0.0f;
float m_maxRadius = 0.0f;
BIND_PROGRAMS(TransitProgramParams,
Program::Transit,
Program::TransitCircle,
Program::TransitMarker)
};

2
shaders/programs.hpp
View file

@ -24,6 +24,7 @@ enum class Program
Area3dOutline,
Line,
CapJoin,
TransitCircle,
DashedLine,
PathSymbol,
HatchingArea,
@ -79,6 +80,7 @@ inline std::string DebugPrint(Program p)
case Program::Area3dOutline: return "Area3dOutline";
case Program::Line: return "Line";
case Program::CapJoin: return "CapJoin";
case Program::TransitCircle: return "TransitCircle";
case Program::DashedLine: return "DashedLine";
case Program::PathSymbol: return "PathSymbol";
case Program::HatchingArea: return "HatchingArea";