[core] UpdateParameters ⇢ TileParameters

2017-04-27 15:05:11 -07:00
parent 806da5d940
commit 89f1ffc6d2
33 changed files with 90 additions and 90 deletions
--- 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/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/style/style.hpp>

 #include <utility>
@@ -10,7 +10,7 @@
 namespace mbgl {

 AnnotationTile::AnnotationTile(const OverscaledTileID& overscaledTileID,
-                               const UpdateParameters& parameters)
+                               const TileParameters& parameters)
    : GeometryTile(overscaledTileID, AnnotationManager::SourceID, parameters,
                   *parameters.style.glyphAtlas,
                   parameters.annotationManager.spriteAtlas),
--- a/src/mbgl/annotation/annotation_tile.hpp
+++ b/src/mbgl/annotation/annotation_tile.hpp
@@ -7,12 +7,12 @@
 namespace mbgl {

 class AnnotationManager;
-class UpdateParameters;
+class TileParameters;

 class AnnotationTile : public GeometryTile {
 public:
    AnnotationTile(const OverscaledTileID&,
-                   const UpdateParameters&);
+                   const TileParameters&);
    ~AnnotationTile() override;

    void setNecessity(Necessity) final;
--- a/src/mbgl/annotation/render_annotation_source.cpp
+++ b/src/mbgl/annotation/render_annotation_source.cpp
@@ -35,7 +35,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderAnnotationSource::getRenderTiles()
    return tilePyramid.getRenderTiles();
 }

-void RenderAnnotationSource::updateTiles(const UpdateParameters& parameters) {
+void RenderAnnotationSource::updateTiles(const TileParameters& parameters) {
    tilePyramid.updateTiles(parameters,
                            SourceType::Annotations,
                            util::tileSize,
--- 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 UpdateParameters&) final;
+    void updateTiles(const TileParameters&) final;

    // Removes all tiles (by putting them into the cache).
    void removeTiles() final;
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -12,7 +12,7 @@
 #include <mbgl/style/light.hpp>
 #include <mbgl/style/observer.hpp>
 #include <mbgl/style/transition_options.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/render_source.hpp>
 #include <mbgl/storage/file_source.hpp>
@@ -255,14 +255,14 @@ void Map::Impl::render(View& view) {
        style->relayout();
    }

-    UpdateParameters parameters(pixelRatio,
-                                       debugOptions,
-                                       transform.getState(),
-                                       scheduler,
-                                       fileSource,
-                                       mode,
-                                       *annotationManager,
-                                       *style);
+    TileParameters parameters(pixelRatio,
+                              debugOptions,
+                              transform.getState(),
+                              scheduler,
+                              fileSource,
+                              mode,
+                              *annotationManager,
+                              *style);

    style->updateTiles(parameters);

--- a/src/mbgl/renderer/render_source.hpp
+++ b/src/mbgl/renderer/render_source.hpp
@@ -21,7 +21,7 @@ class RenderedQueryOptions;
 class SourceQueryOptions;
 class Tile;
 class RenderSourceObserver;
-class UpdateParameters;
+class TileParameters;

 namespace algorithm {
 class ClipIDGenerator;
@@ -36,7 +36,7 @@ public:

    // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
    // trigger re-placement of existing complete tiles.
-    virtual void updateTiles(const UpdateParameters&) = 0;
+    virtual void updateTiles(const TileParameters&) = 0;

    // Removes all tiles (by putting them into the cache).
    virtual void removeTiles() = 0;
--- a/src/mbgl/renderer/sources/render_geojson_source.cpp
+++ b/src/mbgl/renderer/sources/render_geojson_source.cpp
@@ -36,7 +36,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderGeoJSONSource::getRenderTiles() {
    return tilePyramid.getRenderTiles();
 }

-void RenderGeoJSONSource::updateTiles(const UpdateParameters& parameters) {
+void RenderGeoJSONSource::updateTiles(const TileParameters& parameters) {
    GeoJSONData* data_ = impl.getData();

    if (!data_) {
--- a/src/mbgl/renderer/sources/render_geojson_source.hpp
+++ b/src/mbgl/renderer/sources/render_geojson_source.hpp
@@ -18,7 +18,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 UpdateParameters&) final;
+    void updateTiles(const TileParameters&) final;

    // Removes all tiles (by putting them into the cache).
    void removeTiles() final;
--- a/src/mbgl/renderer/sources/render_raster_source.cpp
+++ b/src/mbgl/renderer/sources/render_raster_source.cpp
@@ -32,7 +32,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderRasterSource::getRenderTiles() {
    return tilePyramid.getRenderTiles();
 }

-void RenderRasterSource::updateTiles(const UpdateParameters& parameters) {
+void RenderRasterSource::updateTiles(const TileParameters& parameters) {
    optional<Tileset> tileset = impl.getTileset();

    if (!tileset) {
--- a/src/mbgl/renderer/sources/render_raster_source.hpp
+++ b/src/mbgl/renderer/sources/render_raster_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 UpdateParameters&) final;
+    void updateTiles(const TileParameters&) final;

    // Removes all tiles (by putting them into the cache).
    void removeTiles() final;
--- a/src/mbgl/renderer/sources/render_vector_source.cpp
+++ b/src/mbgl/renderer/sources/render_vector_source.cpp
@@ -36,7 +36,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderVectorSource::getRenderTiles() {
    return tilePyramid.getRenderTiles();
 }

-void RenderVectorSource::updateTiles(const UpdateParameters& parameters) {
+void RenderVectorSource::updateTiles(const TileParameters& parameters) {
    optional<Tileset> tileset = impl.getTileset();

    if (!tileset) {
--- a/src/mbgl/renderer/sources/render_vector_source.hpp
+++ b/src/mbgl/renderer/sources/render_vector_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 UpdateParameters&) final;
+    void updateTiles(const TileParameters&) final;

    // Removes all tiles (by putting them into the cache).
    void removeTiles() final;
--- a/src/mbgl/renderer/update_parameters.hpp
+++ b/src/mbgl/renderer/update_parameters.hpp
@@ -13,16 +13,16 @@ namespace style {
 class Style;
 } // namespace style

-class UpdateParameters {
+class TileParameters {
 public:
-    UpdateParameters(float pixelRatio_,
-                          MapDebugOptions debugOptions_,
-                          const TransformState& transformState_,
-                          Scheduler& workerScheduler_,
-                          FileSource& fileSource_,
-                          const MapMode mode_,
-                          AnnotationManager& annotationManager_,
-                          style::Style& style_)
+    TileParameters(float pixelRatio_,
+                   MapDebugOptions debugOptions_,
+                   const TransformState& transformState_,
+                   Scheduler& workerScheduler_,
+                   FileSource& fileSource_,
+                   const MapMode mode_,
+                   AnnotationManager& annotationManager_,
+                   style::Style& style_)
        : pixelRatio(pixelRatio_),
          debugOptions(debugOptions_),
          transformState(transformState_),
--- a/src/mbgl/renderer/tile_pyramid.cpp
+++ b/src/mbgl/renderer/tile_pyramid.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/renderer/render_tile.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/render_source.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/map/transform.hpp>
 #include <mbgl/map/query.hpp>
 #include <mbgl/text/placement_config.hpp>
@@ -67,7 +67,7 @@ std::map<UnwrappedTileID, RenderTile>& TilePyramid::getRenderTiles() {
    return renderTiles;
 }

-void TilePyramid::updateTiles(const UpdateParameters& parameters,
+void TilePyramid::updateTiles(const TileParameters& parameters,
                              const SourceType type,
                              const uint16_t tileSize,
                              const Range<uint8_t> zoomRange,
--- a/src/mbgl/renderer/tile_pyramid.hpp
+++ b/src/mbgl/renderer/tile_pyramid.hpp
@@ -22,7 +22,7 @@ class TransformState;
 class RenderTile;
 class RenderedQueryOptions;
 class SourceQueryOptions;
-class UpdateParameters;
+class TileParameters;

 class TilePyramid {
 public:
@@ -33,7 +33,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 UpdateParameters&,
+    void updateTiles(const TileParameters&,
                     SourceType type,
                     uint16_t tileSize,
                     Range<uint8_t> zoomRange,
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -20,7 +20,7 @@
 #include <mbgl/text/glyph_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
 #include <mbgl/renderer/render_source.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/cascade_parameters.hpp>
 #include <mbgl/renderer/property_evaluation_parameters.hpp>
 #include <mbgl/renderer/render_item.hpp>
@@ -327,7 +327,7 @@ double Style::getDefaultPitch() const {
    return defaultPitch;
 }

-void Style::updateTiles(const UpdateParameters& parameters) {
+void Style::updateTiles(const TileParameters& parameters) {
    for (const auto& renderSource : renderSources) {
        if (renderSource->enabled) {
            renderSource->updateTiles(parameters);
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -36,7 +36,7 @@ class RenderedQueryOptions;
 class Scheduler;
 class RenderLayer;
 class RenderSource;
-class UpdateParameters;
+class TileParameters;

 namespace style {

@@ -61,7 +61,7 @@ public:

    // Fetch the tiles needed by the current viewport and emit a signal when
    // a tile is ready so observers can render the tile.
-    void updateTiles(const UpdateParameters&);
+    void updateTiles(const TileParameters&);

    void relayout();
    void cascade(const TimePoint&, MapMode);
--- 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,
--- 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>);
--- 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_),
--- 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&);

--- 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),
--- 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;

--- 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();

--- 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),
--- 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,
--- 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;