diff options
author | Lauren Budorick <lauren@mapbox.com> | 2017-04-27 15:56:55 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-27 15:56:55 -0700 |
commit | f6e79d70735361438655f279c8699a786d25458c (patch) | |
tree | cc01ae7aba097bae4aa84beb12ac6b8f34f4d51a /cmake | |
parent | 839ad87f37a4880804fb4c79157d998ac59954b5 (diff) | |
download | qtlocation-mapboxgl-f6e79d70735361438655f279c8699a786d25458c.tar.gz |
[core] Render fill-extrusion layers (#8431)
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/core-files.cmake | 25 | ||||
-rw-r--r-- | cmake/test-files.cmake | 2 |
2 files changed, 23 insertions, 4 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 602cf90dad..d281872102 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -139,6 +139,10 @@ set(MBGL_CORE_FILES src/mbgl/programs/collision_box_program.cpp src/mbgl/programs/collision_box_program.hpp src/mbgl/programs/debug_program.hpp + src/mbgl/programs/extrusion_texture_program.cpp + src/mbgl/programs/extrusion_texture_program.hpp + src/mbgl/programs/fill_extrusion_program.cpp + src/mbgl/programs/fill_extrusion_program.hpp src/mbgl/programs/fill_program.cpp src/mbgl/programs/fill_program.hpp src/mbgl/programs/line_program.cpp @@ -162,6 +166,8 @@ set(MBGL_CORE_FILES src/mbgl/renderer/debug_bucket.hpp src/mbgl/renderer/fill_bucket.cpp src/mbgl/renderer/fill_bucket.hpp + src/mbgl/renderer/fill_extrusion_bucket.cpp + src/mbgl/renderer/fill_extrusion_bucket.hpp src/mbgl/renderer/frame_history.cpp src/mbgl/renderer/frame_history.hpp src/mbgl/renderer/group_by_layout.cpp @@ -176,6 +182,7 @@ set(MBGL_CORE_FILES src/mbgl/renderer/painter_clipping.cpp src/mbgl/renderer/painter_debug.cpp src/mbgl/renderer/painter_fill.cpp + src/mbgl/renderer/painter_fill_extrusion.cpp src/mbgl/renderer/painter_line.cpp src/mbgl/renderer/painter_raster.cpp src/mbgl/renderer/painter_symbol.cpp @@ -213,8 +220,14 @@ set(MBGL_CORE_FILES src/mbgl/shaders/collision_box.hpp src/mbgl/shaders/debug.cpp src/mbgl/shaders/debug.hpp + src/mbgl/shaders/extrusion_texture.cpp + src/mbgl/shaders/extrusion_texture.hpp src/mbgl/shaders/fill.cpp src/mbgl/shaders/fill.hpp + src/mbgl/shaders/fill_extrusion.cpp + src/mbgl/shaders/fill_extrusion.hpp + src/mbgl/shaders/fill_extrusion_pattern.cpp + src/mbgl/shaders/fill_extrusion_pattern.hpp src/mbgl/shaders/fill_outline.cpp src/mbgl/shaders/fill_outline.hpp src/mbgl/shaders/fill_outline_pattern.cpp @@ -270,6 +283,8 @@ set(MBGL_CORE_FILES include/mbgl/style/image.hpp include/mbgl/style/layer.hpp include/mbgl/style/layer_type.hpp + include/mbgl/style/light.hpp + include/mbgl/style/position.hpp include/mbgl/style/property_value.hpp include/mbgl/style/query.hpp include/mbgl/style/source.hpp @@ -288,6 +303,7 @@ set(MBGL_CORE_FILES src/mbgl/style/layer_impl.hpp src/mbgl/style/layer_observer.hpp src/mbgl/style/layout_property.hpp + src/mbgl/style/light_impl.hpp src/mbgl/style/observer.hpp src/mbgl/style/paint_property.hpp src/mbgl/style/paint_property_binder.hpp @@ -304,10 +320,9 @@ set(MBGL_CORE_FILES src/mbgl/style/source_observer.hpp src/mbgl/style/style.cpp src/mbgl/style/style.hpp - src/mbgl/style/style.hpp - src/mbgl/style/style.hpp src/mbgl/style/tile_source_impl.cpp src/mbgl/style/tile_source_impl.hpp + src/mbgl/style/transitioning_property.hpp src/mbgl/style/types.cpp src/mbgl/style/update_batch.hpp src/mbgl/style/update_parameters.hpp @@ -320,7 +335,9 @@ set(MBGL_CORE_FILES include/mbgl/style/conversion/geojson.hpp include/mbgl/style/conversion/geojson_options.hpp include/mbgl/style/conversion/layer.hpp + include/mbgl/style/conversion/light.hpp include/mbgl/style/conversion/make_property_setters.hpp + include/mbgl/style/conversion/position.hpp include/mbgl/style/conversion/property_setter.hpp include/mbgl/style/conversion/property_value.hpp include/mbgl/style/conversion/source.hpp @@ -474,6 +491,7 @@ set(MBGL_CORE_FILES include/mbgl/util/geometry.hpp include/mbgl/util/ignore.hpp include/mbgl/util/image.hpp + include/mbgl/util/indexed_tuple.hpp include/mbgl/util/interpolate.hpp include/mbgl/util/logging.hpp include/mbgl/util/noncopyable.hpp @@ -487,6 +505,7 @@ set(MBGL_CORE_FILES include/mbgl/util/tileset.hpp include/mbgl/util/timer.hpp include/mbgl/util/traits.hpp + include/mbgl/util/type_list.hpp include/mbgl/util/unitbezier.hpp include/mbgl/util/util.hpp include/mbgl/util/variant.hpp @@ -514,7 +533,6 @@ set(MBGL_CORE_FILES src/mbgl/util/http_timeout.hpp src/mbgl/util/i18n.cpp src/mbgl/util/i18n.hpp - src/mbgl/util/indexed_tuple.hpp src/mbgl/util/interpolate.cpp src/mbgl/util/intersection_tests.cpp src/mbgl/util/intersection_tests.hpp @@ -548,7 +566,6 @@ set(MBGL_CORE_FILES src/mbgl/util/tile_cover.cpp src/mbgl/util/tile_cover.hpp src/mbgl/util/token.hpp - src/mbgl/util/type_list.hpp src/mbgl/util/url.cpp src/mbgl/util/url.hpp src/mbgl/util/utf.hpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 9012ae9616..51dedb0052 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -82,6 +82,7 @@ set(MBGL_TEST_FILES test/style/conversion/function.test.cpp test/style/conversion/geojson_options.test.cpp test/style/conversion/layer.test.cpp + test/style/conversion/light.test.cpp test/style/conversion/stringify.test.cpp # style @@ -125,6 +126,7 @@ set(MBGL_TEST_FILES test/util/merge_lines.test.cpp test/util/number_conversions.test.cpp test/util/offscreen_texture.test.cpp + test/util/position.test.cpp test/util/projection.test.cpp test/util/run_loop.test.cpp test/util/text_conversions.test.cpp |