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/style | |
| 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/style')
| -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 |
3 files changed, 5 insertions, 5 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, |