diff options
author | vng <viktor.govako@gmail.com> | 2015-05-21 13:58:06 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:48:13 +0300 |
commit | 9e8a13cb11f11660fd01b6bd3afcdd066cd60e94 (patch) | |
tree | f30855f04c23b552ee3e29a88b68cdc9d03d9586 | |
parent | b54187d51f880826c7814ae1f340d1c6551e21d9 (diff) |
Factor out all rendering routine from “map” to “render” library.
-rw-r--r-- | android/jni/Android.mk | 4 | ||||
-rw-r--r-- | drape_head/drape_head.pro | 2 | ||||
-rw-r--r-- | drape_head/drape_surface.hpp | 3 | ||||
-rw-r--r-- | iphone/Maps/Classes/EAGLView.mm | 2 | ||||
-rw-r--r-- | iphone/Maps/Maps.xcodeproj/project.pbxproj | 10 | ||||
-rw-r--r-- | iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm | 9 | ||||
-rw-r--r-- | map/framework.cpp | 25 | ||||
-rw-r--r-- | map/framework.hpp | 19 | ||||
-rw-r--r-- | map/information_display.cpp | 3 | ||||
-rw-r--r-- | map/map.pro | 57 | ||||
-rw-r--r-- | map/map_tests/map_tests.pro | 3 | ||||
-rw-r--r-- | map/mwm_url.cpp | 5 | ||||
-rw-r--r-- | map/mwm_url.hpp | 2 | ||||
-rw-r--r-- | map/navigator.hpp | 2 | ||||
-rw-r--r-- | map/navigator_utils.hpp | 5 | ||||
-rw-r--r-- | map/user_mark_container.cpp | 8 | ||||
-rw-r--r-- | map/user_mark_container.hpp | 7 | ||||
-rw-r--r-- | map_server/main.cpp | 5 | ||||
-rw-r--r-- | map_server/main.hpp | 4 | ||||
-rw-r--r-- | map_server/map_server.pro | 2 | ||||
-rw-r--r-- | omim.pro | 3 | ||||
-rw-r--r-- | qt/draw_widget.cpp | 5 | ||||
-rw-r--r-- | qt/draw_widget.hpp | 3 | ||||
-rw-r--r-- | qt/qt.pro | 2 | ||||
-rw-r--r-- | qt_tstfrm/tstwidgets.cpp | 2 | ||||
-rw-r--r-- | render/agg_curves.cpp (renamed from map/agg_curves.cpp) | 0 | ||||
-rw-r--r-- | render/area_info.hpp (renamed from map/area_info.hpp) | 0 | ||||
-rw-r--r-- | render/basic_tiling_render_policy.cpp (renamed from map/basic_tiling_render_policy.cpp) | 11 | ||||
-rw-r--r-- | render/basic_tiling_render_policy.hpp (renamed from map/basic_tiling_render_policy.hpp) | 2 | ||||
-rw-r--r-- | render/coverage_generator.cpp (renamed from map/coverage_generator.cpp) | 6 | ||||
-rw-r--r-- | render/coverage_generator.hpp (renamed from map/coverage_generator.hpp) | 8 | ||||
-rw-r--r-- | render/cpu_drawer.cpp (renamed from map/cpu_drawer.cpp) | 4 | ||||
-rw-r--r-- | render/cpu_drawer.hpp (renamed from map/cpu_drawer.hpp) | 6 | ||||
-rw-r--r-- | render/default_font.cpp (renamed from map/temp_text/default_font.cpp) | 0 | ||||
-rw-r--r-- | render/drawer.cpp (renamed from map/drawer.cpp) | 4 | ||||
-rw-r--r-- | render/drawer.hpp (renamed from map/drawer.hpp) | 0 | ||||
-rw-r--r-- | render/events.cpp (renamed from map/events.cpp) | 2 | ||||
-rw-r--r-- | render/events.hpp (renamed from map/events.hpp) | 5 | ||||
-rw-r--r-- | render/feature_info.cpp (renamed from map/feature_info.cpp) | 3 | ||||
-rw-r--r-- | render/feature_info.hpp (renamed from map/feature_info.hpp) | 6 | ||||
-rw-r--r-- | render/feature_processor.cpp (renamed from map/feature_processor.cpp) | 9 | ||||
-rw-r--r-- | render/feature_processor.hpp (renamed from map/feature_processor.hpp) | 2 | ||||
-rw-r--r-- | render/feature_styler.cpp (renamed from map/feature_styler.cpp) | 6 | ||||
-rw-r--r-- | render/feature_styler.hpp (renamed from map/feature_styler.hpp) | 0 | ||||
-rw-r--r-- | render/frame_image.hpp (renamed from map/frame_image.hpp) | 0 | ||||
-rw-r--r-- | render/geometry_processors.cpp (renamed from map/geometry_processors.cpp) | 2 | ||||
-rw-r--r-- | render/geometry_processors.hpp (renamed from map/geometry_processors.hpp) | 4 | ||||
-rw-r--r-- | render/gpu_drawer.cpp (renamed from map/gpu_drawer.cpp) | 10 | ||||
-rw-r--r-- | render/gpu_drawer.hpp (renamed from map/gpu_drawer.hpp) | 2 | ||||
-rw-r--r-- | render/path_info.hpp (renamed from map/path_info.hpp) | 0 | ||||
-rw-r--r-- | render/point.h (renamed from map/temp_text/point.h) | 0 | ||||
-rw-r--r-- | render/proto_to_styles.cpp (renamed from map/proto_to_styles.cpp) | 2 | ||||
-rw-r--r-- | render/proto_to_styles.hpp (renamed from map/proto_to_styles.hpp) | 0 | ||||
-rw-r--r-- | render/queued_renderer.cpp (renamed from map/queued_renderer.cpp) | 2 | ||||
-rw-r--r-- | render/queued_renderer.hpp (renamed from map/queued_renderer.hpp) | 0 | ||||
-rw-r--r-- | render/rect.h (renamed from map/temp_text/rect.h) | 0 | ||||
-rw-r--r-- | render/render.pro | 73 | ||||
-rw-r--r-- | render/render_policy.cpp (renamed from map/render_policy.cpp) | 12 | ||||
-rw-r--r-- | render/render_policy.hpp (renamed from map/render_policy.hpp) | 2 | ||||
-rw-r--r-- | render/render_tests/feature_processor_test.cpp (renamed from map/map_tests/feature_processor_test.cpp) | 4 | ||||
-rw-r--r-- | render/render_tests/render_tests.pro | 16 | ||||
-rw-r--r-- | render/scales_processor.cpp (renamed from map/scales_processor.cpp) | 2 | ||||
-rw-r--r-- | render/scales_processor.hpp (renamed from map/scales_processor.hpp) | 0 | ||||
-rw-r--r-- | render/simple_render_policy.cpp (renamed from map/simple_render_policy.cpp) | 11 | ||||
-rw-r--r-- | render/simple_render_policy.hpp (renamed from map/simple_render_policy.hpp) | 2 | ||||
-rw-r--r-- | render/software_renderer.cpp (renamed from map/software_renderer.cpp) | 0 | ||||
-rw-r--r-- | render/software_renderer.hpp (renamed from map/software_renderer.hpp) | 3 | ||||
-rw-r--r-- | render/text_engine.cpp (renamed from map/temp_text/text_engine.cpp) | 0 | ||||
-rw-r--r-- | render/text_engine.h (renamed from map/temp_text/text_engine.h) | 0 | ||||
-rw-r--r-- | render/tile.cpp (renamed from map/tile.cpp) | 2 | ||||
-rw-r--r-- | render/tile.hpp (renamed from map/tile.hpp) | 3 | ||||
-rw-r--r-- | render/tile_cache.cpp (renamed from map/tile_cache.cpp) | 2 | ||||
-rw-r--r-- | render/tile_cache.hpp (renamed from map/tile_cache.hpp) | 4 | ||||
-rw-r--r-- | render/tile_renderer.cpp (renamed from map/tile_renderer.cpp) | 10 | ||||
-rw-r--r-- | render/tile_renderer.hpp (renamed from map/tile_renderer.hpp) | 10 | ||||
-rw-r--r-- | render/tile_set.cpp (renamed from map/tile_set.cpp) | 2 | ||||
-rw-r--r-- | render/tile_set.hpp (renamed from map/tile_set.hpp) | 4 | ||||
-rw-r--r-- | render/tiler.cpp (renamed from map/tiler.cpp) | 4 | ||||
-rw-r--r-- | render/tiler.hpp (renamed from map/tiler.hpp) | 0 | ||||
-rw-r--r-- | render/tiling_render_policy_mt.cpp (renamed from map/tiling_render_policy_mt.cpp) | 8 | ||||
-rw-r--r-- | render/tiling_render_policy_mt.hpp (renamed from map/tiling_render_policy_mt.hpp) | 2 | ||||
-rw-r--r-- | render/tiling_render_policy_st.cpp (renamed from map/tiling_render_policy_st.cpp) | 10 | ||||
-rw-r--r-- | render/tiling_render_policy_st.hpp (renamed from map/tiling_render_policy_st.hpp) | 2 | ||||
-rw-r--r-- | render/window_handle.cpp (renamed from map/window_handle.cpp) | 4 | ||||
-rw-r--r-- | render/window_handle.hpp (renamed from map/window_handle.hpp) | 4 | ||||
-rw-r--r-- | render/yopme_render_policy.cpp (renamed from map/yopme_render_policy.cpp) | 6 | ||||
-rw-r--r-- | render/yopme_render_policy.hpp (renamed from map/yopme_render_policy.hpp) | 3 |
87 files changed, 276 insertions, 217 deletions
diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 7f66c228ba..197900b463 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -25,7 +25,7 @@ define add_prebuild_static_lib include $(PREBUILT_STATIC_LIBRARY) endef -prebuild_static_libs := osrm protobuf tomcrypt jansson bzip2 zlib fribidi freetype expat base coding geometry anim platform graphics indexer storage search routing gui map stats_client succinct +prebuild_static_libs := osrm protobuf tomcrypt jansson bzip2 zlib fribidi freetype expat base coding geometry anim platform graphics indexer storage search routing gui render map stats_client succinct $(foreach item,$(prebuild_static_libs),$(eval $(call add_prebuild_static_lib,$(item)))) @@ -40,7 +40,7 @@ LOCAL_CPP_FEATURES += exceptions rtti LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../ LOCAL_MODULE := mapswithme -LOCAL_STATIC_LIBRARIES := map gui routing search storage indexer graphics platform anim geometry coding base expat freetype fribidi zlib bzip2 jansson tomcrypt protobuf osrm stats_client succinct +LOCAL_STATIC_LIBRARIES := map render gui routing search storage indexer graphics platform anim geometry coding base expat freetype fribidi zlib bzip2 jansson tomcrypt protobuf osrm stats_client succinct LOCAL_CFLAGS := -ffunction-sections -fdata-sections -Wno-extern-c-compat ifneq ($(NDK_DEBUG),1) diff --git a/drape_head/drape_head.pro b/drape_head/drape_head.pro index 9be6d2010f..f66cb883ff 100644 --- a/drape_head/drape_head.pro +++ b/drape_head/drape_head.pro @@ -1,6 +1,6 @@ # Head project for drape develop and debuging ROOT_DIR = .. -DEPENDENCIES = map drape_frontend anim drape indexer platform geometry coding base \ +DEPENDENCIES = map render drape_frontend anim drape indexer platform geometry coding base \ freetype expat protobuf jansson zlib fribidi tomcrypt include($$ROOT_DIR/common.pri) diff --git a/drape_head/drape_surface.hpp b/drape_head/drape_surface.hpp index b906d180c4..7bf939fcb2 100644 --- a/drape_head/drape_surface.hpp +++ b/drape_head/drape_surface.hpp @@ -4,7 +4,8 @@ #include "map/feature_vec_model.hpp" #include "map/navigator.hpp" -#include "map/scales_processor.hpp" + +#include "render/scales_processor.hpp" #include "drape/batcher.hpp" #include "drape/gpu_program_manager.hpp" diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index bc12053c03..3243370d90 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -18,7 +18,7 @@ #import "../Platform/opengl/iosOGLContextFactory.h" #endif -#include "../../map/render_policy.hpp" +#include "../../render/render_policy.hpp" #include "../../platform/platform.hpp" #include "../../platform/video_timer.hpp" diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index a19a7ebc9d..8ddc432468 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -2027,6 +2027,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-ldrape_frontend", @@ -2084,6 +2085,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-ldrape_frontend", @@ -2155,6 +2157,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-ldrape_frontend", "-ldrape", "-lsearch", @@ -2900,6 +2903,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-lgraphics", @@ -2997,6 +3001,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-lgraphics", @@ -3052,6 +3057,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-lgraphics", @@ -3122,6 +3128,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-lgraphics", @@ -3222,6 +3229,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-lgraphics", @@ -3321,6 +3329,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-lgraphics", @@ -3419,6 +3428,7 @@ OTHER_LDFLAGS = ( "-lstats_client", "-lmap", + "-lrender", "-lsearch", "-lgui", "-lgraphics", diff --git a/iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm b/iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm index 2d806c55c5..c5f7badf74 100644 --- a/iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm +++ b/iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm @@ -8,12 +8,15 @@ #import "MWMFrameworkUtils.h" #import "MWMWatchLocationTracker.h" - #include "Framework.h" + +#include "render/frame_image.hpp" + #include "indexer/scales.hpp" -#include "platform/location.hpp" #include "indexer/mercator.hpp" -#include "map/frame_image.hpp" + +#include "platform/location.hpp" + extern NSString * const kSearchResultTitleKey; extern NSString * const kSearchResultCategoryKey; diff --git a/map/framework.cpp b/map/framework.cpp index c9c75c2638..a96ad52408 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1,20 +1,21 @@ -#include "map/framework.hpp" +#include "framework.hpp" +#include "benchmark_provider.hpp" +#include "benchmark_engine.hpp" +#include "geourl_process.hpp" +#include "navigator_utils.hpp" +#include "dialog_settings.hpp" +#include "ge0_parser.hpp" + +#include "render/cpu_drawer.hpp" +#include "render/gpu_drawer.hpp" + #ifndef USE_DRAPE - #include "feature_processor.hpp" - #include "drawer.hpp" + #include "render/feature_processor.hpp" + #include "render/drawer.hpp" #else #include "../drape_frontend/visual_params.hpp" #endif // USE_DRAPE -#include "map/benchmark_provider.hpp" -#include "map/benchmark_engine.hpp" -#include "map/geourl_process.hpp" -#include "map/gpu_drawer.hpp" -#include "map/navigator_utils.hpp" -#include "map/dialog_settings.hpp" -#include "map/ge0_parser.hpp" -#include "map/cpu_drawer.hpp" - #include "defines.hpp" #include "routing/astar_router.hpp" diff --git a/map/framework.hpp b/map/framework.hpp index 7cafd5448e..6a907d8c7b 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -1,19 +1,10 @@ #pragma once -#include "map/events.hpp" -#ifndef USE_DRAPE - #include "render_policy.hpp" - #include "window_handle.hpp" -#else - #include "drape/oglcontextfactory.hpp" - #include "drape_frontend/drape_engine.hpp" -#endif // USE_DRAPE #include "map/feature_vec_model.hpp" #include "map/information_display.hpp" #include "map/location_state.hpp" #include "map/navigator.hpp" #include "map/animator.hpp" -#include "map/scales_processor.hpp" #include "map/bookmark.hpp" #include "map/bookmark_manager.hpp" @@ -25,6 +16,16 @@ #include "map/routing_session.hpp" #include "map/country_tree.hpp" +#include "render/events.hpp" +#include "render/scales_processor.hpp" +#ifndef USE_DRAPE + #include "render/render_policy.hpp" + #include "render/window_handle.hpp" +#else + #include "drape/oglcontextfactory.hpp" + #include "drape_frontend/drape_engine.hpp" +#endif // USE_DRAPE + #include "indexer/data_header.hpp" #include "indexer/map_style.hpp" diff --git a/map/information_display.cpp b/map/information_display.cpp index e2566f4bad..845c76086c 100644 --- a/map/information_display.cpp +++ b/map/information_display.cpp @@ -1,11 +1,12 @@ #include "map/information_display.hpp" -#include "map/drawer.hpp" #include "map/country_status_display.hpp" #include "map/compass_arrow.hpp" #include "map/framework.hpp" #include "map/ruler.hpp" #include "map/alfa_animation_task.hpp" +#include "render/drawer.hpp" + #include "anim/task.hpp" #include "anim/controller.hpp" diff --git a/map/map.pro b/map/map.pro index ee50e36427..b73bb0571c 100644 --- a/map/map.pro +++ b/map/map.pro @@ -11,34 +11,15 @@ INCLUDEPATH *= $$ROOT_DIR/3party/protobuf/src $$ROOT_DIR/3party/expat/lib $$ROOT include($$ROOT_DIR/common.pri) HEADERS += \ - temp_text/text_engine.h \ framework.hpp \ feature_vec_model.hpp \ - events.hpp \ navigator.hpp \ - drawer.hpp \ - feature_processor.hpp \ - path_info.hpp \ - window_handle.hpp \ - tile_renderer.hpp \ information_display.hpp \ location_state.hpp \ benchmark_provider.hpp \ - render_policy.hpp \ - tiling_render_policy_mt.hpp \ - tiling_render_policy_st.hpp \ benchmark_engine.hpp \ - coverage_generator.hpp \ - tiler.hpp \ - tile.hpp \ - tile_cache.hpp \ ruler.hpp \ - simple_render_policy.hpp \ - proto_to_styles.hpp \ - queued_renderer.hpp \ - basic_tiling_render_policy.hpp \ bookmark.hpp \ - tile_set.hpp \ geourl_process.hpp \ country_status_display.hpp \ rotate_screen_task.hpp \ @@ -48,14 +29,8 @@ HEADERS += \ change_viewport_task.hpp \ dialog_settings.hpp \ mwm_url.hpp \ - feature_styler.hpp \ - feature_info.hpp \ - area_info.hpp \ - geometry_processors.hpp \ bookmark_manager.hpp \ ge0_parser.hpp \ - scales_processor.hpp \ - yopme_render_policy.hpp \ track.hpp \ alfa_animation_task.hpp \ user_mark_container.hpp \ @@ -68,40 +43,17 @@ HEADERS += \ active_maps_layout.hpp \ route_track.hpp \ navigator_utils.hpp \ - software_renderer.hpp \ - gpu_drawer.hpp \ - cpu_drawer.hpp \ - frame_image.hpp \ SOURCES += \ - temp_text/text_engine.cpp \ - temp_text/default_font.cpp \ feature_vec_model.cpp \ framework.cpp \ navigator.cpp \ - drawer.cpp \ - feature_processor.cpp \ - tile_renderer.cpp \ information_display.cpp \ location_state.cpp \ benchmark_provider.cpp \ - render_policy.cpp \ - tiling_render_policy_st.cpp \ - tiling_render_policy_mt.cpp \ benchmark_engine.cpp \ - coverage_generator.cpp \ - tiler.cpp \ - tile_cache.cpp \ - tile.cpp \ ruler.cpp \ - window_handle.cpp \ - simple_render_policy.cpp \ - proto_to_styles.cpp \ - queued_renderer.cpp \ - events.cpp \ - basic_tiling_render_policy.cpp \ address_finder.cpp \ - tile_set.cpp \ geourl_process.cpp \ bookmark.cpp \ country_status_display.cpp \ @@ -112,14 +64,9 @@ SOURCES += \ change_viewport_task.cpp \ dialog_settings.cpp \ mwm_url.cpp \ - feature_styler.cpp \ - feature_info.cpp \ - geometry_processors.cpp \ bookmark_manager.cpp \ ge0_parser.cpp \ ../api/src/c/api-client.c \ - scales_processor.cpp \ - yopme_render_policy.cpp \ track.cpp \ alfa_animation_task.cpp \ user_mark_container.cpp \ @@ -131,10 +78,6 @@ SOURCES += \ active_maps_layout.cpp \ route_track.cpp \ navigator_utils.cpp \ - software_renderer.cpp \ - gpu_drawer.cpp \ - cpu_drawer.cpp \ - agg_curves.cpp \ !iphone*:!tizen*:!android* { HEADERS += qgl_render_context.hpp diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index 53e1d43c69..02646027cd 100644 --- a/map/map_tests/map_tests.pro +++ b/map/map_tests/map_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map gui routing search storage graphics indexer platform anim geometry coding base \ +DEPENDENCIES = map render gui routing search storage graphics indexer platform anim geometry coding base \ freetype fribidi expat protobuf tomcrypt jansson osrm stats_client zlib succinct drape { @@ -30,7 +30,6 @@ macx-*: LIBS *= "-framework Foundation" "-framework IOKit" SOURCES += \ ../../testing/testingmain.cpp \ bookmarks_test.cpp \ - feature_processor_test.cpp \ ge0_parser_tests.cpp \ geourl_test.cpp \ kmz_unarchive_test.cpp \ diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp index 6c5e4c513f..420f5900b2 100644 --- a/map/mwm_url.cpp +++ b/map/mwm_url.cpp @@ -1,5 +1,6 @@ -#include "map/mwm_url.hpp" -#include "map/scales_processor.hpp" +#include "mwm_url.hpp" + +#include "render/scales_processor.hpp" #include "indexer/mercator.hpp" #include "indexer/scales.hpp" diff --git a/map/mwm_url.hpp b/map/mwm_url.hpp index 0af8c008f2..53b9f085c3 100644 --- a/map/mwm_url.hpp +++ b/map/mwm_url.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/user_mark_container.hpp" +#include "user_mark_container.hpp" #include "geometry/rect2d.hpp" diff --git a/map/navigator.hpp b/map/navigator.hpp index 92fd105bd9..7739c771c6 100644 --- a/map/navigator.hpp +++ b/map/navigator.hpp @@ -1,5 +1,5 @@ #pragma once -#include "map/scales_processor.hpp" +#include "render/scales_processor.hpp" #include "anim/task.hpp" diff --git a/map/navigator_utils.hpp b/map/navigator_utils.hpp index 4a8050d544..4e76113499 100644 --- a/map/navigator_utils.hpp +++ b/map/navigator_utils.hpp @@ -1,7 +1,8 @@ #pragma once -#include "map/navigator.hpp" -#include "map/scales_processor.hpp" +#include "navigator.hpp" + +#include "render/scales_processor.hpp" #include "geometry/any_rect2d.hpp" diff --git a/map/user_mark_container.cpp b/map/user_mark_container.cpp index 19698e662b..197887d1a6 100644 --- a/map/user_mark_container.cpp +++ b/map/user_mark_container.cpp @@ -1,8 +1,8 @@ -#include "map/user_mark_container.hpp" +#include "user_mark_container.hpp" +#include "framework.hpp" +#include "anim_phase_chain.hpp" -#include "map/drawer.hpp" -#include "map/framework.hpp" -#include "map/anim_phase_chain.hpp" +#include "render/drawer.hpp" #include "graphics/display_list.hpp" #include "graphics/screen.hpp" diff --git a/map/user_mark_container.hpp b/map/user_mark_container.hpp index 7563893e77..4ca9549e4e 100644 --- a/map/user_mark_container.hpp +++ b/map/user_mark_container.hpp @@ -1,8 +1,9 @@ #pragma once -#include "map/events.hpp" -#include "map/user_mark.hpp" -#include "map/user_mark_dl_cache.hpp" +#include "user_mark.hpp" +#include "user_mark_dl_cache.hpp" + +#include "render/events.hpp" #include "geometry/point2d.hpp" #include "geometry/rect2d.hpp" diff --git a/map_server/main.cpp b/map_server/main.cpp index 7700c80287..fab68fa806 100644 --- a/map_server/main.cpp +++ b/map_server/main.cpp @@ -5,10 +5,11 @@ #include "indexer/mercator.hpp" -#include "map/render_policy.hpp" -#include "map/simple_render_policy.hpp" #include "map/framework.hpp" +#include "render/render_policy.hpp" +#include "render/simple_render_policy.hpp" + #include "gui/controller.hpp" #include "platform/platform.hpp" diff --git a/map_server/main.hpp b/map_server/main.hpp index a8f72bdbc5..a90d908afe 100644 --- a/map_server/main.hpp +++ b/map_server/main.hpp @@ -1,7 +1,9 @@ #include "map_server/render_context.hpp" -#include "map/render_policy.hpp" #include "map/framework.hpp" + +#include "render/render_policy.hpp" + #include "platform/video_timer.hpp" #include <qjsonrpcservice.h> diff --git a/map_server/map_server.pro b/map_server/map_server.pro index 5aa5eb49b9..a6947d52be 100644 --- a/map_server/map_server.pro +++ b/map_server/map_server.pro @@ -5,7 +5,7 @@ TEMPLATE = app DEFINES += QJSONRPC_BUILD -DEPENDENCIES = map gui routing search storage indexer graphics platform anim geometry coding base \ +DEPENDENCIES = map render gui routing search storage indexer graphics platform anim geometry coding base \ osrm bzip2 freetype expat fribidi tomcrypt jansson protobuf qjsonrpc gflags stats_client zlib succinct drape { @@ -32,6 +32,7 @@ SUBDIRS = 3party \ drape/drape_tests \ graphics \ gui \ + render render/render_tests \ storage storage/storage_tests \ search search/search_tests \ drape_frontend drape_frontend/drape_frontend_tests \ @@ -60,6 +61,7 @@ SUBDIRS = 3party \ storage \ graphics \ gui \ + render \ search \ drape_frontend \ map \ @@ -77,6 +79,7 @@ SUBDIRS = 3party \ storage \ graphics \ gui \ + render \ search \ map \ stats \ diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 4e6969ed1c..48c6f9f171 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -1,9 +1,10 @@ #include "qt/draw_widget.hpp" #include "qt/slider_ctrl.hpp" -#include "map/render_policy.hpp" #include "map/country_status_display.hpp" -#include "map/frame_image.hpp" + +#include "render/render_policy.hpp" +#include "render/frame_image.hpp" #include "search/result.hpp" diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index 6996d425ca..4bc4db0135 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -1,10 +1,11 @@ #pragma once -#include "map/window_handle.hpp" #include "map/framework.hpp" #include "map/navigator.hpp" #include "map/qgl_render_context.hpp" +#include "render/window_handle.hpp" + #include "base/scheduled_task.hpp" #include "platform/video_timer.hpp" @@ -1,6 +1,6 @@ # Main application in qt. ROOT_DIR = .. -DEPENDENCIES = map gui routing search storage indexer graphics platform anim geometry coding base \ +DEPENDENCIES = map render gui routing search storage indexer graphics platform anim geometry coding base \ bzip2 freetype expat fribidi tomcrypt jansson protobuf osrm stats_client zlib succinct drape { diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp index 77a67cabf6..3932f4d15e 100644 --- a/qt_tstfrm/tstwidgets.cpp +++ b/qt_tstfrm/tstwidgets.cpp @@ -1,6 +1,6 @@ #include "qt_tstfrm/tstwidgets.hpp" -#include "map/render_policy.hpp" +#include "render/render_policy.hpp" #include "graphics/screen.hpp" #include "graphics/resource_manager.hpp" diff --git a/map/agg_curves.cpp b/render/agg_curves.cpp index c5bf55e5cd..c5bf55e5cd 100644 --- a/map/agg_curves.cpp +++ b/render/agg_curves.cpp diff --git a/map/area_info.hpp b/render/area_info.hpp index f6f4c9bc17..f6f4c9bc17 100644 --- a/map/area_info.hpp +++ b/render/area_info.hpp diff --git a/map/basic_tiling_render_policy.cpp b/render/basic_tiling_render_policy.cpp index f6b2529d5b..9b8d87bcff 100644 --- a/map/basic_tiling_render_policy.cpp +++ b/render/basic_tiling_render_policy.cpp @@ -1,14 +1,13 @@ -#include "map/basic_tiling_render_policy.hpp" +#include "basic_tiling_render_policy.hpp" +#include "tile_renderer.hpp" +#include "coverage_generator.hpp" +#include "queued_renderer.hpp" +#include "scales_processor.hpp" #include "platform/platform.hpp" #include "indexer/scales.hpp" -#include "map/tile_renderer.hpp" -#include "map/coverage_generator.hpp" -#include "map/queued_renderer.hpp" -#include "map/scales_processor.hpp" - BasicTilingRenderPolicy::BasicTilingRenderPolicy(Params const & p, bool doUseQueuedRenderer) diff --git a/map/basic_tiling_render_policy.hpp b/render/basic_tiling_render_policy.hpp index 786a6e48fd..58cf138225 100644 --- a/map/basic_tiling_render_policy.hpp +++ b/render/basic_tiling_render_policy.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/render_policy.hpp" +#include "render_policy.hpp" #include "graphics/overlay.hpp" diff --git a/map/coverage_generator.cpp b/render/coverage_generator.cpp index 87b4f89999..924cbce7ad 100644 --- a/map/coverage_generator.cpp +++ b/render/coverage_generator.cpp @@ -1,6 +1,6 @@ -#include "map/coverage_generator.hpp" -#include "map/tile_renderer.hpp" -#include "map/tile_set.hpp" +#include "coverage_generator.hpp" +#include "tile_renderer.hpp" +#include "tile_set.hpp" #include "platform/settings.hpp" #include "platform/platform.hpp" diff --git a/map/coverage_generator.hpp b/render/coverage_generator.hpp index 4b83470b51..4def88c41d 100644 --- a/map/coverage_generator.hpp +++ b/render/coverage_generator.hpp @@ -1,9 +1,9 @@ #pragma once -#include "map/render_policy.hpp" -#include "map/tiler.hpp" -#include "map/tile.hpp" -#include "map/window_handle.hpp" +#include "render_policy.hpp" +#include "tiler.hpp" +#include "tile.hpp" +#include "window_handle.hpp" #include "geometry/screenbase.hpp" diff --git a/map/cpu_drawer.cpp b/render/cpu_drawer.cpp index eb21c8a11d..6d48865e3b 100644 --- a/map/cpu_drawer.cpp +++ b/render/cpu_drawer.cpp @@ -1,5 +1,5 @@ -#include "map/cpu_drawer.hpp" -#include "map/proto_to_styles.hpp" +#include "cpu_drawer.hpp" +#include "proto_to_styles.hpp" #include "geometry/tree4d.hpp" #include "geometry/transformations.hpp" diff --git a/map/cpu_drawer.hpp b/render/cpu_drawer.hpp index b2ef481ad4..c38b42faa8 100644 --- a/map/cpu_drawer.hpp +++ b/render/cpu_drawer.hpp @@ -1,8 +1,8 @@ #pragma once -#include "map/drawer.hpp" -#include "map/feature_styler.hpp" -#include "map/software_renderer.hpp" +#include "drawer.hpp" +#include "feature_styler.hpp" +#include "software_renderer.hpp" #include "std/list.hpp" #include "std/unique_ptr.hpp" diff --git a/map/temp_text/default_font.cpp b/render/default_font.cpp index 827437c7e2..827437c7e2 100644 --- a/map/temp_text/default_font.cpp +++ b/render/default_font.cpp diff --git a/map/drawer.cpp b/render/drawer.cpp index d4666a399a..55a73d4315 100644 --- a/map/drawer.cpp +++ b/render/drawer.cpp @@ -1,5 +1,5 @@ -#include "map/drawer.hpp" -#include "map/feature_info.hpp" +#include "drawer.hpp" +#include "feature_info.hpp" #include "indexer/drules_include.hpp" #include "indexer/feature_decl.hpp" diff --git a/map/drawer.hpp b/render/drawer.hpp index bce940f797..bce940f797 100644 --- a/map/drawer.hpp +++ b/render/drawer.hpp diff --git a/map/events.cpp b/render/events.cpp index 5e6acbb1ab..1730ceeb8c 100644 --- a/map/events.cpp +++ b/render/events.cpp @@ -1,4 +1,4 @@ -#include "map/events.hpp" +#include "events.hpp" #ifndef USE_DRAPE PaintEvent::PaintEvent(Drawer * drawer, diff --git a/map/events.hpp b/render/events.hpp index 963435776b..81756179c0 100644 --- a/map/events.hpp +++ b/render/events.hpp @@ -1,10 +1,11 @@ #pragma once -#include "base/commands_queue.hpp" #include "geometry/screenbase.hpp" - #include "geometry/point2d.hpp" +#include "base/commands_queue.hpp" + + class DragEvent { m2::PointD m_pt; diff --git a/map/feature_info.cpp b/render/feature_info.cpp index 4408f2eb3f..e7d6115a96 100644 --- a/map/feature_info.cpp +++ b/render/feature_info.cpp @@ -1,4 +1,5 @@ -#include "map/feature_info.hpp" +#include "feature_info.hpp" + #include "indexer/feature.hpp" diff --git a/map/feature_info.hpp b/render/feature_info.hpp index f503c8098a..2cd9a6b7c5 100644 --- a/map/feature_info.hpp +++ b/render/feature_info.hpp @@ -1,8 +1,8 @@ #pragma once -#include "map/feature_styler.hpp" -#include "map/path_info.hpp" -#include "map/area_info.hpp" +#include "feature_styler.hpp" +#include "path_info.hpp" +#include "area_info.hpp" #include "indexer/feature_decl.hpp" diff --git a/map/feature_processor.cpp b/render/feature_processor.cpp index 3fa24a219d..15fa4f33e4 100644 --- a/map/feature_processor.cpp +++ b/render/feature_processor.cpp @@ -1,8 +1,9 @@ -#include "map/feature_processor.hpp" -#include "map/geometry_processors.hpp" -#include "map/feature_info.hpp" +#include "feature_processor.hpp" +#include "geometry_processors.hpp" +#include "feature_info.hpp" + #ifndef USE_DRAPE -#include "map/drawer.hpp" +#include "drawer.hpp" #endif // USE_DRAPE #include "indexer/feature_impl.hpp" diff --git a/map/feature_processor.hpp b/render/feature_processor.hpp index e39b534b68..fca491913d 100644 --- a/map/feature_processor.hpp +++ b/render/feature_processor.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/events.hpp" +#include "events.hpp" #include "indexer/drawing_rule_def.hpp" #include "indexer/feature.hpp" diff --git a/map/feature_styler.cpp b/render/feature_styler.cpp index 8aed44135c..1edbf9d794 100644 --- a/map/feature_styler.cpp +++ b/render/feature_styler.cpp @@ -1,6 +1,6 @@ -#include "map/feature_styler.hpp" -#include "map/geometry_processors.hpp" -#include "map/proto_to_styles.hpp" +#include "feature_styler.hpp" +#include "geometry_processors.hpp" +#include "proto_to_styles.hpp" #include "indexer/drawing_rules.hpp" #include "indexer/feature.hpp" diff --git a/map/feature_styler.hpp b/render/feature_styler.hpp index 9eb37e4c1a..9eb37e4c1a 100644 --- a/map/feature_styler.hpp +++ b/render/feature_styler.hpp diff --git a/map/frame_image.hpp b/render/frame_image.hpp index a7f85d2f69..a7f85d2f69 100644 --- a/map/frame_image.hpp +++ b/render/frame_image.hpp diff --git a/map/geometry_processors.cpp b/render/geometry_processors.cpp index 6697595674..35797d8b81 100644 --- a/map/geometry_processors.cpp +++ b/render/geometry_processors.cpp @@ -1,4 +1,4 @@ -#include "map/geometry_processors.hpp" +#include "geometry_processors.hpp" #include "std/bind.hpp" diff --git a/map/geometry_processors.hpp b/render/geometry_processors.hpp index 0df50c51ea..8bb419a312 100644 --- a/map/geometry_processors.hpp +++ b/render/geometry_processors.hpp @@ -1,7 +1,7 @@ #pragma once -#include "map/area_info.hpp" -#include "map/path_info.hpp" +#include "area_info.hpp" +#include "path_info.hpp" #include "../indexer/cell_id.hpp" // CoordPointT diff --git a/map/gpu_drawer.cpp b/render/gpu_drawer.cpp index a2190fa0b7..a176e14a8a 100644 --- a/map/gpu_drawer.cpp +++ b/render/gpu_drawer.cpp @@ -1,8 +1,8 @@ -#include "map/gpu_drawer.hpp" -#include "map/feature_styler.hpp" -#include "map/proto_to_styles.hpp" -#include "map/path_info.hpp" -#include "map/area_info.hpp" +#include "gpu_drawer.hpp" +#include "feature_styler.hpp" +#include "proto_to_styles.hpp" +#include "path_info.hpp" +#include "area_info.hpp" #include "indexer/drawing_rules.hpp" #include "indexer/feature_decl.hpp" diff --git a/map/gpu_drawer.hpp b/render/gpu_drawer.hpp index ef9e530830..9cd4b39e8c 100644 --- a/map/gpu_drawer.hpp +++ b/render/gpu_drawer.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/drawer.hpp" +#include "drawer.hpp" #include "graphics/screen.hpp" diff --git a/map/path_info.hpp b/render/path_info.hpp index 70679ee655..70679ee655 100644 --- a/map/path_info.hpp +++ b/render/path_info.hpp diff --git a/map/temp_text/point.h b/render/point.h index 51492c475b..51492c475b 100644 --- a/map/temp_text/point.h +++ b/render/point.h diff --git a/map/proto_to_styles.cpp b/render/proto_to_styles.cpp index 1de13232af..8f8bbe1f6c 100644 --- a/map/proto_to_styles.cpp +++ b/render/proto_to_styles.cpp @@ -1,4 +1,4 @@ -#include "map/proto_to_styles.hpp" +#include "proto_to_styles.hpp" #include "indexer/drules_include.hpp" diff --git a/map/proto_to_styles.hpp b/render/proto_to_styles.hpp index ca9df9af48..ca9df9af48 100644 --- a/map/proto_to_styles.hpp +++ b/render/proto_to_styles.hpp diff --git a/map/queued_renderer.cpp b/render/queued_renderer.cpp index f43fa278c9..92f8c660a2 100644 --- a/map/queued_renderer.cpp +++ b/render/queued_renderer.cpp @@ -1,4 +1,4 @@ -#include "map/queued_renderer.hpp" +#include "queued_renderer.hpp" #include "graphics/opengl/opengl.hpp" diff --git a/map/queued_renderer.hpp b/render/queued_renderer.hpp index fb570d468c..fb570d468c 100644 --- a/map/queued_renderer.hpp +++ b/render/queued_renderer.hpp diff --git a/map/temp_text/rect.h b/render/rect.h index ebf4ef48ae..ebf4ef48ae 100644 --- a/map/temp_text/rect.h +++ b/render/rect.h diff --git a/render/render.pro b/render/render.pro new file mode 100644 index 0000000000..fb445807bc --- /dev/null +++ b/render/render.pro @@ -0,0 +1,73 @@ +TARGET = render +TEMPLATE = lib +CONFIG += staticlib warn_on + +ROOT_DIR = .. + +include($$ROOT_DIR/common.pri) + +INCLUDEPATH *= $$ROOT_DIR/3party/protobuf/src $$ROOT_DIR/3party/expat/lib $$ROOT_DIR/3party/freetype/include + +SOURCES += \ + software_renderer.cpp \ + gpu_drawer.cpp \ + cpu_drawer.cpp \ + agg_curves.cpp \ + drawer.cpp \ + feature_info.cpp \ + feature_styler.cpp \ + geometry_processors.cpp \ + proto_to_styles.cpp \ + text_engine.cpp \ + default_font.cpp \ + window_handle.cpp \ + render_policy.cpp \ + tiling_render_policy_st.cpp \ + tiling_render_policy_mt.cpp \ + simple_render_policy.cpp \ + queued_renderer.cpp \ + basic_tiling_render_policy.cpp \ + tiler.cpp \ + tile.cpp \ + tile_cache.cpp \ + tile_set.cpp \ + tile_renderer.cpp \ + feature_processor.cpp \ + events.cpp \ + coverage_generator.cpp \ + scales_processor.cpp \ + yopme_render_policy.cpp \ + + +HEADERS += \ + software_renderer.hpp \ + gpu_drawer.hpp \ + cpu_drawer.hpp \ + frame_image.hpp \ + drawer.hpp \ + feature_info.hpp \ + feature_styler.hpp \ + path_info.hpp \ + area_info.hpp \ + geometry_processors.hpp \ + proto_to_styles.hpp \ + text_engine.h \ + point.h \ + rect.h \ + window_handle.hpp \ + render_policy.hpp \ + tiling_render_policy_st.hpp \ + tiling_render_policy_mt.hpp \ + simple_render_policy.hpp \ + queued_renderer.hpp \ + basic_tiling_render_policy.hpp \ + tiler.hpp \ + tile.hpp \ + tile_cache.hpp \ + tile_set.hpp \ + tile_renderer.hpp \ + feature_processor.hpp \ + events.hpp \ + coverage_generator.hpp \ + scales_processor.hpp \ + yopme_render_policy.hpp \ diff --git a/map/render_policy.cpp b/render/render_policy.cpp index 5312f78a17..1b715705ea 100644 --- a/map/render_policy.cpp +++ b/render/render_policy.cpp @@ -1,10 +1,8 @@ -#include "base/SRC_FIRST.hpp" - -#include "map/render_policy.hpp" -#include "map/window_handle.hpp" -#include "map/tiling_render_policy_st.hpp" -#include "map/tiling_render_policy_mt.hpp" -#include "map/proto_to_styles.hpp" +#include "render_policy.hpp" +#include "window_handle.hpp" +#include "tiling_render_policy_st.hpp" +#include "tiling_render_policy_mt.hpp" +#include "proto_to_styles.hpp" #include "anim/controller.hpp" #include "anim/task.hpp" diff --git a/map/render_policy.hpp b/render/render_policy.hpp index 14d0f85cf2..291b93c6dd 100644 --- a/map/render_policy.hpp +++ b/render/render_policy.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/gpu_drawer.hpp" +#include "gpu_drawer.hpp" #include "graphics/color.hpp" #include "graphics/resource_manager.hpp" diff --git a/map/map_tests/feature_processor_test.cpp b/render/render_tests/feature_processor_test.cpp index a2b357cd5c..96921d0992 100644 --- a/map/map_tests/feature_processor_test.cpp +++ b/render/render_tests/feature_processor_test.cpp @@ -1,7 +1,7 @@ #include "testing/testing.hpp" -#include "map/feature_processor.hpp" -#include "map/geometry_processors.hpp" +#include "render/feature_processor.hpp" +#include "render/geometry_processors.hpp" #include "geometry/screenbase.hpp" diff --git a/render/render_tests/render_tests.pro b/render/render_tests/render_tests.pro new file mode 100644 index 0000000000..4ec1021fab --- /dev/null +++ b/render/render_tests/render_tests.pro @@ -0,0 +1,16 @@ +TARGET = render_tests +CONFIG += console warn_on +CONFIG -= app_bundle +TEMPLATE = app + +ROOT_DIR = ../.. + +DEPENDENCIES = render indexer platform geometry coding base \ + + +include($$ROOT_DIR/common.pri) + + +SOURCES += \ + ../../testing/testingmain.cpp \ + feature_processor_test.cpp \ diff --git a/map/scales_processor.cpp b/render/scales_processor.cpp index 19c7805e1f..72054a2857 100644 --- a/map/scales_processor.cpp +++ b/render/scales_processor.cpp @@ -1,4 +1,4 @@ -#include "map/scales_processor.hpp" +#include "scales_processor.hpp" #include "geometry/screenbase.hpp" diff --git a/map/scales_processor.hpp b/render/scales_processor.hpp index 493b4a51b8..493b4a51b8 100644 --- a/map/scales_processor.hpp +++ b/render/scales_processor.hpp diff --git a/map/simple_render_policy.cpp b/render/simple_render_policy.cpp index 49036a9a97..fc10dd3366 100644 --- a/map/simple_render_policy.cpp +++ b/render/simple_render_policy.cpp @@ -1,8 +1,9 @@ -#include "map/simple_render_policy.hpp" -#include "map/events.hpp" -#include "map/drawer.hpp" -#include "map/window_handle.hpp" -#include "map/scales_processor.hpp" +#include "simple_render_policy.hpp" +#include "events.hpp" +#include "window_handle.hpp" +#include "scales_processor.hpp" + +#include "render/drawer.hpp" #include "graphics/overlay.hpp" #include "graphics/opengl/opengl.hpp" diff --git a/map/simple_render_policy.hpp b/render/simple_render_policy.hpp index be3ffc3814..95b3e40a5a 100644 --- a/map/simple_render_policy.hpp +++ b/render/simple_render_policy.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/render_policy.hpp" +#include "render_policy.hpp" class SimpleRenderPolicy : public RenderPolicy { diff --git a/map/software_renderer.cpp b/render/software_renderer.cpp index 681ef53daf..681ef53daf 100644 --- a/map/software_renderer.cpp +++ b/render/software_renderer.cpp diff --git a/map/software_renderer.hpp b/render/software_renderer.hpp index 12b97758e5..3c5109c687 100644 --- a/map/software_renderer.hpp +++ b/render/software_renderer.hpp @@ -3,6 +3,7 @@ #include "path_info.hpp" #include "area_info.hpp" #include "frame_image.hpp" +#include "text_engine.h" #include "geometry/point2d.hpp" @@ -24,8 +25,6 @@ #include "std/stdint.hpp" #include "std/unique_ptr.hpp" -#include "temp_text/text_engine.h" - class PathWrapper; diff --git a/map/temp_text/text_engine.cpp b/render/text_engine.cpp index e236fac2db..e236fac2db 100644 --- a/map/temp_text/text_engine.cpp +++ b/render/text_engine.cpp diff --git a/map/temp_text/text_engine.h b/render/text_engine.h index fcc14bdec1..fcc14bdec1 100644 --- a/map/temp_text/text_engine.h +++ b/render/text_engine.h diff --git a/map/tile.cpp b/render/tile.cpp index b938de388d..d1a6d15f9b 100644 --- a/map/tile.cpp +++ b/render/tile.cpp @@ -1,4 +1,4 @@ -#include "map/tile.hpp" +#include "tile.hpp" #include "graphics/opengl/base_texture.hpp" diff --git a/map/tile.hpp b/render/tile.hpp index 76553ce7bb..7b086d2590 100644 --- a/map/tile.hpp +++ b/render/tile.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/tiler.hpp" +#include "tiler.hpp" #include "geometry/screenbase.hpp" @@ -41,4 +41,3 @@ struct LessRectInfo { bool operator()(Tile const * l, Tile const * r) const; }; - diff --git a/map/tile_cache.cpp b/render/tile_cache.cpp index dd4c99ca73..3cc44d2edd 100644 --- a/map/tile_cache.cpp +++ b/render/tile_cache.cpp @@ -1,4 +1,4 @@ -#include "map/tile_cache.hpp" +#include "tile_cache.hpp" void TileCache::EntryValueTraits::Evict(Entry &val) { diff --git a/map/tile_cache.hpp b/render/tile_cache.hpp index 217b3755a0..81b9647eda 100644 --- a/map/tile_cache.hpp +++ b/render/tile_cache.hpp @@ -1,7 +1,7 @@ #pragma once -#include "map/tile.hpp" -#include "map/tiler.hpp" +#include "tile.hpp" +#include "tiler.hpp" #include "graphics/resource_manager.hpp" diff --git a/map/tile_renderer.cpp b/render/tile_renderer.cpp index 191b5b9388..b516a02ead 100644 --- a/map/tile_renderer.cpp +++ b/render/tile_renderer.cpp @@ -1,7 +1,5 @@ -#include "base/SRC_FIRST.hpp" - -#include "map/tile_renderer.hpp" -#include "map/window_handle.hpp" +#include "tile_renderer.hpp" +#include "window_handle.hpp" #include "graphics/opengl/opengl.hpp" #include "graphics/opengl/gl_render_context.hpp" @@ -10,14 +8,14 @@ #include "graphics/packets_queue.hpp" #include "graphics/defines.hpp" -#include "std/bind.hpp" - #include "indexer/scales.hpp" #include "base/logging.hpp" #include "base/condition.hpp" #include "base/shared_buffer_manager.hpp" +#include "std/bind.hpp" + namespace { class TileStructuresLockGuard diff --git a/map/tile_renderer.hpp b/render/tile_renderer.hpp index abcc3ca1cc..c467140053 100644 --- a/map/tile_renderer.hpp +++ b/render/tile_renderer.hpp @@ -1,10 +1,10 @@ #pragma once -#include "map/render_policy.hpp" -#include "map/tiler.hpp" -#include "map/tile_cache.hpp" -#include "map/tile_set.hpp" -#include "map/gpu_drawer.hpp" +#include "render_policy.hpp" +#include "tiler.hpp" +#include "tile_cache.hpp" +#include "tile_set.hpp" +#include "gpu_drawer.hpp" #include "geometry/screenbase.hpp" diff --git a/map/tile_set.cpp b/render/tile_set.cpp index 7722a80545..af50b56482 100644 --- a/map/tile_set.cpp +++ b/render/tile_set.cpp @@ -1,4 +1,4 @@ -#include "map/tile_set.hpp" +#include "tile_set.hpp" void TileSet::Lock() { diff --git a/map/tile_set.hpp b/render/tile_set.hpp index 0432e118a5..8b2daac978 100644 --- a/map/tile_set.hpp +++ b/render/tile_set.hpp @@ -1,7 +1,9 @@ #pragma once -#include "map/tile.hpp" +#include "tile.hpp" + #include "base/mutex.hpp" + #include "std/map.hpp" class TileSet diff --git a/map/tiler.cpp b/render/tiler.cpp index 62706a682b..fd4854c04c 100644 --- a/map/tiler.cpp +++ b/render/tiler.cpp @@ -1,5 +1,5 @@ -#include "map/tiler.hpp" -#include "map/scales_processor.hpp" +#include "tiler.hpp" +#include "scales_processor.hpp" #include "indexer/mercator.hpp" diff --git a/map/tiler.hpp b/render/tiler.hpp index 2656548d0c..2656548d0c 100644 --- a/map/tiler.hpp +++ b/render/tiler.hpp diff --git a/map/tiling_render_policy_mt.cpp b/render/tiling_render_policy_mt.cpp index 091407d6a5..b1200e4c0a 100644 --- a/map/tiling_render_policy_mt.cpp +++ b/render/tiling_render_policy_mt.cpp @@ -1,12 +1,12 @@ -#include "map/tiling_render_policy_mt.hpp" +#include "tiling_render_policy_mt.hpp" +#include "window_handle.hpp" +#include "tile_renderer.hpp" +#include "coverage_generator.hpp" #include "platform/platform.hpp" #include "graphics/render_context.hpp" -#include "map/window_handle.hpp" -#include "map/tile_renderer.hpp" -#include "map/coverage_generator.hpp" using namespace graphics; diff --git a/map/tiling_render_policy_mt.hpp b/render/tiling_render_policy_mt.hpp index e52e5cbf6f..ca3c308536 100644 --- a/map/tiling_render_policy_mt.hpp +++ b/render/tiling_render_policy_mt.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/basic_tiling_render_policy.hpp" +#include "basic_tiling_render_policy.hpp" namespace graphics { diff --git a/map/tiling_render_policy_st.cpp b/render/tiling_render_policy_st.cpp index 4014a8aef8..d70482aeb0 100644 --- a/map/tiling_render_policy_st.cpp +++ b/render/tiling_render_policy_st.cpp @@ -1,14 +1,14 @@ -#include "map/tiling_render_policy_st.hpp" +#include "tiling_render_policy_st.hpp" +#include "window_handle.hpp" +#include "queued_renderer.hpp" +#include "tile_renderer.hpp" +#include "coverage_generator.hpp" #include "platform/platform.hpp" #include "graphics/opengl/opengl.hpp" #include "graphics/render_context.hpp" -#include "map/window_handle.hpp" -#include "map/queued_renderer.hpp" -#include "map/tile_renderer.hpp" -#include "map/coverage_generator.hpp" using namespace graphics; diff --git a/map/tiling_render_policy_st.hpp b/render/tiling_render_policy_st.hpp index 0a1e2d961e..771a615ce0 100644 --- a/map/tiling_render_policy_st.hpp +++ b/render/tiling_render_policy_st.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/basic_tiling_render_policy.hpp" +#include "basic_tiling_render_policy.hpp" class TilingRenderPolicyST : public BasicTilingRenderPolicy { diff --git a/map/window_handle.cpp b/render/window_handle.cpp index a96b01ac9a..3b9b6d3c18 100644 --- a/map/window_handle.cpp +++ b/render/window_handle.cpp @@ -1,5 +1,5 @@ -#include "map/window_handle.hpp" -#include "map/render_policy.hpp" +#include "window_handle.hpp" +#include "render_policy.hpp" WindowHandle::WindowHandle() : m_hasPendingUpdates(false), diff --git a/map/window_handle.hpp b/render/window_handle.hpp index 7e6d3f10ac..a123d80317 100644 --- a/map/window_handle.hpp +++ b/render/window_handle.hpp @@ -1,7 +1,7 @@ #pragma once -#include "map/events.hpp" -#include "map/drawer.hpp" +#include "events.hpp" +#include "drawer.hpp" #include "platform/video_timer.hpp" diff --git a/map/yopme_render_policy.cpp b/render/yopme_render_policy.cpp index 89e7adaf16..2ea62e5948 100644 --- a/map/yopme_render_policy.cpp +++ b/render/yopme_render_policy.cpp @@ -1,6 +1,6 @@ -#include "map/yopme_render_policy.hpp" -#include "map/window_handle.hpp" -#include "map/scales_processor.hpp" +#include "yopme_render_policy.hpp" +#include "window_handle.hpp" +#include "scales_processor.hpp" #include "geometry/screenbase.hpp" diff --git a/map/yopme_render_policy.hpp b/render/yopme_render_policy.hpp index 6d42cc993f..c6e05e4d31 100644 --- a/map/yopme_render_policy.hpp +++ b/render/yopme_render_policy.hpp @@ -1,6 +1,7 @@ #pragma once -#include "map/render_policy.hpp" +#include "render_policy.hpp" + #include "std/shared_ptr.hpp" class Drawer; |