diff options
| author | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-02-14 13:17:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 13:17:55 -0800 |
| commit | 8a283b030629abb00367929d047731c3974bc3d6 (patch) | |
| tree | 4016b561a3ab52e4ce12e65b4307f0b626124120 /src/mbgl/renderer/buckets/hillshade_bucket.hpp | |
| parent | a386cac452b333d3e9656efd04e98035cd6b1c57 (diff) | |
| download | qtlocation-mapboxgl-8a283b030629abb00367929d047731c3974bc3d6.tar.gz | |
[core] add support for mapzen terrarium (#11154)
* add support for mapzen terrarium
* Encoding --> DEMEncoding, avoid if statement when unpacking elevation values
* add Terrarium test
* update submodule
* remove redundant checks
Diffstat (limited to 'src/mbgl/renderer/buckets/hillshade_bucket.hpp')
| -rw-r--r-- | src/mbgl/renderer/buckets/hillshade_bucket.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/renderer/buckets/hillshade_bucket.hpp b/src/mbgl/renderer/buckets/hillshade_bucket.hpp index 3d9f6c61af..5335f7ceda 100644 --- a/src/mbgl/renderer/buckets/hillshade_bucket.hpp +++ b/src/mbgl/renderer/buckets/hillshade_bucket.hpp @@ -8,6 +8,7 @@ #include <mbgl/renderer/bucket.hpp> #include <mbgl/renderer/tile_mask.hpp> #include <mbgl/geometry/dem_data.hpp> +#include <mbgl/util/tileset.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/mat4.hpp> #include <mbgl/util/optional.hpp> @@ -16,8 +17,8 @@ namespace mbgl { class HillshadeBucket : public Bucket { public: - HillshadeBucket(PremultipliedImage&&); - HillshadeBucket(std::shared_ptr<PremultipliedImage>); + HillshadeBucket(PremultipliedImage&&, Tileset::DEMEncoding encoding); + HillshadeBucket(std::shared_ptr<PremultipliedImage>, Tileset::DEMEncoding encoding); HillshadeBucket(DEMData&&); |