diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-27 14:33:00 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-03 08:30:17 -0700 |
| commit | d5f4d0f05fcb8490984649d78d6c026f87a77f4e (patch) | |
| tree | dea3b08a7c1d6f29a0f75d37cb2ee54a2429e6b4 /test/tile | |
| parent | 6c7730ee7c2d9e63df526965bb511b2f43ee82b7 (diff) | |
| download | qtlocation-mapboxgl-d5f4d0f05fcb8490984649d78d6c026f87a77f4e.tar.gz | |
[core] Move render-related sources out of style directory/namespace
Moves the following to the renderer directory and out of the style namespace:
* CascadeParameters
* PropertyEvaluationParameters
* UpdateParameters
* PropertyEvaluator
* DataDrivenPropertyEvaluator
* CrossFadedPropertyEvaluator
* PaintPropertyBinder
* PaintProperyStatistics
* PossiblyEvaluatedPropertyValue
* TransitioningLight
* EvaluatedLight
Diffstat (limited to 'test/tile')
| -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 |
4 files changed, 8 insertions, 8 deletions
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, |