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-06-09 16:59:36 +03:00
parent cd0dc231ad
commit af730363bd
14 changed files with 63 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drape/shaders/route_fragment_shader.fsh
View file

@ -1,12 +1,11 @@
varying float v_length;
uniform vec2 u_halfWidth;
uniform vec4 u_color;
uniform float u_clipLength;
void main(void)
{
if (u_color.a < 0.1 || v_length < u_clipLength)
if (v_length < u_clipLength)
discard;
gl_FragColor = u_color;

1
drape_frontend/backend_renderer.cpp
View file

@ -209,6 +209,7 @@ void BackendRenderer::ReleaseResources()
m_readManager.reset();
m_batchersPool.reset();
m_routeBuilder.reset();
m_texMng->Release();
}

12
drape_frontend/drape_engine.cpp
View file

@ -221,11 +221,10 @@ void DrapeEngine::SetCompassInfo(location::CompassInfo const & info)
MessagePriority::High);
}
void DrapeEngine::SetGpsInfo(location::GpsInfo const & info, bool isNavigable, const location::RouteMatchingInfo & routeInfo,
bool hasDistanceFromBegin, double distanceFromBegin)
void DrapeEngine::SetGpsInfo(location::GpsInfo const & info, bool isNavigable, const location::RouteMatchingInfo & routeInfo)
{
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<GpsInfoMessage>(info, isNavigable, routeInfo, hasDistanceFromBegin, distanceFromBegin),
make_unique_dp<GpsInfoMessage>(info, isNavigable, routeInfo),
MessagePriority::High);
}
@ -324,11 +323,4 @@ void DrapeEngine::RemoveRoute(bool deactivateFollowing)
MessagePriority::Normal);
}
void DrapeEngine::FollowRoute()
{
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<FollowRouteMessage>(),
MessagePriority::Normal);
}
} // namespace df

4
drape_frontend/drape_engine.hpp
View file

@ -78,8 +78,7 @@ public:
void SetCountryInfo(gui::CountryInfo const & info, bool isCurrentCountry, bool isCountryLoaded);
void SetCompassInfo(location::CompassInfo const & info);
void SetGpsInfo(location::GpsInfo const & info, bool isNavigable, location::RouteMatchingInfo const & routeInfo,
bool hasDistanceFromBegin, double distanceFromBegin);
void SetGpsInfo(location::GpsInfo const & info, bool isNavigable, location::RouteMatchingInfo const & routeInfo);
void MyPositionNextMode();
void CancelMyPosition();
void StopLocationFollow();
@ -98,7 +97,6 @@ public:
void AddRoute(m2::PolylineD const & routePolyline, dp::Color const & color);
void RemoveRoute(bool deactivateFollowing);
void FollowRoute();
private:
void AddUserEvent(UserEvent const & e);

14
drape_frontend/frontend_renderer.cpp
View file

@ -237,8 +237,9 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
ref_ptr<GpsInfoMessage> msg = message;
m_myPositionController->OnLocationUpdate(msg->GetInfo(), msg->IsNavigable());
if (msg->HasDistanceFromBegin())
m_routeRenderer->UpdateDistanceFromBegin(msg->GetDistanceFromBegin());
location::RouteMatchingInfo const & info = msg->GetRouteInfo();
if (info.HasDistanceFromBegin())
m_routeRenderer->UpdateDistanceFromBegin(info.GetDistanceFromBegin());
break;
}
@ -280,23 +281,18 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
ref_ptr<FlushRouteMessage> msg = message;
dp::GLState const & state = msg->GetState();
drape_ptr<dp::RenderBucket> bucket = msg->AcceptBuffer();
m_routeRenderer->AddRoute(state, move(bucket), msg->GetColor(), make_ref(m_gpuProgramManager));
m_routeRenderer->AddRouteRenderBucket(state, move(bucket), msg->GetColor(), make_ref(m_gpuProgramManager));
m_myPositionController->ActivateRouting();
break;
}
case Message::RemoveRoute:
{
ref_ptr<RemoveRouteMessage> msg = message;
m_routeRenderer->RemoveAllRoutes();
m_routeRenderer->Clear();
if (msg->NeedDeactivateFollowing())
m_myPositionController->DeactivateRouting();
break;
}
case Message::FollowRoute:
{
m_myPositionController->NextMode();
break;
}
default:
ASSERT(false, ());
}

1
drape_frontend/message.hpp
View file

@ -34,7 +34,6 @@ public:
GetMyPosition,
AddRoute,
RemoveRoute,
FollowRoute,
FlushRoute
};

17
drape_frontend/message_subclasses.hpp
View file

@ -339,28 +339,21 @@ class GpsInfoMessage : public Message
{
public:
GpsInfoMessage(location::GpsInfo const & info, bool isNavigable,
location::RouteMatchingInfo const & routeInfo,
bool hasDistanceFromBegin, double distanceFromBegin)
location::RouteMatchingInfo const & routeInfo)
: m_info(info)
, m_isNavigable(isNavigable)
, m_routeInfo(routeInfo)
, m_hasDistanceFromBegin(hasDistanceFromBegin)
, m_distanceFromBegin(distanceFromBegin)
{}
Type GetType() const override { return Message::GpsInfo; }
location::GpsInfo const & GetInfo() const { return m_info; }
bool IsNavigable() const { return m_isNavigable; }
location::RouteMatchingInfo const & GetRouteInfo() const { return m_routeInfo; }
bool HasDistanceFromBegin() const { return m_hasDistanceFromBegin; }
double GetDistanceFromBegin() const { return m_distanceFromBegin; }
private:
location::GpsInfo const m_info;
bool const m_isNavigable;
location::RouteMatchingInfo const m_routeInfo;
bool const m_hasDistanceFromBegin;
double const m_distanceFromBegin;
};
class BaseBlockingMessage : public Message
@ -509,14 +502,6 @@ private:
bool m_deactivateFollowing;
};
class FollowRouteMessage : public Message
{
public:
FollowRouteMessage(){}
Type GetType() const override { return Message::FollowRoute; }
};
class FlushRouteMessage : public Message
{
public:

8
drape_frontend/my_position_controller.cpp
View file

@ -443,7 +443,15 @@ void MyPositionController::ActivateRouting()
void MyPositionController::DeactivateRouting()
{
if (IsInRouting())
{
SetModeInfo(ResetModeBit(m_modeInfo, RoutingSessionBit));
location::EMyPositionMode currentMode = GetMode();
if (currentMode == location::MODE_ROTATE_AND_FOLLOW)
SetModeInfo(ChangeMode(m_modeInfo, location::MODE_FOLLOW));
ChangeModelView(0.0);
}
}
}

28
drape_frontend/route_renderer.cpp
View file

@ -41,36 +41,38 @@ void RouteRenderer::Render(ScreenBase const & screen, ref_ptr<dp::GpuProgramMana
// half width calculation
float halfWidth = 0.0;
double const zoomLevel = my::clamp(fabs(log(screen.GetScale()) / log(2.0)), 1.0, scales::UPPER_STYLE_SCALE);
int const index = static_cast<int>(zoomLevel) - 1;
float const lerpCoef = static_cast<float>(zoomLevel - static_cast<int>(zoomLevel));
double const truncedZoom = trunc(zoomLevel);
int const index = truncedZoom - 1.0;
float const lerpCoef = zoomLevel - truncedZoom;
if (index < scales::UPPER_STYLE_SCALE - 1)
halfWidth = halfWidthInPixel[index] + lerpCoef * (halfWidthInPixel[index + 1] - halfWidthInPixel[index]);
else
halfWidth = halfWidthInPixel[index];
for (RouteGraphics & route : m_routes)
for (RouteGraphics & graphics : m_routeGraphics)
{
dp::UniformValuesStorage uniformStorage;
glsl::vec4 color = glsl::ToVec4(route.m_color);
glsl::vec4 color = glsl::ToVec4(graphics.m_color);
uniformStorage.SetFloatValue("u_color", color.r, color.g, color.b, color.a);
uniformStorage.SetFloatValue("u_halfWidth", halfWidth, halfWidth * screen.GetScale());
uniformStorage.SetFloatValue("u_clipLength", m_distanceFromBegin);
ref_ptr<dp::GpuProgram> prg = mng->GetProgram(route.m_state.GetProgramIndex());
ref_ptr<dp::GpuProgram> prg = mng->GetProgram(graphics.m_state.GetProgramIndex());
prg->Bind();
dp::ApplyState(route.m_state, prg);
dp::ApplyState(graphics.m_state, prg);
dp::ApplyUniforms(commonUniforms, prg);
dp::ApplyUniforms(uniformStorage, prg);
route.m_buffer->Render();
graphics.m_buffer->Render();
}
}
void RouteRenderer::AddRoute(dp::GLState const & state, drape_ptr<dp::RenderBucket> && bucket,
dp::Color const & color, ref_ptr<dp::GpuProgramManager> mng)
void RouteRenderer::AddRouteRenderBucket(dp::GLState const & state, drape_ptr<dp::RenderBucket> && bucket,
dp::Color const & color, ref_ptr<dp::GpuProgramManager> mng)
{
m_routes.push_back(RouteGraphics());
RouteGraphics & route = m_routes.back();
m_routeGraphics.push_back(RouteGraphics());
RouteGraphics & route = m_routeGraphics.back();
route.m_state = state;
route.m_color = color;
@ -78,9 +80,9 @@ void RouteRenderer::AddRoute(dp::GLState const & state, drape_ptr<dp::RenderBuck
route.m_buffer->Build(mng->GetProgram(route.m_state.GetProgramIndex()));
}
void RouteRenderer::RemoveAllRoutes()
void RouteRenderer::Clear()
{
m_routes.clear();
m_routeGraphics.clear();
}
void RouteRenderer::UpdateDistanceFromBegin(double distanceFromBegin)

8
drape_frontend/route_renderer.hpp
View file

@ -31,15 +31,15 @@ public:
void Render(ScreenBase const & screen, ref_ptr<dp::GpuProgramManager> mng,
dp::UniformValuesStorage const & commonUniforms);
void AddRoute(dp::GLState const & state, drape_ptr<dp::RenderBucket> && bucket,
dp::Color const & color, ref_ptr<dp::GpuProgramManager> mng);
void AddRouteRenderBucket(dp::GLState const & state, drape_ptr<dp::RenderBucket> && bucket,
dp::Color const & color, ref_ptr<dp::GpuProgramManager> mng);
void RemoveAllRoutes();
void Clear();
void UpdateDistanceFromBegin(double distanceFromBegin);
private:
vector<RouteGraphics> m_routes;
vector<RouteGraphics> m_routeGraphics;
double m_distanceFromBegin;
};

14
map/framework.cpp
View file

@ -128,13 +128,10 @@ void Framework::OnLocationUpdate(GpsInfo const & info)
location::RouteMatchingInfo routeMatchingInfo;
CheckLocationForRouting(rInfo);
bool hasDistanceFromBegin = false;
double distanceFromBegin = 0.0;
MatchLocationToRoute(rInfo, routeMatchingInfo, hasDistanceFromBegin, distanceFromBegin);
MatchLocationToRoute(rInfo, routeMatchingInfo);
CallDrapeFunction(bind(&df::DrapeEngine::SetGpsInfo, _1, rInfo,
m_routingSession.IsNavigable(), routeMatchingInfo,
hasDistanceFromBegin, distanceFromBegin));
m_routingSession.IsNavigable(), routeMatchingInfo));
}
void Framework::OnCompassUpdate(CompassInfo const & info)
@ -1868,7 +1865,7 @@ void Framework::BuildRoute(m2::PointD const & start, m2::PointD const & finish,
void Framework::FollowRoute()
{
ASSERT(m_drapeEngine != nullptr, ());
m_drapeEngine->FollowRoute();
m_drapeEngine->MyPositionNextMode();
m2::PointD const & position = m_routingSession.GetUserCurrentPosition();
m_drapeEngine->SetModelViewCenter(position, scales::GetNavigationScale(), true);
@ -2013,13 +2010,12 @@ void Framework::CheckLocationForRouting(GpsInfo const & info)
}
}
void Framework::MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo,
bool & hasDistanceFromBegin, double & distanceFromBegin) const
void Framework::MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo) const
{
if (!IsRoutingActive())
return;
m_routingSession.MatchLocationToRoute(location, routeMatchingInfo);
hasDistanceFromBegin = m_routingSession.GetMercatorDistanceFromBegin(distanceFromBegin);
}
void Framework::CallRouteBuilded(IRouter::ResultCode code, vector<storage::TIndex> const & absentCountries, vector<storage::TIndex> const & absentRoutingFiles)

4
map/framework.hpp
View file

@ -504,9 +504,7 @@ private:
void CallRouteBuilded(routing::IRouter::ResultCode code,
vector<storage::TIndex> const & absentCountries,
vector<storage::TIndex> const & absentRoutingFiles);
void MatchLocationToRoute(location::GpsInfo & info, location::RouteMatchingInfo & routeMatchingInfo,
bool & hasDistanceFromBegin, double & distanceFromBegin) const;
void MatchLocationToRoute(location::GpsInfo & info, location::RouteMatchingInfo & routeMatchingInfo) const;
string GetRoutingErrorMessage(routing::IRouter::ResultCode code);
TRouteBuildingCallback m_routingCallback;

19
platform/location.hpp
View file

@ -178,19 +178,34 @@ namespace location
m2::PointD m_matchedPosition;
size_t m_indexInRoute;
bool m_isPositionMatched;
bool m_hasDistanceFromBegin;
double m_distanceFromBegin;
public:
RouteMatchingInfo() : m_matchedPosition(0., 0.), m_indexInRoute(0), m_isPositionMatched(false) {}
void Set(m2::PointD const & matchedPosition, size_t indexInRoute)
RouteMatchingInfo()
: m_matchedPosition(0., 0.)
, m_indexInRoute(0)
, m_isPositionMatched(false)
, m_hasDistanceFromBegin(false)
, m_distanceFromBegin(0.0)
{}
void Set(m2::PointD const & matchedPosition, size_t indexInRoute, double distanceFromBegin)
{
m_matchedPosition = matchedPosition;
m_indexInRoute = indexInRoute;
m_isPositionMatched = true;
m_distanceFromBegin = distanceFromBegin;
m_hasDistanceFromBegin = true;
}
void Reset() { m_isPositionMatched = false; }
bool IsMatched() const { return m_isPositionMatched; }
size_t GetIndexInRoute() const { return m_indexInRoute; }
m2::PointD GetPosition() const { return m_matchedPosition; }
bool HasDistanceFromBegin() const { return m_hasDistanceFromBegin; }
double GetDistanceFromBegin() const { return m_distanceFromBegin; }
};
// Do not change the order and values

2
routing/route.hpp
View file

@ -116,6 +116,8 @@ private:
double GetPolySegAngle(size_t ind) const;
TTurns::const_iterator GetCurrentTurn() const;
double GetMercatorDistanceFromBegin() const;
private:
friend string DebugPrint(Route const & r);