diff options
80 files changed, 781 insertions, 452 deletions
diff --git a/3party/3party.pro b/3party/3party.pro index f616008581..01317bb8af 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -8,7 +8,7 @@ TEMPLATE = subdirs } SUBDIRS = freetype minizip jansson protobuf osrm expat succinct pugixml liboauthcpp stb_image sdf_image \ - icu + icu agg # TODO(mgsrergio): Move opening hours out of 3party to the main project tree. # See https://trello.com/c/tWYSnXSS/22-opening-hours-3party-boost-test-framework. diff --git a/3party/agg/CMakeLists.txt b/3party/agg/CMakeLists.txt new file mode 100644 index 0000000000..1d21209693 --- /dev/null +++ b/3party/agg/CMakeLists.txt @@ -0,0 +1,13 @@ +project(agg) + +add_clang_compile_options("-Wno-deprecated-declarations") + +set(CMAKE_PREFIX_PATH ./) + +set( + SRC + agg_curves.cpp + agg_vcgen_stroke.cpp +) + +add_library(${PROJECT_NAME} ${SRC}) diff --git a/3party/agg/agg.pro b/3party/agg/agg.pro new file mode 100644 index 0000000000..cf8de96639 --- /dev/null +++ b/3party/agg/agg.pro @@ -0,0 +1,14 @@ +TARGET = agg +TEMPLATE = lib +CONFIG += staticlib + +ROOT_DIR = ../.. + +include($$ROOT_DIR/common.pri) + +CONFIG -= warn_on +CONFIG *= warn_off + +SOURCES += \ + agg_curves.cpp \ + agg_vcgen_stroke.cpp \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 74563bf50a..0b70abae3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,6 +280,7 @@ add_subdirectory(3party/jansson) add_subdirectory(3party/minizip) add_subdirectory(3party/freetype) add_subdirectory(3party/icu) +add_subdirectory(3party/agg) add_subdirectory(3party/expat) add_subdirectory(map) @@ -329,7 +330,13 @@ add_subdirectory(partners_api) add_subdirectory(local_ads) add_subdirectory(ugc) +option(BUILD_MAPSHOT "Build mapshot tool" OFF) + if (PLATFORM_DESKTOP) + if (BUILD_MAPSHOT) + add_subdirectory(software_renderer) + add_subdirectory(mapshot) + endif() add_subdirectory(openlr) add_subdirectory(generator) add_subdirectory(skin_generator) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index c437f87214..6ab7db89a4 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -28,7 +28,7 @@ endef prebuild_static_libs := map tracking routing traffic routing_common drape_frontend search storage prebuild_static_libs += ugc indexer drape platform editor partners_api local_ads geometry coding base prebuild_static_libs += opening_hours pugixml oauthcpp expat freetype minizip jansson -prebuild_static_libs += protobuf osrm stats_client succinct stb_image sdf_image icu +prebuild_static_libs += protobuf osrm stats_client succinct stb_image sdf_image icu agg $(foreach item,$(prebuild_static_libs),$(eval $(call add_prebuild_static_lib,$(item)))) diff --git a/drape_frontend/CMakeLists.txt b/drape_frontend/CMakeLists.txt index 80be3ccb54..bdb55cf80d 100644 --- a/drape_frontend/CMakeLists.txt +++ b/drape_frontend/CMakeLists.txt @@ -20,7 +20,6 @@ include_directories( set( SRC - ${OMIM_ROOT}/3party/agg/agg_curves.cpp animation/animation.cpp animation/animation.hpp animation/arrow_animation.cpp @@ -215,34 +214,6 @@ set( user_marks_provider.hpp visual_params.cpp visual_params.hpp - watch/area_info.hpp - watch/brush_info.hpp - watch/circle_info.hpp - watch/cpu_drawer.cpp - watch/cpu_drawer.hpp - watch/default_font.cpp - watch/feature_processor.cpp - watch/feature_processor.hpp - watch/feature_styler.cpp - watch/feature_styler.hpp - watch/frame_image.hpp - watch/geometry_processors.cpp - watch/geometry_processors.hpp - watch/glyph_cache.cpp - watch/glyph_cache.hpp - watch/glyph_cache_impl.cpp - watch/glyph_cache_impl.hpp - watch/icon_info.hpp - watch/path_info.hpp - watch/pen_info.hpp - watch/point.h - watch/proto_to_styles.cpp - watch/proto_to_styles.hpp - watch/rect.h - watch/software_renderer.cpp - watch/software_renderer.hpp - watch/text_engine.cpp - watch/text_engine.h ) add_library(${PROJECT_NAME} ${SRC}) diff --git a/drape_frontend/drape_frontend.pro b/drape_frontend/drape_frontend.pro index 0c5607ec60..d5b094a571 100755 --- a/drape_frontend/drape_frontend.pro +++ b/drape_frontend/drape_frontend.pro @@ -14,7 +14,6 @@ INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib INCLUDEPATH *= $$ROOT_DIR/3party/freetype/include SOURCES += \ - $$ROOT_DIR/3party/agg/agg_curves.cpp \ animation/animation.cpp \ animation/arrow_animation.cpp \ animation/base_interpolator.cpp \ @@ -107,16 +106,6 @@ SOURCES += \ user_marks_provider.cpp \ visual_params.cpp \ kinetic_scroller.cpp \ - watch/cpu_drawer.cpp \ - watch/software_renderer.cpp \ - watch/proto_to_styles.cpp \ - watch/text_engine.cpp \ - watch/feature_styler.cpp \ - watch/glyph_cache.cpp \ - watch/glyph_cache_impl.cpp \ - watch/geometry_processors.cpp \ - watch/feature_processor.cpp \ - watch/default_font.cpp \ HEADERS += \ animation/animation.hpp \ @@ -221,25 +210,6 @@ HEADERS += \ user_marks_provider.hpp \ visual_params.hpp \ kinetic_scroller.hpp \ - watch/cpu_drawer.hpp \ - watch/software_renderer.hpp \ - watch/proto_to_styles.hpp \ - watch/text_engine.h \ - watch/point.h \ - watch/rect.h \ - watch/path_info.hpp \ - watch/area_info.hpp \ - watch/frame_image.hpp \ - watch/feature_styler.hpp \ - watch/glyph_cache.hpp \ - watch/glyph_cache_impl.hpp \ - watch/freetype.hpp \ - watch/circle_info.hpp \ - watch/pen_info.hpp \ - watch/icon_info.hpp \ - watch/brush_info.hpp \ - watch/geometry_processors.hpp \ - watch/feature_processor.hpp \ OTHER_FILES += \ shaders/area.vsh.glsl \ diff --git a/feature_list/feature_list.pro b/feature_list/feature_list.pro index 8ca87a9611..8b2b219706 100644 --- a/feature_list/feature_list.pro +++ b/feature_list/feature_list.pro @@ -2,7 +2,7 @@ ROOT_DIR = .. DEPENDENCIES = map traffic search_tests_support search search_quality storage ugc indexer platform editor geometry \ - coding base jansson protobuf stats_client succinct opening_hours pugixml icu + coding base jansson protobuf stats_client succinct opening_hours pugixml icu agg include($$ROOT_DIR/common.pri) diff --git a/generator/feature_segments_checker/feature_segments_checker.pro b/generator/feature_segments_checker/feature_segments_checker.pro index d8a441361a..55a8c7bf07 100644 --- a/generator/feature_segments_checker/feature_segments_checker.pro +++ b/generator/feature_segments_checker/feature_segments_checker.pro @@ -8,7 +8,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = generator map routing traffic routing_common storage ugc indexer \ - platform geometry coding base minizip succinct protobuf gflags stats_client icu + platform geometry coding base minizip succinct protobuf gflags stats_client icu agg include($$ROOT_DIR/common.pri) diff --git a/generator/generator_tests/CMakeLists.txt b/generator/generator_tests/CMakeLists.txt index 9d9e54218e..ca06c008e6 100644 --- a/generator/generator_tests/CMakeLists.txt +++ b/generator/generator_tests/CMakeLists.txt @@ -50,6 +50,7 @@ omim_link_libraries( freetype expat icu + agg jansson protobuf osrm diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.pro b/generator/srtm_coverage_checker/srtm_coverage_checker.pro index 32aa173e5f..a5ed578f3b 100644 --- a/generator/srtm_coverage_checker/srtm_coverage_checker.pro +++ b/generator/srtm_coverage_checker/srtm_coverage_checker.pro @@ -8,7 +8,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = generator map routing routing_common search storage ugc indexer platform editor geometry coding base \ - osrm jansson protobuf succinct stats_client pugixml minizip gflags stats_client icu + osrm jansson protobuf succinct stats_client pugixml minizip gflags stats_client icu agg include($$ROOT_DIR/common.pri) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 09d9645e39..390c6d1303 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -6944,6 +6944,7 @@ "-licu", "-llocal_ads", "-lugc", + "-lagg", ); }; name = Simulator; @@ -7047,6 +7048,7 @@ "-licu", "-llocal_ads", "-lugc", + "-lagg", ); }; name = Debug; @@ -7153,6 +7155,7 @@ "-licu", "-llocal_ads", "-lugc", + "-lagg", ); }; name = AdHoc; @@ -7259,6 +7262,7 @@ "-licu", "-llocal_ads", "-lugc", + "-lagg", ); }; name = "Production Full"; @@ -7365,6 +7369,7 @@ "-licu", "-llocal_ads", "-lugc", + "-lagg", ); }; name = Release; @@ -7472,6 +7477,7 @@ "-licu", "-llocal_ads", "-lugc", + "-lagg", ); }; name = "Simulator Release"; diff --git a/map/benchmark_tool/benchmark_tool.pro b/map/benchmark_tool/benchmark_tool.pro index 3a7049deea..8e65ff1fad 100644 --- a/map/benchmark_tool/benchmark_tool.pro +++ b/map/benchmark_tool/benchmark_tool.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map ugc indexer platform editor geometry coding base gflags protobuf succinct pugixml stats_client icu +DEPENDENCIES = map ugc indexer platform editor geometry coding base gflags protobuf succinct pugixml stats_client icu agg include($$ROOT_DIR/common.pri) diff --git a/map/framework.cpp b/map/framework.cpp index fd7e54ffdd..df3279be0a 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -38,8 +38,6 @@ #include "drape_frontend/gps_track_point.hpp" #include "drape_frontend/route_renderer.hpp" #include "drape_frontend/visual_params.hpp" -#include "drape_frontend/watch/cpu_drawer.hpp" -#include "drape_frontend/watch/feature_processor.hpp" #include "drape/constants.hpp" @@ -547,71 +545,6 @@ cian::Api * Framework::GetCianApi(platform::NetworkPolicy const & policy) return nullptr; } -void Framework::DrawWatchFrame(m2::PointD const & center, int zoomModifier, - uint32_t pxWidth, uint32_t pxHeight, - df::watch::FrameSymbols const & symbols, - df::watch::FrameImage & image) -{ - ASSERT(IsWatchFrameRendererInited(), ()); - - int resultZoom = -1; - ScreenBase screen = m_cpuDrawer->CalculateScreen(center, zoomModifier, pxWidth, pxHeight, symbols, resultZoom); - ASSERT_GREATER(resultZoom, 0, ()); - - uint32_t const bgColor = drule::rules().GetBgColor(resultZoom); - m_cpuDrawer->BeginFrame(pxWidth, pxHeight, dp::Extract(bgColor, 255 - (bgColor >> 24))); - - m2::RectD renderRect = m2::RectD(0, 0, pxWidth, pxHeight); - m2::RectD selectRect; - m2::RectD clipRect; - double const inflationSize = 24 * m_cpuDrawer->GetVisualScale(); - screen.PtoG(m2::Inflate(renderRect, inflationSize, inflationSize), clipRect); - screen.PtoG(renderRect, selectRect); - - uint32_t const tileSize = static_cast<uint32_t>(df::CalculateTileSize(pxWidth, pxHeight)); - int const drawScale = df::GetDrawTileScale(screen, tileSize, m_cpuDrawer->GetVisualScale()); - df::watch::FeatureProcessor doDraw(make_ref(m_cpuDrawer), clipRect, screen, drawScale); - - int const upperScale = scales::GetUpperScale(); - m_model.ForEachFeature(selectRect, doDraw, min(upperScale, drawScale)); - - m_cpuDrawer->Flush(); - m_cpuDrawer->DrawMyPosition(screen.GtoP(center)); - - if (symbols.m_showSearchResult) - { - if (!screen.PixelRect().IsPointInside(screen.GtoP(symbols.m_searchResult))) - m_cpuDrawer->DrawSearchArrow(ang::AngleTo(center, symbols.m_searchResult)); - else - m_cpuDrawer->DrawSearchResult(screen.GtoP(symbols.m_searchResult)); - } - - m_cpuDrawer->EndFrame(image); -} - -void Framework::InitWatchFrameRenderer(float visualScale) -{ - using namespace df::watch; - - ASSERT(!IsWatchFrameRendererInited(), ()); - if (m_cpuDrawer == nullptr) - { - string resPostfix = df::VisualParams::GetResourcePostfix(visualScale); - m_cpuDrawer = make_unique_dp<CPUDrawer>(CPUDrawer::Params(resPostfix, visualScale)); - } -} - -void Framework::ReleaseWatchFrameRenderer() -{ - if (IsWatchFrameRendererInited()) - m_cpuDrawer.reset(); -} - -bool Framework::IsWatchFrameRendererInited() const -{ - return m_cpuDrawer != nullptr; -} - void Framework::ShowNode(storage::TCountryId const & countryId) { StopLocationFollow(); diff --git a/map/framework.hpp b/map/framework.hpp index 4e1ea322b2..e2f33fe291 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -17,7 +17,6 @@ #include "drape_frontend/drape_api.hpp" #include "drape_frontend/drape_engine.hpp" #include "drape_frontend/user_event_stream.hpp" -#include "drape_frontend/watch/frame_image.hpp" #include "drape/oglcontextfactory.hpp" @@ -90,14 +89,6 @@ struct DownloaderSearchParams; namespace routing { namespace turns{ class Settings; } } -namespace df -{ - namespace watch - { - class CPUDrawer; - } -} - namespace platform { class NetworkPolicy; @@ -172,7 +163,6 @@ protected: TViewportChanged m_viewportChanged; drape_ptr<df::DrapeEngine> m_drapeEngine; - drape_ptr<df::watch::CPUDrawer> m_cpuDrawer; double m_startForegroundTime; double m_startBackgroundTime; @@ -237,26 +227,6 @@ public: storage::Storage::TProgressFunction const & progress); void Migrate(bool keepDownloaded = true); - void InitWatchFrameRenderer(float visualScale); - - /// @param center - map center in Mercator - /// @param zoomModifier - result zoom calculate like "base zoom" + zoomModifier - /// if we are have search result "base zoom" calculate that my position and search result - /// will be see with some bottom clamp. - /// if we are't have search result "base zoom" == scales::GetUpperComfortScale() - 1 - /// @param pxWidth - result image width. - /// It must be equal render buffer width. For retina it's equal 2.0 * displayWidth - /// @param pxHeight - result image height. - /// It must be equal render buffer height. For retina it's equal 2.0 * displayHeight - /// @param symbols - configuration for symbols on the frame - /// @param image [out] - result image - void DrawWatchFrame(m2::PointD const & center, int zoomModifier, - uint32_t pxWidth, uint32_t pxHeight, - df::watch::FrameSymbols const & symbols, - df::watch::FrameImage & image); - void ReleaseWatchFrameRenderer(); - bool IsWatchFrameRendererInited() const; - /// \returns true if there're unsaved changes in map with |countryId| and false otherwise. /// \note It works for group and leaf node. bool HasUnsavedEdits(storage::TCountryId const & countryId); diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt index 692c7535c7..cfdc528b2c 100644 --- a/map/map_tests/CMakeLists.txt +++ b/map/map_tests/CMakeLists.txt @@ -43,6 +43,7 @@ omim_link_libraries( base freetype icu + agg expat protobuf jansson diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index 15a057c11c..6629df0bee 100644 --- a/map/map_tests/map_tests.pro +++ b/map/map_tests/map_tests.pro @@ -8,7 +8,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map drape_frontend routing traffic routing_common search storage tracking drape \ ugc indexer partners_api local_ads platform editor geometry coding base freetype expat \ - protobuf jansson osrm stats_client minizip succinct pugixml stats_client stb_image sdf_image icu + protobuf jansson osrm stats_client minizip succinct pugixml stats_client stb_image sdf_image icu agg DEPENDENCIES *= opening_hours diff --git a/map/mwm_tests/CMakeLists.txt b/map/mwm_tests/CMakeLists.txt index 90ddc73d8a..0bd8aa1fa8 100644 --- a/map/mwm_tests/CMakeLists.txt +++ b/map/mwm_tests/CMakeLists.txt @@ -27,6 +27,7 @@ omim_link_libraries( opening_hours freetype icu + agg expat oauthcpp protobuf diff --git a/map/mwm_tests/mwm_tests.pro b/map/mwm_tests/mwm_tests.pro index 8e7df6dc1a..087b2cf53a 100644 --- a/map/mwm_tests/mwm_tests.pro +++ b/map/mwm_tests/mwm_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map traffic search storage ugc indexer platform editor geometry coding base \ - freetype expat protobuf jansson succinct pugixml stats_client icu + freetype expat protobuf jansson succinct pugixml stats_client icu agg include($$ROOT_DIR/common.pri) diff --git a/map/style_tests/CMakeLists.txt b/map/style_tests/CMakeLists.txt index 0ec219f02f..656b5bff66 100644 --- a/map/style_tests/CMakeLists.txt +++ b/map/style_tests/CMakeLists.txt @@ -30,6 +30,7 @@ omim_link_libraries( base protobuf icu + agg stats_client ${LIBZ} ) diff --git a/map/style_tests/style_tests.pro b/map/style_tests/style_tests.pro index 6f44d0850d..d5f7048d2f 100644 --- a/map/style_tests/style_tests.pro +++ b/map/style_tests/style_tests.pro @@ -9,7 +9,7 @@ CONFIG += console warn_on INCLUDEPATH += ../../3party/protobuf/protobuf/src ROOT_DIR = ../.. -DEPENDENCIES = map traffic ugc indexer platform geometry coding base expat protobuf stats_client icu +DEPENDENCIES = map traffic ugc indexer platform geometry coding base expat protobuf stats_client icu agg macx-*: LIBS *= "-framework IOKit" diff --git a/mapshot/CMakeLists.txt b/mapshot/CMakeLists.txt new file mode 100644 index 0000000000..55c2eefaaa --- /dev/null +++ b/mapshot/CMakeLists.txt @@ -0,0 +1,57 @@ +project(mapshot_tool) + +include_directories( + . + ${OMIM_ROOT}/3party/glm + ${OMIM_ROOT}/3party/gflags/src +) + +set( + SRC + mapshot.cpp +) + +omim_add_executable(${PROJECT_NAME} ${SRC}) + +omim_link_libraries( + ${PROJECT_NAME} + map + software_renderer + drape_frontend + routing + search + storage + tracking + traffic + routing_common + ugc + indexer + drape + partners_api + local_ads + platform + editor + geometry + coding + base + freetype + expat + gflags + icu + agg + jansson + protobuf + osrm + stats_client + minizip + succinct + pugixml + oauthcpp + opening_hours + stb_image + sdf_image + ${LIBZ} +) + +link_opengl(${PROJECT_NAME}) +link_qt5_core(${PROJECT_NAME}) diff --git a/mapshot/mapshot.cpp b/mapshot/mapshot.cpp index 90035447b2..1f9aae1d62 100644 --- a/mapshot/mapshot.cpp +++ b/mapshot/mapshot.cpp @@ -1,5 +1,11 @@ #include "map/framework.hpp" +#include "software_renderer/cpu_drawer.hpp" +#include "software_renderer/feature_processor.hpp" +#include "software_renderer/frame_image.hpp" + +#include "drape_frontend/visual_params.hpp" + #include "geometry/mercator.hpp" #include "base/string_utils.hpp" @@ -52,31 +58,110 @@ Place ParsePlace(string const & src) return p; } +string FilenameSeq(string const & path) +{ + static size_t counter = 0; + stringstream filename; + filename << path << "mapshot" << setw(6) << setfill('0') << counter++ << ".png"; + return filename.str(); +} + +unique_ptr<software_renderer::CPUDrawer> cpuDrawer; + +bool IsFrameRendererInitialized() +{ + return cpuDrawer != nullptr; +} + +void InitFrameRenderer(float visualScale) +{ + using namespace software_renderer; + + if (cpuDrawer == nullptr) + { + string resPostfix = df::VisualParams::GetResourcePostfix(visualScale); + cpuDrawer = make_unique_dp<CPUDrawer>(CPUDrawer::Params(resPostfix, visualScale)); + } +} + +void ReleaseFrameRenderer() +{ + if (IsFrameRendererInitialized()) + cpuDrawer.reset(); +} + +/// @param center - map center in Mercator +/// @param zoomModifier - result zoom calculate like "base zoom" + zoomModifier +/// if we are have search result "base zoom" calculate that my position and search result +/// will be see with some bottom clamp. +/// if we are't have search result "base zoom" == scales::GetUpperComfortScale() - 1 +/// @param pxWidth - result image width. +/// It must be equal render buffer width. For retina it's equal 2.0 * displayWidth +/// @param pxHeight - result image height. +/// It must be equal render buffer height. For retina it's equal 2.0 * displayHeight +/// @param symbols - configuration for symbols on the frame +/// @param image [out] - result image +void DrawFrame(Framework & framework, + m2::PointD const & center, int zoomModifier, + uint32_t pxWidth, uint32_t pxHeight, + software_renderer::FrameSymbols const & symbols, + software_renderer::FrameImage & image) +{ + ASSERT(IsFrameRendererInitialized(), ()); + + int resultZoom = -1; + ScreenBase screen = cpuDrawer->CalculateScreen(center, zoomModifier, pxWidth, pxHeight, symbols, resultZoom); + ASSERT_GREATER(resultZoom, 0, ()); + + uint32_t const bgColor = drule::rules().GetBgColor(resultZoom); + cpuDrawer->BeginFrame(pxWidth, pxHeight, dp::Extract(bgColor, 255 - (bgColor >> 24))); + + m2::RectD renderRect = m2::RectD(0, 0, pxWidth, pxHeight); + m2::RectD selectRect; + m2::RectD clipRect; + double const inflationSize = 24 * cpuDrawer->GetVisualScale(); + screen.PtoG(m2::Inflate(renderRect, inflationSize, inflationSize), clipRect); + screen.PtoG(renderRect, selectRect); + + uint32_t const tileSize = static_cast<uint32_t>(df::CalculateTileSize(pxWidth, pxHeight)); + int const drawScale = df::GetDrawTileScale(screen, tileSize, cpuDrawer->GetVisualScale()); + software_renderer::FeatureProcessor doDraw(make_ref(cpuDrawer), clipRect, screen, drawScale); + + int const upperScale = scales::GetUpperScale(); + + framework.GetIndex().ForEachInRect(doDraw, selectRect, min(upperScale, drawScale)); + + cpuDrawer->Flush(); + //cpuDrawer->DrawMyPosition(screen.GtoP(center)); + + if (symbols.m_showSearchResult) + { + if (!screen.PixelRect().IsPointInside(screen.GtoP(symbols.m_searchResult))) + cpuDrawer->DrawSearchArrow(ang::AngleTo(center, symbols.m_searchResult)); + else + cpuDrawer->DrawSearchResult(screen.GtoP(symbols.m_searchResult)); + } + + cpuDrawer->EndFrame(image); +} + void RenderPlace(Framework & framework, Place const & place, string const & filename) { - df::watch::FrameImage frame; - df::watch::FrameSymbols sym; + software_renderer::FrameImage frame; + software_renderer::FrameSymbols sym; sym.m_showSearchResult = false; // If you are interested why, look at CPUDrawer::CalculateScreen. // It is almost UpperComfortScale but there is some magic involved. int constexpr kMagicBaseScale = 17; - framework.DrawWatchFrame(MercatorBounds::FromLatLon(place.lat, place.lon), place.zoom - kMagicBaseScale, - place.width, place.height, sym, frame); + DrawFrame(framework, MercatorBounds::FromLatLon(place.lat, place.lon), + place.zoom - kMagicBaseScale, place.width, place.height, sym, frame); ofstream file(filename.c_str()); file.write(reinterpret_cast<char const *>(frame.m_data.data()), frame.m_data.size()); file.close(); } - -string FilenameSeq(string const & path) -{ - static size_t counter = 0; - stringstream filename; - filename << path << "mapshot" << setw(6) << setfill('0') << counter++ << ".png"; - return filename.str(); -} } // namespace int main(int argc, char * argv[]) @@ -114,7 +199,7 @@ int main(int argc, char * argv[]) // This magic constant was determined in several attempts. // It is a scale level, basically, dpi factor. 1 means 90 or 96, it seems, // and with 1.1 the map looks subjectively better. - f.InitWatchFrameRenderer(1.1 /* visualScale */); + InitFrameRenderer(1.1 /* visualScale */); if (!FLAGS_place.empty()) processPlace(FLAGS_place); @@ -125,11 +210,12 @@ int main(int argc, char * argv[]) processPlace(line); } - f.ReleaseWatchFrameRenderer(); + ReleaseFrameRenderer(); return 0; } catch (exception & e) { + ReleaseFrameRenderer(); cerr << e.what() << endl; } return 1; diff --git a/mapshot/mapshot.pro b/mapshot/mapshot.pro index 2ca6b64693..d4cc968064 100644 --- a/mapshot/mapshot.pro +++ b/mapshot/mapshot.pro @@ -1,10 +1,10 @@ # mapshot binary ROOT_DIR = .. -DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common ugc indexer \ - drape partners_api local_ads platform editor geometry coding base \ - freetype expat gflags jansson protobuf osrm stats_client minizip succinct \ - pugixml opening_hours stb_image sdf_image icu +DEPENDENCIES = map drape_frontend software_renderer routing search storage tracking traffic \ + routing_common ugc indexer drape partners_api local_ads platform editor geometry \ + coding base freetype expat gflags jansson protobuf osrm stats_client minizip succinct \ + pugixml opening_hours stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) @@ -83,14 +83,13 @@ SUBDIRS = 3party base coding geometry editor ugc indexer routing routing_common CONFIG(desktop) { benchmark_tool.subdir = map/benchmark_tool benchmark_tool.depends = 3party base coding geometry platform indexer search map - mapshot.depends = $$SUBDIRS qt_common.subdir = qt/qt_common qt_common.depends = $$SUBDIRS qt.depends = $$SUBDIRS qt_common - SUBDIRS *= benchmark_tool mapshot qt qt_common + SUBDIRS *= benchmark_tool qt qt_common } CONFIG(desktop) { @@ -288,4 +287,10 @@ SUBDIRS = 3party base coding geometry editor ugc indexer routing routing_common mwm_diff_tests.depends = mwm_diff generator platform coding base SUBDIRS *= mwm_diff_tests } # !no-tests + + CONFIG(map_shot) { + mapshot.depends = 3party base coding geometry editor platform storage indexer search map \ + routing_common drape drape_frontend software_renderer + SUBDIRS *= software_renderer mapshot + } } # !gtool diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt index 636f44137a..05e54261d6 100644 --- a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt +++ b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt @@ -48,6 +48,7 @@ omim_link_libraries( expat freetype icu + agg gflags jansson minizip diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 37195fb95c..70a1874779 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -99,6 +99,7 @@ omim_link_libraries( expat gflags icu + agg jansson protobuf osrm diff --git a/routing/routing_benchmarks/CMakeLists.txt b/routing/routing_benchmarks/CMakeLists.txt index 157a660056..cb9def4e8c 100644 --- a/routing/routing_benchmarks/CMakeLists.txt +++ b/routing/routing_benchmarks/CMakeLists.txt @@ -33,6 +33,7 @@ omim_link_libraries( succinct pugixml icu + agg ${LIBZ} ) diff --git a/routing/routing_benchmarks/routing_benchmarks.pro b/routing/routing_benchmarks/routing_benchmarks.pro index 018904f510..dcf25d7600 100644 --- a/routing/routing_benchmarks/routing_benchmarks.pro +++ b/routing/routing_benchmarks/routing_benchmarks.pro @@ -5,7 +5,7 @@ TEMPLATE = app ROOT_DIR = ../../ DEPENDENCIES = map routing traffic routing_common search storage indexer platform editor geometry coding base \ - osrm jansson protobuf stats_client succinct pugixml icu + osrm jansson protobuf stats_client succinct pugixml icu agg macx-*: LIBS *= "-framework IOKit" diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/routing/routing_consistency_tests/CMakeLists.txt index 0121d973d4..63f3e503fc 100644 --- a/routing/routing_consistency_tests/CMakeLists.txt +++ b/routing/routing_consistency_tests/CMakeLists.txt @@ -39,6 +39,7 @@ omim_link_libraries( gflags pugixml icu + agg ${Qt5Widgets_LIBRARIES} ${LIBZ} ) diff --git a/routing/routing_consistency_tests/routing_consistency_tests.pro b/routing/routing_consistency_tests/routing_consistency_tests.pro index 95513fe313..7adeb35c75 100644 --- a/routing/routing_consistency_tests/routing_consistency_tests.pro +++ b/routing/routing_consistency_tests/routing_consistency_tests.pro @@ -8,7 +8,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map routing traffic routing_common search storage indexer platform editor geometry coding base osrm \ - jansson protobuf succinct stats_client generator gflags pugixml icu + jansson protobuf succinct stats_client generator gflags pugixml icu agg include($$ROOT_DIR/common.pri) diff --git a/routing/routing_integration_tests/CMakeLists.txt b/routing/routing_integration_tests/CMakeLists.txt index aa90ea281d..5743469e23 100644 --- a/routing/routing_integration_tests/CMakeLists.txt +++ b/routing/routing_integration_tests/CMakeLists.txt @@ -47,6 +47,7 @@ omim_link_libraries( pugixml opening_hours icu + agg ${LIBZ} ) diff --git a/routing/routing_integration_tests/routing_integration_tests.pro b/routing/routing_integration_tests/routing_integration_tests.pro index 8d317112e0..fffdeea9ab 100644 --- a/routing/routing_integration_tests/routing_integration_tests.pro +++ b/routing/routing_integration_tests/routing_integration_tests.pro @@ -12,7 +12,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map routing traffic routing_common search storage ugc indexer platform editor geometry coding base \ - osrm jansson protobuf succinct stats_client pugixml icu + osrm jansson protobuf succinct stats_client pugixml icu agg DEPENDENCIES += opening_hours diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt index 9f62ac611a..f3bc530849 100644 --- a/routing/routing_tests/CMakeLists.txt +++ b/routing/routing_tests/CMakeLists.txt @@ -59,6 +59,7 @@ omim_link_libraries( pugixml stats_client icu + agg ${LIBZ} ) diff --git a/routing/routing_tests/routing_tests.pro b/routing/routing_tests/routing_tests.pro index 997a0c9eed..32985c6ff4 100644 --- a/routing/routing_tests/routing_tests.pro +++ b/routing/routing_tests/routing_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = routing routing_common indexer platform_tests_support platform editor geometry coding base \ - osrm protobuf succinct jansson stats_client map traffic pugixml stats_client icu + osrm protobuf succinct jansson stats_client map traffic pugixml stats_client icu agg macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration" diff --git a/routing_common/routing_common_tests/CMakeLists.txt b/routing_common/routing_common_tests/CMakeLists.txt index 0a31cb5b11..2e4a500e6b 100644 --- a/routing_common/routing_common_tests/CMakeLists.txt +++ b/routing_common/routing_common_tests/CMakeLists.txt @@ -29,6 +29,7 @@ omim_link_libraries( pugixml stats_client icu + agg ${LIBZ} ) diff --git a/routing_common/routing_common_tests/routing_common_tests.pro b/routing_common/routing_common_tests/routing_common_tests.pro index 86f5706e32..9ea3a558c6 100644 --- a/routing_common/routing_common_tests/routing_common_tests.pro +++ b/routing_common/routing_common_tests/routing_common_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = routing_common indexer platform_tests_support platform editor geometry coding base \ - osrm protobuf succinct jansson stats_client map traffic pugixml stats_client icu + osrm protobuf succinct jansson stats_client map traffic pugixml stats_client icu agg macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration" diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt index 072c0352b7..9b5f214a99 100644 --- a/search/search_quality/assessment_tool/CMakeLists.txt +++ b/search/search_quality/assessment_tool/CMakeLists.txt @@ -57,6 +57,7 @@ omim_link_libraries( expat freetype icu + agg gflags jansson minizip diff --git a/search/search_quality/features_collector_tool/features_collector_tool.pro b/search/search_quality/features_collector_tool/features_collector_tool.pro index 1be330db3a..8a2dbc55e1 100644 --- a/search/search_quality/features_collector_tool/features_collector_tool.pro +++ b/search/search_quality/features_collector_tool/features_collector_tool.pro @@ -9,7 +9,7 @@ ROOT_DIR = ../../.. # todo(@m) revise DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search search_quality \ storage ugc indexer drape platform editor geometry coding base freetype expat gflags \ - jansson protobuf osrm stats_client minizip succinct opening_hours pugixml stb_image sdf_image icu + jansson protobuf osrm stats_client minizip succinct opening_hours pugixml stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/search/search_quality/search_quality_tests/search_quality_tests.pro b/search/search_quality/search_quality_tests/search_quality_tests.pro index f4f1705a26..547adbc2d8 100644 --- a/search/search_quality/search_quality_tests/search_quality_tests.pro +++ b/search/search_quality/search_quality_tests/search_quality_tests.pro @@ -9,7 +9,7 @@ ROOT_DIR = ../../.. # todo(@m) revise DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search_quality search storage indexer drape platform geometry coding base \ freetype expat gflags jansson protobuf osrm stats_client minizip succinct \ - opening_hours stb_image sdf_image icu + opening_hours stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/search/search_quality/search_quality_tool/search_quality_tool.pro b/search/search_quality/search_quality_tool/search_quality_tool.pro index 89da562c29..e7884dc251 100644 --- a/search/search_quality/search_quality_tool/search_quality_tool.pro +++ b/search/search_quality/search_quality_tool/search_quality_tool.pro @@ -10,7 +10,7 @@ ROOT_DIR = ../../.. DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search search_quality storage ugc indexer drape \ platform editor geometry coding base freetype expat gflags \ jansson protobuf osrm stats_client minizip succinct \ - opening_hours pugixml stb_image sdf_image icu + opening_hours pugixml stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/software_renderer/CMakeLists.txt b/software_renderer/CMakeLists.txt new file mode 100644 index 0000000000..6a0d63fdbb --- /dev/null +++ b/software_renderer/CMakeLists.txt @@ -0,0 +1,43 @@ +project(software_renderer) + +include_directories( + . + ${OMIM_ROOT}/3party/protobuf/protobuf/src + ${OMIM_ROOT}/3party/expat/lib + ${OMIM_ROOT}/3party/freetype/include + ${OMIM_ROOT}/3party/glm +) + +set( + SRC + area_info.hpp + brush_info.hpp + circle_info.hpp + cpu_drawer.cpp + cpu_drawer.hpp + default_font.cpp + feature_processor.cpp + feature_processor.hpp + feature_styler.cpp + feature_styler.hpp + frame_image.hpp + geometry_processors.cpp + geometry_processors.hpp + glyph_cache.cpp + glyph_cache.hpp + glyph_cache_impl.cpp + glyph_cache_impl.hpp + icon_info.hpp + path_info.hpp + pen_info.hpp + point.h + proto_to_styles.cpp + proto_to_styles.hpp + rect.h + software_renderer.cpp + software_renderer.hpp + text_engine.cpp + text_engine.h +) + +add_library(${PROJECT_NAME} ${SRC}) diff --git a/drape_frontend/watch/agg_curves.cpp b/software_renderer/agg_curves.cpp index 26c83ae853..26c83ae853 100644 --- a/drape_frontend/watch/agg_curves.cpp +++ b/software_renderer/agg_curves.cpp diff --git a/drape_frontend/watch/area_info.hpp b/software_renderer/area_info.hpp index 1d54564bb4..f087980aaf 100644 --- a/drape_frontend/watch/area_info.hpp +++ b/software_renderer/area_info.hpp @@ -5,9 +5,7 @@ #include "std/vector.hpp" #include "std/algorithm.hpp" -namespace df -{ -namespace watch +namespace software_renderer { class AreaInfo @@ -40,9 +38,8 @@ public: }; } -} -inline void swap(df::watch::AreaInfo & p1, df::watch::AreaInfo & p2) +inline void swap(software_renderer::AreaInfo & p1, software_renderer::AreaInfo & p2) { p1.swap(p2); } diff --git a/drape_frontend/watch/brush_info.hpp b/software_renderer/brush_info.hpp index a87e7dcd14..5728802a7e 100644 --- a/drape_frontend/watch/brush_info.hpp +++ b/software_renderer/brush_info.hpp @@ -2,9 +2,7 @@ #include "drape/drape_global.hpp" -namespace df -{ -namespace watch +namespace software_renderer { struct BrushInfo @@ -16,4 +14,3 @@ struct BrushInfo }; } -} diff --git a/drape_frontend/watch/circle_info.hpp b/software_renderer/circle_info.hpp index 11a5c861a7..f31d2ea4ed 100644 --- a/drape_frontend/watch/circle_info.hpp +++ b/software_renderer/circle_info.hpp @@ -2,9 +2,7 @@ #include "drape/drape_global.hpp" -namespace df -{ -namespace watch +namespace software_renderer { struct CircleInfo @@ -36,4 +34,3 @@ struct CircleInfo }; } -} diff --git a/drape_frontend/watch/cpu_drawer.cpp b/software_renderer/cpu_drawer.cpp index 5466cba0c3..d77f2c0974 100644 --- a/drape_frontend/watch/cpu_drawer.cpp +++ b/software_renderer/cpu_drawer.cpp @@ -1,6 +1,6 @@ -#include "drape_frontend/watch/cpu_drawer.hpp" -#include "drape_frontend/watch/proto_to_styles.hpp" -#include "drape_frontend/watch/software_renderer.hpp" +#include "software_renderer/cpu_drawer.hpp" +#include "software_renderer/proto_to_styles.hpp" +#include "software_renderer/software_renderer.hpp" #include "drape_frontend/navigator.hpp" #include "drape_frontend/visual_params.hpp" @@ -94,9 +94,7 @@ TInfo const & GetInfo(FeatureID const & id, map<FeatureID, TInfo> & m) } -namespace df -{ -namespace watch +namespace software_renderer { class CPUDrawer::CPUOverlayTree @@ -714,10 +712,10 @@ void CPUDrawer::Draw(FeatureData const & data) bool const isArea = !data.m_areas.empty(); drule::BaseRule const * pSymbolRule = nullptr; - double symbolDepth = df::watch::minDepth; + double symbolDepth = software_renderer::minDepth; drule::BaseRule const * pShieldRule = nullptr; - double shieldDepth = df::watch::minDepth; + double shieldDepth = software_renderer::minDepth; // separating path rules from other for (size_t i = 0; i < rules.size(); ++i) @@ -832,4 +830,3 @@ void CPUDrawer::Draw(FeatureData const & data) } } -} diff --git a/drape_frontend/watch/cpu_drawer.hpp b/software_renderer/cpu_drawer.hpp index aa4e4b2b99..7d5886de86 100644 --- a/drape_frontend/watch/cpu_drawer.hpp +++ b/software_renderer/cpu_drawer.hpp @@ -1,7 +1,7 @@ #pragma once -#include "drape_frontend/watch/frame_image.hpp" -#include "drape_frontend/watch/feature_processor.hpp" +#include "software_renderer/frame_image.hpp" +#include "software_renderer/feature_processor.hpp" #include "drape/drape_global.hpp" @@ -13,9 +13,7 @@ #include "std/list.hpp" #include "std/unique_ptr.hpp" -namespace df -{ -namespace watch +namespace software_renderer { class SoftwareRenderer; @@ -219,4 +217,3 @@ private: }; } -} diff --git a/drape_frontend/watch/default_font.cpp b/software_renderer/default_font.cpp index 827437c7e2..827437c7e2 100644 --- a/drape_frontend/watch/default_font.cpp +++ b/software_renderer/default_font.cpp diff --git a/drape_frontend/watch/feature_processor.cpp b/software_renderer/feature_processor.cpp index d8dc700e74..7ed22a61e9 100644 --- a/drape_frontend/watch/feature_processor.cpp +++ b/software_renderer/feature_processor.cpp @@ -1,14 +1,12 @@ -#include "drape_frontend/watch/feature_processor.hpp" -#include "drape_frontend/watch/geometry_processors.hpp" -#include "drape_frontend/watch/feature_styler.hpp" -#include "drape_frontend/watch/cpu_drawer.hpp" +#include "software_renderer/feature_processor.hpp" +#include "software_renderer/geometry_processors.hpp" +#include "software_renderer/feature_styler.hpp" +#include "software_renderer/cpu_drawer.hpp" #include "indexer/feature_impl.hpp" #include "indexer/feature_algo.hpp" -namespace df -{ -namespace watch +namespace software_renderer { namespace @@ -169,4 +167,3 @@ bool FeatureProcessor::operator()(FeatureType const & f) } } -} diff --git a/drape_frontend/watch/feature_processor.hpp b/software_renderer/feature_processor.hpp index b8c1cf431b..e888f8c516 100644 --- a/drape_frontend/watch/feature_processor.hpp +++ b/software_renderer/feature_processor.hpp @@ -1,8 +1,8 @@ #pragma once -#include "drape_frontend/watch/feature_styler.hpp" -#include "drape_frontend/watch/area_info.hpp" -#include "drape_frontend/watch/path_info.hpp" +#include "software_renderer/feature_styler.hpp" +#include "software_renderer/area_info.hpp" +#include "software_renderer/path_info.hpp" #include "drape/pointers.hpp" @@ -17,9 +17,7 @@ class ScreenBase; -namespace df -{ -namespace watch +namespace software_renderer { struct FeatureData @@ -56,4 +54,3 @@ private: }; } -} diff --git a/drape_frontend/watch/feature_styler.cpp b/software_renderer/feature_styler.cpp index c0f29ffbc7..afb624056a 100644 --- a/drape_frontend/watch/feature_styler.cpp +++ b/software_renderer/feature_styler.cpp @@ -1,7 +1,7 @@ -#include "drape_frontend/watch/feature_styler.hpp" -#include "drape_frontend/watch/proto_to_styles.hpp" -#include "drape_frontend/watch/glyph_cache.hpp" -#include "drape_frontend/watch/geometry_processors.hpp" +#include "software_renderer/feature_styler.hpp" +#include "software_renderer/proto_to_styles.hpp" +#include "software_renderer/glyph_cache.hpp" +#include "software_renderer/geometry_processors.hpp" #include "indexer/drawing_rules.hpp" #include "indexer/feature.hpp" @@ -22,7 +22,7 @@ namespace struct less_depth { - bool operator() (df::watch::DrawRule const & r1, df::watch::DrawRule const & r2) const + bool operator() (software_renderer::DrawRule const & r1, software_renderer::DrawRule const & r2) const { return (r1.m_depth < r2.m_depth); } @@ -30,9 +30,7 @@ struct less_depth } -namespace df -{ -namespace watch +namespace software_renderer { DrawRule::DrawRule(drule::BaseRule const * p, double depth) : m_rule(p) @@ -408,4 +406,3 @@ bool FeatureStyler::FilterTextSize(drule::BaseRule const * pRule) const } } -} diff --git a/drape_frontend/watch/feature_styler.hpp b/software_renderer/feature_styler.hpp index 3510559eb1..0b736c77ab 100644 --- a/drape_frontend/watch/feature_styler.hpp +++ b/software_renderer/feature_styler.hpp @@ -9,9 +9,7 @@ class FeatureType; class ScreenBase; -namespace df -{ -namespace watch +namespace software_renderer { const int maxDepth = 20000; @@ -82,4 +80,3 @@ private: }; } -} diff --git a/drape_frontend/watch/frame_image.hpp b/software_renderer/frame_image.hpp index 373b7aff55..a9ab458080 100644 --- a/drape_frontend/watch/frame_image.hpp +++ b/software_renderer/frame_image.hpp @@ -5,9 +5,7 @@ #include "std/cstdint.hpp" #include "std/vector.hpp" -namespace df -{ -namespace watch +namespace software_renderer { struct FrameSymbols @@ -29,4 +27,3 @@ struct FrameImage }; } -} diff --git a/drape_frontend/watch/geometry_processors.cpp b/software_renderer/geometry_processors.cpp index af5ac7d7fe..2486dc2d52 100644 --- a/drape_frontend/watch/geometry_processors.cpp +++ b/software_renderer/geometry_processors.cpp @@ -2,9 +2,7 @@ #include "std/bind.hpp" -namespace df -{ -namespace watch +namespace software_renderer { base_screen::base_screen(params const & p) @@ -276,4 +274,3 @@ bool area_tess_points::IsExist() const } } -} diff --git a/drape_frontend/watch/geometry_processors.hpp b/software_renderer/geometry_processors.hpp index d3cc24b6ea..7f17e63e90 100644 --- a/drape_frontend/watch/geometry_processors.hpp +++ b/software_renderer/geometry_processors.hpp @@ -17,9 +17,7 @@ class ScreenBase; -namespace df -{ -namespace watch +namespace software_renderer { /// @name Base class policies (use by inheritance) for points processing. @@ -343,4 +341,3 @@ public: }; } -} diff --git a/drape_frontend/watch/glyph_cache.cpp b/software_renderer/glyph_cache.cpp index 4143e03668..b8bcc22673 100644 --- a/drape_frontend/watch/glyph_cache.cpp +++ b/software_renderer/glyph_cache.cpp @@ -1,9 +1,7 @@ -#include "drape_frontend/watch/glyph_cache.hpp" -#include "drape_frontend/watch/glyph_cache_impl.hpp" +#include "software_renderer/glyph_cache.hpp" +#include "software_renderer/glyph_cache_impl.hpp" -namespace df -{ -namespace watch +namespace software_renderer { GlyphKey::GlyphKey(strings::UniChar symbolCode, @@ -97,4 +95,3 @@ double GlyphCache::getTextLength(double fontSize, string const & text) } } -} diff --git a/drape_frontend/watch/glyph_cache.hpp b/software_renderer/glyph_cache.hpp index 51af909178..3756569234 100644 --- a/drape_frontend/watch/glyph_cache.hpp +++ b/software_renderer/glyph_cache.hpp @@ -9,9 +9,7 @@ #include "std/string.hpp" #include "std/utility.hpp" -namespace df -{ -namespace watch +namespace software_renderer { /// metrics of the single glyph @@ -94,4 +92,3 @@ public: }; } -} diff --git a/drape_frontend/watch/glyph_cache_impl.cpp b/software_renderer/glyph_cache_impl.cpp index 29a5e905d1..92e6b44fb0 100644 --- a/drape_frontend/watch/glyph_cache_impl.cpp +++ b/software_renderer/glyph_cache_impl.cpp @@ -1,4 +1,4 @@ -#include "drape_frontend/watch/glyph_cache_impl.hpp" +#include "software_renderer/glyph_cache_impl.hpp" #include "platform/platform.hpp" @@ -15,9 +15,7 @@ #define FREETYPE_CHECK(x) x #define FREETYPE_CHECK_RETURN(x, msg) FREETYPE_CHECK(x) -namespace df -{ -namespace watch +namespace software_renderer { UnicodeBlock::UnicodeBlock(string const & name, strings::UniChar start, strings::UniChar end) @@ -588,4 +586,3 @@ FT_Error GlyphCacheImpl::RequestFace(FTC_FaceID faceID, FT_Library library, FT_P } } -} diff --git a/drape_frontend/watch/glyph_cache_impl.hpp b/software_renderer/glyph_cache_impl.hpp index 395e99b237..e24bc69b6a 100644 --- a/drape_frontend/watch/glyph_cache_impl.hpp +++ b/software_renderer/glyph_cache_impl.hpp @@ -1,6 +1,6 @@ #pragma once -#include "drape_frontend/watch/glyph_cache.hpp" +#include "software_renderer/glyph_cache.hpp" #include <ft2build.h> #include FT_TYPES_H @@ -17,9 +17,7 @@ #include "std/vector.hpp" #include "std/shared_ptr.hpp" -namespace df -{ -namespace watch +namespace software_renderer { struct Font @@ -102,4 +100,3 @@ struct GlyphCacheImpl }; } -} diff --git a/drape_frontend/watch/icon_info.hpp b/software_renderer/icon_info.hpp index 69918fe6f1..23fdc83d4c 100644 --- a/drape_frontend/watch/icon_info.hpp +++ b/software_renderer/icon_info.hpp @@ -2,9 +2,7 @@ #include "std/string.hpp" -namespace df -{ -namespace watch +namespace software_renderer { struct IconInfo @@ -16,4 +14,3 @@ struct IconInfo }; } -} diff --git a/drape_frontend/watch/path_info.hpp b/software_renderer/path_info.hpp index 19c8c4c5ef..6d21e93535 100644 --- a/drape_frontend/watch/path_info.hpp +++ b/software_renderer/path_info.hpp @@ -6,9 +6,7 @@ #include "std/vector.hpp" #include "std/algorithm.hpp" -namespace df -{ -namespace watch +namespace software_renderer { class PathInfo @@ -93,9 +91,8 @@ public: }; } -} -inline void swap(df::watch::PathInfo & p1, df::watch::PathInfo & p2) +inline void swap(software_renderer::PathInfo & p1, software_renderer::PathInfo & p2) { p1.swap(p2); } diff --git a/drape_frontend/watch/pen_info.hpp b/software_renderer/pen_info.hpp index e81d7b51b7..9d49bf9282 100644 --- a/drape_frontend/watch/pen_info.hpp +++ b/software_renderer/pen_info.hpp @@ -1,6 +1,6 @@ #pragma once -#include "drape_frontend/watch/icon_info.hpp" +#include "software_renderer/icon_info.hpp" #include "drape/drape_global.hpp" @@ -10,9 +10,7 @@ #include "std/algorithm.hpp" #include "std/iterator.hpp" -namespace df -{ -namespace watch +namespace software_renderer { struct PenInfo @@ -122,4 +120,3 @@ struct PenInfo }; } -} diff --git a/drape_frontend/watch/point.h b/software_renderer/point.h index c2ca849958..c2ca849958 100644 --- a/drape_frontend/watch/point.h +++ b/software_renderer/point.h diff --git a/drape_frontend/watch/proto_to_styles.cpp b/software_renderer/proto_to_styles.cpp index 6ee723348c..e13841d2ba 100644 --- a/drape_frontend/watch/proto_to_styles.cpp +++ b/software_renderer/proto_to_styles.cpp @@ -15,9 +15,7 @@ double ConvertWidth(double w, double scale) } -namespace df -{ -namespace watch +namespace software_renderer { dp::Color ConvertColor(uint32_t c) @@ -133,4 +131,3 @@ uint8_t GetFontSize(CaptionDefProto const * pSrc) } } -} diff --git a/drape_frontend/watch/proto_to_styles.hpp b/software_renderer/proto_to_styles.hpp index feb75548fd..a4dccb05ac 100644 --- a/drape_frontend/watch/proto_to_styles.hpp +++ b/software_renderer/proto_to_styles.hpp @@ -1,9 +1,9 @@ #pragma once -#include "drape_frontend/watch/pen_info.hpp" -#include "drape_frontend/watch/brush_info.hpp" -#include "drape_frontend/watch/icon_info.hpp" -#include "drape_frontend/watch/circle_info.hpp" +#include "software_renderer/pen_info.hpp" +#include "software_renderer/brush_info.hpp" +#include "software_renderer/icon_info.hpp" +#include "software_renderer/circle_info.hpp" #include "drape/drape_global.hpp" @@ -15,9 +15,7 @@ class SymbolRuleProto; class CaptionDefProto; class ShieldRuleProto; -namespace df -{ -namespace watch +namespace software_renderer { dp::Color ConvertColor(uint32_t c); @@ -31,4 +29,3 @@ void ConvertStyle(ShieldRuleProto const * pSrc, double scale, dp::FontDecl & des uint8_t GetFontSize(CaptionDefProto const * pSrc); } -} diff --git a/drape_frontend/watch/rect.h b/software_renderer/rect.h index 2a56b38b5c..2a56b38b5c 100644 --- a/drape_frontend/watch/rect.h +++ b/software_renderer/rect.h diff --git a/drape_frontend/watch/software_renderer.cpp b/software_renderer/software_renderer.cpp index e7d3f7ead3..7e720693a0 100644 --- a/drape_frontend/watch/software_renderer.cpp +++ b/software_renderer/software_renderer.cpp @@ -1,5 +1,5 @@ -#include "drape_frontend/watch/software_renderer.hpp" -#include "drape_frontend/watch/proto_to_styles.hpp" +#include "software_renderer/software_renderer.hpp" +#include "software_renderer/proto_to_styles.hpp" #include "drape/symbols_texture.hpp" #include "drape/texture_manager.hpp" @@ -29,9 +29,7 @@ #include "3party/stb_image/stb_image_write.h" -namespace df -{ -namespace watch +namespace software_renderer { #define BLENDER_TYPE agg::comp_op_src_over @@ -716,4 +714,3 @@ void PathWrapper::Render(SoftwareRenderer::TSolidRenderer & renderer, } } -} diff --git a/drape_frontend/watch/software_renderer.hpp b/software_renderer/software_renderer.hpp index 123503ee7a..a41a9fb5eb 100644 --- a/drape_frontend/watch/software_renderer.hpp +++ b/software_renderer/software_renderer.hpp @@ -1,14 +1,14 @@ #pragma once -#include "drape_frontend/watch/path_info.hpp" -#include "drape_frontend/watch/area_info.hpp" -#include "drape_frontend/watch/frame_image.hpp" -#include "drape_frontend/watch/text_engine.h" -#include "drape_frontend/watch/glyph_cache.hpp" -#include "drape_frontend/watch/icon_info.hpp" -#include "drape_frontend/watch/circle_info.hpp" -#include "drape_frontend/watch/pen_info.hpp" -#include "drape_frontend/watch/brush_info.hpp" +#include "software_renderer/path_info.hpp" +#include "software_renderer/area_info.hpp" +#include "software_renderer/frame_image.hpp" +#include "software_renderer/text_engine.h" +#include "software_renderer/glyph_cache.hpp" +#include "software_renderer/icon_info.hpp" +#include "software_renderer/circle_info.hpp" +#include "software_renderer/pen_info.hpp" +#include "software_renderer/brush_info.hpp" #include "drape/drape_global.hpp" @@ -27,9 +27,7 @@ #include "std/unique_ptr.hpp" #include "std/vector.hpp" -namespace df -{ -namespace watch +namespace software_renderer { class PathWrapper; @@ -175,4 +173,3 @@ private: }; } -} diff --git a/software_renderer/software_renderer.pro b/software_renderer/software_renderer.pro new file mode 100755 index 0000000000..101a82c703 --- /dev/null +++ b/software_renderer/software_renderer.pro @@ -0,0 +1,43 @@ +TARGET = software_renderer +TEMPLATE = lib +CONFIG += staticlib + +ROOT_DIR = .. +include($$ROOT_DIR/common.pri) + +INCLUDEPATH *= $$ROOT_DIR/3party/protobuf/protobuf/src +INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib +INCLUDEPATH *= $$ROOT_DIR/3party/freetype/include + +SOURCES += \ + cpu_drawer.cpp \ + software_renderer.cpp \ + proto_to_styles.cpp \ + text_engine.cpp \ + feature_styler.cpp \ + glyph_cache.cpp \ + glyph_cache_impl.cpp \ + geometry_processors.cpp \ + feature_processor.cpp \ + default_font.cpp \ + +HEADERS += \ + cpu_drawer.hpp \ + software_renderer.hpp \ + proto_to_styles.hpp \ + text_engine.h \ + point.h \ + rect.h \ + path_info.hpp \ + area_info.hpp \ + frame_image.hpp \ + feature_styler.hpp \ + glyph_cache.hpp \ + glyph_cache_impl.hpp \ + freetype.hpp \ + circle_info.hpp \ + pen_info.hpp \ + icon_info.hpp \ + brush_info.hpp \ + geometry_processors.hpp \ + feature_processor.hpp \ diff --git a/drape_frontend/watch/text_engine.cpp b/software_renderer/text_engine.cpp index c6ea397534..c6ea397534 100644 --- a/drape_frontend/watch/text_engine.cpp +++ b/software_renderer/text_engine.cpp diff --git a/drape_frontend/watch/text_engine.h b/software_renderer/text_engine.h index a38d49211e..a38d49211e 100644 --- a/drape_frontend/watch/text_engine.h +++ b/software_renderer/text_engine.h diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt index 50e68d1a05..cf504745bc 100644 --- a/storage/storage_integration_tests/CMakeLists.txt +++ b/storage/storage_integration_tests/CMakeLists.txt @@ -42,6 +42,7 @@ omim_link_libraries( freetype expat icu + agg jansson protobuf osrm diff --git a/storage/storage_integration_tests/storage_integration_tests.pro b/storage/storage_integration_tests/storage_integration_tests.pro index 2b87fcfed6..98381c425a 100644 --- a/storage/storage_integration_tests/storage_integration_tests.pro +++ b/storage/storage_integration_tests/storage_integration_tests.pro @@ -9,7 +9,7 @@ ROOT_DIR = ../.. DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common ugc indexer drape \ partners_api local_ads platform_tests_support platform editor opening_hours geometry \ coding base freetype expat jansson protobuf osrm stats_client \ - minizip succinct pugixml oauthcpp stb_image sdf_image icu + minizip succinct pugixml oauthcpp stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index 3c4c029a28..1ecd39928f 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -47,6 +47,7 @@ omim_link_libraries( freetype expat icu + agg jansson tess2 protobuf diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro index 2c91323149..970261c2d3 100644 --- a/storage/storage_tests/storage_tests.pro +++ b/storage/storage_tests/storage_tests.pro @@ -14,7 +14,7 @@ DEPENDENCIES = generator_tests_support generator DEPENDENCIES *= drape_frontend map routing traffic routing_common \ search storage indexer drape platform_tests_support platform editor opening_hours geometry \ coding base freetype expat jansson tess2 protobuf osrm stats_client \ - minizip succinct pugixml oauthcpp stb_image sdf_image icu + minizip succinct pugixml oauthcpp stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 2ff4da8625..1dbd7473ae 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -167,26 +167,6 @@ 6709484E1BDF9C48005014C0 /* shape.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948361BDF9C48005014C0 /* shape.hpp */; }; 6709484F1BDF9C48005014C0 /* skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948371BDF9C48005014C0 /* skin.cpp */; }; 670948501BDF9C48005014C0 /* skin.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948381BDF9C48005014C0 /* skin.hpp */; }; - 670948681BDF9C7F005014C0 /* agg_curves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948521BDF9C7F005014C0 /* agg_curves.cpp */; }; - 670948691BDF9C7F005014C0 /* area_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948531BDF9C7F005014C0 /* area_info.hpp */; }; - 6709486A1BDF9C7F005014C0 /* brush_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948541BDF9C7F005014C0 /* brush_info.hpp */; }; - 6709486B1BDF9C7F005014C0 /* circle_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948551BDF9C7F005014C0 /* circle_info.hpp */; }; - 6709486C1BDF9C7F005014C0 /* cpu_drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948561BDF9C7F005014C0 /* cpu_drawer.cpp */; }; - 6709486D1BDF9C7F005014C0 /* cpu_drawer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948571BDF9C7F005014C0 /* cpu_drawer.hpp */; }; - 6709486E1BDF9C7F005014C0 /* default_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948581BDF9C7F005014C0 /* default_font.cpp */; }; - 670948701BDF9C7F005014C0 /* feature_processor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709485A1BDF9C7F005014C0 /* feature_processor.hpp */; }; - 670948711BDF9C7F005014C0 /* feature_styler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709485B1BDF9C7F005014C0 /* feature_styler.cpp */; }; - 670948721BDF9C7F005014C0 /* feature_styler.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709485C1BDF9C7F005014C0 /* feature_styler.hpp */; }; - 670948731BDF9C7F005014C0 /* frame_image.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709485D1BDF9C7F005014C0 /* frame_image.hpp */; }; - 670948741BDF9C7F005014C0 /* geometry_processors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709485E1BDF9C7F005014C0 /* geometry_processors.cpp */; }; - 670948751BDF9C7F005014C0 /* geometry_processors.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709485F1BDF9C7F005014C0 /* geometry_processors.hpp */; }; - 670948771BDF9C7F005014C0 /* glyph_cache_impl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948611BDF9C7F005014C0 /* glyph_cache_impl.hpp */; }; - 670948781BDF9C7F005014C0 /* glyph_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948621BDF9C7F005014C0 /* glyph_cache.cpp */; }; - 670948791BDF9C7F005014C0 /* glyph_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948631BDF9C7F005014C0 /* glyph_cache.hpp */; }; - 6709487A1BDF9C7F005014C0 /* icon_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948641BDF9C7F005014C0 /* icon_info.hpp */; }; - 6709487B1BDF9C7F005014C0 /* path_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948651BDF9C7F005014C0 /* path_info.hpp */; }; - 6709487C1BDF9C7F005014C0 /* pen_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670948661BDF9C7F005014C0 /* pen_info.hpp */; }; - 6709487D1BDF9C7F005014C0 /* point.h in Headers */ = {isa = PBXBuildFile; fileRef = 670948671BDF9C7F005014C0 /* point.h */; }; 670E393A1C46C59000E9C0A6 /* batch_merge_helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E39361C46C59000E9C0A6 /* batch_merge_helper.cpp */; }; 670E393B1C46C59000E9C0A6 /* batch_merge_helper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670E39371C46C59000E9C0A6 /* batch_merge_helper.hpp */; }; 670E393C1C46C59000E9C0A6 /* color_constants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E39381C46C59000E9C0A6 /* color_constants.cpp */; }; @@ -196,17 +176,8 @@ 6743D36D1C3A9F090095054B /* arrow3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6743D3671C3A9F090095054B /* arrow3d.cpp */; }; 6743D36E1C3A9F090095054B /* arrow3d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6743D3681C3A9F090095054B /* arrow3d.hpp */; }; 675D21661BFB785900717E4F /* ruler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948331BDF9C48005014C0 /* ruler.cpp */; }; - 675D218C1BFB871D00717E4F /* proto_to_styles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D21851BFB871D00717E4F /* proto_to_styles.cpp */; }; - 675D218D1BFB871D00717E4F /* proto_to_styles.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675D21861BFB871D00717E4F /* proto_to_styles.hpp */; }; - 675D218E1BFB871D00717E4F /* rect.h in Headers */ = {isa = PBXBuildFile; fileRef = 675D21871BFB871D00717E4F /* rect.h */; }; - 675D218F1BFB871D00717E4F /* software_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D21881BFB871D00717E4F /* software_renderer.cpp */; }; - 675D21901BFB871D00717E4F /* software_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675D21891BFB871D00717E4F /* software_renderer.hpp */; }; - 675D21911BFB871D00717E4F /* text_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D218A1BFB871D00717E4F /* text_engine.cpp */; }; - 675D21921BFB871D00717E4F /* text_engine.h in Headers */ = {isa = PBXBuildFile; fileRef = 675D218B1BFB871D00717E4F /* text_engine.h */; }; 677A2DE51C0DD55D00635A00 /* requested_tiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677A2DE31C0DD55D00635A00 /* requested_tiles.cpp */; }; 677A2DE61C0DD55D00635A00 /* requested_tiles.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 677A2DE41C0DD55D00635A00 /* requested_tiles.hpp */; }; - 67E91C751BDFC85E005CEE88 /* feature_processor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948591BDF9C7F005014C0 /* feature_processor.cpp */; }; - 67E91C761BDFC85E005CEE88 /* glyph_cache_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670948601BDF9C7F005014C0 /* glyph_cache_impl.cpp */; }; 67E91C781BDFC85E005CEE88 /* area_shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947EA1BDF9BF5005014C0 /* area_shape.cpp */; }; 67E91C791BDFC85E005CEE88 /* base_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947EE1BDF9BF5005014C0 /* base_renderer.cpp */; }; 67E91C7B1BDFC85E005CEE88 /* my_position_controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947541BDF9BE0005014C0 /* my_position_controller.cpp */; }; @@ -459,28 +430,6 @@ 670948361BDF9C48005014C0 /* shape.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = shape.hpp; sourceTree = "<group>"; }; 670948371BDF9C48005014C0 /* skin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skin.cpp; sourceTree = "<group>"; }; 670948381BDF9C48005014C0 /* skin.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = skin.hpp; sourceTree = "<group>"; }; - 670948521BDF9C7F005014C0 /* agg_curves.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = agg_curves.cpp; sourceTree = "<group>"; }; - 670948531BDF9C7F005014C0 /* area_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = area_info.hpp; sourceTree = "<group>"; }; - 670948541BDF9C7F005014C0 /* brush_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = brush_info.hpp; sourceTree = "<group>"; }; - 670948551BDF9C7F005014C0 /* circle_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = circle_info.hpp; sourceTree = "<group>"; }; - 670948561BDF9C7F005014C0 /* cpu_drawer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_drawer.cpp; sourceTree = "<group>"; }; - 670948571BDF9C7F005014C0 /* cpu_drawer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cpu_drawer.hpp; sourceTree = "<group>"; }; - 670948581BDF9C7F005014C0 /* default_font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = default_font.cpp; sourceTree = "<group>"; }; - 670948591BDF9C7F005014C0 /* feature_processor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_processor.cpp; sourceTree = "<group>"; }; - 6709485A1BDF9C7F005014C0 /* feature_processor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_processor.hpp; sourceTree = "<group>"; }; - 6709485B1BDF9C7F005014C0 /* feature_styler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_styler.cpp; sourceTree = "<group>"; }; - 6709485C1BDF9C7F005014C0 /* feature_styler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_styler.hpp; sourceTree = "<group>"; }; - 6709485D1BDF9C7F005014C0 /* frame_image.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = frame_image.hpp; sourceTree = "<group>"; }; - 6709485E1BDF9C7F005014C0 /* geometry_processors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geometry_processors.cpp; sourceTree = "<group>"; }; - 6709485F1BDF9C7F005014C0 /* geometry_processors.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geometry_processors.hpp; sourceTree = "<group>"; }; - 670948601BDF9C7F005014C0 /* glyph_cache_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = glyph_cache_impl.cpp; sourceTree = "<group>"; }; - 670948611BDF9C7F005014C0 /* glyph_cache_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = glyph_cache_impl.hpp; sourceTree = "<group>"; }; - 670948621BDF9C7F005014C0 /* glyph_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = glyph_cache.cpp; sourceTree = "<group>"; }; - 670948631BDF9C7F005014C0 /* glyph_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = glyph_cache.hpp; sourceTree = "<group>"; }; - 670948641BDF9C7F005014C0 /* icon_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = icon_info.hpp; sourceTree = "<group>"; }; - 670948651BDF9C7F005014C0 /* path_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = path_info.hpp; sourceTree = "<group>"; }; - 670948661BDF9C7F005014C0 /* pen_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pen_info.hpp; sourceTree = "<group>"; }; - 670948671BDF9C7F005014C0 /* point.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = point.h; sourceTree = "<group>"; }; 670E39361C46C59000E9C0A6 /* batch_merge_helper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = batch_merge_helper.cpp; sourceTree = "<group>"; }; 670E39371C46C59000E9C0A6 /* batch_merge_helper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = batch_merge_helper.hpp; sourceTree = "<group>"; }; 670E39381C46C59000E9C0A6 /* color_constants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = color_constants.cpp; sourceTree = "<group>"; }; @@ -489,13 +438,6 @@ 672D24991E892768004BB7B1 /* overlays_tracker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = overlays_tracker.hpp; sourceTree = "<group>"; }; 6743D3671C3A9F090095054B /* arrow3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = arrow3d.cpp; sourceTree = "<group>"; }; 6743D3681C3A9F090095054B /* arrow3d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = arrow3d.hpp; sourceTree = "<group>"; }; - 675D21851BFB871D00717E4F /* proto_to_styles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = proto_to_styles.cpp; sourceTree = "<group>"; }; - 675D21861BFB871D00717E4F /* proto_to_styles.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = proto_to_styles.hpp; sourceTree = "<group>"; }; - 675D21871BFB871D00717E4F /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rect.h; sourceTree = "<group>"; }; - 675D21881BFB871D00717E4F /* software_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = software_renderer.cpp; sourceTree = "<group>"; }; - 675D21891BFB871D00717E4F /* software_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = software_renderer.hpp; sourceTree = "<group>"; }; - 675D218A1BFB871D00717E4F /* text_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text_engine.cpp; sourceTree = "<group>"; }; - 675D218B1BFB871D00717E4F /* text_engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_engine.h; sourceTree = "<group>"; }; 677A2DE31C0DD55D00635A00 /* requested_tiles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = requested_tiles.cpp; sourceTree = "<group>"; }; 677A2DE41C0DD55D00635A00 /* requested_tiles.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = requested_tiles.hpp; sourceTree = "<group>"; }; BB035F6D1E3A2AAE00519962 /* drape_measurer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drape_measurer.cpp; sourceTree = "<group>"; }; @@ -670,7 +612,6 @@ F6B2830D1C1B04680081957A /* gps_track_renderer.hpp */, 677A2DE31C0DD55D00635A00 /* requested_tiles.cpp */, 677A2DE41C0DD55D00635A00 /* requested_tiles.hpp */, - 670948511BDF9C5F005014C0 /* watch */, 670948061BDF9C15005014C0 /* gui */, 670948051BDF9C0D005014C0 /* animation */, 670947E81BDF9BF5005014C0 /* apply_feature_functors.cpp */, @@ -828,42 +769,6 @@ path = gui; sourceTree = "<group>"; }; - 670948511BDF9C5F005014C0 /* watch */ = { - isa = PBXGroup; - children = ( - 675D21851BFB871D00717E4F /* proto_to_styles.cpp */, - 675D21861BFB871D00717E4F /* proto_to_styles.hpp */, - 675D21871BFB871D00717E4F /* rect.h */, - 675D21881BFB871D00717E4F /* software_renderer.cpp */, - 675D21891BFB871D00717E4F /* software_renderer.hpp */, - 675D218A1BFB871D00717E4F /* text_engine.cpp */, - 675D218B1BFB871D00717E4F /* text_engine.h */, - 670948521BDF9C7F005014C0 /* agg_curves.cpp */, - 670948531BDF9C7F005014C0 /* area_info.hpp */, - 670948541BDF9C7F005014C0 /* brush_info.hpp */, - 670948551BDF9C7F005014C0 /* circle_info.hpp */, - 670948561BDF9C7F005014C0 /* cpu_drawer.cpp */, - 670948571BDF9C7F005014C0 /* cpu_drawer.hpp */, - 670948581BDF9C7F005014C0 /* default_font.cpp */, - 670948591BDF9C7F005014C0 /* feature_processor.cpp */, - 6709485A1BDF9C7F005014C0 /* feature_processor.hpp */, - 6709485B1BDF9C7F005014C0 /* feature_styler.cpp */, - 6709485C1BDF9C7F005014C0 /* feature_styler.hpp */, - 6709485D1BDF9C7F005014C0 /* frame_image.hpp */, - 6709485E1BDF9C7F005014C0 /* geometry_processors.cpp */, - 6709485F1BDF9C7F005014C0 /* geometry_processors.hpp */, - 670948601BDF9C7F005014C0 /* glyph_cache_impl.cpp */, - 670948611BDF9C7F005014C0 /* glyph_cache_impl.hpp */, - 670948621BDF9C7F005014C0 /* glyph_cache.cpp */, - 670948631BDF9C7F005014C0 /* glyph_cache.hpp */, - 670948641BDF9C7F005014C0 /* icon_info.hpp */, - 670948651BDF9C7F005014C0 /* path_info.hpp */, - 670948661BDF9C7F005014C0 /* pen_info.hpp */, - 670948671BDF9C7F005014C0 /* point.h */, - ); - path = watch; - sourceTree = "<group>"; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -877,13 +782,10 @@ EB2B78001EEDD418002697B6 /* metaline_manager.hpp in Headers */, 45580ABB1E28DB2600CD535D /* scenario_manager.hpp in Headers */, 670948031BDF9BF5005014C0 /* drape_engine.hpp in Headers */, - 6709486A1BDF9C7F005014C0 /* brush_info.hpp in Headers */, - 675D218E1BFB871D00717E4F /* rect.h in Headers */, 670948191BDF9C39005014C0 /* interpolations.hpp in Headers */, 456B3F9A1ED464FE009B3D1F /* postprocess_renderer.hpp in Headers */, 670947CB1BDF9BE1005014C0 /* threads_commutator.hpp in Headers */, 347F52121DC2334A0064B273 /* drape_api.hpp in Headers */, - 670948701BDF9C7F005014C0 /* feature_processor.hpp in Headers */, 452C9EDF1CEDCF3200A55E57 /* parallel_animation.hpp in Headers */, 670947A41BDF9BE1005014C0 /* my_position_controller.hpp in Headers */, 452C9ED91CEDCF3200A55E57 /* follow_animation.hpp in Headers */, @@ -891,7 +793,6 @@ 452C9ED51CEDCF3200A55E57 /* animation.hpp in Headers */, 45B4B8CE1CF5C16B00A54761 /* screen_operations.hpp in Headers */, 670947C71BDF9BE1005014C0 /* text_layout.hpp in Headers */, - 670948791BDF9C7F005014C0 /* glyph_cache.hpp in Headers */, 451A2A831EE8464E003E05A4 /* circles_pack_shape.hpp in Headers */, 670947FF1BDF9BF5005014C0 /* batchers_pool.hpp in Headers */, 670947C01BDF9BE1005014C0 /* selection_shape.hpp in Headers */, @@ -903,7 +804,6 @@ 670E393D1C46C59000E9C0A6 /* color_constants.hpp in Headers */, 34C624C41DABDB0400510300 /* traffic_generator.hpp in Headers */, 347F520E1DC2334A0064B273 /* drape_api_builder.hpp in Headers */, - 670948721BDF9C7F005014C0 /* feature_styler.hpp in Headers */, 6709484E1BDF9C48005014C0 /* shape.hpp in Headers */, 452C9EE31CEDCF3200A55E57 /* scale_animation.hpp in Headers */, F6B283101C1B04680081957A /* gps_track_point.hpp in Headers */, @@ -912,8 +812,6 @@ 670947AE1BDF9BE1005014C0 /* poi_symbol_shape.hpp in Headers */, 670947AA1BDF9BE1005014C0 /* path_symbol_shape.hpp in Headers */, 6709483E1BDF9C48005014C0 /* copyright_label.hpp in Headers */, - 675D21921BFB871D00717E4F /* text_engine.h in Headers */, - 675D218D1BFB871D00717E4F /* proto_to_styles.hpp in Headers */, 670947951BDF9BE1005014C0 /* line_shape_helper.hpp in Headers */, EB2B78041EEDD439002697B6 /* read_metaline_task.hpp in Headers */, 670948501BDF9C48005014C0 /* skin.hpp in Headers */, @@ -926,11 +824,8 @@ 670948461BDF9C48005014C0 /* gui_text.hpp in Headers */, 670947E51BDF9BEC005014C0 /* engine_context.hpp in Headers */, 670947BE1BDF9BE1005014C0 /* rule_drawer.hpp in Headers */, - 6709487C1BDF9C7F005014C0 /* pen_info.hpp in Headers */, - 6709487D1BDF9C7F005014C0 /* point.h in Headers */, 6709479A1BDF9BE1005014C0 /* map_shape.hpp in Headers */, 672D249B1E892768004BB7B1 /* overlays_tracker.hpp in Headers */, - 670948731BDF9C7F005014C0 /* frame_image.hpp in Headers */, 347F52101DC2334A0064B273 /* drape_api_renderer.hpp in Headers */, 3492DA0F1CA2D9BF00C1F3B3 /* animation_utils.hpp in Headers */, 670947FB1BDF9BF5005014C0 /* backend_renderer.hpp in Headers */, @@ -952,7 +847,6 @@ 670947E71BDF9BEC005014C0 /* frontend_renderer.hpp in Headers */, 670947F71BDF9BF5005014C0 /* apply_feature_functors.hpp in Headers */, 670947CD1BDF9BE1005014C0 /* tile_info.hpp in Headers */, - 6709486B1BDF9C7F005014C0 /* circle_info.hpp in Headers */, 670947C31BDF9BE1005014C0 /* stylist.hpp in Headers */, 670948481BDF9C48005014C0 /* layer_render.hpp in Headers */, 670947AC1BDF9BE1005014C0 /* path_text_shape.hpp in Headers */, @@ -966,7 +860,6 @@ 670947B41BDF9BE1005014C0 /* render_group.hpp in Headers */, BB7D67D41F34A62C002FD122 /* path_text_handle.hpp in Headers */, 452C9EE51CEDCF3200A55E57 /* sequence_animation.hpp in Headers */, - 670948771BDF9C7F005014C0 /* glyph_cache_impl.hpp in Headers */, 670947A11BDF9BE1005014C0 /* message_subclasses.hpp in Headers */, BBD9E2D41F009D9E00DF189A /* user_mark_generator.hpp in Headers */, 670947C51BDF9BE1005014C0 /* text_handle.hpp in Headers */, @@ -977,18 +870,12 @@ 6743D36E1C3A9F090095054B /* arrow3d.hpp in Headers */, 670947B81BDF9BE1005014C0 /* route_builder.hpp in Headers */, 45B4B8CC1CF5C16B00A54761 /* screen_animations.hpp in Headers */, - 670948751BDF9C7F005014C0 /* geometry_processors.hpp in Headers */, - 6709487A1BDF9C7F005014C0 /* icon_info.hpp in Headers */, 670948151BDF9C39005014C0 /* base_interpolator.hpp in Headers */, BB035F701E3A2AAE00519962 /* drape_measurer.hpp in Headers */, 670947A61BDF9BE1005014C0 /* my_position.hpp in Headers */, - 675D21901BFB871D00717E4F /* software_renderer.hpp in Headers */, 670947A81BDF9BE1005014C0 /* navigator.hpp in Headers */, 34C624C61DABDB0400510300 /* traffic_renderer.hpp in Headers */, 670947A21BDF9BE1005014C0 /* message.hpp in Headers */, - 6709487B1BDF9C7F005014C0 /* path_info.hpp in Headers */, - 6709486D1BDF9C7F005014C0 /* cpu_drawer.hpp in Headers */, - 670948691BDF9C7F005014C0 /* area_info.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1066,13 +953,11 @@ buildActionMask = 2147483647; files = ( 56BF56DA1C7608C0006DD7CB /* choose_position_mark.cpp in Sources */, - 67E91C751BDFC85E005CEE88 /* feature_processor.cpp in Sources */, 6743D36D1C3A9F090095054B /* arrow3d.cpp in Sources */, BBD9E2D31F009D9E00DF189A /* user_mark_generator.cpp in Sources */, 670E393A1C46C59000E9C0A6 /* batch_merge_helper.cpp in Sources */, 452C9EDA1CEDCF3200A55E57 /* interpolators.cpp in Sources */, 451A2A821EE8464E003E05A4 /* circles_pack_shape.cpp in Sources */, - 67E91C761BDFC85E005CEE88 /* glyph_cache_impl.cpp in Sources */, 67E91C781BDFC85E005CEE88 /* area_shape.cpp in Sources */, 67E91C791BDFC85E005CEE88 /* base_renderer.cpp in Sources */, 452C9ED61CEDCF3200A55E57 /* arrow_animation.cpp in Sources */, @@ -1081,9 +966,7 @@ 67E91C7C1BDFC85E005CEE88 /* selection_shape.cpp in Sources */, 67E91C7D1BDFC85E005CEE88 /* user_marks_provider.cpp in Sources */, 67E91C7E1BDFC85E005CEE88 /* visual_params.cpp in Sources */, - 6709486E1BDF9C7F005014C0 /* default_font.cpp in Sources */, 675D21661BFB785900717E4F /* ruler.cpp in Sources */, - 675D218F1BFB871D00717E4F /* software_renderer.cpp in Sources */, 452C9EE21CEDCF3200A55E57 /* scale_animation.cpp in Sources */, 670947CE1BDF9BE1005014C0 /* tile_key.cpp in Sources */, 670947AB1BDF9BE1005014C0 /* path_text_shape.cpp in Sources */, @@ -1098,15 +981,11 @@ 453EEA6D1E3A28F400505E09 /* colored_symbol_shape.cpp in Sources */, 670947921BDF9BE1005014C0 /* kinetic_scroller.cpp in Sources */, 6709484D1BDF9C48005014C0 /* shape.cpp in Sources */, - 675D218C1BFB871D00717E4F /* proto_to_styles.cpp in Sources */, - 670948781BDF9C7F005014C0 /* glyph_cache.cpp in Sources */, 670948431BDF9C48005014C0 /* drape_gui.cpp in Sources */, 670947D61BDF9BE1005014C0 /* user_event_stream.cpp in Sources */, 452C9EDE1CEDCF3200A55E57 /* parallel_animation.cpp in Sources */, 670947B11BDF9BE1005014C0 /* read_mwm_task.cpp in Sources */, - 670948711BDF9C7F005014C0 /* feature_styler.cpp in Sources */, 670948471BDF9C48005014C0 /* layer_render.cpp in Sources */, - 6709486C1BDF9C7F005014C0 /* cpu_drawer.cpp in Sources */, 670947C41BDF9BE1005014C0 /* text_handle.cpp in Sources */, 670947BD1BDF9BE1005014C0 /* rule_drawer.cpp in Sources */, 6709481E1BDF9C39005014C0 /* show_hide_animation.cpp in Sources */, @@ -1119,7 +998,6 @@ 670947CC1BDF9BE1005014C0 /* tile_info.cpp in Sources */, 34C624C51DABDB0400510300 /* traffic_renderer.cpp in Sources */, 670947961BDF9BE1005014C0 /* line_shape.cpp in Sources */, - 670948681BDF9C7F005014C0 /* agg_curves.cpp in Sources */, 670947A91BDF9BE1005014C0 /* path_symbol_shape.cpp in Sources */, 670947FA1BDF9BF5005014C0 /* backend_renderer.cpp in Sources */, 45BB025D1EB8BE5200FE5C0C /* shader_def.cpp in Sources */, @@ -1133,7 +1011,6 @@ 670947AF1BDF9BE1005014C0 /* read_manager.cpp in Sources */, 670947941BDF9BE1005014C0 /* line_shape_helper.cpp in Sources */, 670947C21BDF9BE1005014C0 /* stylist.cpp in Sources */, - 670948741BDF9C7F005014C0 /* geometry_processors.cpp in Sources */, 670947AD1BDF9BE1005014C0 /* poi_symbol_shape.cpp in Sources */, 6709479F1BDF9BE1005014C0 /* message_queue.cpp in Sources */, 452C9EE41CEDCF3200A55E57 /* sequence_animation.cpp in Sources */, @@ -1147,7 +1024,6 @@ 453FEDAC1F34C257005C1BB4 /* render_state.cpp in Sources */, 45B4B8CD1CF5C16B00A54761 /* screen_operations.cpp in Sources */, 670947B31BDF9BE1005014C0 /* render_group.cpp in Sources */, - 675D21911BFB871D00717E4F /* text_engine.cpp in Sources */, 347F52111DC2334A0064B273 /* drape_api.cpp in Sources */, 347F520F1DC2334A0064B273 /* drape_api_renderer.cpp in Sources */, 347F520D1DC2334A0064B273 /* drape_api_builder.cpp in Sources */, diff --git a/xcode/mapshot/mapshot.xcodeproj/project.pbxproj b/xcode/mapshot/mapshot.xcodeproj/project.pbxproj index a981251d17..c91aca539b 100644 --- a/xcode/mapshot/mapshot.xcodeproj/project.pbxproj +++ b/xcode/mapshot/mapshot.xcodeproj/project.pbxproj @@ -12,6 +12,8 @@ 346B76D51DC1ED4D00C7C87E /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 346B76D41DC1ED4D00C7C87E /* libpugixml.a */; }; 346B76D71DC1ED5D00C7C87E /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 346B76D61DC1ED5D00C7C87E /* liboauthcpp.a */; }; 346B76D91DC1ED7A00C7C87E /* libtracking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 346B76D81DC1ED7A00C7C87E /* libtracking.a */; }; + 453FEE221F35E87B005C1BB4 /* libsoftware_renderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 453FEE211F35E87B005C1BB4 /* libsoftware_renderer.a */; }; + 453FEE241F35E8C1005C1BB4 /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 453FEE231F35E8C1005C1BB4 /* libagg.a */; }; 675D213D1BFB717400717E4F /* mapshot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D213C1BFB717400717E4F /* mapshot.cpp */; }; 675D21411BFB76B000717E4F /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675D213E1BFB76B000717E4F /* libbase.a */; }; 675D21431BFB76B000717E4F /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675D21401BFB76B000717E4F /* libmap.a */; }; @@ -65,6 +67,8 @@ 346B76D81DC1ED7A00C7C87E /* libtracking.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtracking.a; path = "../../../omim-build/xcode/Debug/libtracking.a"; sourceTree = "<group>"; }; 3475E0DF1DBF57AC004C7E69 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; }; 3475E0E01DBF57AC004C7E69 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; }; + 453FEE211F35E87B005C1BB4 /* libsoftware_renderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsoftware_renderer.a; path = ../software_renderer/build/Debug/libsoftware_renderer.a; sourceTree = "<group>"; }; + 453FEE231F35E8C1005C1BB4 /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = ../agg/build/Release/libagg.a; sourceTree = "<group>"; }; 675D21311BFB6F3D00717E4F /* mapshot */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mapshot; sourceTree = BUILT_PRODUCTS_DIR; }; 675D213C1BFB717400717E4F /* mapshot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mapshot.cpp; sourceTree = "<group>"; }; 675D213E1BFB76B000717E4F /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<group>"; }; @@ -104,6 +108,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 453FEE241F35E8C1005C1BB4 /* libagg.a in Frameworks */, + 453FEE221F35E87B005C1BB4 /* libsoftware_renderer.a in Frameworks */, 346B76D91DC1ED7A00C7C87E /* libtracking.a in Frameworks */, 346B76D71DC1ED5D00C7C87E /* liboauthcpp.a in Frameworks */, 346B76D51DC1ED4D00C7C87E /* libpugixml.a in Frameworks */, @@ -148,6 +154,8 @@ 346B76CF1DC1ED0B00C7C87E /* Frameworks */ = { isa = PBXGroup; children = ( + 453FEE231F35E8C1005C1BB4 /* libagg.a */, + 453FEE211F35E87B005C1BB4 /* libsoftware_renderer.a */, 346B76D81DC1ED7A00C7C87E /* libtracking.a */, 346B76D61DC1ED5D00C7C87E /* liboauthcpp.a */, 346B76D41DC1ED4D00C7C87E /* libpugixml.a */, diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 51d11ecb37..33504aa5c8 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -311,6 +311,9 @@ location = "group:ugc/ugc.xcodeproj"> </FileRef> <FileRef + location = "group:software_renderer/software_renderer.xcodeproj"> + </FileRef> + <FileRef location = "container:../iphone/Maps/Maps.xcodeproj"> </FileRef> </Workspace> diff --git a/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj b/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..13dd5ea2ca --- /dev/null +++ b/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj @@ -0,0 +1,379 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 453FEE041F35E7E6005C1BB4 /* agg_curves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDE61F35E7E5005C1BB4 /* agg_curves.cpp */; }; + 453FEE051F35E7E6005C1BB4 /* area_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDE71F35E7E5005C1BB4 /* area_info.hpp */; }; + 453FEE061F35E7E6005C1BB4 /* brush_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDE81F35E7E5005C1BB4 /* brush_info.hpp */; }; + 453FEE071F35E7E6005C1BB4 /* circle_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDE91F35E7E5005C1BB4 /* circle_info.hpp */; }; + 453FEE081F35E7E6005C1BB4 /* cpu_drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDEB1F35E7E5005C1BB4 /* cpu_drawer.cpp */; }; + 453FEE091F35E7E6005C1BB4 /* cpu_drawer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDEC1F35E7E5005C1BB4 /* cpu_drawer.hpp */; }; + 453FEE0A1F35E7E6005C1BB4 /* default_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDED1F35E7E5005C1BB4 /* default_font.cpp */; }; + 453FEE0B1F35E7E6005C1BB4 /* feature_processor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDEE1F35E7E5005C1BB4 /* feature_processor.cpp */; }; + 453FEE0C1F35E7E6005C1BB4 /* feature_processor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDEF1F35E7E5005C1BB4 /* feature_processor.hpp */; }; + 453FEE0D1F35E7E6005C1BB4 /* feature_styler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDF01F35E7E5005C1BB4 /* feature_styler.cpp */; }; + 453FEE0E1F35E7E6005C1BB4 /* feature_styler.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDF11F35E7E5005C1BB4 /* feature_styler.hpp */; }; + 453FEE0F1F35E7E6005C1BB4 /* frame_image.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDF21F35E7E5005C1BB4 /* frame_image.hpp */; }; + 453FEE101F35E7E6005C1BB4 /* geometry_processors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDF31F35E7E5005C1BB4 /* geometry_processors.cpp */; }; + 453FEE111F35E7E6005C1BB4 /* geometry_processors.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDF41F35E7E5005C1BB4 /* geometry_processors.hpp */; }; + 453FEE121F35E7E6005C1BB4 /* glyph_cache_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDF51F35E7E5005C1BB4 /* glyph_cache_impl.cpp */; }; + 453FEE131F35E7E6005C1BB4 /* glyph_cache_impl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDF61F35E7E5005C1BB4 /* glyph_cache_impl.hpp */; }; + 453FEE141F35E7E6005C1BB4 /* glyph_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDF71F35E7E5005C1BB4 /* glyph_cache.cpp */; }; + 453FEE151F35E7E6005C1BB4 /* glyph_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDF81F35E7E5005C1BB4 /* glyph_cache.hpp */; }; + 453FEE161F35E7E6005C1BB4 /* icon_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDF91F35E7E5005C1BB4 /* icon_info.hpp */; }; + 453FEE171F35E7E6005C1BB4 /* path_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDFA1F35E7E5005C1BB4 /* path_info.hpp */; }; + 453FEE181F35E7E6005C1BB4 /* pen_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDFB1F35E7E5005C1BB4 /* pen_info.hpp */; }; + 453FEE191F35E7E6005C1BB4 /* point.h in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDFC1F35E7E5005C1BB4 /* point.h */; }; + 453FEE1A1F35E7E6005C1BB4 /* proto_to_styles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEDFD1F35E7E5005C1BB4 /* proto_to_styles.cpp */; }; + 453FEE1B1F35E7E6005C1BB4 /* proto_to_styles.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDFE1F35E7E5005C1BB4 /* proto_to_styles.hpp */; }; + 453FEE1C1F35E7E6005C1BB4 /* rect.h in Headers */ = {isa = PBXBuildFile; fileRef = 453FEDFF1F35E7E5005C1BB4 /* rect.h */; }; + 453FEE1D1F35E7E6005C1BB4 /* software_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEE001F35E7E5005C1BB4 /* software_renderer.cpp */; }; + 453FEE1E1F35E7E6005C1BB4 /* software_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 453FEE011F35E7E5005C1BB4 /* software_renderer.hpp */; }; + 453FEE1F1F35E7E6005C1BB4 /* text_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 453FEE021F35E7E6005C1BB4 /* text_engine.cpp */; }; + 453FEE201F35E7E6005C1BB4 /* text_engine.h in Headers */ = {isa = PBXBuildFile; fileRef = 453FEE031F35E7E6005C1BB4 /* text_engine.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 453FEDD51F35E647005C1BB4 /* libsoftware_renderer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsoftware_renderer.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 453FEDE31F35E6E4005C1BB4 /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; }; + 453FEDE41F35E6E4005C1BB4 /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; }; + 453FEDE61F35E7E5005C1BB4 /* agg_curves.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = agg_curves.cpp; sourceTree = "<group>"; }; + 453FEDE71F35E7E5005C1BB4 /* area_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = area_info.hpp; sourceTree = "<group>"; }; + 453FEDE81F35E7E5005C1BB4 /* brush_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = brush_info.hpp; sourceTree = "<group>"; }; + 453FEDE91F35E7E5005C1BB4 /* circle_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = circle_info.hpp; sourceTree = "<group>"; }; + 453FEDEB1F35E7E5005C1BB4 /* cpu_drawer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_drawer.cpp; sourceTree = "<group>"; }; + 453FEDEC1F35E7E5005C1BB4 /* cpu_drawer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cpu_drawer.hpp; sourceTree = "<group>"; }; + 453FEDED1F35E7E5005C1BB4 /* default_font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = default_font.cpp; sourceTree = "<group>"; }; + 453FEDEE1F35E7E5005C1BB4 /* feature_processor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_processor.cpp; sourceTree = "<group>"; }; + 453FEDEF1F35E7E5005C1BB4 /* feature_processor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_processor.hpp; sourceTree = "<group>"; }; + 453FEDF01F35E7E5005C1BB4 /* feature_styler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_styler.cpp; sourceTree = "<group>"; }; + 453FEDF11F35E7E5005C1BB4 /* feature_styler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_styler.hpp; sourceTree = "<group>"; }; + 453FEDF21F35E7E5005C1BB4 /* frame_image.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = frame_image.hpp; sourceTree = "<group>"; }; + 453FEDF31F35E7E5005C1BB4 /* geometry_processors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geometry_processors.cpp; sourceTree = "<group>"; }; + 453FEDF41F35E7E5005C1BB4 /* geometry_processors.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geometry_processors.hpp; sourceTree = "<group>"; }; + 453FEDF51F35E7E5005C1BB4 /* glyph_cache_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = glyph_cache_impl.cpp; sourceTree = "<group>"; }; + 453FEDF61F35E7E5005C1BB4 /* glyph_cache_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = glyph_cache_impl.hpp; sourceTree = "<group>"; }; + 453FEDF71F35E7E5005C1BB4 /* glyph_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = glyph_cache.cpp; sourceTree = "<group>"; }; + 453FEDF81F35E7E5005C1BB4 /* glyph_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = glyph_cache.hpp; sourceTree = "<group>"; }; + 453FEDF91F35E7E5005C1BB4 /* icon_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = icon_info.hpp; sourceTree = "<group>"; }; + 453FEDFA1F35E7E5005C1BB4 /* path_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = path_info.hpp; sourceTree = "<group>"; }; + 453FEDFB1F35E7E5005C1BB4 /* pen_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pen_info.hpp; sourceTree = "<group>"; }; + 453FEDFC1F35E7E5005C1BB4 /* point.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = point.h; sourceTree = "<group>"; }; + 453FEDFD1F35E7E5005C1BB4 /* proto_to_styles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = proto_to_styles.cpp; sourceTree = "<group>"; }; + 453FEDFE1F35E7E5005C1BB4 /* proto_to_styles.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = proto_to_styles.hpp; sourceTree = "<group>"; }; + 453FEDFF1F35E7E5005C1BB4 /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rect.h; sourceTree = "<group>"; }; + 453FEE001F35E7E5005C1BB4 /* software_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = software_renderer.cpp; sourceTree = "<group>"; }; + 453FEE011F35E7E5005C1BB4 /* software_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = software_renderer.hpp; sourceTree = "<group>"; }; + 453FEE021F35E7E6005C1BB4 /* text_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text_engine.cpp; sourceTree = "<group>"; }; + 453FEE031F35E7E6005C1BB4 /* text_engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_engine.h; sourceTree = "<group>"; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 453FEDD21F35E647005C1BB4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 453FEDCC1F35E647005C1BB4 = { + isa = PBXGroup; + children = ( + 453FEDE31F35E6E4005C1BB4 /* common-debug.xcconfig */, + 453FEDE41F35E6E4005C1BB4 /* common-release.xcconfig */, + 453FEDE51F35E7A0005C1BB4 /* software_renderer */, + 453FEDD61F35E647005C1BB4 /* Products */, + ); + sourceTree = "<group>"; + }; + 453FEDD61F35E647005C1BB4 /* Products */ = { + isa = PBXGroup; + children = ( + 453FEDD51F35E647005C1BB4 /* libsoftware_renderer.a */, + ); + name = Products; + sourceTree = "<group>"; + }; + 453FEDE51F35E7A0005C1BB4 /* software_renderer */ = { + isa = PBXGroup; + children = ( + 453FEDE61F35E7E5005C1BB4 /* agg_curves.cpp */, + 453FEDE71F35E7E5005C1BB4 /* area_info.hpp */, + 453FEDE81F35E7E5005C1BB4 /* brush_info.hpp */, + 453FEDE91F35E7E5005C1BB4 /* circle_info.hpp */, + 453FEDEB1F35E7E5005C1BB4 /* cpu_drawer.cpp */, + 453FEDEC1F35E7E5005C1BB4 /* cpu_drawer.hpp */, + 453FEDED1F35E7E5005C1BB4 /* default_font.cpp */, + 453FEDEE1F35E7E5005C1BB4 /* feature_processor.cpp */, + 453FEDEF1F35E7E5005C1BB4 /* feature_processor.hpp */, + 453FEDF01F35E7E5005C1BB4 /* feature_styler.cpp */, + 453FEDF11F35E7E5005C1BB4 /* feature_styler.hpp */, + 453FEDF21F35E7E5005C1BB4 /* frame_image.hpp */, + 453FEDF31F35E7E5005C1BB4 /* geometry_processors.cpp */, + 453FEDF41F35E7E5005C1BB4 /* geometry_processors.hpp */, + 453FEDF51F35E7E5005C1BB4 /* glyph_cache_impl.cpp */, + 453FEDF61F35E7E5005C1BB4 /* glyph_cache_impl.hpp */, + 453FEDF71F35E7E5005C1BB4 /* glyph_cache.cpp */, + 453FEDF81F35E7E5005C1BB4 /* glyph_cache.hpp */, + 453FEDF91F35E7E5005C1BB4 /* icon_info.hpp */, + 453FEDFA1F35E7E5005C1BB4 /* path_info.hpp */, + 453FEDFB1F35E7E5005C1BB4 /* pen_info.hpp */, + 453FEDFC1F35E7E5005C1BB4 /* point.h */, + 453FEDFD1F35E7E5005C1BB4 /* proto_to_styles.cpp */, + 453FEDFE1F35E7E5005C1BB4 /* proto_to_styles.hpp */, + 453FEDFF1F35E7E5005C1BB4 /* rect.h */, + 453FEE001F35E7E5005C1BB4 /* software_renderer.cpp */, + 453FEE011F35E7E5005C1BB4 /* software_renderer.hpp */, + 453FEE021F35E7E6005C1BB4 /* text_engine.cpp */, + 453FEE031F35E7E6005C1BB4 /* text_engine.h */, + ); + name = software_renderer; + path = ../../software_renderer; + sourceTree = "<group>"; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 453FEDD31F35E647005C1BB4 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 453FEE161F35E7E6005C1BB4 /* icon_info.hpp in Headers */, + 453FEE091F35E7E6005C1BB4 /* cpu_drawer.hpp in Headers */, + 453FEE051F35E7E6005C1BB4 /* area_info.hpp in Headers */, + 453FEE201F35E7E6005C1BB4 /* text_engine.h in Headers */, + 453FEE171F35E7E6005C1BB4 /* path_info.hpp in Headers */, + 453FEE151F35E7E6005C1BB4 /* glyph_cache.hpp in Headers */, + 453FEE181F35E7E6005C1BB4 /* pen_info.hpp in Headers */, + 453FEE0E1F35E7E6005C1BB4 /* feature_styler.hpp in Headers */, + 453FEE111F35E7E6005C1BB4 /* geometry_processors.hpp in Headers */, + 453FEE0F1F35E7E6005C1BB4 /* frame_image.hpp in Headers */, + 453FEE0C1F35E7E6005C1BB4 /* feature_processor.hpp in Headers */, + 453FEE1C1F35E7E6005C1BB4 /* rect.h in Headers */, + 453FEE1E1F35E7E6005C1BB4 /* software_renderer.hpp in Headers */, + 453FEE071F35E7E6005C1BB4 /* circle_info.hpp in Headers */, + 453FEE1B1F35E7E6005C1BB4 /* proto_to_styles.hpp in Headers */, + 453FEE191F35E7E6005C1BB4 /* point.h in Headers */, + 453FEE131F35E7E6005C1BB4 /* glyph_cache_impl.hpp in Headers */, + 453FEE061F35E7E6005C1BB4 /* brush_info.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 453FEDD41F35E647005C1BB4 /* software_renderer */ = { + isa = PBXNativeTarget; + buildConfigurationList = 453FEDE01F35E647005C1BB4 /* Build configuration list for PBXNativeTarget "software_renderer" */; + buildPhases = ( + 453FEDD11F35E647005C1BB4 /* Sources */, + 453FEDD21F35E647005C1BB4 /* Frameworks */, + 453FEDD31F35E647005C1BB4 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = software_renderer; + productName = software_renderer; + productReference = 453FEDD51F35E647005C1BB4 /* libsoftware_renderer.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 453FEDCD1F35E647005C1BB4 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0830; + ORGANIZATIONNAME = maps.me; + TargetAttributes = { + 453FEDD41F35E647005C1BB4 = { + CreatedOnToolsVersion = 8.3.3; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 453FEDD01F35E647005C1BB4 /* Build configuration list for PBXProject "software_renderer" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 453FEDCC1F35E647005C1BB4; + productRefGroup = 453FEDD61F35E647005C1BB4 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 453FEDD41F35E647005C1BB4 /* software_renderer */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 453FEDD11F35E647005C1BB4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 453FEE0A1F35E7E6005C1BB4 /* default_font.cpp in Sources */, + 453FEE121F35E7E6005C1BB4 /* glyph_cache_impl.cpp in Sources */, + 453FEE1A1F35E7E6005C1BB4 /* proto_to_styles.cpp in Sources */, + 453FEE0B1F35E7E6005C1BB4 /* feature_processor.cpp in Sources */, + 453FEE1F1F35E7E6005C1BB4 /* text_engine.cpp in Sources */, + 453FEE101F35E7E6005C1BB4 /* geometry_processors.cpp in Sources */, + 453FEE041F35E7E6005C1BB4 /* agg_curves.cpp in Sources */, + 453FEE0D1F35E7E6005C1BB4 /* feature_styler.cpp in Sources */, + 453FEE1D1F35E7E6005C1BB4 /* software_renderer.cpp in Sources */, + 453FEE081F35E7E6005C1BB4 /* cpu_drawer.cpp in Sources */, + 453FEE141F35E7E6005C1BB4 /* glyph_cache.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 453FEDDE1F35E647005C1BB4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.12; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 453FEDDF1F35E647005C1BB4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.12; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + }; + name = Release; + }; + 453FEDE11F35E647005C1BB4 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 453FEDE31F35E6E4005C1BB4 /* common-debug.xcconfig */; + buildSettings = { + EXECUTABLE_PREFIX = lib; + GCC_ENABLE_CPP_EXCEPTIONS = YES; + GCC_ENABLE_CPP_RTTI = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 453FEDE21F35E647005C1BB4 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 453FEDE41F35E6E4005C1BB4 /* common-release.xcconfig */; + buildSettings = { + EXECUTABLE_PREFIX = lib; + GCC_ENABLE_CPP_EXCEPTIONS = YES; + GCC_ENABLE_CPP_RTTI = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 453FEDD01F35E647005C1BB4 /* Build configuration list for PBXProject "software_renderer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 453FEDDE1F35E647005C1BB4 /* Debug */, + 453FEDDF1F35E647005C1BB4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 453FEDE01F35E647005C1BB4 /* Build configuration list for PBXNativeTarget "software_renderer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 453FEDE11F35E647005C1BB4 /* Debug */, + 453FEDE21F35E647005C1BB4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 453FEDCD1F35E647005C1BB4 /* Project object */; +} |