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/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 'src/mbgl/tile')
-rw-r--r-- | src/mbgl/tile/geojson_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/geojson_tile.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile_worker.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/raster_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/raster_tile.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/tile_loader.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/tile_loader_impl.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile.hpp | 5 |
11 files changed, 19 insertions, 27 deletions
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index 4e0623c18b..21c29f3eb7 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -2,7 +2,7 @@ #include <mbgl/tile/geometry_tile_data.hpp> #include <mbgl/map/query.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/style/update_parameters.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mapbox/geojsonvt.hpp> #include <supercluster.hpp> @@ -84,7 +84,7 @@ public: GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID, std::string sourceID_, - const style::UpdateParameters& parameters, + const UpdateParameters& parameters, mapbox::geometry::feature_collection<int16_t> features) : GeometryTile(overscaledTileID, sourceID_, parameters, *parameters.style.glyphAtlas, diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp index 0bafe14bdc..8bb0cb01b9 100644 --- a/src/mbgl/tile/geojson_tile.hpp +++ b/src/mbgl/tile/geojson_tile.hpp @@ -5,15 +5,13 @@ namespace mbgl { -namespace style { class UpdateParameters; -} // namespace style class GeoJSONTile : public GeometryTile { public: GeoJSONTile(const OverscaledTileID&, std::string sourceID, - const style::UpdateParameters&, + const UpdateParameters&, mapbox::geometry::feature_collection<int16_t>); void updateData(mapbox::geometry::feature_collection<int16_t>); diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 6ac4a2e3aa..e995347f70 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -2,10 +2,10 @@ #include <mbgl/tile/geometry_tile_worker.hpp> #include <mbgl/tile/geometry_tile_data.hpp> #include <mbgl/tile/tile_observer.hpp> -#include <mbgl/style/update_parameters.hpp> #include <mbgl/style/layer_impl.hpp> #include <mbgl/style/layers/background_layer.hpp> #include <mbgl/style/layers/custom_layer.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/renderer/render_background_layer.hpp> #include <mbgl/renderer/render_custom_layer.hpp> #include <mbgl/renderer/render_symbol_layer.hpp> @@ -28,7 +28,7 @@ using namespace style; GeometryTile::GeometryTile(const OverscaledTileID& id_, std::string sourceID_, - const style::UpdateParameters& parameters, + const UpdateParameters& parameters, GlyphAtlas& glyphAtlas_, SpriteAtlas& spriteAtlas_) : Tile(id_), diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 227e774e9d..c54e48a5bc 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -20,17 +20,17 @@ class FeatureIndex; class CollisionTile; class RenderLayer; class SourceQueryOptions; +class UpdateParameters; namespace style { class Style; -class UpdateParameters; } // namespace style class GeometryTile : public Tile, public GlyphRequestor, IconRequestor { public: GeometryTile(const OverscaledTileID&, std::string sourceID, - const style::UpdateParameters&, + const UpdateParameters&, GlyphAtlas&, SpriteAtlas&); diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp index 550e06bae2..a2d1f15906 100644 --- a/src/mbgl/tile/geometry_tile_worker.cpp +++ b/src/mbgl/tile/geometry_tile_worker.cpp @@ -249,13 +249,13 @@ static std::vector<std::unique_ptr<RenderLayer>> toRenderLayers(const std::vecto for (auto& layer : layers) { renderLayers.push_back(layer->baseImpl->createRenderLayer()); - renderLayers.back()->cascade(style::CascadeParameters { + renderLayers.back()->cascade(CascadeParameters { { ClassID::Default }, Clock::time_point::max(), TransitionOptions() }); - renderLayers.back()->evaluate(style::PropertyEvaluationParameters { + renderLayers.back()->evaluate(PropertyEvaluationParameters { zoom, Clock::time_point::max(), ZoomHistory(), diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp index 65907eb92a..d670a142fe 100644 --- a/src/mbgl/tile/raster_tile.cpp +++ b/src/mbgl/tile/raster_tile.cpp @@ -3,17 +3,17 @@ #include <mbgl/tile/tile_observer.hpp> #include <mbgl/tile/tile_loader_impl.hpp> #include <mbgl/style/source.hpp> -#include <mbgl/style/update_parameters.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> #include <mbgl/storage/file_source.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/renderer/raster_bucket.hpp> #include <mbgl/util/run_loop.hpp> namespace mbgl { RasterTile::RasterTile(const OverscaledTileID& id_, - const style::UpdateParameters& parameters, + const UpdateParameters& parameters, const Tileset& tileset) : Tile(id_), loader(*this, id_, parameters, tileset), diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp index 47f67a0842..c2ece70ab0 100644 --- a/src/mbgl/tile/raster_tile.hpp +++ b/src/mbgl/tile/raster_tile.hpp @@ -8,16 +8,16 @@ namespace mbgl { class Tileset; +class UpdateParameters; namespace style { class Layer; -class UpdateParameters; } // namespace style class RasterTile : public Tile { public: RasterTile(const OverscaledTileID&, - const style::UpdateParameters&, + const UpdateParameters&, const Tileset&); ~RasterTile() final; diff --git a/src/mbgl/tile/tile_loader.hpp b/src/mbgl/tile/tile_loader.hpp index 0d64f647d7..125f82f0f5 100644 --- a/src/mbgl/tile/tile_loader.hpp +++ b/src/mbgl/tile/tile_loader.hpp @@ -10,17 +10,14 @@ class FileSource; class AsyncRequest; class Response; class Tileset; - -namespace style { class UpdateParameters; -} // namespace style template <typename T> class TileLoader : private util::noncopyable { public: TileLoader(T&, const OverscaledTileID&, - const style::UpdateParameters&, + const UpdateParameters&, const Tileset&); ~TileLoader(); diff --git a/src/mbgl/tile/tile_loader_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp index 9a5b35a7af..7d7839f808 100644 --- a/src/mbgl/tile/tile_loader_impl.hpp +++ b/src/mbgl/tile/tile_loader_impl.hpp @@ -2,7 +2,7 @@ #include <mbgl/tile/tile_loader.hpp> #include <mbgl/storage/file_source.hpp> -#include <mbgl/style/update_parameters.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <mbgl/util/tileset.hpp> #include <cassert> @@ -12,7 +12,7 @@ namespace mbgl { template <typename T> TileLoader<T>::TileLoader(T& tile_, const OverscaledTileID& id, - const style::UpdateParameters& parameters, + const UpdateParameters& parameters, const Tileset& tileset) : tile(tile_), necessity(Necessity::Optional), diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp index 277a176670..d43ab74007 100644 --- a/src/mbgl/tile/vector_tile.cpp +++ b/src/mbgl/tile/vector_tile.cpp @@ -2,7 +2,7 @@ #include <mbgl/tile/tile_loader_impl.hpp> #include <mbgl/tile/geometry_tile_data.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/style/update_parameters.hpp> +#include <mbgl/renderer/update_parameters.hpp> #include <protozero/pbf_reader.hpp> @@ -83,7 +83,7 @@ private: VectorTile::VectorTile(const OverscaledTileID& id_, std::string sourceID_, - const style::UpdateParameters& parameters, + const UpdateParameters& parameters, const Tileset& tileset) : GeometryTile(id_, sourceID_, parameters, *parameters.style.glyphAtlas, diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp index 2568a277e6..175b71c213 100644 --- a/src/mbgl/tile/vector_tile.hpp +++ b/src/mbgl/tile/vector_tile.hpp @@ -6,16 +6,13 @@ namespace mbgl { class Tileset; - -namespace style { class UpdateParameters; -} // namespace style class VectorTile : public GeometryTile { public: VectorTile(const OverscaledTileID&, std::string sourceID, - const style::UpdateParameters&, + const UpdateParameters&, const Tileset&); void setNecessity(Necessity) final; |