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

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2015-11-20 18:26:16 +03:00
parent 5fd86de514
commit d5cdf3ba6b
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drape_frontend/frontend_renderer.cpp
View file

@ -321,8 +321,8 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
{
ref_ptr<FlushRouteMessage> msg = message;
drape_ptr<RouteData> routeData = msg->AcceptRouteData();
m2::PointD startPoint = routeData->m_sourcePolyline.Front();
m2::PointD finishPoint = routeData->m_sourcePolyline.Back();
m2::PointD const startPoint = routeData->m_sourcePolyline.Front();
m2::PointD const finishPoint = routeData->m_sourcePolyline.Back();
m_routeRenderer->SetRouteData(move(routeData), make_ref(m_gpuProgramManager));
if (!m_routeRenderer->GetStartPoint())
{

6
drape_frontend/message_subclasses.hpp
View file

@ -555,9 +555,9 @@ public:
bool IsValid() const { return m_isValid; }
private:
m2::PointD m_position;
bool m_isStart;
bool m_isValid;
m2::PointD const m_position;
bool const m_isStart;
bool const m_isValid;
};
class RemoveRouteMessage : public Message

4
drape_frontend/route_renderer.cpp
View file

@ -239,14 +239,14 @@ void RouteRenderer::RenderRouteSign(drape_ptr<RouteSignData> const & sign, Scree
dp::GLState const & state = sign->m_sign.m_state;
dp::UniformValuesStorage uniforms = commonUniforms;
uniforms.SetFloatValue("u_opacity", 1.0);
uniforms.SetFloatValue("u_opacity", 1.0f);
ref_ptr<dp::GpuProgram> program = mng->GetProgram(state.GetProgramIndex());
program->Bind();
dp::ApplyState(sign->m_sign.m_state, program);
dp::ApplyUniforms(uniforms, program);
for (drape_ptr<dp::RenderBucket> const & bucket : sign->m_sign.m_buckets)
for (auto const & bucket : sign->m_sign.m_buckets)
bucket->Render(screen);
}