Added drape and drape_tests

7 files changed, 323 insertions, 6 deletions

diff --git a/3party/freetype/CMakeLists.txt b/3party/freetype/CMakeLists.txt
index c205922f18..e803f1a275 100644
--- a/3party/freetype/CMakeLists.txt
+++ b/3party/freetype/CMakeLists.txt
@@ -112,6 +112,7 @@ set(
   src/truetype/ttobjs.c
   src/truetype/ttpload.c
   src/truetype/truetype.c
+  src/truetype/ttgxvar.c
   src/type1/t1afm.c
   src/type1/t1driver.c
   src/type1/t1gload.c
diff --git a/3party/gmock/CMakeLists.txt b/3party/gmock/CMakeLists.txt
new file mode 100644
index 0000000000..00660b1b66
--- /dev/null
+++ b/3party/gmock/CMakeLists.txt
@@ -0,0 +1,39 @@
+project(gmock)
+
+include_directories(. gtest gtest/include include)
+
+set(
+  SRC
+  gtest/src/gtest-all.cc
+  gtest/src/gtest-death-test.cc
+  gtest/src/gtest-filepath.cc
+  gtest/src/gtest-internal-inl.h
+  gtest/src/gtest-port.cc
+  gtest/src/gtest-printers.cc
+  gtest/src/gtest-test-part.cc
+  gtest/src/gtest-typed-test.cc
+  gtest/src/gtest.cc
+  include/gmock/gmock-actions.h
+  include/gmock/gmock-cardinalities.h
+  include/gmock/gmock-generated-actions.h
+  include/gmock/gmock-generated-function-mockers.h
+  include/gmock/gmock-generated-matchers.h
+  include/gmock/gmock-generated-nice-strict.h
+  include/gmock/gmock-matchers.h
+  include/gmock/gmock-more-actions.h
+  include/gmock/gmock-more-matchers.h
+  include/gmock/gmock-spec-builders.h
+  include/gmock/gmock.h
+  include/gmock/internal/gmock-generated-internal-utils.h
+  include/gmock/internal/gmock-internal-utils.h
+  include/gmock/internal/gmock-port.h
+  src/gmock-all.cc
+  src/gmock-cardinalities.cc
+  src/gmock-internal-utils.cc
+  src/gmock-matchers.cc
+  src/gmock-spec-builders.cc
+  src/gmock.cc
+  src/gmock_main.cc
+)
+
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d515f6ecd..c315ce2cf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,10 +14,6 @@ find_package(Qt5Network REQUIRED)
 find_package(Qt5OpenGL REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 
-if (APPLE)
-  find_library(APL_SYSCON SystemConfiguration)
-endif()
-
 find_library(LIBZ NAMES z)
 if (LIBZ STREQUAL "LIBZ-NOTFOUND")
   message(FATAL_ERROR "Failed to find libz library.")
@@ -137,6 +133,7 @@ add_subdirectory(3party/freetype)
 add_subdirectory(3party/fribidi)
 add_subdirectory(3party/expat)
 add_subdirectory(map)
+add_subdirectory(drape)
 
 add_compile_options(
   "-Wall"
@@ -148,7 +145,8 @@ add_subdirectory(3party/liboauthcpp)
 add_subdirectory(3party/pugixml)
 add_subdirectory(3party/succinct)
 add_subdirectory(3party/osrm)
-
+add_subdirectory(3party/gmock)
+add_subdirectory(qt_tstfrm)
 add_subdirectory(base)
 add_subdirectory(coding)
 add_subdirectory(geometry)
diff --git a/drape/CMakeLists.txt b/drape/CMakeLists.txt
new file mode 100644
index 0000000000..cb9138cf9a
--- /dev/null
+++ b/drape/CMakeLists.txt
@@ -0,0 +1,194 @@
+project(drape)
+
+get_filename_component(DRAPE_ROOT ${PROJECT_SOURCE_DIR} ABSOLUTE)
+
+execute_process(
+  COMMAND python ${OMIM_ROOT}/tools/autobuild/shader_preprocessor.py
+  ${DRAPE_ROOT}/shaders
+  shader_index.txt
+  shader_def
+)
+
+include_directories(
+  ${OMIM_ROOT}/3party/freetype/include
+  ${OMIM_ROOT}/3party/glm
+)
+
+append(CMAKE_CXX_FLAGS "-std=c++11 ")
+
+set(
+  DRAPE_COMMON_SRC
+  ${DRAPE_ROOT}/attribute_buffer_mutator.cpp
+  ${DRAPE_ROOT}/attribute_buffer_mutator.hpp
+  ${DRAPE_ROOT}/attribute_provider.cpp
+  ${DRAPE_ROOT}/attribute_provider.hpp
+  ${DRAPE_ROOT}/batcher.cpp
+  ${DRAPE_ROOT}/batcher.hpp
+  ${DRAPE_ROOT}/batcher_helpers.cpp
+  ${DRAPE_ROOT}/batcher_helpers.hpp
+  ${DRAPE_ROOT}/binding_info.cpp
+  ${DRAPE_ROOT}/binding_info.hpp
+  ${DRAPE_ROOT}/buffer_base.cpp
+  ${DRAPE_ROOT}/buffer_base.hpp
+  ${DRAPE_ROOT}/color.cpp
+  ${DRAPE_ROOT}/color.hpp
+  ${DRAPE_ROOT}/constants.hpp
+  ${DRAPE_ROOT}/cpu_buffer.cpp
+  ${DRAPE_ROOT}/cpu_buffer.hpp
+  ${DRAPE_ROOT}/data_buffer.cpp
+  ${DRAPE_ROOT}/data_buffer.hpp
+  ${DRAPE_ROOT}/data_buffer_impl.hpp
+  ${DRAPE_ROOT}/debug_rect_renderer.cpp
+  ${DRAPE_ROOT}/debug_rect_renderer.hpp
+  ${DRAPE_ROOT}/drape_global.hpp
+  ${DRAPE_ROOT}/dynamic_texture.hpp
+  ${DRAPE_ROOT}/font_texture.cpp
+  ${DRAPE_ROOT}/font_texture.hpp
+  ${DRAPE_ROOT}/fribidi.cpp
+  ${DRAPE_ROOT}/fribidi.hpp
+  ${DRAPE_ROOT}/glconstants.cpp
+  ${DRAPE_ROOT}/glconstants.hpp
+  ${DRAPE_ROOT}/glextensions_list.cpp
+  ${DRAPE_ROOT}/glextensions_list.hpp
+  ${DRAPE_ROOT}/glfunctions.hpp
+  ${DRAPE_ROOT}/glIncludes.hpp
+  ${DRAPE_ROOT}/glsl_func.hpp
+  ${DRAPE_ROOT}/glsl_types.hpp
+  ${DRAPE_ROOT}/glstate.cpp
+  ${DRAPE_ROOT}/glstate.hpp
+  ${DRAPE_ROOT}/glyph_manager.cpp
+  ${DRAPE_ROOT}/glyph_manager.hpp
+  ${DRAPE_ROOT}/gpu_buffer.cpp
+  ${DRAPE_ROOT}/gpu_buffer.hpp
+  ${DRAPE_ROOT}/gpu_program.cpp
+  ${DRAPE_ROOT}/gpu_program.hpp
+  ${DRAPE_ROOT}/gpu_program_manager.cpp
+  ${DRAPE_ROOT}/gpu_program_manager.hpp
+  ${DRAPE_ROOT}/hw_texture.cpp
+  ${DRAPE_ROOT}/hw_texture.hpp
+  ${DRAPE_ROOT}/index_buffer.cpp
+  ${DRAPE_ROOT}/index_buffer.hpp
+  ${DRAPE_ROOT}/index_buffer_mutator.cpp
+  ${DRAPE_ROOT}/index_buffer_mutator.hpp
+  ${DRAPE_ROOT}/index_storage.cpp
+  ${DRAPE_ROOT}/index_storage.hpp
+  ${DRAPE_ROOT}/object_pool.hpp
+  ${DRAPE_ROOT}/oglcontext.hpp
+  ${DRAPE_ROOT}/oglcontextfactory.cpp
+  ${DRAPE_ROOT}/oglcontextfactory.hpp
+  ${DRAPE_ROOT}/overlay_handle.cpp
+  ${DRAPE_ROOT}/overlay_handle.hpp
+  ${DRAPE_ROOT}/overlay_tree.cpp
+  ${DRAPE_ROOT}/overlay_tree.hpp
+  ${DRAPE_ROOT}/pointers.cpp
+  ${DRAPE_ROOT}/pointers.hpp
+  ${DRAPE_ROOT}/render_bucket.cpp
+  ${DRAPE_ROOT}/render_bucket.hpp
+  ${DRAPE_ROOT}/shader.cpp
+  ${DRAPE_ROOT}/shader.hpp
+  ${DRAPE_ROOT}/shader_def.cpp
+  ${DRAPE_ROOT}/shader_def.hpp
+  ${DRAPE_ROOT}/static_texture.cpp
+  ${DRAPE_ROOT}/static_texture.hpp
+  ${DRAPE_ROOT}/stipple_pen_resource.cpp
+  ${DRAPE_ROOT}/stipple_pen_resource.hpp
+  ${DRAPE_ROOT}/support_manager.cpp
+  ${DRAPE_ROOT}/support_manager.hpp
+  ${DRAPE_ROOT}/symbols_texture.cpp
+  ${DRAPE_ROOT}/symbols_texture.hpp
+  ${DRAPE_ROOT}/texture.cpp
+  ${DRAPE_ROOT}/texture.hpp
+  ${DRAPE_ROOT}/texture_manager.cpp
+  ${DRAPE_ROOT}/texture_manager.hpp
+  ${DRAPE_ROOT}/texture_of_colors.cpp
+  ${DRAPE_ROOT}/texture_of_colors.hpp
+  ${DRAPE_ROOT}/uniform_value.cpp
+  ${DRAPE_ROOT}/uniform_value.hpp
+  ${DRAPE_ROOT}/uniform_values_storage.cpp
+  ${DRAPE_ROOT}/uniform_values_storage.hpp
+  ${DRAPE_ROOT}/utils/glyph_usage_tracker.cpp
+  ${DRAPE_ROOT}/utils/glyph_usage_tracker.hpp
+  ${DRAPE_ROOT}/utils/gpu_mem_tracker.cpp
+  ${DRAPE_ROOT}/utils/gpu_mem_tracker.hpp
+  ${DRAPE_ROOT}/utils/projection.cpp
+  ${DRAPE_ROOT}/utils/projection.hpp
+  ${DRAPE_ROOT}/utils/vertex_decl.cpp
+  ${DRAPE_ROOT}/utils/vertex_decl.hpp
+  ${DRAPE_ROOT}/vertex_array_buffer.cpp
+  ${DRAPE_ROOT}/vertex_array_buffer.hpp
+  ${DRAPE_ROOT}/visual_scale.hpp
+
+  ${OMIM_ROOT}/3party/sdf_image/sdf_image.cpp
+  ${OMIM_ROOT}/3party/sdf_image/sdf_image.h
+  ${OMIM_ROOT}/3party/stb_image/stb_image.c
+  ${OMIM_ROOT}/3party/stb_image/stb_image.h
+)
+
+set(
+  SRC
+  glfunctions.cpp
+)
+
+if (PLATFORM_IOS)
+  append(
+    SRC
+    hw_texture_ios.hpp
+    hw_texture_ios.mm
+  )
+endif()
+
+set( #might not need this declaration
+  OTHER_FILES
+  shaders/area3d_outline_vertex_shader.vsh
+  shaders/area3d_vertex_shader.vsh
+  shaders/area_vertex_shader.vsh
+  shaders/arrow3d_fragment_shader.fsh
+  shaders/arrow3d_shadow_fragment_shader.fsh
+  shaders/arrow3d_shadow_vertex_shader.vsh
+  shaders/arrow3d_vertex_shader.vsh
+  shaders/circle_shader.fsh
+  shaders/circle_shader.vsh
+  shaders/compass_vertex_shader.vsh
+  shaders/dashed_fragment_shader.fsh
+  shaders/dashed_vertex_shader.vsh
+  shaders/debug_rect_fragment_shader.fsh
+  shaders/debug_rect_vertex_shader.vsh
+  shaders/line_fragment_shader.fsh
+  shaders/line_vertex_shader.vsh
+  shaders/masked_texturing_billboard_vertex_shader.vsh
+  shaders/masked_texturing_fragment_shader.fsh
+  shaders/masked_texturing_vertex_shader.vsh
+  shaders/my_position_shader.vsh
+  shaders/path_symbol_vertex_shader.vsh
+  shaders/position_accuracy3d_shader.vsh
+  shaders/route_arrow_vertex_shader.vsh
+  shaders/route_dash_fragment_shader.fsh
+  shaders/route_fragment_shader.fsh
+  shaders/route_vertex_shader.vsh
+  shaders/ruler_vertex_shader.vsh
+  shaders/shader_index.txt
+  shaders/solid_color_fragment_shader.fsh
+  shaders/text_billboard_vertex_shader.vsh
+  shaders/text_fragment_shader.fsh
+  shaders/text_outlined_billboard_vertex_shader.vsh
+  shaders/text_outlined_gui_vertex_shader.vsh
+  shaders/text_outlined_vertex_shader.vsh
+  shaders/text_vertex_shader.vsh
+  shaders/texturing3d_fragment_shader.fsh
+  shaders/texturing3d_vertex_shader.vsh
+  shaders/texturing_billboard_vertex_shader.vsh
+  shaders/texturing_fragment_shader.fsh
+  shaders/texturing_vertex_shader.vsh
+  shaders/trackpoint_fragment_shader.fsh
+  shaders/trackpoint_vertex_shader.vsh
+  shaders/traffic_fragment_shader.fsh
+  shaders/traffic_vertex_shader.vsh
+  shaders/transparent_layer_fragment_shader.fsh
+  shaders/transparent_layer_vertex_shader.vsh
+  shaders/user_mark.vsh
+  shaders/user_mark_billboard.vsh
+)
+
+add_library(${PROJECT_NAME} ${DRAPE_COMMON_SRC} ${SRC})
+
+omim_add_test_subdirectory(drape_tests)
diff --git a/drape/drape_tests/CMakeLists.txt b/drape/drape_tests/CMakeLists.txt
new file mode 100644
index 0000000000..d4cdf981da
--- /dev/null
+++ b/drape/drape_tests/CMakeLists.txt
@@ -0,0 +1,77 @@
+project(drape_tests)
+
+execute_process(
+  COMMAND python ${OMIM_ROOT}/tools/autobuild/shader_preprocessor.py
+  ${DRAPE_ROOT}/shaders
+  shader_index.txt
+  shader_def
+)
+
+add_definitions(
+  -DOGL_TEST_ENABLED
+  -DGTEST_DONT_DEFINE_TEST
+  -DCOMPILER_TESTS
+)
+
+include_directories(
+  ${OMIM_ROOT}/3party/gmock/include
+  ${OMIM_ROOT}/3party/gmock/gtest/include
+  ${OMIM_ROOT}/3party/freetype/include
+)
+
+set(
+  SRC
+  attribute_provides_tests.cpp
+  batcher_tests.cpp
+  bingind_info_tests.cpp
+  buffer_tests.cpp
+  compile_shaders_test.cpp
+  dummy_texture.hpp
+  failure_reporter.cpp
+  font_texture_tests.cpp
+  fribidi_tests.cpp
+  glfunctions.cpp
+  glmock_functions.cpp
+  glmock_functions.hpp
+  glyph_mng_tests.cpp
+  glyph_packer_test.cpp
+  img.cpp
+  img.hpp
+  memory_comparer.hpp
+  pointers_tests.cpp
+  stipple_pen_tests.cpp
+  texture_of_colors_tests.cpp
+  uniform_value_tests.cpp
+)
+
+omim_add_test(${PROJECT_NAME} ${DRAPE_COMMON_SRC} ${SRC})
+
+omim_link_libraries(
+  ${PROJECT_NAME}
+  qt_tstfrm
+  indexer
+  platform
+  coding
+  geometry
+  base
+  fribidi
+  expat
+  tomcrypt
+  stats_client
+  freetype
+  gmock
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Gui_LIBRARIES}
+  ${Qt5Widgets_LIBRARIES}
+  ${LIBZ}
+)
+
+if (PLATFORM_MAC)
+  omim_link_libraries(
+    ${PROJECT_NAME}
+    "-framework IOKit"
+    "-framework Cocoa"
+    "-framework CoreLocation"
+    "-framework SystemConfiguration"
+  )
+endif()
diff --git a/platform/platform_tests/CMakeLists.txt b/platform/platform_tests/CMakeLists.txt
index ae6e11d933..5ffd0ca67b 100644
--- a/platform/platform_tests/CMakeLists.txt
+++ b/platform/platform_tests/CMakeLists.txt
@@ -1,7 +1,6 @@
 project(platform_tests)
 
 add_definitions(-DOMIM_UNIT_TEST_WITH_QT_EVENT_LOOP)
-include_directories(${APL_SYSCON})
 
 set(
   SRC
diff --git a/qt_tstfrm/CMakeLists.txt b/qt_tstfrm/CMakeLists.txt
new file mode 100644
index 0000000000..ef4f591acc
--- /dev/null
+++ b/qt_tstfrm/CMakeLists.txt
@@ -0,0 +1,9 @@
+project(qt_tstfrm)
+
+set(
+  SRC
+  test_main_loop.hpp
+  test_main_loop.cpp
+)
+
+add_library(${PROJECT_NAME} ${SRC})