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 /src/mbgl/annotation | |
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 'src/mbgl/annotation')
-rw-r--r-- | src/mbgl/annotation/annotation_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/annotation/annotation_tile.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/annotation/render_annotation_source.hpp | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index fd182b70bc..796ca04ba6 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -2,7 +2,7 @@ #include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/storage/file_source.hpp> -#include <mbgl/style/update_parameters.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/style/style.hpp> #include <utility> @@ -10,7 +10,7 @@ namespace mbgl { AnnotationTile::AnnotationTile(const OverscaledTileID& overscaledTileID, - const style::UpdateParameters& parameters) + const UpdateParameters& parameters) : GeometryTile(overscaledTileID, AnnotationManager::SourceID, parameters, *parameters.style.glyphAtlas, parameters.annotationManager.spriteAtlas), diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index 2c100ed50a..6ca9079f9e 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -7,15 +7,12 @@ namespace mbgl { class AnnotationManager; - -namespace style { class UpdateParameters; -} // namespace style class AnnotationTile : public GeometryTile { public: AnnotationTile(const OverscaledTileID&, - const style::UpdateParameters&); + const UpdateParameters&); ~AnnotationTile() override; void setNecessity(Necessity) final; diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp index 394acc5108..ae0a43c5c7 100644 --- a/src/mbgl/annotation/render_annotation_source.hpp +++ b/src/mbgl/annotation/render_annotation_source.hpp @@ -14,7 +14,7 @@ public: // Called when the camera has changed. May load new tiles, unload obsolete tiles, or // trigger re-placement of existing complete tiles. - void updateTiles(const style::UpdateParameters&) final; + void updateTiles(const UpdateParameters&) final; // Removes all tiles (by putting them into the cache). void removeTiles() final; |