diff options
Diffstat (limited to 'src/mbgl/renderer/sources')
12 files changed, 15 insertions, 15 deletions
diff --git a/src/mbgl/renderer/sources/render_custom_geometry_source.cpp b/src/mbgl/renderer/sources/render_custom_geometry_source.cpp index 45d49ffa5b..9746d84599 100644 --- a/src/mbgl/renderer/sources/render_custom_geometry_source.cpp +++ b/src/mbgl/renderer/sources/render_custom_geometry_source.cpp @@ -51,7 +51,7 @@ void RenderCustomGeometrySource::upload(gfx::UploadPass& uploadPass) { tilePyramid.upload(uploadPass); } -void RenderCustomGeometrySource::prepare(PaintParameters& parameters) { +void RenderCustomGeometrySource::prepare(const SourcePrepareParameters& parameters) { tilePyramid.prepare(parameters); } diff --git a/src/mbgl/renderer/sources/render_custom_geometry_source.hpp b/src/mbgl/renderer/sources/render_custom_geometry_source.hpp index 485979bee9..aac6fe221b 100644 --- a/src/mbgl/renderer/sources/render_custom_geometry_source.hpp +++ b/src/mbgl/renderer/sources/render_custom_geometry_source.hpp @@ -19,7 +19,7 @@ public: const TileParameters&) final; void upload(gfx::UploadPass&) final; - void prepare(PaintParameters&) final; + void prepare(const SourcePrepareParameters&) final; void finishRender(PaintParameters&) final; std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final; diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp index 7ff371620a..c43b44934e 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.cpp +++ b/src/mbgl/renderer/sources/render_geojson_source.cpp @@ -127,7 +127,7 @@ void RenderGeoJSONSource::upload(gfx::UploadPass& parameters) { tilePyramid.upload(parameters); } -void RenderGeoJSONSource::prepare(PaintParameters& parameters) { +void RenderGeoJSONSource::prepare(const SourcePrepareParameters& parameters) { tilePyramid.prepare(parameters); } diff --git a/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp index 1a2ff55427..f2b0014ac4 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.hpp +++ b/src/mbgl/renderer/sources/render_geojson_source.hpp @@ -24,7 +24,7 @@ public: const TileParameters&) final; void upload(gfx::UploadPass&) final; - void prepare(PaintParameters&) final; + void prepare(const SourcePrepareParameters&) final; void finishRender(PaintParameters&) final; std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final; diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index e63c9ad15c..2c6538221f 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -37,18 +37,18 @@ void RenderImageSource::upload(gfx::UploadPass& uploadPass) { } } -void RenderImageSource::prepare(PaintParameters& parameters) { +void RenderImageSource::prepare(const SourcePrepareParameters& parameters) { if (!isLoaded()) { return; } matrices.clear(); - + const auto& transformParams = parameters.transform; for (auto& tileId : tileIds) { mat4 matrix; matrix::identity(matrix); - parameters.state.matrixFor(matrix, tileId); - matrix::multiply(matrix, parameters.alignedProjMatrix, matrix); + transformParams.state.matrixFor(matrix, tileId); + matrix::multiply(matrix, transformParams.alignedProjMatrix, matrix); matrices.push_back(matrix); } } diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp index c07fd467cb..cdc866ea5c 100644 --- a/src/mbgl/renderer/sources/render_image_source.hpp +++ b/src/mbgl/renderer/sources/render_image_source.hpp @@ -16,7 +16,7 @@ public: bool isLoaded() const final; void upload(gfx::UploadPass&) final; - void prepare(PaintParameters&) final; + void prepare(const SourcePrepareParameters&) final; void finishRender(PaintParameters&) final; void update(Immutable<style::Source::Impl>, diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.cpp b/src/mbgl/renderer/sources/render_raster_dem_source.cpp index c9f17f38c4..9962e26337 100644 --- a/src/mbgl/renderer/sources/render_raster_dem_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_dem_source.cpp @@ -130,7 +130,7 @@ void RenderRasterDEMSource::upload(gfx::UploadPass& parameters) { tilePyramid.upload(parameters); } -void RenderRasterDEMSource::prepare(PaintParameters& parameters) { +void RenderRasterDEMSource::prepare(const SourcePrepareParameters& parameters) { algorithm::updateTileMasks(tilePyramid.getRenderTiles()); tilePyramid.prepare(parameters); } diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.hpp b/src/mbgl/renderer/sources/render_raster_dem_source.hpp index 57180bb4e2..712f4fefaa 100644 --- a/src/mbgl/renderer/sources/render_raster_dem_source.hpp +++ b/src/mbgl/renderer/sources/render_raster_dem_source.hpp @@ -19,7 +19,7 @@ public: const TileParameters&) final; void upload(gfx::UploadPass&) final; - void prepare(PaintParameters&) final; + void prepare(const SourcePrepareParameters&) final; void finishRender(PaintParameters&) final; std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final; diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp index 39cccd47e6..d7dec8ff17 100644 --- a/src/mbgl/renderer/sources/render_raster_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_source.cpp @@ -61,7 +61,7 @@ void RenderRasterSource::upload(gfx::UploadPass& parameters) { tilePyramid.upload(parameters); } -void RenderRasterSource::prepare(PaintParameters& parameters) { +void RenderRasterSource::prepare(const SourcePrepareParameters& parameters) { algorithm::updateTileMasks(tilePyramid.getRenderTiles()); tilePyramid.prepare(parameters); } diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp index e399893cb9..74f81a1397 100644 --- a/src/mbgl/renderer/sources/render_raster_source.hpp +++ b/src/mbgl/renderer/sources/render_raster_source.hpp @@ -19,7 +19,7 @@ public: const TileParameters&) final; void upload(gfx::UploadPass&) final; - void prepare(PaintParameters&) final; + void prepare(const SourcePrepareParameters&) final; void finishRender(PaintParameters&) final; std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final; diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp index 21b728e266..36fc69d988 100644 --- a/src/mbgl/renderer/sources/render_vector_source.cpp +++ b/src/mbgl/renderer/sources/render_vector_source.cpp @@ -61,7 +61,7 @@ void RenderVectorSource::upload(gfx::UploadPass& parameters) { tilePyramid.upload(parameters); } -void RenderVectorSource::prepare(PaintParameters& parameters) { +void RenderVectorSource::prepare(const SourcePrepareParameters& parameters) { tilePyramid.prepare(parameters); } diff --git a/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp index bea9bad20e..fd37e1e4fd 100644 --- a/src/mbgl/renderer/sources/render_vector_source.hpp +++ b/src/mbgl/renderer/sources/render_vector_source.hpp @@ -19,7 +19,7 @@ public: const TileParameters&) final; void upload(gfx::UploadPass&) final; - void prepare(PaintParameters&) final; + void prepare(const SourcePrepareParameters&) final; void finishRender(PaintParameters&) final; std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final; |