diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-27 15:05:11 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-04 07:29:08 -0700 |
commit | 89f1ffc6d29d5631dfd322834397ec2247c5c9d7 (patch) | |
tree | 277bd6ca61cbecaa9c659273992da2abbe9a431e /src/mbgl/tile | |
parent | 806da5d940aed7021f921ab98b9ae8e4e364f732 (diff) | |
download | qtlocation-mapboxgl-89f1ffc6d29d5631dfd322834397ec2247c5c9d7.tar.gz |
[core] UpdateParameters ⇢ TileParameters
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/raster_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/raster_tile.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/tile_loader.hpp | 4 | ||||
-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 | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index 21c29f3eb7..3c4939a0a6 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/renderer/update_parameters.hpp> +#include <mbgl/renderer/tile_parameters.hpp> #include <mapbox/geojsonvt.hpp> #include <supercluster.hpp> @@ -84,7 +84,7 @@ public: GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID, std::string sourceID_, - const UpdateParameters& parameters, + const TileParameters& 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 8bb0cb01b9..d8a0a379d7 100644 --- a/src/mbgl/tile/geojson_tile.hpp +++ b/src/mbgl/tile/geojson_tile.hpp @@ -5,13 +5,13 @@ namespace mbgl { -class UpdateParameters; +class TileParameters; class GeoJSONTile : public GeometryTile { public: GeoJSONTile(const OverscaledTileID&, std::string sourceID, - const UpdateParameters&, + const TileParameters&, 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 e995347f70..a8eda38284 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -5,7 +5,7 @@ #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/tile_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 UpdateParameters& parameters, + const TileParameters& parameters, GlyphAtlas& glyphAtlas_, SpriteAtlas& spriteAtlas_) : Tile(id_), diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index c54e48a5bc..594952d329 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -20,7 +20,7 @@ class FeatureIndex; class CollisionTile; class RenderLayer; class SourceQueryOptions; -class UpdateParameters; +class TileParameters; namespace style { class Style; @@ -30,7 +30,7 @@ class GeometryTile : public Tile, public GlyphRequestor, IconRequestor { public: GeometryTile(const OverscaledTileID&, std::string sourceID, - const UpdateParameters&, + const TileParameters&, GlyphAtlas&, SpriteAtlas&); diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp index d670a142fe..b1a901e565 100644 --- a/src/mbgl/tile/raster_tile.cpp +++ b/src/mbgl/tile/raster_tile.cpp @@ -6,14 +6,14 @@ #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/tile_parameters.hpp> #include <mbgl/renderer/raster_bucket.hpp> #include <mbgl/util/run_loop.hpp> namespace mbgl { RasterTile::RasterTile(const OverscaledTileID& id_, - const UpdateParameters& parameters, + const TileParameters& 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 c2ece70ab0..e047430485 100644 --- a/src/mbgl/tile/raster_tile.hpp +++ b/src/mbgl/tile/raster_tile.hpp @@ -8,7 +8,7 @@ namespace mbgl { class Tileset; -class UpdateParameters; +class TileParameters; namespace style { class Layer; @@ -17,7 +17,7 @@ class Layer; class RasterTile : public Tile { public: RasterTile(const OverscaledTileID&, - const UpdateParameters&, + const TileParameters&, const Tileset&); ~RasterTile() final; diff --git a/src/mbgl/tile/tile_loader.hpp b/src/mbgl/tile/tile_loader.hpp index 125f82f0f5..bc408ebaf6 100644 --- a/src/mbgl/tile/tile_loader.hpp +++ b/src/mbgl/tile/tile_loader.hpp @@ -10,14 +10,14 @@ class FileSource; class AsyncRequest; class Response; class Tileset; -class UpdateParameters; +class TileParameters; template <typename T> class TileLoader : private util::noncopyable { public: TileLoader(T&, const OverscaledTileID&, - const UpdateParameters&, + const TileParameters&, const Tileset&); ~TileLoader(); diff --git a/src/mbgl/tile/tile_loader_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp index 7d7839f808..899cbaf9b0 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/renderer/update_parameters.hpp> +#include <mbgl/renderer/tile_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 UpdateParameters& parameters, + const TileParameters& 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 d43ab74007..46914e5f5a 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/renderer/update_parameters.hpp> +#include <mbgl/renderer/tile_parameters.hpp> #include <protozero/pbf_reader.hpp> @@ -83,7 +83,7 @@ private: VectorTile::VectorTile(const OverscaledTileID& id_, std::string sourceID_, - const UpdateParameters& parameters, + const TileParameters& 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 175b71c213..566cde4f37 100644 --- a/src/mbgl/tile/vector_tile.hpp +++ b/src/mbgl/tile/vector_tile.hpp @@ -6,13 +6,13 @@ namespace mbgl { class Tileset; -class UpdateParameters; +class TileParameters; class VectorTile : public GeometryTile { public: VectorTile(const OverscaledTileID&, std::string sourceID, - const UpdateParameters&, + const TileParameters&, const Tileset&); void setNecessity(Necessity) final; |