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

Merge pull request #5854 from rokuz/traffic-green-arrows

Browse source 
Added arrows to green traffic segments
This commit is contained in:
Daria Volvenkova 2017-04-17 17:54:12 +03:00 • committed by GitHub
commit 22a03899ef
2 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drape_frontend/traffic_generator.cpp
View file

@ -32,7 +32,7 @@ static array<float, static_cast<size_t>(traffic::SpeedGroup::Count)> kCoordVOffs
0.75f, // G2
0.5f, // G3
0.25f, // G4
0.0f, // G5
0.25f, // G5
0.75f, // TempBlock
0.0f, // Unknown
}};
@ -138,7 +138,8 @@ void TrafficGenerator::FlushSegmentsGeometry(TileKey const & tileKey, TrafficSeg
lineState.SetColorTexture(texture);
lineState.SetDrawAsLine(true);
static vector<RoadClass> const kRoadClasses = {RoadClass::Class0, RoadClass::Class1, RoadClass::Class2};
static vector<RoadClass> const kRoadClasses = {RoadClass::Class0, RoadClass::Class1,
RoadClass::Class2};
static float const kDepths[] = {2.0f, 1.0f, 0.0f};
static vector<int> const kGenerateCapsZoomLevel = {14, 14, 16};
@ -162,12 +163,14 @@ void TrafficGenerator::FlushSegmentsGeometry(TileKey const & tileKey, TrafficSeg
continue;
TrafficSegmentGeometry const & g = geomIt->second[i].second;
ref_ptr<dp::Batcher> batcher = m_batchersPool->GetBatcher(TrafficBatcherKey(geomIt->first, tileKey, g.m_roadClass));
ref_ptr<dp::Batcher> batcher =
m_batchersPool->GetBatcher(TrafficBatcherKey(geomIt->first, tileKey, g.m_roadClass));
float const depth = kDepths[static_cast<size_t>(g.m_roadClass)];
ASSERT(m_colorsCacheValid, ());
dp::TextureManager::ColorRegion const & colorRegion = m_colorsCache[static_cast<size_t>(segmentColoringIt->second)];
dp::TextureManager::ColorRegion const & colorRegion =
m_colorsCache[static_cast<size_t>(segmentColoringIt->second)];
float const vOffset = kCoordVOffsets[static_cast<size_t>(segmentColoringIt->second)];
float const minU = kMinCoordU[static_cast<size_t>(segmentColoringIt->second)];
@ -175,7 +178,8 @@ void TrafficGenerator::FlushSegmentsGeometry(TileKey const & tileKey, TrafficSeg
if (TrafficRenderer::CanBeRendereredAsLine(g.m_roadClass, tileKey.m_zoomLevel, width))
{
vector<TrafficLineStaticVertex> staticGeometry;
GenerateLineSegment(colorRegion, g.m_polyline, tileKey.GetGlobalRect().Center(), depth, staticGeometry);
GenerateLineSegment(colorRegion, g.m_polyline, tileKey.GetGlobalRect().Center(), depth,
staticGeometry);
if (staticGeometry.empty())
continue;
@ -189,9 +193,10 @@ void TrafficGenerator::FlushSegmentsGeometry(TileKey const & tileKey, TrafficSeg
else
{
vector<TrafficStaticVertex> staticGeometry;
bool const generateCaps = (tileKey.m_zoomLevel > kGenerateCapsZoomLevel[static_cast<uint32_t>(g.m_roadClass)]);
GenerateSegment(colorRegion, g.m_polyline, tileKey.GetGlobalRect().Center(), generateCaps, depth,
vOffset, minU, staticGeometry);
bool const generateCaps =
(tileKey.m_zoomLevel > kGenerateCapsZoomLevel[static_cast<uint32_t>(g.m_roadClass)]);
GenerateSegment(colorRegion, g.m_polyline, tileKey.GetGlobalRect().Center(),
generateCaps, depth, vOffset, minU, staticGeometry);
if (staticGeometry.empty())
continue;
@ -285,7 +290,7 @@ void TrafficGenerator::GenerateSegment(dp::TextureManager::ColorRegion const & c
lastLeftNormal = leftNormal;
lastRightNormal = rightNormal;
lastPoint = p2;
float const maskSize = (path[i] - path[i - 1]).Length();
float const maskSize = static_cast<float>((path[i] - path[i - 1]).Length());
glsl::vec3 const startPivot = glsl::vec3(p1, depth);
glsl::vec3 const endPivot = glsl::vec3(p2, depth);

42
drape_frontend/traffic_renderer.cpp
View file

@ -76,8 +76,8 @@ float CalculateHalfWidth(ScreenBase const & screen, RoadClass const & roadClass,
{
double const zoomLevel = GetZoomLevel(screen.GetScale());
double zoom = trunc(zoomLevel);
int const index = zoom - 1.0;
float const lerpCoef = zoomLevel - zoom;
int const index = static_cast<int>(zoom - 1.0);
float const lerpCoef = static_cast<float>(zoomLevel - zoom);
float const * widthScalar = nullptr;
if (roadClass == RoadClass::Class1)
@ -100,7 +100,7 @@ float CalculateHalfWidth(ScreenBase const & screen, RoadClass const & roadClass,
radius *= widthScalar[scales::UPPER_STYLE_SCALE];
}
return radius * VisualParams::Instance().GetVisualScale();
return radius * static_cast<float>(VisualParams::Instance().GetVisualScale());
}
} // namespace
@ -174,20 +174,17 @@ void TrafficRenderer::RenderTraffic(ScreenBase const & screen, int zoomLevel, fl
else
{
// Filter by road class.
float leftPixelHalfWidth = 0.0f;
float invLeftPixelLength = 0.0f;
float rightPixelHalfWidth = 0.0f;
int minVisibleArrowZoomLevel = kMinVisibleArrowZoomLevel;
float outline = 0.0f;
int visibleZoomLevel = kRoadClass0ZoomLevel;
if (renderData.m_roadClass == RoadClass::Class0)
{
outline = (zoomLevel <= kOutlineMinZoomLevel ? 1.0 : 0.0);
outline = (zoomLevel <= kOutlineMinZoomLevel ? 1.0f : 0.0f);
}
else if (renderData.m_roadClass == RoadClass::Class1)
{
outline = (zoomLevel <= kOutlineMinZoomLevel ? 1.0 : 0.0);
outline = (zoomLevel <= kOutlineMinZoomLevel ? 1.0f : 0.0f);
visibleZoomLevel = kRoadClass1ZoomLevel;
}
else if (renderData.m_roadClass == RoadClass::Class2)
@ -198,9 +195,11 @@ void TrafficRenderer::RenderTraffic(ScreenBase const & screen, int zoomLevel, fl
if (zoomLevel < visibleZoomLevel)
continue;
leftPixelHalfWidth = CalculateHalfWidth(screen, renderData.m_roadClass, true /* left */);
invLeftPixelLength = 1.0f / (2.0f * leftPixelHalfWidth * kTrafficArrowAspect);
rightPixelHalfWidth = CalculateHalfWidth(screen, renderData.m_roadClass, false /* left */);
float const leftPixelHalfWidth =
CalculateHalfWidth(screen, renderData.m_roadClass, true /* left */);
float const invLeftPixelLength = 1.0f / (2.0f * leftPixelHalfWidth * kTrafficArrowAspect);
float const rightPixelHalfWidth =
CalculateHalfWidth(screen, renderData.m_roadClass, false /* left */);
float const kEps = 1e-5;
if (fabs(leftPixelHalfWidth) < kEps && fabs(rightPixelHalfWidth) < kEps)
continue;
@ -218,10 +217,11 @@ void TrafficRenderer::RenderTraffic(ScreenBase const & screen, int zoomLevel, fl
lightArrowColor.GetGreenF(), lightArrowColor.GetBlueF());
uniforms.SetFloatValue("u_darkArrowColor", darkArrowColor.GetRedF(),
darkArrowColor.GetGreenF(), darkArrowColor.GetBlueF());
uniforms.SetFloatValue("u_outlineColor", outlineColor.GetRedF(),
outlineColor.GetGreenF(), outlineColor.GetBlueF());
uniforms.SetFloatValue("u_outlineColor", outlineColor.GetRedF(), outlineColor.GetGreenF(),
outlineColor.GetBlueF());
uniforms.SetFloatValue("u_trafficParams", leftPixelHalfWidth, rightPixelHalfWidth,
invLeftPixelLength, zoomLevel >= minVisibleArrowZoomLevel ? 1.0f : 0.0f);
invLeftPixelLength,
zoomLevel >= minVisibleArrowZoomLevel ? 1.0f : 0.0f);
dp::ApplyUniforms(uniforms, program);
renderData.m_bucket->Render(false /* draw as line */);
@ -236,12 +236,10 @@ void TrafficRenderer::ClearGLDependentResources()
void TrafficRenderer::Clear(MwmSet::MwmId const & mwmId)
{
auto removePredicate = [&mwmId](TrafficRenderData const & data)
{
return data.m_mwmId == mwmId;
};
auto removePredicate = [&mwmId](TrafficRenderData const & data) { return data.m_mwmId == mwmId; };
m_renderData.erase(remove_if(m_renderData.begin(), m_renderData.end(), removePredicate), m_renderData.end());
m_renderData.erase(remove_if(m_renderData.begin(), m_renderData.end(), removePredicate),
m_renderData.end());
}
// static
@ -257,7 +255,9 @@ float TrafficRenderer::GetTwoWayOffset(RoadClass const & roadClass, int zoomLeve
ASSERT_LESS_OR_EQUAL(zoomLevel, scales::GetUpperStyleScale(), ());
int const index = zoomLevel - 1;
float const halfWidth = 0.5f * df::TrafficRenderer::GetPixelWidth(roadClass, zoomLevel);
return halfWidth + kTwoWayOffsetInPixel[index] * VisualParams::Instance().GetVisualScale();
return kTwoWayOffsetInPixel[index] *
static_cast<float>(VisualParams::Instance().GetVisualScale()) +
halfWidth;
}
// static
@ -283,7 +283,7 @@ float TrafficRenderer::GetPixelWidthInternal(RoadClass const & roadClass, int zo
int const index = zoomLevel - 1;
float const baseWidth = (kLeftWidthInPixel[index] + kRightWidthInPixel[index]) *
df::VisualParams::Instance().GetVisualScale();
static_cast<float>(df::VisualParams::Instance().GetVisualScale());
return (widthScalar != nullptr) ? (baseWidth * widthScalar[index]) : baseWidth;
}