diff options
author | Molly Lloyd <molly@mapbox.com> | 2018-01-09 14:54:54 -0800 |
---|---|---|
committer | Molly Lloyd <molly@mapbox.com> | 2018-01-18 18:10:09 -0800 |
commit | c171b61b7d9026e2e9c9d37cfd989d2dde59b8f7 (patch) | |
tree | 78ad5e650578e00371d0f6a7e4b20a3730363b41 | |
parent | 7c40b59d056f7006d001ac116b81fd3a464e7329 (diff) | |
download | qtlocation-mapboxgl-c171b61b7d9026e2e9c9d37cfd989d2dde59b8f7.tar.gz |
fix tests
-rw-r--r-- | include/mbgl/style/types.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_hillshade_layer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index 0d1b72440c..693972a72f 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -38,7 +38,7 @@ enum class LineJoinType : uint8_t { FlipBevel }; -enum HillshadeIlluminationAnchorType : bool { +enum class HillshadeIlluminationAnchorType : bool { Map, Viewport }; diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index 71c6642cf6..11bfa96484 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -37,7 +37,7 @@ const std::array<float, 2> RenderHillshadeLayer::getLatRange(const UnwrappedTile const std::array<float, 3> RenderHillshadeLayer::getLight(const PaintParameters& parameters){ float azimuthal = evaluated.get<HillshadeIlluminationDirection>() * util::DEG2RAD; const float zenith = 30.0f * util::DEG2RAD; - if (evaluated.get<HillshadeIlluminationAnchor>() == Viewport) azimuthal = azimuthal - parameters.state.getAngle(); + if (evaluated.get<HillshadeIlluminationAnchor>() == HillshadeIlluminationAnchorType::Viewport) azimuthal = azimuthal - parameters.state.getAngle(); return {{evaluated.get<HillshadeExaggeration>(), azimuthal, zenith}}; } |