diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/style/function/camera_function.test.cpp | 4 | ||||
-rw-r--r-- | test/style/paint_property.test.cpp | 2 | ||||
-rw-r--r-- | test/style/source.test.cpp | 4 | ||||
-rw-r--r-- | test/tile/annotation_tile.test.cpp | 4 | ||||
-rw-r--r-- | test/tile/geojson_tile.test.cpp | 4 | ||||
-rw-r--r-- | test/tile/raster_tile.test.cpp | 4 | ||||
-rw-r--r-- | test/tile/vector_tile.test.cpp | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/test/style/function/camera_function.test.cpp b/test/style/function/camera_function.test.cpp index 6cd53b0fa0..59e3f2cef3 100644 --- a/test/style/function/camera_function.test.cpp +++ b/test/style/function/camera_function.test.cpp @@ -1,8 +1,8 @@ #include <iostream> #include <mbgl/test/util.hpp> -#include <mbgl/style/property_evaluator.hpp> -#include <mbgl/style/property_evaluation_parameters.hpp> +#include <mbgl/renderer/property_evaluator.hpp> +#include <mbgl/renderer/property_evaluation_parameters.hpp> using namespace mbgl; using namespace mbgl::style; diff --git a/test/style/paint_property.test.cpp b/test/style/paint_property.test.cpp index 15a0796f21..1854351f7a 100644 --- a/test/style/paint_property.test.cpp +++ b/test/style/paint_property.test.cpp @@ -1,7 +1,7 @@ #include <mbgl/test/util.hpp> #include <mbgl/style/paint_property.hpp> -#include <mbgl/style/transitioning_property.hpp> +#include <mbgl/renderer/transitioning_property.hpp> using namespace mbgl; using namespace mbgl::style; diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index 6a336a8c23..a651fd8964 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -23,7 +23,7 @@ #include <mbgl/map/transform.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/style/update_parameters.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/style/layers/line_layer.hpp> #include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/annotation/annotation_source.hpp> @@ -46,7 +46,7 @@ public: AnnotationManager annotationManager { 1.0 }; style::Style style { threadPool, fileSource, 1.0 }; - style::UpdateParameters updateParameters { + UpdateParameters updateParameters { 1.0, MapDebugOptions(), transformState, diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp index 032f918068..64d2c8f1f5 100644 --- a/test/tile/annotation_tile.test.cpp +++ b/test/tile/annotation_tile.test.cpp @@ -6,7 +6,7 @@ #include <mbgl/map/transform.hpp> #include <mbgl/map/query.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/style/update_parameters.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/map/query.hpp> #include <mbgl/text/collision_tile.hpp> #include <mbgl/geometry/feature_index.hpp> @@ -26,7 +26,7 @@ public: AnnotationManager annotationManager { 1.0 }; style::Style style { threadPool, fileSource, 1.0 }; - style::UpdateParameters updateParameters { + UpdateParameters updateParameters { 1.0, MapDebugOptions(), transformState, diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp index f39ff0a4cd..5d3a28c261 100644 --- a/test/tile/geojson_tile.test.cpp +++ b/test/tile/geojson_tile.test.cpp @@ -8,7 +8,7 @@ #include <mbgl/util/run_loop.hpp> #include <mbgl/map/transform.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/style/update_parameters.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/style/layers/circle_layer.hpp> #include <mbgl/annotation/annotation_manager.hpp> @@ -27,7 +27,7 @@ public: style::Style style { threadPool, fileSource, 1.0 }; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - style::UpdateParameters updateParameters { + UpdateParameters updateParameters { 1.0, MapDebugOptions(), transformState, diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp index 1d1e7d746e..5543c3c56f 100644 --- a/test/tile/raster_tile.test.cpp +++ b/test/tile/raster_tile.test.cpp @@ -7,8 +7,8 @@ #include <mbgl/util/run_loop.hpp> #include <mbgl/map/transform.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/style/update_parameters.hpp> #include <mbgl/annotation/annotation_manager.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/renderer/raster_bucket.hpp> using namespace mbgl; @@ -23,7 +23,7 @@ public: style::Style style { threadPool, fileSource, 1.0 }; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - style::UpdateParameters updateParameters { + UpdateParameters updateParameters { 1.0, MapDebugOptions(), transformState, diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index 15d437c361..244892f220 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -8,8 +8,8 @@ #include <mbgl/map/transform.hpp> #include <mbgl/map/query.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/style/update_parameters.hpp> #include <mbgl/style/layers/symbol_layer.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/renderer/symbol_bucket.hpp> #include <mbgl/text/collision_tile.hpp> #include <mbgl/geometry/feature_index.hpp> @@ -29,7 +29,7 @@ public: style::Style style { threadPool, fileSource, 1.0 }; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - style::UpdateParameters updateParameters { + UpdateParameters updateParameters { 1.0, MapDebugOptions(), transformState, |