diff options
| author | Molly Lloyd <molly@mapbox.com> | 2018-01-10 14:10:04 -0800 |
|---|---|---|
| committer | Molly Lloyd <molly@mapbox.com> | 2018-01-18 18:10:09 -0800 |
| commit | df806bb35ae77fe180ab1bebb7a8f03ae91e749c (patch) | |
| tree | 26a80494c7f57187abc1b020ef4a3f142e5598f1 | |
| parent | e210047ff6d7a607394dee569c107b385f5b1b1a (diff) | |
| download | qtlocation-mapboxgl-df806bb35ae77fe180ab1bebb7a8f03ae91e749c.tar.gz | |
update hillshade shaders
| -rw-r--r-- | src/mbgl/programs/hillshade_program.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/layers/render_hillshade_layer.cpp | 5 | ||||
| -rw-r--r-- | src/mbgl/renderer/layers/render_hillshade_layer.hpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/mbgl/programs/hillshade_program.hpp b/src/mbgl/programs/hillshade_program.hpp index 065e262be6..5f9b4d1c2f 100644 --- a/src/mbgl/programs/hillshade_program.hpp +++ b/src/mbgl/programs/hillshade_program.hpp @@ -13,7 +13,7 @@ namespace uniforms { MBGL_DEFINE_UNIFORM_SCALAR(Color, u_shadow); MBGL_DEFINE_UNIFORM_SCALAR(Color, u_highlight); MBGL_DEFINE_UNIFORM_SCALAR(Color, u_accent); -MBGL_DEFINE_UNIFORM_VECTOR(float, 3, u_light); +MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_light); MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_latrange); } // namespace uniforms diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index 11bfa96484..81b3bcd94e 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -34,11 +34,10 @@ const std::array<float, 2> RenderHillshadeLayer::getLatRange(const UnwrappedTile return {{ (float)latlng0.latitude(), (float)latlng1.latitude() }}; } -const std::array<float, 3> RenderHillshadeLayer::getLight(const PaintParameters& parameters){ +const std::array<float, 2> RenderHillshadeLayer::getLight(const PaintParameters& parameters){ float azimuthal = evaluated.get<HillshadeIlluminationDirection>() * util::DEG2RAD; - const float zenith = 30.0f * util::DEG2RAD; if (evaluated.get<HillshadeIlluminationAnchor>() == HillshadeIlluminationAnchorType::Viewport) azimuthal = azimuthal - parameters.state.getAngle(); - return {{evaluated.get<HillshadeExaggeration>(), azimuthal, zenith}}; + return {{evaluated.get<HillshadeExaggeration>(), azimuthal}}; } void RenderHillshadeLayer::transition(const TransitionParameters& parameters) { diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.hpp b/src/mbgl/renderer/layers/render_hillshade_layer.hpp index 7e1315bbca..e9b9db1ec3 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.hpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.hpp @@ -27,7 +27,7 @@ public: const style::HillshadeLayer::Impl& impl() const; private: const std::array<float, 2> getLatRange(const UnwrappedTileID& id); - const std::array<float, 3> getLight(const PaintParameters& parameters); + const std::array<float, 2> getLight(const PaintParameters& parameters); }; template <> |