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

[drape] Added DebugPrint for drape message type.

Browse source
This commit is contained in:
Daria Volvenkova 2018-09-18 15:58:28 +03:00 • committed by Roman Kuznetsov
parent 704d39c684
commit e0d62d7c72
8 changed files with 299 additions and 328 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drape_frontend/CMakeLists.txt
View file

@ -119,6 +119,7 @@ set(
map_data_provider.cpp
map_data_provider.hpp
map_shape.hpp
message.cpp
message.hpp
message_acceptor.cpp
message_acceptor.hpp

82
drape_frontend/backend_renderer.cpp
View file

@ -120,7 +120,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
{
switch (message->GetType())
{
case Message::UpdateReadManager:
case Message::Type::UpdateReadManager:
{
TTilesCollection tiles = m_requestedTiles->GetTiles();
if (!tiles.empty())
@ -137,7 +137,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::InvalidateReadManagerRect:
case Message::Type::InvalidateReadManagerRect:
{
ref_ptr<InvalidateReadManagerRectMessage> msg = message;
if (msg->NeedRestartReading())
@ -147,13 +147,13 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::ShowChoosePositionMark:
case Message::Type::ShowChoosePositionMark:
{
RecacheChoosePositionMark();
break;
}
case Message::GuiRecache:
case Message::Type::GuiRecache:
{
ref_ptr<GuiRecacheMessage> msg = message;
m_lastWidgetsInfo = msg->GetInitInfo();
@ -164,7 +164,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::GuiLayerLayout:
case Message::Type::GuiLayerLayout:
{
ref_ptr<GuiLayerLayoutMessage> msg = message;
m_commutator->PostMessage(ThreadsCommutator::RenderThread,
@ -173,21 +173,21 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::TileReadStarted:
case Message::Type::TileReadStarted:
{
ref_ptr<TileReadStartMessage> msg = message;
m_batchersPool->ReserveBatcher(msg->GetKey());
break;
}
case Message::TileReadEnded:
case Message::Type::TileReadEnded:
{
ref_ptr<TileReadEndMessage> msg = message;
m_batchersPool->ReleaseBatcher(msg->GetKey());
break;
}
case Message::FinishTileRead:
case Message::Type::FinishTileRead:
{
ref_ptr<FinishTileReadMessage> msg = message;
if (msg->NeedForceUpdateUserMarks())
@ -202,7 +202,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FinishReading:
case Message::Type::FinishReading:
{
TOverlaysRenderData overlays;
overlays.swap(m_overlays);
@ -212,13 +212,13 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::MapShapesRecache:
case Message::Type::MapShapesRecache:
{
RecacheMapShapes();
break;
}
case Message::MapShapeReaded:
case Message::Type::MapShapeReaded:
{
ref_ptr<MapShapeReadedMessage> msg = message;
auto const & tileKey = msg->GetKey();
@ -240,7 +240,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::OverlayMapShapeReaded:
case Message::Type::OverlayMapShapeReaded:
{
ref_ptr<OverlayMapShapeReadedMessage> msg = message;
auto const & tileKey = msg->GetKey();
@ -271,14 +271,14 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::ChangeUserMarkGroupVisibility:
case Message::Type::ChangeUserMarkGroupVisibility:
{
ref_ptr<ChangeUserMarkGroupVisibilityMessage> msg = message;
m_userMarkGenerator->SetGroupVisibility(msg->GetGroupId(), msg->IsVisible());
break;
}
case Message::UpdateUserMarks:
case Message::Type::UpdateUserMarks:
{
ref_ptr<UpdateUserMarksMessage> msg = message;
m_userMarkGenerator->SetRemovedUserMarks(msg->AcceptRemovedIds());
@ -288,7 +288,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::UpdateUserMarkGroup:
case Message::Type::UpdateUserMarkGroup:
{
ref_ptr<UpdateUserMarkGroupMessage> msg = message;
kml::MarkGroupId const groupId = msg->GetGroupId();
@ -296,21 +296,21 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::ClearUserMarkGroup:
case Message::Type::ClearUserMarkGroup:
{
ref_ptr<ClearUserMarkGroupMessage> msg = message;
m_userMarkGenerator->RemoveGroup(msg->GetGroupId());
break;
}
case Message::InvalidateUserMarks:
case Message::Type::InvalidateUserMarks:
{
m_commutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<InvalidateUserMarksMessage>(),
MessagePriority::Normal);
break;
}
case Message::AddSubroute:
case Message::Type::AddSubroute:
{
ref_ptr<AddSubrouteMessage> msg = message;
auto context = make_ref(m_contextFactory->GetResourcesUploadContext());
@ -319,7 +319,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::CacheSubrouteArrows:
case Message::Type::CacheSubrouteArrows:
{
ref_ptr<CacheSubrouteArrowsMessage> msg = message;
auto context = make_ref(m_contextFactory->GetResourcesUploadContext());
@ -328,7 +328,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::RemoveSubroute:
case Message::Type::RemoveSubroute:
{
ref_ptr<RemoveSubrouteMessage> msg = message;
m_routeBuilder->ClearRouteCache();
@ -341,7 +341,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SwitchMapStyle:
case Message::Type::SwitchMapStyle:
{
m_texMng->OnSwitchMapStyle();
RecacheMapShapes();
@ -354,7 +354,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::CacheCirclesPack:
case Message::Type::CacheCirclesPack:
{
ref_ptr<CacheCirclesPackMessage> msg = message;
drape_ptr<CirclesPackRenderData> data = make_unique_dp<CirclesPackRenderData>();
@ -368,14 +368,14 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::Allow3dBuildings:
case Message::Type::Allow3dBuildings:
{
ref_ptr<Allow3dBuildingsMessage> msg = message;
m_readManager->Allow3dBuildings(msg->Allow3dBuildings());
break;
}
case Message::RequestSymbolsSize:
case Message::Type::RequestSymbolsSize:
{
ref_ptr<RequestSymbolsSizeMessage> msg = message;
auto const & symbols = msg->GetSymbols();
@ -392,7 +392,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::EnableTraffic:
case Message::Type::EnableTraffic:
{
ref_ptr<EnableTrafficMessage> msg = message;
if (!msg->IsTrafficEnabled())
@ -404,7 +404,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FlushTrafficGeometry:
case Message::Type::FlushTrafficGeometry:
{
ref_ptr<FlushTrafficGeometryMessage> msg = message;
auto const & tileKey = msg->GetKey();
@ -416,7 +416,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::UpdateTraffic:
case Message::Type::UpdateTraffic:
{
ref_ptr<UpdateTrafficMessage> msg = message;
m_trafficGenerator->UpdateColoring(msg->GetSegmentsColoring());
@ -426,7 +426,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::ClearTrafficData:
case Message::Type::ClearTrafficData:
{
ref_ptr<ClearTrafficDataMessage> msg = message;
@ -438,7 +438,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SetSimplifiedTrafficColors:
case Message::Type::SetSimplifiedTrafficColors:
{
ref_ptr<SetSimplifiedTrafficColorsMessage> msg = message;
@ -451,20 +451,20 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::UpdateTransitScheme:
case Message::Type::UpdateTransitScheme:
{
ref_ptr<UpdateTransitSchemeMessage> msg = message;
m_transitBuilder->UpdateSchemes(msg->GetTransitDisplayInfos(), m_texMng);
break;
}
case Message::RegenerateTransitScheme:
case Message::Type::RegenerateTransitScheme:
{
m_transitBuilder->RebuildSchemes(m_texMng);
break;
}
case Message::ClearTransitSchemeData:
case Message::Type::ClearTransitSchemeData:
{
ref_ptr<ClearTransitSchemeDataMessage> msg = message;
m_transitBuilder->Clear(msg->GetMwmId());
@ -474,7 +474,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::ClearAllTransitSchemeData:
case Message::Type::ClearAllTransitSchemeData:
{
m_transitBuilder->Clear();
m_commutator->PostMessage(ThreadsCommutator::RenderThread,
@ -483,7 +483,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::EnableTransitScheme:
case Message::Type::EnableTransitScheme:
{
ref_ptr<EnableTransitSchemeMessage> msg = message;
if (!msg->IsEnabled())
@ -493,7 +493,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
MessagePriority::Normal);
break;
}
case Message::DrapeApiAddLines:
case Message::Type::DrapeApiAddLines:
{
ref_ptr<DrapeApiAddLinesMessage> msg = message;
vector<drape_ptr<DrapeApiRenderProperty>> properties;
@ -504,7 +504,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::DrapeApiRemove:
case Message::Type::DrapeApiRemove:
{
ref_ptr<DrapeApiRemoveMessage> msg = message;
m_commutator->PostMessage(ThreadsCommutator::RenderThread,
@ -513,7 +513,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SetCustomFeatures:
case Message::Type::SetCustomFeatures:
{
ref_ptr<SetCustomFeaturesMessage> msg = message;
m_readManager->SetCustomFeatures(msg->AcceptFeatures());
@ -524,7 +524,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::RemoveCustomFeatures:
case Message::Type::RemoveCustomFeatures:
{
ref_ptr<RemoveCustomFeaturesMessage> msg = message;
bool changed = false;
@ -543,7 +543,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SetDisplacementMode:
case Message::Type::SetDisplacementMode:
{
ref_ptr<SetDisplacementModeMessage> msg = message;
m_readManager->SetDisplacementMode(msg->GetMode());
@ -556,7 +556,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::EnableUGCRendering:
case Message::Type::EnableUGCRendering:
{
ref_ptr<EnableUGCRenderingMessage> msg = message;
m_readManager->EnableUGCRendering(msg->IsEnabled());
@ -566,7 +566,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::NotifyRenderThread:
case Message::Type::NotifyRenderThread:
{
ref_ptr<NotifyRenderThreadMessage> msg = message;
msg->InvokeFunctor();

118
drape_frontend/frontend_renderer.cpp
View file

@ -214,7 +214,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
{
switch (message->GetType())
{
case Message::FlushTile:
case Message::Type::FlushTile:
{
ref_ptr<FlushRenderBucketMessage> msg = message;
dp::RenderState const & state = msg->GetState();
@ -228,7 +228,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FlushOverlays:
case Message::Type::FlushOverlays:
{
ref_ptr<FlushOverlaysMessage> msg = message;
TOverlaysRenderData renderData = msg->AcceptRenderData();
@ -253,7 +253,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FinishTileRead:
case Message::Type::FinishTileRead:
{
ref_ptr<FinishTileReadMessage> msg = message;
bool changed = false;
@ -282,14 +282,14 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::InvalidateRect:
case Message::Type::InvalidateRect:
{
ref_ptr<InvalidateRectMessage> m = message;
InvalidateRect(m->GetRect());
break;
}
case Message::FlushUserMarks:
case Message::Type::FlushUserMarks:
{
ref_ptr<FlushUserMarksMessage> msg = message;
TUserMarksRenderData marksRenderData = msg->AcceptRenderData();
@ -306,7 +306,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::GuiLayerRecached:
case Message::Type::GuiLayerRecached:
{
ref_ptr<GuiLayerRecachedMessage> msg = message;
drape_ptr<gui::LayerRenderer> renderer = std::move(msg->AcceptRenderer());
@ -336,7 +336,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::GuiLayerLayout:
case Message::Type::GuiLayerLayout:
{
m_lastWidgetsLayout = ref_ptr<GuiLayerLayoutMessage>(message)->GetLayoutInfo();
if (m_guiRenderer != nullptr)
@ -344,7 +344,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::MapShapes:
case Message::Type::MapShapes:
{
ref_ptr<MapShapesMessage> msg = message;
m_myPositionController->SetRenderShape(msg->AcceptShape());
@ -358,7 +358,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
}
break;
case Message::ChangeMyPositionMode:
case Message::Type::ChangeMyPositionMode:
{
ref_ptr<ChangeMyPositionModeMessage> msg = message;
switch (msg->GetChangeType())
@ -379,14 +379,14 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::CompassInfo:
case Message::Type::CompassInfo:
{
ref_ptr<CompassInfoMessage> msg = message;
m_myPositionController->OnCompassUpdate(msg->GetInfo(), m_userEventStream.GetCurrentScreen());
break;
}
case Message::GpsInfo:
case Message::Type::GpsInfo:
{
#ifdef SCENARIO_ENABLE
if (m_scenarioManager->IsRunning())
@ -408,7 +408,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SelectObject:
case Message::Type::SelectObject:
{
ref_ptr<SelectObjectMessage> msg = message;
m_overlayTree->SetSelectedFeature(msg->IsDismiss() ? FeatureID() : msg->GetFeatureID());
@ -424,7 +424,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FlushSubroute:
case Message::Type::FlushSubroute:
{
ref_ptr<FlushSubrouteMessage> msg = message;
auto subrouteData = msg->AcceptRenderData();
@ -453,7 +453,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FlushTransitScheme:
case Message::Type::FlushTransitScheme:
{
ref_ptr<FlushTransitSchemeMessage > msg = message;
auto renderData = msg->AcceptRenderData();
@ -462,7 +462,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FlushSubrouteArrows:
case Message::Type::FlushSubrouteArrows:
{
ref_ptr<FlushSubrouteArrowsMessage> msg = message;
drape_ptr<SubrouteArrowsData> routeArrowsData = msg->AcceptRenderData();
@ -474,7 +474,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FlushSubrouteMarkers:
case Message::Type::FlushSubrouteMarkers:
{
ref_ptr<FlushSubrouteMarkersMessage> msg = message;
drape_ptr<SubrouteMarkersData> markersData = msg->AcceptRenderData();
@ -489,7 +489,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::RemoveSubroute:
case Message::Type::RemoveSubroute:
{
ref_ptr<RemoveSubrouteMessage> msg = message;
if (msg->NeedDeactivateFollowing())
@ -509,7 +509,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FollowRoute:
case Message::Type::FollowRoute:
{
ref_ptr<FollowRouteMessage> const msg = message;
@ -527,7 +527,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::DeactivateRouteFollowing:
case Message::Type::DeactivateRouteFollowing:
{
m_myPositionController->DeactivateRouting();
m_postprocessRenderer->OnChangedRouteFollowingMode(false /* active */);
@ -536,7 +536,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::AddRoutePreviewSegment:
case Message::Type::AddRoutePreviewSegment:
{
ref_ptr<AddRoutePreviewSegmentMessage> const msg = message;
RouteRenderer::PreviewInfo info;
@ -546,7 +546,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::RemoveRoutePreviewSegment:
case Message::Type::RemoveRoutePreviewSegment:
{
ref_ptr<RemoveRoutePreviewSegmentMessage> const msg = message;
if (msg->NeedRemoveAll())
@ -556,20 +556,20 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SetSubrouteVisibility:
case Message::Type::SetSubrouteVisibility:
{
ref_ptr<SetSubrouteVisibilityMessage> const msg = message;
m_routeRenderer->SetSubrouteVisibility(msg->GetSubrouteId(), msg->IsVisible());
break;
}
case Message::RecoverGLResources:
case Message::Type::RecoverGLResources:
{
UpdateGLResources();
break;
}
case Message::UpdateMapStyle:
case Message::Type::UpdateMapStyle:
{
#ifdef BUILD_DESIGNER
classificator::Load();
@ -607,20 +607,20 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::AllowAutoZoom:
case Message::Type::AllowAutoZoom:
{
ref_ptr<AllowAutoZoomMessage> const msg = message;
m_myPositionController->EnableAutoZoomInRouting(msg->AllowAutoZoom());
break;
}
case Message::EnablePerspective:
case Message::Type::EnablePerspective:
{
AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(true /* isAutoPerspective */));
break;
}
case Message::Allow3dMode:
case Message::Type::Allow3dMode:
{
ref_ptr<Allow3dModeMessage> const msg = message;
ScreenBase const & screen = m_userEventStream.GetCurrentScreen();
@ -652,7 +652,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::FlushCirclesPack:
case Message::Type::FlushCirclesPack:
{
ref_ptr<FlushCirclesPackMessage> msg = message;
switch (msg->GetDestination())
@ -667,41 +667,41 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::UpdateGpsTrackPoints:
case Message::Type::UpdateGpsTrackPoints:
{
ref_ptr<UpdateGpsTrackPointsMessage> msg = message;
m_gpsTrackRenderer->UpdatePoints(msg->GetPointsToAdd(), msg->GetPointsToRemove());
break;
}
case Message::ClearGpsTrackPoints:
case Message::Type::ClearGpsTrackPoints:
{
m_gpsTrackRenderer->Clear();
break;
}
case Message::BlockTapEvents:
case Message::Type::BlockTapEvents:
{
ref_ptr<BlockTapEventsMessage> msg = message;
m_blockTapEvents = msg->NeedBlock();
break;
}
case Message::SetKineticScrollEnabled:
case Message::Type::SetKineticScrollEnabled:
{
ref_ptr<SetKineticScrollEnabledMessage> msg = message;
m_userEventStream.SetKineticScrollEnabled(msg->IsEnabled());
break;
}
case Message::SetTimeInBackground:
case Message::Type::SetTimeInBackground:
{
ref_ptr<SetTimeInBackgroundMessage> msg = message;
m_myPositionController->SetTimeInBackground(msg->GetTime());
break;
}
case Message::SetAddNewPlaceMode:
case Message::Type::SetAddNewPlaceMode:
{
ref_ptr<SetAddNewPlaceModeMessage> msg = message;
m_userEventStream.SetKineticScrollEnabled(msg->IsKineticScrollEnabled());
@ -726,7 +726,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SetVisibleViewport:
case Message::Type::SetVisibleViewport:
{
ref_ptr<SetVisibleViewportMessage> msg = message;
AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(msg->GetRect()));
@ -736,14 +736,14 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::Invalidate:
case Message::Type::Invalidate:
{
m_myPositionController->ResetRoutingNotFollowTimer();
m_myPositionController->ResetBlockAutoZoomTimer();
break;
}
case Message::EnableTransitScheme:
case Message::Type::EnableTransitScheme:
{
ref_ptr<EnableTransitSchemeMessage > msg = message;
m_transitSchemeEnabled = msg->IsEnabled();
@ -756,20 +756,20 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::ClearTransitSchemeData:
case Message::Type::ClearTransitSchemeData:
{
ref_ptr<ClearTransitSchemeDataMessage> msg = message;
m_transitSchemeRenderer->Clear(msg->GetMwmId(), make_ref(m_overlayTree));
break;
}
case Message::ClearAllTransitSchemeData:
case Message::Type::ClearAllTransitSchemeData:
{
m_transitSchemeRenderer->ClearGLDependentResources(make_ref(m_overlayTree));
break;
}
case Message::EnableTraffic:
case Message::Type::EnableTraffic:
{
ref_ptr<EnableTrafficMessage> msg = message;
m_trafficEnabled = msg->IsTrafficEnabled();
@ -780,17 +780,17 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::RegenerateTraffic:
case Message::SetSimplifiedTrafficColors:
case Message::SetDisplacementMode:
case Message::UpdateMetalines:
case Message::EnableUGCRendering:
case Message::Type::RegenerateTraffic:
case Message::Type::SetSimplifiedTrafficColors:
case Message::Type::SetDisplacementMode:
case Message::Type::UpdateMetalines:
case Message::Type::EnableUGCRendering:
{
m_forceUpdateScene = true;
break;
}
case Message::EnableDebugRectRendering:
case Message::Type::EnableDebugRectRendering:
{
ref_ptr<EnableDebugRectRenderingMessage> msg = message;
m_isDebugRectRenderingEnabled = msg->IsEnabled();
@ -798,13 +798,13 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
}
break;
case Message::InvalidateUserMarks:
case Message::Type::InvalidateUserMarks:
{
m_forceUpdateUserMarks = true;
break;
}
case Message::FlushTrafficData:
case Message::Type::FlushTrafficData:
{
if (!m_trafficEnabled)
break;
@ -813,21 +813,21 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::ClearTrafficData:
case Message::Type::ClearTrafficData:
{
ref_ptr<ClearTrafficDataMessage> msg = message;
m_trafficRenderer->Clear(msg->GetMwmId());
break;
}
case Message::DrapeApiFlush:
case Message::Type::DrapeApiFlush:
{
ref_ptr<DrapeApiFlushMessage> msg = message;
m_drapeApiRenderer->AddRenderProperties(make_ref(m_gpuProgramManager), msg->AcceptProperties());
break;
}
case Message::DrapeApiRemove:
case Message::Type::DrapeApiRemove:
{
ref_ptr<DrapeApiRemoveMessage> msg = message;
if (msg->NeedRemoveAll())
@ -837,7 +837,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SetTrackedFeatures:
case Message::Type::SetTrackedFeatures:
{
ref_ptr<SetTrackedFeaturesMessage> msg = message;
m_overlaysTracker->SetTrackedOverlaysFeatures(msg->AcceptFeatures());
@ -845,14 +845,14 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::SetPostprocessStaticTextures:
case Message::Type::SetPostprocessStaticTextures:
{
ref_ptr<SetPostprocessStaticTexturesMessage> msg = message;
m_postprocessRenderer->SetStaticTextures(msg->AcceptTextures());
break;
}
case Message::SetPosteffectEnabled:
case Message::Type::SetPosteffectEnabled:
{
ref_ptr<SetPosteffectEnabledMessage> msg = message;
if (msg->GetEffect() == PostprocessRenderer::Effect::Antialiasing)
@ -863,7 +863,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::RunFirstLaunchAnimation:
case Message::Type::RunFirstLaunchAnimation:
{
ref_ptr<RunFirstLaunchAnimationMessage> msg = message;
m_firstLaunchAnimationTriggered = true;
@ -871,28 +871,28 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
case Message::PostUserEvent:
case Message::Type::PostUserEvent:
{
ref_ptr<PostUserEventMessage> msg = message;
AddUserEvent(msg->AcceptEvent());
break;
}
case Message::FinishTexturesInitialization:
case Message::Type::FinishTexturesInitialization:
{
ref_ptr<FinishTexturesInitializationMessage> msg = message;
m_finishTexturesInitialization = true;
break;
}
case Message::ShowDebugInfo:
case Message::Type::ShowDebugInfo:
{
ref_ptr<ShowDebugInfoMessage> msg = message;
gui::DrapeGui::Instance().GetScaleFpsHelper().SetVisible(msg->IsShown());
break;
}
case Message::NotifyRenderThread:
case Message::Type::NotifyRenderThread:
{
ref_ptr<NotifyRenderThreadMessage> msg = message;
msg->InvokeFunctor();

8
drape_frontend/map_shape.hpp
View file

@ -64,7 +64,7 @@ class TileReadStartMessage : public MapShapeMessage
{
public:
explicit TileReadStartMessage(TileKey const & key) : MapShapeMessage(key) {}
Type GetType() const override { return Message::TileReadStarted; }
Type GetType() const override { return Message::Type::TileReadStarted; }
bool IsGLContextDependent() const override { return true; }
};
@ -72,7 +72,7 @@ class TileReadEndMessage : public MapShapeMessage
{
public:
explicit TileReadEndMessage(TileKey const & key) : MapShapeMessage(key) {}
Type GetType() const override { return Message::TileReadEnded; }
Type GetType() const override { return Message::Type::TileReadEnded; }
bool IsGLContextDependent() const override { return true; }
};
@ -83,7 +83,7 @@ public:
: MapShapeMessage(key), m_shapes(move(shapes))
{}
Type GetType() const override { return Message::MapShapeReaded; }
Type GetType() const override { return Message::Type::MapShapeReaded; }
bool IsGLContextDependent() const override { return true; }
TMapShapes const & GetShapes() { return m_shapes; }
@ -98,6 +98,6 @@ public:
: MapShapeReadedMessage(key, move(shapes))
{}
Type GetType() const override { return Message::OverlayMapShapeReaded; }
Type GetType() const override { return Message::Type::OverlayMapShapeReaded; }
};
} // namespace df

102
drape_frontend/message.cpp Normal file
View file

@ -0,0 +1,102 @@
#include "drape_frontend/message.hpp"
#include "base/assert.hpp"
namespace df
{
std::string DebugPrint(Message::Type msgType)
{
switch (msgType)
{
case Message::Type::Unknown: return "Unknown";
case Message::Type::TileReadStarted: return "TileReadStarted";
case Message::Type::TileReadEnded: return "TileReadEnded";
case Message::Type::FinishReading: return "FinishReading";
case Message::Type::FinishTileRead: return "FinishTileRead";
case Message::Type::FlushTile: return "FlushTile";
case Message::Type::FlushOverlays: return "FlushOverlays";
case Message::Type::MapShapeReaded: return "MapShapeReaded";
case Message::Type::OverlayMapShapeReaded: return "OverlayMapShapeReaded";
case Message::Type::UpdateReadManager: return "UpdateReadManager";
case Message::Type::InvalidateRect: return "InvalidateRect";
case Message::Type::InvalidateReadManagerRect: return "InvalidateReadManagerRect";
case Message::Type::UpdateUserMarkGroup: return "UpdateUserMarkGroup";
case Message::Type::ClearUserMarkGroup: return "ClearUserMarkGroup";
case Message::Type::ChangeUserMarkGroupVisibility: return "ChangeUserMarkGroupVisibility";
case Message::Type::UpdateUserMarks: return "UpdateUserMarks";
case Message::Type::InvalidateUserMarks: return "InvalidateUserMarks";
case Message::Type::FlushUserMarks: return "FlushUserMarks";
case Message::Type::GuiLayerRecached: return "GuiLayerRecached";
case Message::Type::GuiRecache: return "GuiRecache";
case Message::Type::GuiLayerLayout: return "GuiLayerLayout";
case Message::Type::MapShapesRecache: return "MapShapesRecache";
case Message::Type::MapShapes: return "MapShapes";
case Message::Type::ChangeMyPositionMode: return "ChangeMyPositionMode";
case Message::Type::CompassInfo: return "CompassInfo";
case Message::Type::GpsInfo: return "GpsInfo";
case Message::Type::SelectObject: return "SelectObject";
case Message::Type::AddSubroute: return "AddSubroute";
case Message::Type::RemoveSubroute: return "RemoveSubroute";
case Message::Type::CacheSubrouteArrows: return "CacheSubrouteArrows";
case Message::Type::FlushSubroute: return "FlushSubroute";
case Message::Type::FlushSubrouteArrows: return "FlushSubrouteArrows";
case Message::Type::FlushSubrouteMarkers: return "FlushSubrouteMarkers";
case Message::Type::FollowRoute: return "FollowRoute";
case Message::Type::DeactivateRouteFollowing: return "DeactivateRouteFollowing";
case Message::Type::SetSubrouteVisibility: return "SetSubrouteVisibility";
case Message::Type::AddRoutePreviewSegment: return "AddRoutePreviewSegment";
case Message::Type::RemoveRoutePreviewSegment: return "RemoveRoutePreviewSegment";
case Message::Type::UpdateMapStyle: return "UpdateMapStyle";
case Message::Type::SwitchMapStyle: return "SwitchMapStyle";
case Message::Type::Invalidate: return "Invalidate";
case Message::Type::Allow3dMode: return "Allow3dMode";
case Message::Type::Allow3dBuildings: return "Allow3dBuildings";
case Message::Type::EnablePerspective: return "EnablePerspective";
case Message::Type::FlushCirclesPack: return "FlushCirclesPack";
case Message::Type::CacheCirclesPack: return "CacheCirclesPack";
case Message::Type::UpdateGpsTrackPoints: return "UpdateGpsTrackPoints";
case Message::Type::ClearGpsTrackPoints: return "ClearGpsTrackPoints";
case Message::Type::ShowChoosePositionMark: return "ShowChoosePositionMark";
case Message::Type::SetKineticScrollEnabled: return "SetKineticScrollEnabled";
case Message::Type::BlockTapEvents: return "BlockTapEvents";
case Message::Type::SetTimeInBackground: return "SetTimeInBackground";
case Message::Type::SetAddNewPlaceMode: return "SetAddNewPlaceMode";
case Message::Type::SetDisplacementMode: return "SetDisplacementMode";
case Message::Type::AllowAutoZoom: return "AllowAutoZoom";
case Message::Type::RequestSymbolsSize: return "RequestSymbolsSize";
case Message::Type::RecoverGLResources: return "RecoverGLResources";
case Message::Type::SetVisibleViewport: return "SetVisibleViewport";
case Message::Type::EnableTraffic: return "EnableTraffic";
case Message::Type::FlushTrafficGeometry: return "FlushTrafficGeometry";
case Message::Type::RegenerateTraffic: return "RegenerateTraffic";
case Message::Type::UpdateTraffic: return "UpdateTraffic";
case Message::Type::FlushTrafficData: return "FlushTrafficData";
case Message::Type::ClearTrafficData: return "ClearTrafficData";
case Message::Type::SetSimplifiedTrafficColors: return "SetSimplifiedTrafficColors";
case Message::Type::DrapeApiAddLines: return "DrapeApiAddLines";
case Message::Type::DrapeApiRemove: return "DrapeApiRemove";
case Message::Type::DrapeApiFlush: return "DrapeApiFlush";
case Message::Type::SetCustomFeatures: return "SetCustomFeatures";
case Message::Type::RemoveCustomFeatures: return "RemoveCustomFeatures";
case Message::Type::SetTrackedFeatures: return "SetTrackedFeatures";
case Message::Type::SetPostprocessStaticTextures: return "SetPostprocessStaticTextures";
case Message::Type::SetPosteffectEnabled: return "SetPosteffectEnabled";
case Message::Type::RunFirstLaunchAnimation: return "RunFirstLaunchAnimation";
case Message::Type::UpdateMetalines: return "UpdateMetalines";
case Message::Type::PostUserEvent: return "PostUserEvent";
case Message::Type::FinishTexturesInitialization: return "FinishTexturesInitialization";
case Message::Type::EnableUGCRendering: return "EnableUGCRendering";
case Message::Type::EnableDebugRectRendering: return "EnableDebugRectRendering";
case Message::Type::EnableTransitScheme: return "EnableTransitScheme";
case Message::Type::UpdateTransitScheme: return "UpdateTransitScheme";
case Message::Type::ClearTransitSchemeData: return "ClearTransitSchemeData";
case Message::Type::ClearAllTransitSchemeData: return "ClearAllTransitSchemeData";
case Message::Type::RegenerateTransitScheme: return "RegenerateTransitScheme";
case Message::Type::FlushTransitScheme: return "FlushTransitScheme";
case Message::Type::ShowDebugInfo: return "ShowDebugInfo";
case Message::Type::NotifyRenderThread: return "NotifyRenderThread";
}
ASSERT(false, ("Unknown message type."));
return "Unknown type";
}
} // namespace df

8
drape_frontend/message.hpp
View file

@ -1,11 +1,13 @@
#pragma once
#include <string>
namespace df
{
class Message
{
public:
enum Type
enum class Type
{
Unknown,
TileReadStarted,
@ -97,7 +99,7 @@ public:
};
virtual ~Message() = default;
virtual Type GetType() const { return Unknown; }
virtual Type GetType() const { return Type::Unknown; }
virtual bool IsGLContextDependent() const { return false; }
};
@ -116,4 +118,6 @@ enum class MessagePriority
// This priority allows to process messages after any other messages in queue.
Low
};
std::string DebugPrint(Message::Type msgType);
} // namespace df

164
drape_frontend/message_subclasses.hpp
View file

@ -98,7 +98,7 @@ private:
class FinishReadingMessage : public Message
{
public:
Type GetType() const override { return Message::FinishReading; }
Type GetType() const override { return Type::FinishReading; }
};
class FinishTileReadMessage : public Message
@ -109,7 +109,7 @@ public:
, m_forceUpdateUserMarks(forceUpdateUserMarks)
{}
Type GetType() const override { return Message::FinishTileRead; }
Type GetType() const override { return Type::FinishTileRead; }
TTilesCollection const & GetTiles() const { return m_tiles; }
TTilesCollection && MoveTiles() { return std::move(m_tiles); }
@ -130,7 +130,7 @@ public:
, m_buffer(std::move(buffer))
{}
Type GetType() const override { return Message::FlushTile; }
Type GetType() const override { return Type::FlushTile; }
bool IsGLContextDependent() const override { return true; }
dp::RenderState const & GetState() const { return m_state; }
@ -157,7 +157,7 @@ private:
};
using FlushOverlaysMessage = FlushRenderDataMessage<TOverlaysRenderData,
Message::FlushOverlays>;
Message::Type::FlushOverlays>;
class InvalidateRectMessage : public Message
{
@ -165,7 +165,7 @@ public:
explicit InvalidateRectMessage(m2::RectD const & rect)
: m_rect(rect) {}
Type GetType() const override { return Message::InvalidateRect; }
Type GetType() const override { return Type::InvalidateRect; }
m2::RectD const & GetRect() const { return m_rect; }
@ -176,7 +176,7 @@ private:
class UpdateReadManagerMessage : public Message
{
public:
Type GetType() const override { return Message::UpdateReadManager; }
Type GetType() const override { return Type::UpdateReadManager; }
};
class InvalidateReadManagerRectMessage : public BaseBlockingMessage
@ -193,7 +193,7 @@ public:
, m_needRestartReading(true)
{}
Type GetType() const override { return Message::InvalidateReadManagerRect; }
Type GetType() const override { return Type::InvalidateReadManagerRect; }
TTilesCollection const & GetTilesForInvalidate() const { return m_tiles; }
bool NeedRestartReading() const { return m_needRestartReading; }
@ -210,7 +210,7 @@ public:
: m_groupId(groupId)
{}
Type GetType() const override { return Message::ClearUserMarkGroup; }
Type GetType() const override { return Type::ClearUserMarkGroup; }
kml::MarkGroupId GetGroupId() const { return m_groupId; }
@ -225,7 +225,7 @@ public:
: m_groupId(groupId)
, m_isVisible(isVisible) {}
Type GetType() const override { return Message::ChangeUserMarkGroupVisibility; }
Type GetType() const override { return Type::ChangeUserMarkGroupVisibility; }
kml::MarkGroupId GetGroupId() const { return m_groupId; }
bool IsVisible() const { return m_isVisible; }
@ -248,7 +248,7 @@ public:
, m_linesRenderParams(std::move(linesRenderParams))
{}
Type GetType() const override { return Message::UpdateUserMarks; }
Type GetType() const override { return Type::UpdateUserMarks; }
drape_ptr<UserMarksRenderCollection> AcceptMarkRenderParams() { return std::move(m_marksRenderParams); }
drape_ptr<UserLinesRenderCollection> AcceptLineRenderParams() { return std::move(m_linesRenderParams); }
@ -271,7 +271,7 @@ public:
, m_ids(std::move(ids))
{}
Type GetType() const override { return Message::UpdateUserMarkGroup; }
Type GetType() const override { return Type::UpdateUserMarkGroup; }
kml::MarkGroupId GetGroupId() const { return m_groupId; }
drape_ptr<IDCollections> AcceptIds() { return std::move(m_ids); }
@ -282,14 +282,14 @@ private:
};
using FlushUserMarksMessage = FlushRenderDataMessage<TUserMarksRenderData,
Message::FlushUserMarks>;
Message::Type::FlushUserMarks>;
class InvalidateUserMarksMessage : public Message
{
public:
InvalidateUserMarksMessage() = default;
Type GetType() const override { return Message::InvalidateUserMarks; }
Type GetType() const override { return Type::InvalidateUserMarks; }
};
class GuiLayerRecachedMessage : public Message
@ -300,7 +300,7 @@ public:
, m_needResetOldGui(needResetOldGui)
{}
Type GetType() const override { return Message::GuiLayerRecached; }
Type GetType() const override { return Type::GuiLayerRecached; }
bool IsGLContextDependent() const override { return true; }
drape_ptr<gui::LayerRenderer> && AcceptRenderer() { return std::move(m_renderer); }
@ -319,7 +319,7 @@ public:
, m_needResetOldGui(needResetOldGui)
{}
Type GetType() const override { return Message::GuiRecache;}
Type GetType() const override { return Type::GuiRecache;}
bool IsGLContextDependent() const override { return true; }
gui::TWidgetsInitInfo const & GetInitInfo() const { return m_initInfo; }
@ -335,7 +335,7 @@ class MapShapesRecacheMessage : public Message
public:
MapShapesRecacheMessage() = default;
Type GetType() const override { return Message::MapShapesRecache; }
Type GetType() const override { return Type::MapShapesRecache; }
bool IsGLContextDependent() const override { return true; }
};
@ -346,7 +346,7 @@ public:
: m_layoutInfo(info)
{}
Type GetType() const override { return GuiLayerLayout; }
Type GetType() const override { return Type::GuiLayerLayout; }
bool IsGLContextDependent() const override { return true; }
gui::TWidgetsLayoutInfo const & GetLayoutInfo() const { return m_layoutInfo; }
@ -360,7 +360,7 @@ class ShowChoosePositionMarkMessage : public Message
{
public:
ShowChoosePositionMarkMessage() = default;
Type GetType() const override { return Message::ShowChoosePositionMark; }
Type GetType() const override { return Type::ShowChoosePositionMark; }
};
class SetKineticScrollEnabledMessage : public Message
@ -370,7 +370,7 @@ public:
: m_enabled(enabled)
{}
Type GetType() const override { return Message::SetKineticScrollEnabled; }
Type GetType() const override { return Type::SetKineticScrollEnabled; }
bool IsEnabled() const { return m_enabled; }
@ -390,7 +390,7 @@ public:
, m_position(position)
{}
Type GetType() const override { return Message::SetAddNewPlaceMode; }
Type GetType() const override { return Type::SetAddNewPlaceMode; }
std::vector<m2::TriangleD> && AcceptBoundArea() { return std::move(m_boundArea); }
bool IsEnabled() const { return m_enable; }
@ -413,7 +413,7 @@ public:
: m_needBlock(block)
{}
Type GetType() const override { return Message::BlockTapEvents; }
Type GetType() const override { return Type::BlockTapEvents; }
bool NeedBlock() const { return m_needBlock; }
@ -429,7 +429,7 @@ public:
, m_selection(std::move(selection))
{}
Type GetType() const override { return Message::MapShapes; }
Type GetType() const override { return Type::MapShapes; }
bool IsGLContextDependent() const override { return true; }
drape_ptr<MyPosition> && AcceptShape() { return std::move(m_shape); }
@ -455,7 +455,7 @@ public:
{}
EChangeType GetChangeType() const { return m_changeType; }
Type GetType() const override { return Message::ChangeMyPositionMode; }
Type GetType() const override { return Type::ChangeMyPositionMode; }
private:
EChangeType const m_changeType;
@ -468,7 +468,7 @@ public:
: m_info(info)
{}
Type GetType() const override { return Message::CompassInfo; }
Type GetType() const override { return Type::CompassInfo; }
location::CompassInfo const & GetInfo() const { return m_info; }
@ -486,7 +486,7 @@ public:
, m_routeInfo(routeInfo)
{}
Type GetType() const override { return Message::GpsInfo; }
Type GetType() const override { return Type::GpsInfo; }
location::GpsInfo const & GetInfo() const { return m_info; }
bool IsNavigable() const { return m_isNavigable; }
@ -519,7 +519,7 @@ public:
, m_isDismiss(false)
{}
Type GetType() const override { return SelectObject; }
Type GetType() const override { return Type::SelectObject; }
bool IsGLContextDependent() const override { return false; }
m2::PointD const & GetPosition() const { return m_glbPoint; }
@ -549,7 +549,7 @@ public:
, m_recacheId(recacheId)
{}
Type GetType() const override { return Message::AddSubroute; }
Type GetType() const override { return Type::AddSubroute; }
dp::DrapeID GetSubrouteId() const { return m_subrouteId; };
SubrouteConstPtr GetSubroute() const { return m_subroute; }
@ -572,7 +572,7 @@ public:
, m_recacheId(recacheId)
{}
Type GetType() const override { return Message::CacheSubrouteArrows; }
Type GetType() const override { return Type::CacheSubrouteArrows; }
dp::DrapeID GetSubrouteId() const { return m_subrouteId; }
std::vector<ArrowBorders> const & GetBorders() const { return m_borders; }
int GetRecacheId() const { return m_recacheId; }
@ -591,7 +591,7 @@ public:
, m_deactivateFollowing(deactivateFollowing)
{}
Type GetType() const override { return Message::RemoveSubroute; }
Type GetType() const override { return Type::RemoveSubroute; }
dp::DrapeID GetSegmentId() const { return m_subrouteId; }
bool NeedDeactivateFollowing() const { return m_deactivateFollowing; }
@ -602,11 +602,11 @@ private:
};
using FlushSubrouteMessage = FlushRenderDataMessage<drape_ptr<SubrouteData>,
Message::FlushSubroute>;
Message::Type::FlushSubroute>;
using FlushSubrouteArrowsMessage = FlushRenderDataMessage<drape_ptr<SubrouteArrowsData>,
Message::FlushSubrouteArrows>;
Message::Type::FlushSubrouteArrows>;
using FlushSubrouteMarkersMessage = FlushRenderDataMessage<drape_ptr<SubrouteMarkersData>,
Message::FlushSubrouteMarkers>;
Message::Type::FlushSubrouteMarkers>;
class AddRoutePreviewSegmentMessage : public Message
{
@ -618,7 +618,7 @@ public:
, m_finishPoint(finishPt)
{}
Type GetType() const override { return Message::AddRoutePreviewSegment; }
Type GetType() const override { return Type::AddRoutePreviewSegment; }
dp::DrapeID GetSegmentId() const { return m_segmentId; };
m2::PointD const & GetStartPoint() const { return m_startPoint; }
@ -640,7 +640,7 @@ public:
, m_needRemoveAll(false)
{}
Type GetType() const override { return Message::RemoveRoutePreviewSegment; }
Type GetType() const override { return Type::RemoveRoutePreviewSegment; }
dp::DrapeID GetSegmentId() const { return m_segmentId; }
bool NeedRemoveAll() const { return m_needRemoveAll; }
@ -658,7 +658,7 @@ public:
, m_isVisible(isVisible)
{}
Type GetType() const override { return Message::SetSubrouteVisibility; }
Type GetType() const override { return Type::SetSubrouteVisibility; }
dp::DrapeID GetSubrouteId() const { return m_subrouteId; }
bool IsVisible() const { return m_isVisible; }
@ -671,7 +671,7 @@ private:
class UpdateMapStyleMessage : public Message
{
public:
Type GetType() const override { return Message::UpdateMapStyle; }
Type GetType() const override { return Type::UpdateMapStyle; }
};
class FollowRouteMessage : public Message
@ -683,7 +683,7 @@ public:
, m_enableAutoZoom(enableAutoZoom)
{}
Type GetType() const override { return Message::FollowRoute; }
Type GetType() const override { return Type::FollowRoute; }
int GetPreferredZoomLevel() const { return m_preferredZoomLevel; }
int GetPreferredZoomLevelIn3d() const { return m_preferredZoomLevelIn3d; }
@ -702,19 +702,19 @@ public:
: BaseBlockingMessage(blocker)
{}
Type GetType() const override { return Message::SwitchMapStyle; }
Type GetType() const override { return Type::SwitchMapStyle; }
};
class InvalidateMessage : public Message
{
public:
Type GetType() const override { return Message::Invalidate; }
Type GetType() const override { return Type::Invalidate; }
};
class RecoverGLResourcesMessage : public Message
{
public:
Type GetType() const override { return Message::RecoverGLResources; }
Type GetType() const override { return Type::RecoverGLResources; }
bool IsGLContextDependent() const override { return true; }
};
@ -725,7 +725,7 @@ public:
: m_rect(rect)
{}
Type GetType() const override { return Message::SetVisibleViewport; }
Type GetType() const override { return Type::SetVisibleViewport; }
m2::RectD const & GetRect() const { return m_rect; }
@ -736,7 +736,7 @@ private:
class DeactivateRouteFollowingMessage : public Message
{
public:
Type GetType() const override { return Message::DeactivateRouteFollowing; }
Type GetType() const override { return Type::DeactivateRouteFollowing; }
};
class Allow3dModeMessage : public Message
@ -747,7 +747,7 @@ public:
, m_allow3dBuildings(allow3dBuildings)
{}
Type GetType() const override { return Message::Allow3dMode; }
Type GetType() const override { return Type::Allow3dMode; }
bool AllowPerspective() const { return m_allowPerspective; }
bool Allow3dBuildings() const { return m_allow3dBuildings; }
@ -764,7 +764,7 @@ public:
: m_allowAutoZoom(allowAutoZoom)
{}
Type GetType() const override { return Message::AllowAutoZoom; }
Type GetType() const override { return Type::AllowAutoZoom; }
bool AllowAutoZoom() const { return m_allowAutoZoom; }
@ -779,7 +779,7 @@ public:
: m_allow3dBuildings(allow3dBuildings)
{}
Type GetType() const override { return Message::Allow3dBuildings; }
Type GetType() const override { return Type::Allow3dBuildings; }
bool Allow3dBuildings() const { return m_allow3dBuildings; }
@ -792,7 +792,7 @@ class EnablePerspectiveMessage : public Message
public:
EnablePerspectiveMessage() = default;
Type GetType() const override { return Message::EnablePerspective; }
Type GetType() const override { return Type::EnablePerspective; }
};
class CacheCirclesPackMessage : public Message
@ -809,7 +809,7 @@ public:
, m_destination(dest)
{}
Type GetType() const override { return Message::CacheCirclesPack; }
Type GetType() const override { return Type::CacheCirclesPack; }
uint32_t GetPointsCount() const { return m_pointsCount; }
Destination GetDestination() const { return m_destination; }
@ -820,7 +820,7 @@ private:
};
using BaseFlushCirclesPackMessage = FlushRenderDataMessage<drape_ptr<CirclesPackRenderData>,
Message::FlushCirclesPack>;
Message::Type::FlushCirclesPack>;
class FlushCirclesPackMessage : public BaseFlushCirclesPackMessage
{
public:
@ -845,7 +845,7 @@ public:
, m_pointsToRemove(std::move(toRemove))
{}
Type GetType() const override { return Message::UpdateGpsTrackPoints; }
Type GetType() const override { return Type::UpdateGpsTrackPoints; }
std::vector<GpsTrackPoint> const & GetPointsToAdd() { return m_pointsToAdd; }
std::vector<uint32_t> const & GetPointsToRemove() { return m_pointsToRemove; }
@ -858,7 +858,7 @@ private:
class ClearGpsTrackPointsMessage : public Message
{
public:
Type GetType() const override { return Message::ClearGpsTrackPoints; }
Type GetType() const override { return Type::ClearGpsTrackPoints; }
};
class SetTimeInBackgroundMessage : public Message
@ -868,7 +868,7 @@ public:
: m_time(time)
{}
Type GetType() const override { return Message::SetTimeInBackground; }
Type GetType() const override { return Type::SetTimeInBackground; }
double GetTime() const { return m_time; }
@ -883,7 +883,7 @@ public:
: m_mode(mode)
{}
Type GetType() const override { return Message::SetDisplacementMode; }
Type GetType() const override { return Type::SetDisplacementMode; }
int GetMode() const { return m_mode; }
@ -903,7 +903,7 @@ public:
, m_callback(callback)
{}
Type GetType() const override { return Message::RequestSymbolsSize; }
Type GetType() const override { return Type::RequestSymbolsSize; }
std::vector<std::string> const & GetSymbols() const { return m_symbols; }
@ -925,7 +925,7 @@ public:
: m_trafficEnabled(trafficEnabled)
{}
Type GetType() const override { return Message::EnableTraffic; }
Type GetType() const override { return Type::EnableTraffic; }
bool IsTrafficEnabled() const { return m_trafficEnabled; }
@ -941,7 +941,7 @@ public:
, m_segments(std::move(segments))
{}
Type GetType() const override { return Message::FlushTrafficGeometry; }
Type GetType() const override { return Type::FlushTrafficGeometry; }
TrafficSegmentsGeometry & GetSegments() { return m_segments; }
@ -952,7 +952,7 @@ private:
class RegenerateTrafficMessage : public Message
{
public:
Type GetType() const override { return Message::RegenerateTraffic; }
Type GetType() const override { return Type::RegenerateTraffic; }
};
class UpdateTrafficMessage : public Message
@ -962,7 +962,7 @@ public:
: m_segmentsColoring(std::move(segmentsColoring))
{}
Type GetType() const override { return Message::UpdateTraffic; }
Type GetType() const override { return Type::UpdateTraffic; }
TrafficSegmentsColoring & GetSegmentsColoring() { return m_segmentsColoring; }
@ -971,7 +971,7 @@ private:
};
using FlushTrafficDataMessage = FlushRenderDataMessage<TrafficRenderData,
Message::FlushTrafficData>;
Message::Type::FlushTrafficData>;
class ClearTrafficDataMessage : public Message
{
@ -980,7 +980,7 @@ public:
: m_mwmId(mwmId)
{}
Type GetType() const override { return Message::ClearTrafficData; }
Type GetType() const override { return Type::ClearTrafficData; }
MwmSet::MwmId const & GetMwmId() { return m_mwmId; }
@ -995,7 +995,7 @@ public:
: m_isSimplified(isSimplified)
{}
Type GetType() const override { return Message::SetSimplifiedTrafficColors; }
Type GetType() const override { return Type::SetSimplifiedTrafficColors; }
bool IsSimplified() const { return m_isSimplified; }
@ -1010,7 +1010,7 @@ public:
: m_isEnabled(isEnabled)
{}
Type GetType() const override { return Message::EnableTransitScheme; }
Type GetType() const override { return Type::EnableTransitScheme; }
bool IsEnabled() { return m_isEnabled; }
@ -1025,7 +1025,7 @@ public:
: m_mwmId(mwmId)
{}
Type GetType() const override { return Message::ClearTransitSchemeData; }
Type GetType() const override { return Type::ClearTransitSchemeData; }
MwmSet::MwmId const & GetMwmId() { return m_mwmId; }
@ -1036,7 +1036,7 @@ private:
class ClearAllTransitSchemeDataMessage : public Message
{
public:
Type GetType() const override { return Message::ClearAllTransitSchemeData; }
Type GetType() const override { return Type::ClearAllTransitSchemeData; }
};
class UpdateTransitSchemeMessage : public Message
@ -1046,7 +1046,7 @@ public:
: m_transitInfos(std::move(transitInfos))
{}
Type GetType() const override { return Message::UpdateTransitScheme; }
Type GetType() const override { return Type::UpdateTransitScheme; }
TransitDisplayInfos const & GetTransitDisplayInfos() { return m_transitInfos; }
@ -1057,11 +1057,11 @@ private:
class RegenerateTransitMessage : public Message
{
public:
Type GetType() const override { return Message::RegenerateTransitScheme; }
Type GetType() const override { return Type::RegenerateTransitScheme; }
};
using FlushTransitSchemeMessage = FlushRenderDataMessage<TransitRenderData,
Message::FlushTransitScheme>;
Message::Type::FlushTransitScheme>;
class DrapeApiAddLinesMessage : public Message
{
@ -1070,7 +1070,7 @@ public:
: m_lines(lines)
{}
Type GetType() const override { return Message::DrapeApiAddLines; }
Type GetType() const override { return Type::DrapeApiAddLines; }
DrapeApi::TLines const & GetLines() const { return m_lines; }
@ -1086,7 +1086,7 @@ public:
, m_removeAll(removeAll)
{}
Type GetType() const override { return Message::DrapeApiRemove; }
Type GetType() const override { return Type::DrapeApiRemove; }
string const & GetId() const { return m_id; }
bool NeedRemoveAll() const { return m_removeAll; }
@ -1105,7 +1105,7 @@ public:
: m_properties(std::move(properties))
{}
Type GetType() const override { return Message::DrapeApiFlush; }
Type GetType() const override { return Type::DrapeApiFlush; }
TProperties && AcceptProperties() { return std::move(m_properties); }
@ -1120,7 +1120,7 @@ public:
: m_features(std::move(ids))
{}
Type GetType() const override { return Message::SetCustomFeatures; }
Type GetType() const override { return Type::SetCustomFeatures; }
CustomFeatures && AcceptFeatures() { return std::move(m_features); }
@ -1136,7 +1136,7 @@ public:
: m_mwmId(mwmId), m_removeAll(false)
{}
Type GetType() const override { return Message::RemoveCustomFeatures; }
Type GetType() const override { return Type::RemoveCustomFeatures; }
bool NeedRemoveAll() const { return m_removeAll; }
MwmSet::MwmId const & GetMwmId() const { return m_mwmId; }
@ -1152,7 +1152,7 @@ public:
: m_features(std::move(features))
{}
Type GetType() const override { return Message::SetTrackedFeatures; }
Type GetType() const override { return Type::SetTrackedFeatures; }
std::vector<FeatureID> && AcceptFeatures() { return std::move(m_features); }
@ -1167,7 +1167,7 @@ public:
: m_textures(std::move(textures))
{}
Type GetType() const override { return Message::SetPostprocessStaticTextures; }
Type GetType() const override { return Type::SetPostprocessStaticTextures; }
bool IsGLContextDependent() const override { return true; }
drape_ptr<PostprocessStaticTextures> && AcceptTextures() { return std::move(m_textures); }
@ -1184,7 +1184,7 @@ public:
, m_enabled(enabled)
{}
Type GetType() const override { return Message::SetPosteffectEnabled; }
Type GetType() const override { return Type::SetPosteffectEnabled; }
PostprocessRenderer::Effect GetEffect() const { return m_effect; }
bool IsEnabled() const { return m_enabled; }
@ -1200,7 +1200,7 @@ public:
: m_enabled(enabled)
{}
Type GetType() const override { return Message::EnableUGCRendering; }
Type GetType() const override { return Type::EnableUGCRendering; }
bool IsEnabled() const { return m_enabled; }
private:
@ -1214,7 +1214,7 @@ public:
: m_enabled(enabled)
{}
Type GetType() const override { return Message::EnableDebugRectRendering; }
Type GetType() const override { return Type::EnableDebugRectRendering; }
bool IsEnabled() const { return m_enabled; }
private:
@ -1224,13 +1224,13 @@ private:
class RunFirstLaunchAnimationMessage : public Message
{
public:
Type GetType() const override { return Message::RunFirstLaunchAnimation; }
Type GetType() const override { return Type::RunFirstLaunchAnimation; }
};
class UpdateMetalinesMessage : public Message
{
public:
Type GetType() const override { return Message::UpdateMetalines; }
Type GetType() const override { return Type::UpdateMetalines; }
};
class PostUserEventMessage : public Message
@ -1240,7 +1240,7 @@ public:
: m_event(std::move(event))
{}
Type GetType() const override { return Message::PostUserEvent; }
Type GetType() const override { return Type::PostUserEvent; }
drape_ptr<UserEvent> && AcceptEvent() { return std::move(m_event); }
@ -1252,7 +1252,7 @@ class FinishTexturesInitializationMessage : public Message
{
public:
bool IsGLContextDependent() const override { return true; }
Type GetType() const override { return Message::FinishTexturesInitialization; }
Type GetType() const override { return Type::FinishTexturesInitialization; }
};
class ShowDebugInfoMessage : public Message
@ -1262,7 +1262,7 @@ public:
: m_shown(shown)
{}
Type GetType() const override { return Message::ShowDebugInfo; }
Type GetType() const override { return Type::ShowDebugInfo; }
bool IsShown() const { return m_shown; }
private:
@ -1281,7 +1281,7 @@ public:
// We can not notify render threads without active OpenGL context.
bool IsGLContextDependent() const override { return true; }
Type GetType() const override { return Message::NotifyRenderThread; }
Type GetType() const override { return Type::NotifyRenderThread; }
void InvokeFunctor()
{

144
xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
View file

@ -196,6 +196,7 @@
BB7D67D21F34A62C002FD122 /* custom_features_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BB7D67CF1F34A62C002FD122 /* custom_features_context.hpp */; };
BB7D67D31F34A62C002FD122 /* path_text_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7D67D01F34A62C002FD122 /* path_text_handle.cpp */; };
BB7D67D41F34A62C002FD122 /* path_text_handle.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BB7D67D11F34A62C002FD122 /* path_text_handle.hpp */; };
BB8403202151380500AB8783 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB84031F2151380400AB8783 /* message.cpp */; };
BBAD59FB21258843005543FC /* debug_rect_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBAD59F921258841005543FC /* debug_rect_renderer.cpp */; };
BBAD59FC21258843005543FC /* debug_rect_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBAD59FA21258842005543FC /* debug_rect_renderer.hpp */; };
BBD8F8791E96A51A00BAEB72 /* drape_hints.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBD8F8781E96A51A00BAEB72 /* drape_hints.hpp */; };
@ -225,8 +226,6 @@
34C624C01DABDB0400510300 /* traffic_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_generator.hpp; sourceTree = "<group>"; };
34C624C11DABDB0400510300 /* traffic_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_renderer.cpp; sourceTree = "<group>"; };
34C624C21DABDB0400510300 /* traffic_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_renderer.hpp; sourceTree = "<group>"; };
451A2A7E1EE8463F003E05A4 /* circle_point.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = circle_point.fsh.glsl; path = shaders/circle_point.fsh.glsl; sourceTree = "<group>"; };
451A2A7F1EE8463F003E05A4 /* circle_point.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = circle_point.vsh.glsl; path = shaders/circle_point.vsh.glsl; sourceTree = "<group>"; };
451A2A801EE8464E003E05A4 /* circles_pack_shape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = circles_pack_shape.cpp; sourceTree = "<group>"; };
451A2A811EE8464E003E05A4 /* circles_pack_shape.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = circles_pack_shape.hpp; sourceTree = "<group>"; };
452C9EC21CEDCF3200A55E57 /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cpp; sourceTree = "<group>"; };
@ -247,9 +246,6 @@
452C9ED31CEDCF3200A55E57 /* sequence_animation.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sequence_animation.hpp; sourceTree = "<group>"; };
452FE5C11EB2004F00EE470C /* screen_quad_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen_quad_renderer.cpp; sourceTree = "<group>"; };
452FE5C21EB2004F00EE470C /* screen_quad_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = screen_quad_renderer.hpp; sourceTree = "<group>"; };
453C5E882065599C00C78952 /* route_marker.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = route_marker.vsh.glsl; path = shaders/route_marker.vsh.glsl; sourceTree = "<group>"; };
453C5E892065599D00C78952 /* user_mark.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = user_mark.fsh.glsl; path = shaders/user_mark.fsh.glsl; sourceTree = "<group>"; };
453C5E8A2065599D00C78952 /* route_marker.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = route_marker.fsh.glsl; path = shaders/route_marker.fsh.glsl; sourceTree = "<group>"; };
453EEA6B1E3A28F400505E09 /* colored_symbol_shape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = colored_symbol_shape.cpp; sourceTree = "<group>"; };
453EEA6C1E3A28F400505E09 /* colored_symbol_shape.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = colored_symbol_shape.hpp; sourceTree = "<group>"; };
454B9A391F4591AC003FAE7A /* drape_engine_safe_ptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drape_engine_safe_ptr.hpp; sourceTree = "<group>"; };
@ -258,14 +254,6 @@
454C19BA1CCE3EC0002A2C86 /* animation_system.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = animation_system.hpp; sourceTree = "<group>"; };
45580AB81E28DB2600CD535D /* scenario_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scenario_manager.cpp; sourceTree = "<group>"; };
45580AB91E28DB2600CD535D /* scenario_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = scenario_manager.hpp; sourceTree = "<group>"; };
455FFE391F3896F600F68481 /* route_arrow.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = route_arrow.fsh.glsl; path = shaders/route_arrow.fsh.glsl; sourceTree = "<group>"; };
455FFE3A1F3896F600F68481 /* smaa_blending_weight.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smaa_blending_weight.fsh.glsl; path = shaders/smaa_blending_weight.fsh.glsl; sourceTree = "<group>"; };
455FFE3B1F3896F600F68481 /* smaa_blending_weight.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smaa_blending_weight.vsh.glsl; path = shaders/smaa_blending_weight.vsh.glsl; sourceTree = "<group>"; };
455FFE3C1F3896F600F68481 /* smaa_edges.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smaa_edges.fsh.glsl; path = shaders/smaa_edges.fsh.glsl; sourceTree = "<group>"; };
455FFE3D1F3896F600F68481 /* smaa_edges.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smaa_edges.vsh.glsl; path = shaders/smaa_edges.vsh.glsl; sourceTree = "<group>"; };
455FFE3E1F3896F600F68481 /* smaa_final.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smaa_final.fsh.glsl; path = shaders/smaa_final.fsh.glsl; sourceTree = "<group>"; };
455FFE3F1F3896F600F68481 /* smaa_final.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smaa_final.vsh.glsl; path = shaders/smaa_final.vsh.glsl; sourceTree = "<group>"; };
4560692B1EB9F9D2009AB7B7 /* shaders_lib.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = shaders_lib.glsl; path = shaders/shaders_lib.glsl; sourceTree = "<group>"; };
456B3F971ED464FE009B3D1F /* postprocess_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = postprocess_renderer.cpp; sourceTree = "<group>"; };
456B3F981ED464FE009B3D1F /* postprocess_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = postprocess_renderer.hpp; sourceTree = "<group>"; };
45A3781920B324E5005FBDBB /* watermark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = watermark.hpp; sourceTree = "<group>"; };
@ -277,59 +265,6 @@
45B4B8C81CF5C16B00A54761 /* screen_animations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = screen_animations.hpp; sourceTree = "<group>"; };
45B4B8C91CF5C16B00A54761 /* screen_operations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen_operations.cpp; sourceTree = "<group>"; };
45B4B8CA1CF5C16B00A54761 /* screen_operations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = screen_operations.hpp; sourceTree = "<group>"; };
45BB02231EB8BE2B00FE5C0C /* area.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = area.vsh.glsl; path = shaders/area.vsh.glsl; sourceTree = "<group>"; };
45BB02241EB8BE2B00FE5C0C /* area3d_outline.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = area3d_outline.vsh.glsl; path = shaders/area3d_outline.vsh.glsl; sourceTree = "<group>"; };
45BB02251EB8BE2B00FE5C0C /* area3d.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = area3d.vsh.glsl; path = shaders/area3d.vsh.glsl; sourceTree = "<group>"; };
45BB02261EB8BE2B00FE5C0C /* arrow3d_outline.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = arrow3d_outline.fsh.glsl; path = shaders/arrow3d_outline.fsh.glsl; sourceTree = "<group>"; };
45BB02271EB8BE2B00FE5C0C /* arrow3d_shadow.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = arrow3d_shadow.fsh.glsl; path = shaders/arrow3d_shadow.fsh.glsl; sourceTree = "<group>"; };
45BB02281EB8BE2B00FE5C0C /* arrow3d_shadow.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = arrow3d_shadow.vsh.glsl; path = shaders/arrow3d_shadow.vsh.glsl; sourceTree = "<group>"; };
45BB02291EB8BE2B00FE5C0C /* arrow3d.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = arrow3d.fsh.glsl; path = shaders/arrow3d.fsh.glsl; sourceTree = "<group>"; };
45BB022A1EB8BE2B00FE5C0C /* arrow3d.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = arrow3d.vsh.glsl; path = shaders/arrow3d.vsh.glsl; sourceTree = "<group>"; };
45BB022B1EB8BE2B00FE5C0C /* circle.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = circle.fsh.glsl; path = shaders/circle.fsh.glsl; sourceTree = "<group>"; };
45BB022C1EB8BE2B00FE5C0C /* circle.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = circle.vsh.glsl; path = shaders/circle.vsh.glsl; sourceTree = "<group>"; };
45BB022D1EB8BE2B00FE5C0C /* colored_symbol_billboard.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = colored_symbol_billboard.vsh.glsl; path = shaders/colored_symbol_billboard.vsh.glsl; sourceTree = "<group>"; };
45BB022E1EB8BE2B00FE5C0C /* colored_symbol.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = colored_symbol.fsh.glsl; path = shaders/colored_symbol.fsh.glsl; sourceTree = "<group>"; };
45BB022F1EB8BE2B00FE5C0C /* colored_symbol.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = colored_symbol.vsh.glsl; path = shaders/colored_symbol.vsh.glsl; sourceTree = "<group>"; };
45BB02301EB8BE2B00FE5C0C /* dashed_line.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dashed_line.fsh.glsl; path = shaders/dashed_line.fsh.glsl; sourceTree = "<group>"; };
45BB02311EB8BE2B00FE5C0C /* dashed_line.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dashed_line.vsh.glsl; path = shaders/dashed_line.vsh.glsl; sourceTree = "<group>"; };
45BB02321EB8BE2B00FE5C0C /* debug_rect.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = debug_rect.fsh.glsl; path = shaders/debug_rect.fsh.glsl; sourceTree = "<group>"; };
45BB02331EB8BE2B00FE5C0C /* debug_rect.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = debug_rect.vsh.glsl; path = shaders/debug_rect.vsh.glsl; sourceTree = "<group>"; };
45BB02351EB8BE2B00FE5C0C /* hatching_area.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = hatching_area.fsh.glsl; path = shaders/hatching_area.fsh.glsl; sourceTree = "<group>"; };
45BB02361EB8BE2B00FE5C0C /* hatching_area.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = hatching_area.vsh.glsl; path = shaders/hatching_area.vsh.glsl; sourceTree = "<group>"; };
45BB02371EB8BE2B00FE5C0C /* line.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = line.fsh.glsl; path = shaders/line.fsh.glsl; sourceTree = "<group>"; };
45BB02381EB8BE2B00FE5C0C /* line.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = line.vsh.glsl; path = shaders/line.vsh.glsl; sourceTree = "<group>"; };
45BB02391EB8BE2B00FE5C0C /* masked_texturing_billboard.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = masked_texturing_billboard.vsh.glsl; path = shaders/masked_texturing_billboard.vsh.glsl; sourceTree = "<group>"; };
45BB023A1EB8BE2B00FE5C0C /* masked_texturing.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = masked_texturing.fsh.glsl; path = shaders/masked_texturing.fsh.glsl; sourceTree = "<group>"; };
45BB023B1EB8BE2B00FE5C0C /* masked_texturing.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = masked_texturing.vsh.glsl; path = shaders/masked_texturing.vsh.glsl; sourceTree = "<group>"; };
45BB023C1EB8BE2B00FE5C0C /* my_position.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = my_position.vsh.glsl; path = shaders/my_position.vsh.glsl; sourceTree = "<group>"; };
45BB023D1EB8BE2B00FE5C0C /* path_symbol.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = path_symbol.vsh.glsl; path = shaders/path_symbol.vsh.glsl; sourceTree = "<group>"; };
45BB023E1EB8BE2B00FE5C0C /* position_accuracy3d.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = position_accuracy3d.vsh.glsl; path = shaders/position_accuracy3d.vsh.glsl; sourceTree = "<group>"; };
45BB023F1EB8BE2B00FE5C0C /* route_arrow.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = route_arrow.vsh.glsl; path = shaders/route_arrow.vsh.glsl; sourceTree = "<group>"; };
45BB02401EB8BE2B00FE5C0C /* route_dash.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = route_dash.fsh.glsl; path = shaders/route_dash.fsh.glsl; sourceTree = "<group>"; };
45BB02411EB8BE2B00FE5C0C /* route.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = route.fsh.glsl; path = shaders/route.fsh.glsl; sourceTree = "<group>"; };
45BB02421EB8BE2B00FE5C0C /* route.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = route.vsh.glsl; path = shaders/route.vsh.glsl; sourceTree = "<group>"; };
45BB02431EB8BE2B00FE5C0C /* ruler.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ruler.vsh.glsl; path = shaders/ruler.vsh.glsl; sourceTree = "<group>"; };
45BB02441EB8BE2B00FE5C0C /* screen_quad.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = screen_quad.vsh.glsl; path = shaders/screen_quad.vsh.glsl; sourceTree = "<group>"; };
45BB02451EB8BE2B00FE5C0C /* shader_index.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = shader_index.txt; path = shaders/shader_index.txt; sourceTree = "<group>"; };
45BB02461EB8BE2B00FE5C0C /* solid_color.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = solid_color.fsh.glsl; path = shaders/solid_color.fsh.glsl; sourceTree = "<group>"; };
45BB02471EB8BE2B00FE5C0C /* text_billboard.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = text_billboard.vsh.glsl; path = shaders/text_billboard.vsh.glsl; sourceTree = "<group>"; };
45BB02481EB8BE2B00FE5C0C /* text_fixed.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = text_fixed.fsh.glsl; path = shaders/text_fixed.fsh.glsl; sourceTree = "<group>"; };
45BB02491EB8BE2B00FE5C0C /* text_outlined_billboard.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = text_outlined_billboard.vsh.glsl; path = shaders/text_outlined_billboard.vsh.glsl; sourceTree = "<group>"; };
45BB024A1EB8BE2B00FE5C0C /* text_outlined_gui.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = text_outlined_gui.vsh.glsl; path = shaders/text_outlined_gui.vsh.glsl; sourceTree = "<group>"; };
45BB024B1EB8BE2B00FE5C0C /* text_outlined.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = text_outlined.vsh.glsl; path = shaders/text_outlined.vsh.glsl; sourceTree = "<group>"; };
45BB024C1EB8BE2B00FE5C0C /* text.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = text.fsh.glsl; path = shaders/text.fsh.glsl; sourceTree = "<group>"; };
45BB024D1EB8BE2B00FE5C0C /* text.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = text.vsh.glsl; path = shaders/text.vsh.glsl; sourceTree = "<group>"; };
45BB024E1EB8BE2B00FE5C0C /* texturing_billboard.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = texturing_billboard.vsh.glsl; path = shaders/texturing_billboard.vsh.glsl; sourceTree = "<group>"; };
45BB024F1EB8BE2B00FE5C0C /* texturing_gui.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = texturing_gui.vsh.glsl; path = shaders/texturing_gui.vsh.glsl; sourceTree = "<group>"; };
45BB02501EB8BE2B00FE5C0C /* texturing.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = texturing.fsh.glsl; path = shaders/texturing.fsh.glsl; sourceTree = "<group>"; };
45BB02511EB8BE2B00FE5C0C /* texturing.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = texturing.vsh.glsl; path = shaders/texturing.vsh.glsl; sourceTree = "<group>"; };
45BB02521EB8BE2B00FE5C0C /* texturing3d.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = texturing3d.fsh.glsl; path = shaders/texturing3d.fsh.glsl; sourceTree = "<group>"; };
45BB02551EB8BE2B00FE5C0C /* traffic_line.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = traffic_line.fsh.glsl; path = shaders/traffic_line.fsh.glsl; sourceTree = "<group>"; };
45BB02561EB8BE2B00FE5C0C /* traffic_line.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = traffic_line.vsh.glsl; path = shaders/traffic_line.vsh.glsl; sourceTree = "<group>"; };
45BB02571EB8BE2B00FE5C0C /* traffic.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = traffic.fsh.glsl; path = shaders/traffic.fsh.glsl; sourceTree = "<group>"; };
45BB02581EB8BE2B00FE5C0C /* traffic.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = traffic.vsh.glsl; path = shaders/traffic.vsh.glsl; sourceTree = "<group>"; };
45BB02591EB8BE2B00FE5C0C /* user_mark_billboard.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = user_mark_billboard.vsh.glsl; path = shaders/user_mark_billboard.vsh.glsl; sourceTree = "<group>"; };
45BB025A1EB8BE2B00FE5C0C /* user_mark.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = user_mark.vsh.glsl; path = shaders/user_mark.vsh.glsl; sourceTree = "<group>"; };
45BE604D20E504FC00A456AE /* frame_values.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = frame_values.hpp; sourceTree = "<group>"; };
45D7ADDC2113532700160DE3 /* render_state_extension.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = render_state_extension.hpp; sourceTree = "<group>"; };
45D7ADDD2113532700160DE3 /* render_state_extension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = render_state_extension.cpp; sourceTree = "<group>"; };
@ -470,6 +405,7 @@
BB7D67CF1F34A62C002FD122 /* custom_features_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = custom_features_context.hpp; sourceTree = "<group>"; };
BB7D67D01F34A62C002FD122 /* path_text_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = path_text_handle.cpp; sourceTree = "<group>"; };
BB7D67D11F34A62C002FD122 /* path_text_handle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = path_text_handle.hpp; sourceTree = "<group>"; };
BB84031F2151380400AB8783 /* message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message.cpp; sourceTree = "<group>"; };
BBAD59F921258841005543FC /* debug_rect_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug_rect_renderer.cpp; sourceTree = "<group>"; };
BBAD59FA21258842005543FC /* debug_rect_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = debug_rect_renderer.hpp; sourceTree = "<group>"; };
BBD8F8781E96A51A00BAEB72 /* drape_hints.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drape_hints.hpp; sourceTree = "<group>"; };
@ -495,79 +431,6 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
45BB02221EB8BE1400FE5C0C /* shaders */ = {
isa = PBXGroup;
children = (
45BB02231EB8BE2B00FE5C0C /* area.vsh.glsl */,
45BB02241EB8BE2B00FE5C0C /* area3d_outline.vsh.glsl */,
45BB02251EB8BE2B00FE5C0C /* area3d.vsh.glsl */,
45BB02261EB8BE2B00FE5C0C /* arrow3d_outline.fsh.glsl */,
45BB02271EB8BE2B00FE5C0C /* arrow3d_shadow.fsh.glsl */,
45BB02281EB8BE2B00FE5C0C /* arrow3d_shadow.vsh.glsl */,
45BB02291EB8BE2B00FE5C0C /* arrow3d.fsh.glsl */,
45BB022A1EB8BE2B00FE5C0C /* arrow3d.vsh.glsl */,
451A2A7E1EE8463F003E05A4 /* circle_point.fsh.glsl */,
451A2A7F1EE8463F003E05A4 /* circle_point.vsh.glsl */,
45BB022B1EB8BE2B00FE5C0C /* circle.fsh.glsl */,
45BB022C1EB8BE2B00FE5C0C /* circle.vsh.glsl */,
45BB022D1EB8BE2B00FE5C0C /* colored_symbol_billboard.vsh.glsl */,
45BB022E1EB8BE2B00FE5C0C /* colored_symbol.fsh.glsl */,
45BB022F1EB8BE2B00FE5C0C /* colored_symbol.vsh.glsl */,
45BB02301EB8BE2B00FE5C0C /* dashed_line.fsh.glsl */,
45BB02311EB8BE2B00FE5C0C /* dashed_line.vsh.glsl */,
45BB02321EB8BE2B00FE5C0C /* debug_rect.fsh.glsl */,
45BB02331EB8BE2B00FE5C0C /* debug_rect.vsh.glsl */,
45BB02351EB8BE2B00FE5C0C /* hatching_area.fsh.glsl */,
45BB02361EB8BE2B00FE5C0C /* hatching_area.vsh.glsl */,
45BB02371EB8BE2B00FE5C0C /* line.fsh.glsl */,
45BB02381EB8BE2B00FE5C0C /* line.vsh.glsl */,
45BB02391EB8BE2B00FE5C0C /* masked_texturing_billboard.vsh.glsl */,
45BB023A1EB8BE2B00FE5C0C /* masked_texturing.fsh.glsl */,
45BB023B1EB8BE2B00FE5C0C /* masked_texturing.vsh.glsl */,
45BB023C1EB8BE2B00FE5C0C /* my_position.vsh.glsl */,
45BB023D1EB8BE2B00FE5C0C /* path_symbol.vsh.glsl */,
45BB023E1EB8BE2B00FE5C0C /* position_accuracy3d.vsh.glsl */,
455FFE391F3896F600F68481 /* route_arrow.fsh.glsl */,
45BB023F1EB8BE2B00FE5C0C /* route_arrow.vsh.glsl */,
45BB02401EB8BE2B00FE5C0C /* route_dash.fsh.glsl */,
453C5E8A2065599D00C78952 /* route_marker.fsh.glsl */,
453C5E882065599C00C78952 /* route_marker.vsh.glsl */,
45BB02411EB8BE2B00FE5C0C /* route.fsh.glsl */,
45BB02421EB8BE2B00FE5C0C /* route.vsh.glsl */,
45BB02431EB8BE2B00FE5C0C /* ruler.vsh.glsl */,
45BB02441EB8BE2B00FE5C0C /* screen_quad.vsh.glsl */,
45BB02451EB8BE2B00FE5C0C /* shader_index.txt */,
4560692B1EB9F9D2009AB7B7 /* shaders_lib.glsl */,
455FFE3A1F3896F600F68481 /* smaa_blending_weight.fsh.glsl */,
455FFE3B1F3896F600F68481 /* smaa_blending_weight.vsh.glsl */,
455FFE3C1F3896F600F68481 /* smaa_edges.fsh.glsl */,
455FFE3D1F3896F600F68481 /* smaa_edges.vsh.glsl */,
455FFE3E1F3896F600F68481 /* smaa_final.fsh.glsl */,
455FFE3F1F3896F600F68481 /* smaa_final.vsh.glsl */,
45BB02461EB8BE2B00FE5C0C /* solid_color.fsh.glsl */,
45BB02471EB8BE2B00FE5C0C /* text_billboard.vsh.glsl */,
45BB02481EB8BE2B00FE5C0C /* text_fixed.fsh.glsl */,
45BB02491EB8BE2B00FE5C0C /* text_outlined_billboard.vsh.glsl */,
45BB024A1EB8BE2B00FE5C0C /* text_outlined_gui.vsh.glsl */,
45BB024B1EB8BE2B00FE5C0C /* text_outlined.vsh.glsl */,
45BB024C1EB8BE2B00FE5C0C /* text.fsh.glsl */,
45BB024D1EB8BE2B00FE5C0C /* text.vsh.glsl */,
45BB024E1EB8BE2B00FE5C0C /* texturing_billboard.vsh.glsl */,
45BB024F1EB8BE2B00FE5C0C /* texturing_gui.vsh.glsl */,
45BB02501EB8BE2B00FE5C0C /* texturing.fsh.glsl */,
45BB02511EB8BE2B00FE5C0C /* texturing.vsh.glsl */,
45BB02521EB8BE2B00FE5C0C /* texturing3d.fsh.glsl */,
45BB02551EB8BE2B00FE5C0C /* traffic_line.fsh.glsl */,
45BB02561EB8BE2B00FE5C0C /* traffic_line.vsh.glsl */,
45BB02571EB8BE2B00FE5C0C /* traffic.fsh.glsl */,
45BB02581EB8BE2B00FE5C0C /* traffic.vsh.glsl */,
45BB02591EB8BE2B00FE5C0C /* user_mark_billboard.vsh.glsl */,
453C5E892065599D00C78952 /* user_mark.fsh.glsl */,
45BB025A1EB8BE2B00FE5C0C /* user_mark.vsh.glsl */,
);
name = shaders;
sourceTree = "<group>";
};
670947311BDF9B82005014C0 = {
isa = PBXGroup;
children = (
@ -652,6 +515,7 @@
670947501BDF9BE0005014C0 /* message_queue.cpp */,
670947511BDF9BE0005014C0 /* message_queue.hpp */,
670947521BDF9BE0005014C0 /* message_subclasses.hpp */,
BB84031F2151380400AB8783 /* message.cpp */,
670947531BDF9BE0005014C0 /* message.hpp */,
EB2B77FD1EEDD418002697B6 /* metaline_manager.cpp */,
EB2B77FE1EEDD418002697B6 /* metaline_manager.hpp */,
@ -706,7 +570,6 @@
452FE5C21EB2004F00EE470C /* screen_quad_renderer.hpp */,
670947701BDF9BE0005014C0 /* selection_shape.cpp */,
670947711BDF9BE0005014C0 /* selection_shape.hpp */,
45BB02221EB8BE1400FE5C0C /* shaders */,
670947721BDF9BE0005014C0 /* shape_view_params.hpp */,
670947731BDF9BE0005014C0 /* stylist.cpp */,
670947741BDF9BE0005014C0 /* stylist.hpp */,
@ -1019,6 +882,7 @@
670948431BDF9C48005014C0 /* drape_gui.cpp in Sources */,
670947D61BDF9BE1005014C0 /* user_event_stream.cpp in Sources */,
452C9EDE1CEDCF3200A55E57 /* parallel_animation.cpp in Sources */,
BB8403202151380500AB8783 /* message.cpp in Sources */,
670947B11BDF9BE1005014C0 /* read_mwm_task.cpp in Sources */,
670948471BDF9C48005014C0 /* layer_render.cpp in Sources */,
670947C41BDF9BE1005014C0 /* text_handle.cpp in Sources */,