From 89f1ffc6d29d5631dfd322834397ec2247c5c9d7 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 27 Apr 2017 15:05:11 -0700 Subject: =?UTF-8?q?[core]=20UpdateParameters=20=E2=87=A2=20TileParameters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mbgl/annotation/annotation_tile.cpp | 4 +- src/mbgl/annotation/annotation_tile.hpp | 4 +- src/mbgl/annotation/render_annotation_source.cpp | 2 +- src/mbgl/annotation/render_annotation_source.hpp | 2 +- src/mbgl/map/map.cpp | 18 ++++----- src/mbgl/renderer/render_source.hpp | 4 +- .../renderer/sources/render_geojson_source.cpp | 2 +- .../renderer/sources/render_geojson_source.hpp | 2 +- src/mbgl/renderer/sources/render_raster_source.cpp | 2 +- src/mbgl/renderer/sources/render_raster_source.hpp | 2 +- src/mbgl/renderer/sources/render_vector_source.cpp | 2 +- src/mbgl/renderer/sources/render_vector_source.hpp | 2 +- src/mbgl/renderer/tile_parameters.hpp | 47 ++++++++++++++++++++++ src/mbgl/renderer/tile_pyramid.cpp | 4 +- src/mbgl/renderer/tile_pyramid.hpp | 4 +- src/mbgl/renderer/update_parameters.hpp | 47 ---------------------- src/mbgl/style/style.cpp | 4 +- src/mbgl/style/style.hpp | 4 +- src/mbgl/tile/geojson_tile.cpp | 4 +- src/mbgl/tile/geojson_tile.hpp | 4 +- src/mbgl/tile/geometry_tile.cpp | 4 +- src/mbgl/tile/geometry_tile.hpp | 4 +- src/mbgl/tile/raster_tile.cpp | 4 +- src/mbgl/tile/raster_tile.hpp | 4 +- src/mbgl/tile/tile_loader.hpp | 4 +- src/mbgl/tile/tile_loader_impl.hpp | 4 +- src/mbgl/tile/vector_tile.cpp | 4 +- src/mbgl/tile/vector_tile.hpp | 4 +- 28 files changed, 98 insertions(+), 98 deletions(-) create mode 100644 src/mbgl/renderer/tile_parameters.hpp delete mode 100644 src/mbgl/renderer/update_parameters.hpp (limited to 'src') diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index 796ca04ba6..1253681414 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include @@ -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), diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index 6ca9079f9e..ea4ff5ebd5 100644 --- 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; diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp index f926b6ce9a..a62d2d51d3 100644 --- a/src/mbgl/annotation/render_annotation_source.cpp +++ b/src/mbgl/annotation/render_annotation_source.cpp @@ -35,7 +35,7 @@ std::map& RenderAnnotationSource::getRenderTiles() return tilePyramid.getRenderTiles(); } -void RenderAnnotationSource::updateTiles(const UpdateParameters& parameters) { +void RenderAnnotationSource::updateTiles(const TileParameters& parameters) { tilePyramid.updateTiles(parameters, SourceType::Annotations, util::tileSize, diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp index ae0a43c5c7..9ae9340477 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 UpdateParameters&) final; + void updateTiles(const TileParameters&) final; // Removes all tiles (by putting them into the cache). void removeTiles() final; diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 4bd370eff3..d28869bd65 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -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); diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp index bec1d24d0f..d31347579e 100644 --- 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; diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp index 7e36b44ea4..2b1eeea73b 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.cpp +++ b/src/mbgl/renderer/sources/render_geojson_source.cpp @@ -36,7 +36,7 @@ std::map& RenderGeoJSONSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } -void RenderGeoJSONSource::updateTiles(const UpdateParameters& parameters) { +void RenderGeoJSONSource::updateTiles(const TileParameters& parameters) { GeoJSONData* data_ = impl.getData(); if (!data_) { diff --git a/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp index 502df0f1c5..262ab29276 100644 --- 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; diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp index 75a2189053..c5a29eebf5 100644 --- a/src/mbgl/renderer/sources/render_raster_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_source.cpp @@ -32,7 +32,7 @@ std::map& RenderRasterSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } -void RenderRasterSource::updateTiles(const UpdateParameters& parameters) { +void RenderRasterSource::updateTiles(const TileParameters& parameters) { optional tileset = impl.getTileset(); if (!tileset) { diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp index ebb7b62150..5690ba80ea 100644 --- 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; diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp index 3d7e09fd2a..0db4698a81 100644 --- a/src/mbgl/renderer/sources/render_vector_source.cpp +++ b/src/mbgl/renderer/sources/render_vector_source.cpp @@ -36,7 +36,7 @@ std::map& RenderVectorSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } -void RenderVectorSource::updateTiles(const UpdateParameters& parameters) { +void RenderVectorSource::updateTiles(const TileParameters& parameters) { optional tileset = impl.getTileset(); if (!tileset) { diff --git a/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp index c435db6f0b..36d75e0982 100644 --- 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; diff --git a/src/mbgl/renderer/tile_parameters.hpp b/src/mbgl/renderer/tile_parameters.hpp new file mode 100644 index 0000000000..8f04baaec5 --- /dev/null +++ b/src/mbgl/renderer/tile_parameters.hpp @@ -0,0 +1,47 @@ +#pragma once + +#include + +namespace mbgl { + +class TransformState; +class Scheduler; +class FileSource; +class AnnotationManager; + +namespace style { +class Style; +} // namespace style + +class TileParameters { +public: + 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_), + workerScheduler(workerScheduler_), + fileSource(fileSource_), + mode(mode_), + annotationManager(annotationManager_), + style(style_) {} + + float pixelRatio; + MapDebugOptions debugOptions; + const TransformState& transformState; + Scheduler& workerScheduler; + FileSource& fileSource; + const MapMode mode; + AnnotationManager& annotationManager; + + // TODO: remove + style::Style& style; +}; + +} // namespace mbgl diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp index 97f9f31937..144afcb4f6 100644 --- a/src/mbgl/renderer/tile_pyramid.cpp +++ b/src/mbgl/renderer/tile_pyramid.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ std::map& 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 zoomRange, diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp index b8ffbfb2b0..b51c5342de 100644 --- 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 zoomRange, diff --git a/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/update_parameters.hpp deleted file mode 100644 index a00e01b973..0000000000 --- a/src/mbgl/renderer/update_parameters.hpp +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once - -#include - -namespace mbgl { - -class TransformState; -class Scheduler; -class FileSource; -class AnnotationManager; - -namespace style { -class Style; -} // namespace style - -class UpdateParameters { -public: - UpdateParameters(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_), - workerScheduler(workerScheduler_), - fileSource(fileSource_), - mode(mode_), - annotationManager(annotationManager_), - style(style_) {} - - float pixelRatio; - MapDebugOptions debugOptions; - const TransformState& transformState; - Scheduler& workerScheduler; - FileSource& fileSource; - const MapMode mode; - AnnotationManager& annotationManager; - - // TODO: remove - style::Style& style; -}; - -} // namespace mbgl diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 7f21d81b0e..5180f440c5 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -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); diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index c7528483e9..e07a4fda75 100644 --- 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); 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 #include #include -#include +#include #include #include @@ -84,7 +84,7 @@ public: GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID, std::string sourceID_, - const UpdateParameters& parameters, + const TileParameters& parameters, mapbox::geometry::feature_collection 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); void updateData(mapbox::geometry::feature_collection); 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 #include #include -#include +#include #include #include #include @@ -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 #include #include -#include +#include #include #include 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 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 #include -#include +#include #include #include @@ -12,7 +12,7 @@ namespace mbgl { template TileLoader::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 #include #include -#include +#include #include @@ -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; -- cgit v1.2.1